From 00e4376bf819162466456b8a72a71835bb0f6e52 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Mon, 9 Dec 2024 11:44:46 -0500 Subject: [PATCH 01/21] Initial commit for hk_conv --- src/data/registry.xml | 52 +++++++++++++++++++++++++++++++++++++++++++ src/physics/ncar_ccpp | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index ca875b67..e192306c 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -137,6 +137,58 @@ horizontal_dimension vertical_layer_dimension frontga pbuf_frontga + + horizontal_dimension + pblh pbuf_pblh + + + horizontal_dimension + qpert pbuf_qpert + + + horizontal_dimension vertical_layer_dimension + cmfmc tphysbc_cmfmc + + + horizontal_dimension vertical_layer_dimension + dlf tphysbc_dlf + + + horizontal_dimension vertical_layer_dimension + dlf2 tphysbc_dlf2 + + + + horizontal_dimension + rliq tphysbc_rliq + + + horizontal_dimension + rliq2 tphysbc_rliq2 + Date: Wed, 8 Jan 2025 17:12:27 -0500 Subject: [PATCH 02/21] Fixes to build Hack with ZM --- src/data/registry.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index e192306c..b52679b8 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -137,13 +137,6 @@ horizontal_dimension vertical_layer_dimension frontga pbuf_frontga - - horizontal_dimension - pblh pbuf_pblh - Date: Wed, 22 Jan 2025 18:36:26 -0500 Subject: [PATCH 03/21] Add dlfzm --- src/data/registry.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index b52679b8..747ec080 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -151,6 +151,13 @@ horizontal_dimension vertical_layer_dimension cmfmc tphysbc_cmfmc + + horizontal_dimension vertical_layer_dimension + dlfzm pbuf_dlfzm + dlf2 tphysbc_dlf2 + the CCPP standard names table claim that it should be in kg m-2 s-1 units. --> Date: Mon, 27 Jan 2025 11:04:51 -0500 Subject: [PATCH 04/21] Update to atmos_phys rebased Add CAM4 suite and tests --- cime_config/config_component.xml | 4 +-- cime_config/config_compsets.xml | 5 ++++ cime_config/testdefs/testlist_cam.xml | 12 ++++++++ src/data/registry.xml | 43 ++++++++++++++++++++++++--- 4 files changed, 58 insertions(+), 6 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 5162cdbd..6fcca200 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -122,8 +122,8 @@ --physics-suites cam7 - diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 6a3df181..30b3def5 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -109,6 +109,11 @@ 2000_CAM70_SLND_SICE_SOCN_SROF_SGLC_SWAV + + FCAM4 + 2000_CAM40_SLND_SICE_SOCN_SROF_SGLC_SWAV + + F2010climo 2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 28eaa1cb..94c6372a 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -106,4 +106,16 @@ + + + + + + + + + + + + diff --git a/src/data/registry.xml b/src/data/registry.xml index 747ec080..7f03f7dc 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -148,15 +148,29 @@ standard_name="atmosphere_convective_mass_flux_due_to_all_convection" units="kg m-2 s-1" type="real" kind="kind_phys" allocatable="pointer"> - horizontal_dimension vertical_layer_dimension + horizontal_dimension vertical_interface_dimension cmfmc tphysbc_cmfmc + + horizontal_dimension vertical_interface_dimension + cmfmc_dp pbuf_CMFMC_DP + + + horizontal_dimension vertical_interface_dimension + cmfmc_sh pbuf_CMFMC_SH + horizontal_dimension vertical_layer_dimension - dlfzm pbuf_dlfzm + dlfzm pbuf_DLFZM horizontal_dimension vertical_layer_dimension dlf2 tphysbc_dlf2 + + horizontal_dimension + pbuf_ZM_JT + + + horizontal_dimension + pbuf_ZM_MAXG + + + horizontal_dimension vertical_layer_dimension + pbuf_RPRDDP + horizontal_dimension rliq tphysbc_rliq horizontal_dimension From 22dd39dcfea01ec843a0e18d408f244e4ce5fe5b Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Mon, 3 Feb 2025 11:33:37 -0500 Subject: [PATCH 05/21] Remove zm_jt/maxg due to incorrect pbuf writing; update ref_pres from ZM PR --- src/data/registry.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index 7f03f7dc..c8eda87a 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -186,20 +186,6 @@ horizontal_dimension vertical_layer_dimension dlf2 tphysbc_dlf2 - - horizontal_dimension - pbuf_ZM_JT - - - horizontal_dimension - pbuf_ZM_MAXG - Date: Thu, 6 Feb 2025 18:56:40 -0500 Subject: [PATCH 06/21] Add use_shfrc and shfrc registry (stateful) fields --- src/data/registry.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/data/registry.xml b/src/data/registry.xml index c8eda87a..5ebf2884 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -573,6 +573,23 @@ landfrac cam_in_landfrac + + + should cloud fraction use shallow convection calculated convective clouds + + .false. + + + horizontal_dimension vertical_layer_dimension + + 0.0_kind_phys + + Date: Thu, 13 Feb 2025 17:52:54 -0500 Subject: [PATCH 07/21] Update submodules to pre-finalized state --- .gitmodules | 4 ++-- src/data/registry.xml | 16 ++++++++++++---- src/physics/ncar_ccpp | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index ff98f992..fbf167ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,8 +19,8 @@ fxDONOTUSEurl = https://github.com/MPAS-Dev/MPAS-Model.git [submodule "ncar-physics"] path = src/physics/ncar_ccpp - url = https://github.com/ESCOMP/atmospheric_physics - fxtag = atmos_phys0_08_000 + url = https://github.com/jimmielin/atmospheric_physics + fxtag = 1564399165ad6ffb71c19d04d60d611cf226727b fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "ccs_config"] diff --git a/src/data/registry.xml b/src/data/registry.xml index 5ebf2884..3181dea1 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -573,16 +573,24 @@ landfrac cam_in_landfrac - + + + vertical layer index for top of cloud area fraction schemes + 1 + + + - should cloud fraction use shallow convection calculated convective clouds + should cloud fraction use shallow convection calculated convective cloud area fraction .false. horizontal_dimension vertical_layer_dimension diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index 4d4ca68a..15643991 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit 4d4ca68a496f8291f6af78a7ceb508162bfbc5c8 +Subproject commit 1564399165ad6ffb71c19d04d60d611cf226727b From 236a21e8e61ec4047d6fc235b3660a2cc207bc67 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Fri, 14 Feb 2025 17:54:31 -0500 Subject: [PATCH 08/21] Update trop_cloud_top_lev standard name --- .gitmodules | 2 +- src/data/ref_pres.meta | 2 +- src/physics/ncar_ccpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8e4f7b4c..52a13266 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "ncar-physics"] path = src/physics/ncar_ccpp url = https://github.com/jimmielin/atmospheric_physics - fxtag = 414b6a69112b3955db85469cbc56059c32419ba5 + fxtag = ac51af80d1c46cca7ed3538b872592b0097333d6 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "ccs_config"] diff --git a/src/data/ref_pres.meta b/src/data/ref_pres.meta index bf95e6c8..79f9f319 100644 --- a/src/data/ref_pres.meta +++ b/src/data/ref_pres.meta @@ -35,7 +35,7 @@ dimensions = () protected = True [ trop_cloud_top_lev ] - standard_name = vertical_layer_index_of_troposphere_cloud_top + standard_name = vertical_layer_index_of_troposphere_cloud_physics_top units = index type = integer dimensions = () diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index 414b6a69..ac51af80 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit 414b6a69112b3955db85469cbc56059c32419ba5 +Subproject commit ac51af80d1c46cca7ed3538b872592b0097333d6 From e28e1d4376fe70e5b3671e74ec61b0c7c92150d8 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Tue, 18 Feb 2025 14:10:25 -0500 Subject: [PATCH 09/21] Update to address review comments --- .gitmodules | 2 +- src/data/registry.xml | 10 +++++----- src/physics/ncar_ccpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 52a13266..c69394b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "ncar-physics"] path = src/physics/ncar_ccpp url = https://github.com/jimmielin/atmospheric_physics - fxtag = ac51af80d1c46cca7ed3538b872592b0097333d6 + fxtag = eb7981691f80e89c4b1eca0dbe4da47315f6647f fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "ccs_config"] diff --git a/src/data/registry.xml b/src/data/registry.xml index 957cb172..59d1a4b9 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -166,21 +166,21 @@ cmfmc_sh pbuf_CMFMC_SH horizontal_dimension vertical_layer_dimension dlfzm pbuf_DLFZM horizontal_dimension vertical_layer_dimension dlf tphysbc_dlf horizontal_dimension vertical_layer_dimension @@ -196,14 +196,14 @@ horizontal_dimension rliq tphysbc_rliq horizontal_dimension diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index ac51af80..eb798169 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit ac51af80d1c46cca7ed3538b872592b0097333d6 +Subproject commit eb7981691f80e89c4b1eca0dbe4da47315f6647f From 92c05d67bee23f87bc8a5d4ef45843b99e99042f Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Thu, 20 Feb 2025 12:32:52 -0500 Subject: [PATCH 10/21] Add initializations for snapshot fields for running CAM4 suite (need companion PR) --- src/data/registry.xml | 55 ++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index 59d1a4b9..6b26d460 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -137,60 +137,69 @@ horizontal_dimension vertical_layer_dimension frontga pbuf_frontga + + allocatable="allocatable"> horizontal_dimension + 0.0_kind_phys qpert pbuf_qpert + allocatable="allocatable"> horizontal_dimension vertical_interface_dimension + 0.0_kind_phys cmfmc tphysbc_cmfmc + allocatable="allocatable"> horizontal_dimension vertical_interface_dimension + 0.0_kind_phys cmfmc_dp pbuf_CMFMC_DP + allocatable="allocatable"> horizontal_dimension vertical_interface_dimension + 0.0_kind_phys cmfmc_sh pbuf_CMFMC_SH + allocatable="allocatable"> horizontal_dimension vertical_layer_dimension + 0.0_kind_phys dlfzm pbuf_DLFZM + allocatable="allocatable"> horizontal_dimension vertical_layer_dimension + 0.0_kind_phys dlf tphysbc_dlf + allocatable="allocatable"> horizontal_dimension vertical_layer_dimension + 0.0_kind_phys dlf2 tphysbc_dlf2 + allocatable="allocatable"> horizontal_dimension vertical_layer_dimension + 0.0_kind_phys pbuf_RPRDDP @@ -573,6 +584,19 @@ landfrac cam_in_landfrac + + + + horizontal_dimension + + 0.0_kind_phys + pblh pbuf_pblh + + should cloud fraction use shallow convection calculated convective cloud area fraction @@ -599,12 +623,9 @@ - - horizontal_dimension - pblh pbuf_pblh + Date: Fri, 21 Feb 2025 11:35:43 -0500 Subject: [PATCH 11/21] Add Hack shallow convection test. --- cime_config/testdefs/testlist_cam.xml | 9 +++++ .../shell_commands | 1 + .../outfrq_hack_shallow_derecho/user_nl_cam | 33 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/user_nl_cam diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 94c6372a..66410c0a 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -52,6 +52,15 @@ + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/shell_commands new file mode 100644 index 00000000..cb312142 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/shell_commands @@ -0,0 +1 @@ + ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites convect_shallow_hack" diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/user_nl_cam new file mode 100644 index 00000000..a831db5a --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/user_nl_cam @@ -0,0 +1,33 @@ +! these are QPC4 snapshots and require custom physical constant definitions. +ncdata = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne5np4_hack_convect_shallow_snapshot_derecho_gnu_before_c20250220.nc' +ncdata_check = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne5np4_hack_convect_shallow_snapshot_derecho_gnu_after_c20250220.nc' + +pver = 26 +user_defined_cpwv = 1.846e3 +user_defined_gravit = 9.79764 +user_defined_mwdry = 28.96623324623746 +user_defined_mwh2o = 18.01618112892741 +user_defined_rearth = 6.37100e6 +user_defined_sday = 86164.10063718943 + +zmconv_c0_lnd = 0.0035D0 +zmconv_c0_ocn = 0.0035D0 +zmconv_capelmt = 70.0 +zmconv_dmpdz = -1.0E-3 +zmconv_ke = 5.0E-6 +zmconv_ke_lnd = 3.0E-6 +zmconv_momcd = 0.4000D0 +zmconv_momcu = 0.4000D0 +zmconv_num_cin = 5 +zmconv_parcel_pbl = .false. +zmconv_tau = 3600.0 +zmconv_tiedke_add = 0.5 + +! snapshot is sourced from SE dycore +hkconv_c0 = 1.0e-4 + +! history fields for CAM4 Hack shallow convection +hist_output_frequency;h1: 1*nsteps +hist_max_frames;h1: 1 +hist_add_inst_fields;h1: CMFDT,CMFDQ,CMFDLIQ,CMFDICE,CMFDQR,DQP,ICWMRSH,CMFSL,CMFLQ,FREQSH,EVAPTCM,FZSNTCM,EVSNTCM,HKNTPRPD,HKNTSNPD,HKFLXPRC,HKFLXSNW,HKEIHEAT,EVAPQCM,PRECSH,CMFMCSH,CMFMC,CLDTOP,CLDBOT,PCLDTOP,PCLDBOT,ZMDLF,SHDLF +hist_precision;h1: REAL64 From ee30f0a9a3d99e930a041ac31f196650026b2f32 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Fri, 21 Feb 2025 13:24:46 -0500 Subject: [PATCH 12/21] Fix test definition res; initialize tpert to zero; initialize landfrac to zero in registry. --- cime_config/testdefs/testlist_cam.xml | 2 +- src/data/registry.xml | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 66410c0a..279b32f2 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -52,7 +52,7 @@ - + diff --git a/src/data/registry.xml b/src/data/registry.xml index 6b26d460..f681d721 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -581,6 +581,7 @@ units="fraction" type="real" kind="kind_phys" allocatable="allocatable"> horizontal_dimension + 0.0_kind_phys landfrac cam_in_landfrac @@ -596,6 +597,14 @@ 0.0_kind_phys pblh pbuf_pblh + + horizontal_dimension + 0.0_kind_phys + tpert pbuf_tpert + - - horizontal_dimension - tpert pbuf_tpert - Date: Fri, 21 Feb 2025 13:25:43 -0500 Subject: [PATCH 13/21] Update ncar-physics external to latest in hk_conv --- .gitmodules | 2 +- src/physics/ncar_ccpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index c69394b0..60319783 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "ncar-physics"] path = src/physics/ncar_ccpp url = https://github.com/jimmielin/atmospheric_physics - fxtag = eb7981691f80e89c4b1eca0dbe4da47315f6647f + fxtag = 7dcf8b9261612a1deb5916a50b4ffcd43aebea34 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "ccs_config"] diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index eb798169..7dcf8b92 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit eb7981691f80e89c4b1eca0dbe4da47315f6647f +Subproject commit 7dcf8b9261612a1deb5916a50b4ffcd43aebea34 From 67f88c34feba8b8a2903a782a0d1a568dd856419 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Wed, 26 Feb 2025 21:13:04 -0500 Subject: [PATCH 14/21] Add cam_in inputs in registry for reading from snapshot. --- src/data/registry.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/data/registry.xml b/src/data/registry.xml index f681d721..a2cdfbdd 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -584,6 +584,30 @@ 0.0_kind_phys landfrac cam_in_landfrac + + horizontal_dimension + 0.0_kind_phys + icefrac cam_in_icefrac + + + horizontal_dimension + 0.0_kind_phys + snowhland cam_in_snowhland + + + horizontal_dimension + 0.0_kind_phys + sst cam_in_sst + From cba3f3970c44b97f03dd7d1a4ed88e0a9937d8d6 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Wed, 26 Feb 2025 21:13:28 -0500 Subject: [PATCH 15/21] Update atmos_phys tag to pre-merge for regression testing --- .gitmodules | 2 +- src/physics/ncar_ccpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 60319783..2a5ff1f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "ncar-physics"] path = src/physics/ncar_ccpp url = https://github.com/jimmielin/atmospheric_physics - fxtag = 7dcf8b9261612a1deb5916a50b4ffcd43aebea34 + fxtag = 92ea4d69de368b729c5906ea43fed663644ee008 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "ccs_config"] diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index 7dcf8b92..92ea4d69 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit 7dcf8b9261612a1deb5916a50b4ffcd43aebea34 +Subproject commit 92ea4d69de368b729c5906ea43fed663644ee008 From 5aff5d1981fa8857c6b6240e035c2003ecb5c598 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Wed, 26 Feb 2025 22:57:58 -0500 Subject: [PATCH 16/21] More reasonable SST initialization --- src/data/registry.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index a2cdfbdd..32c086ac 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -605,7 +605,9 @@ units="K" type="real" kind="kind_phys" allocatable="allocatable"> horizontal_dimension - 0.0_kind_phys + + 273.15_kind_phys sst cam_in_sst From 0defe92744590eb9f58eb25685e8e37981330fd5 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Fri, 7 Mar 2025 12:04:48 -0500 Subject: [PATCH 17/21] Update to atmos_phys0_10_001 --- .gitmodules | 4 ++-- src/physics/ncar_ccpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2a5ff1f9..2dfe440b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,8 +19,8 @@ fxDONOTUSEurl = https://github.com/MPAS-Dev/MPAS-Model.git [submodule "ncar-physics"] path = src/physics/ncar_ccpp - url = https://github.com/jimmielin/atmospheric_physics - fxtag = 92ea4d69de368b729c5906ea43fed663644ee008 + url = https://github.com/ESCOMP/atmospheric_physics + fxtag = atmos_phys0_10_001 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "ccs_config"] diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index 92ea4d69..988ef008 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit 92ea4d69de368b729c5906ea43fed663644ee008 +Subproject commit 988ef00880ba5c013de3ff4182c4592e80f343fe From ae2604a09d5b3e01ecd7f1cd23bd2feb60999f35 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Mon, 10 Mar 2025 12:41:04 -0400 Subject: [PATCH 18/21] Change all dycore tests to ne3pg3_ne3pg3_mg37 --- cime_config/testdefs/testlist_cam.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 279b32f2..f96786c8 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -73,7 +73,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -117,7 +117,7 @@ - + From 30764b1c425350d54c84d27e5e1819810cd34123 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Mon, 10 Mar 2025 12:59:55 -0400 Subject: [PATCH 19/21] Remove delt from registry.xml --- src/data/registry.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index 32c086ac..639e8675 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -658,10 +658,6 @@ - - Date: Mon, 10 Mar 2025 13:28:53 -0400 Subject: [PATCH 20/21] Fix standard name for vertical_layer_index_of_troposphere_cloud_physics_top --- src/data/ref_pres.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/ref_pres.F90 b/src/data/ref_pres.F90 index 137c1e6d..4cc34cbb 100644 --- a/src/data/ref_pres.F90 +++ b/src/data/ref_pres.F90 @@ -179,7 +179,7 @@ subroutine ref_pres_init(pref_edge_in, pref_mid_in, num_pr_lev_in) ! num_pr_lev call mark_as_initialized("number_of_pure_pressure_levels_at_top") ! trop_cloud_top_lev - call mark_as_initialized("index_of_pressure_at_troposhere_cloud_top") + call mark_as_initialized("vertical_layer_index_of_troposphere_cloud_physics_top") ! clim_modal_aero_top_lev call mark_as_initialized("index_of_air_pressure_at_top_of_aerosol_model") ! do_molec_press From b76c1056f2dfbef619b3ac28aac597272c86473c Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Mon, 10 Mar 2025 14:05:57 -0400 Subject: [PATCH 21/21] Update comments in registry.xml --- src/data/registry.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index 639e8675..0ffdd61f 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -202,8 +202,6 @@ 0.0_kind_phys pbuf_RPRDDP - tpert pbuf_tpert - + @@ -640,7 +638,7 @@ 1 - +