From fd511428d35a12ee31a70fee43f49bce616625fe Mon Sep 17 00:00:00 2001 From: tanyasmirnova Date: Thu, 12 Aug 2021 21:22:27 +0000 Subject: [PATCH 1/4] Changed dimensions of variables tsnow_land and sncovr_ice from horizontal_dimension to horizontal_loop_extent --- ccpp/data/GFS_typedefs.meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index c9d340fc2..91c5d3fbc 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -631,7 +631,7 @@ standard_name = surface_snow_area_fraction_over_ice long_name = surface snow area fraction over ice units = frac - dimensions = (horizontal_dimension) + dimensions = (horizontal_loop_extent) type = real kind = kind_phys active = (flag_for_land_surface_scheme == flag_for_ruc_land_surface_scheme) @@ -1460,7 +1460,7 @@ standard_name = snow_temperature_bottom_first_layer_over_land long_name = snow temperature at the bottom of the first snow layer over land units = K - dimensions = (horizontal_dimension) + dimensions = (horizontal_loop_extent) type = real kind = kind_phys active = (flag_for_land_surface_scheme == flag_for_ruc_land_surface_scheme) From 37391a35331a34ce29db15c4d20e18ab77853522 Mon Sep 17 00:00:00 2001 From: tanyasmirnova Date: Mon, 16 Aug 2021 22:01:38 +0000 Subject: [PATCH 2/4] Added Flake to two suites: FV3_GSD_v0 and FV3_HRRR. --- ccpp/suites/suite_FV3_GSD_v0.xml | 1 + ccpp/suites/suite_FV3_HRRR.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/ccpp/suites/suite_FV3_GSD_v0.xml b/ccpp/suites/suite_FV3_GSD_v0.xml index d1b76b3a8..d0b6a0383 100644 --- a/ccpp/suites/suite_FV3_GSD_v0.xml +++ b/ccpp/suites/suite_FV3_GSD_v0.xml @@ -46,6 +46,7 @@ sfc_nst sfc_nst_post lsm_ruc + flake_driver GFS_surface_loop_control_part2 diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml index c7f76c274..5ba22a8f7 100644 --- a/ccpp/suites/suite_FV3_HRRR.xml +++ b/ccpp/suites/suite_FV3_HRRR.xml @@ -46,6 +46,7 @@ sfc_nst sfc_nst_post lsm_ruc + flake_driver GFS_surface_loop_control_part2 From 56ee817b4af52264decd69c26673d73102da1a1c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 18 Aug 2021 15:52:37 -0600 Subject: [PATCH 3/4] Update .gitmodules and submodule pointer for ccpp-physics for code review and testing --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6d2d19bb4..a8018914d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,7 @@ branch = gsl/develop [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NOAA-GSL/ccpp-physics - branch = gsl/develop + #url = https://github.com/NOAA-GSL/ccpp-physics + #branch = gsl/develop + url = https://github.com/tanyasmirnova/ccpp-physics + branch = gsl_dev_11aug21_lake diff --git a/ccpp/physics b/ccpp/physics index d7289c4d7..28a920c57 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d7289c4d7754ad7f914aa3744b056f38eee4e1ea +Subproject commit 28a920c573b2ad476eefee06a78f18b9ab141e26 From 309a912cf734c70539d9fe10c8843188291e2a74 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 23 Aug 2021 10:09:07 -0600 Subject: [PATCH 4/4] Revert change to .gitmodules and update submodule pointer for ccpp-physics --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index a8018914d..6d2d19bb4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,5 @@ branch = gsl/develop [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NOAA-GSL/ccpp-physics - #branch = gsl/develop - url = https://github.com/tanyasmirnova/ccpp-physics - branch = gsl_dev_11aug21_lake + url = https://github.com/NOAA-GSL/ccpp-physics + branch = gsl/develop diff --git a/ccpp/physics b/ccpp/physics index 28a920c57..8c0206785 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 28a920c573b2ad476eefee06a78f18b9ab141e26 +Subproject commit 8c0206785e57a386a4155531e8640eb423b3118e