From 647034359500ec8721f0f195412e3027e8d6dc2d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 26 Mar 2021 20:14:56 -0600 Subject: [PATCH 1/5] Update .gitmodules and submodule pointer for GFDL_atmos_cubed_sphere and ccpp-framework for code review and testing --- .gitmodules | 12 ++++++++---- atmos_cubed_sphere | 2 +- ccpp/framework | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..ac4fc0067 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,15 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere - branch = dev/emc + #url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + #branch = dev/emc + url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere + branch = nest_workaround_read_ccpp_suite_from_input_nml [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = master + #url = https://github.com/NCAR/ccpp-framework + #branch = master + url = https://github.com/climbfuji/ccpp-framework + branch = speedup_recompile_again_20210326 [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 306ff3137..4a27a0413 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 306ff31371e74694e5d9f4a57584295c7122b9ac +Subproject commit 4a27a041372ad3fd641a3ddf19937784f452a11c diff --git a/ccpp/framework b/ccpp/framework index 9a5c9ce5e..c49803f7f 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 9a5c9ce5e35f311f3d6f25da6e85ad8ae9bbc6a1 +Subproject commit c49803f7fa263dcada38272966491c2f2bf98f30 From 91d5a20f2d9248ec2ac0455611abad100da2517d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 26 Mar 2021 20:15:47 -0600 Subject: [PATCH 2/5] atmos_model.F90: move reading of namelist section atmos_model_nml to after atmosphere_init so that nests work correctly --- atmos_model.F90 | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index 04ecae56b..5046330c4 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -416,24 +416,6 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step) logunit = stdlog() -!----------------------------------------------------------------------- -! initialize atmospheric model ----- - - IF ( file_exist('input.nml')) THEN -#ifdef INTERNAL_FILE_NML - read(input_nml_file, nml=atmos_model_nml, iostat=io) - ierr = check_nml_error(io, 'atmos_model_nml') -#else - unit = open_namelist_file ( ) - ierr=1 - do while (ierr /= 0) - read (unit, nml=atmos_model_nml, iostat=io, end=10) - ierr = check_nml_error(io,'atmos_model_nml') - enddo - 10 call close_file (unit) -#endif - endif - !---------- initialize atmospheric dynamics after reading the namelist ------- !---------- (need name of CCPP suite definition file from input.nml) --------- call atmosphere_init (Atmos%Time_init, Atmos%Time, Atmos%Time_step,& @@ -453,6 +435,25 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step) Atmos%mlon = mlon Atmos%mlat = mlat + +!---------------------------------------------------------------------------------------------- +! initialize atmospheric model - must happen AFTER atmosphere_init so that nests work correctly + + IF ( file_exist('input.nml')) THEN +#ifdef INTERNAL_FILE_NML + read(input_nml_file, nml=atmos_model_nml, iostat=io) + ierr = check_nml_error(io, 'atmos_model_nml') +#else + unit = open_namelist_file ( ) + ierr=1 + do while (ierr /= 0) + read (unit, nml=atmos_model_nml, iostat=io, end=10) + ierr = check_nml_error(io,'atmos_model_nml') + enddo + 10 call close_file (unit) +#endif + endif + !----------------------------------------------------------------------- !--- before going any further check definitions for 'blocks' !----------------------------------------------------------------------- From 67549b04afbaa8165f4b9089138af77e48bc5559 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 29 Mar 2021 08:32:45 -0600 Subject: [PATCH 3/5] Update submodule pointer for GFDL_atmos_cubed_sphere --- .gitmodules | 2 +- atmos_cubed_sphere | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index ac4fc0067..114d0afdc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - #url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere #branch = dev/emc url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere branch = nest_workaround_read_ccpp_suite_from_input_nml diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 4a27a0413..97ccbe789 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 4a27a041372ad3fd641a3ddf19937784f452a11c +Subproject commit 97ccbe789f4305a8889450e6faf5dfde5813d55f From 5930832146da39d8f92c0036509de09bc9754256 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 31 Mar 2021 12:06:20 -0600 Subject: [PATCH 4/5] Revert ccpp-framework change in .gitmodules, update submodule pointer for ccpp-framework --- .gitmodules | 6 ++---- ccpp/framework | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 114d0afdc..2cdd87756 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,8 @@ branch = nest_workaround_read_ccpp_suite_from_input_nml [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = master - url = https://github.com/climbfuji/ccpp-framework - branch = speedup_recompile_again_20210326 + url = https://github.com/NCAR/ccpp-framework + branch = master [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index c49803f7f..186e76d3e 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit c49803f7fa263dcada38272966491c2f2bf98f30 +Subproject commit 186e76d3e6b03a719303e5e608498e8354caa278 From c678d4aa386e8281e687fca6c0cd7c5c528a6cf1 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 9 Apr 2021 15:04:30 -0600 Subject: [PATCH 5/5] Update submodule pointer for GFDL_atmos_cubed_sphere and revert change to .gitmodules --- .gitmodules | 6 ++---- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2cdd87756..1f7526633 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - #branch = dev/emc - url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere - branch = nest_workaround_read_ccpp_suite_from_input_nml + url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 129a3ae96..6944f421b 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 129a3ae9653a1cce944b0a3c397c68bf7078bfe9 +Subproject commit 6944f421bba37887394ef9552d8b88869f82dd49