Skip to content

update framework tag #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peverwhee merged 6 commits into from
Feb 13, 2026
Merged

update framework tag #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
710d41a
update framework tag; mods to match
peverwhee Jan 21, 2026
81c3f6c
use latest atmos phys hash
peverwhee Feb 13, 2026
ef6e767
merge to head of development
peverwhee Feb 13, 2026
e5f086d
fix unit test
peverwhee Feb 13, 2026
4449611
update existing-test-failures
peverwhee Feb 13, 2026
5cfc0dc
fix error message
peverwhee Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "ccpp-framework"]
path = ccpp_framework
url = https://github.com/NCAR/ccpp-framework
fxtag = 2025-10-15-dev
fxtag = sima_2026-01-20
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/NCAR/ccpp-framework
[submodule "history"]
Expand All @@ -20,7 +20,7 @@
[submodule "ncar-physics"]
path = src/physics/ncar_ccpp
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_21_000
fxtag = 87e76a6ce90767d1d32259ff3f11dec9c9a03b03
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
[submodule "rrtmgp-data"]
Expand Down
2 changes: 1 addition & 1 deletion ccpp_framework
Open in desktop
Submodule ccpp_framework updated 108 files
1 change: 1 addition & 0 deletions src/control/cam_comp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,7 @@ subroutine cam_register_constituents(cam_runtime_opts)
default_value=0._kind_phys, &
vertical_dim="vertical_layer_dimension", &
advected=.true., &
diag_name="Q", &
errcode=errflg, errmsg=errmsg)

if (errflg /= 0) then
Expand Down
3 changes: 1 addition & 2 deletions src/data/generate_registry_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,8 +1863,7 @@ def gen_registry(registry_file, dycore, outdir, indent,
try:
emsg = f"Invalid registry file, {registry_file}"
file_ok = validate_xml_file(registry_file, 'registry', version,
logger, schema_path=schema_dir,
error_on_noxmllint=error_on_no_validate)
logger, schema_path=schema_dir)
except CCPPError as ccpperr:
emsg += f"\n{ccpperr}"
file_ok = False
Expand Down
2 changes: 1 addition & 1 deletion src/physics/ncar_ccpp
Open in desktop
Submodule ncar_ccpp updated 25 files
+1 −0 .gitattributes
+1 −1 .github/workflows/unit-tests.yaml
+1 −1 .gitmodules
+8 −6 schemes/mmm/CMakeLists.txt
+21 −6 schemes/mmm/cu_ntiedtke_compat.F90
+1 −19 schemes/mmm/cu_ntiedtke_compat.meta
+1 −1 schemes/mmm/mmm_physics
+46 −3 schemes/mmm/mmm_physics_compat.F90
+72 −0 schemes/mmm/mmm_physics_compat.meta
+541 −0 schemes/mmm/sf_mynn_compat.F90
+982 −0 schemes/mmm/sf_mynn_compat.meta
+7 −1 schemes/rrtmgp/objects/ccpp_gas_optics_rrtmgp.meta
+3 −0 schemes/rrtmgp/rrtmgp_constituents.F90
+5 −0 schemes/rrtmgp/rrtmgp_lw_cloud_optics.meta
+6 −0 schemes/rrtmgp/rrtmgp_lw_gas_optics.meta
+5 −1 schemes/rrtmgp/rrtmgp_lw_rte.meta
+6 −0 schemes/rrtmgp/rrtmgp_sw_gas_optics.meta
+5 −1 schemes/rrtmgp/rrtmgp_sw_rte.meta
+55 −2 schemes/utilities/state_converters.F90
+88 −0 schemes/utilities/state_converters.meta
+14 −1 test/test_schemes/initialize_constituents.F90
+11 −0 test/test_suites/suite_convection_permitting.xml
+6 −0 test/unit-test/tests/mmm/CMakeLists.txt
+65 −2 test/unit-test/tests/mmm/mmm_physics_compat_tests.pf
+60 −0 test/unit-test/tests/utilities/test_state_converters.pf
3 changes: 3 additions & 0 deletions test/existing-test-failures.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
SMS_Ln9.ne3pg3_ne3pg3_mg37.FKESSLER.derecho_intel.cam-outfrq_se_cslam_multitape
- known NLFAIL due to cime validation error on multiple history tapes (#430)

SMS_Ln9.ne3pg3_ne3pg3_mg37.FADIAB.derecho_gnu.cam-outfrq_se_cslam
- known FAIL on shr_reprosum_calc call from src/dynamics/se/dycore/global_norms_mod.F90
4 changes: 2 additions & 2 deletions test/unit/python/test_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ def test_bad_registry_xml(self):
# end with
expected_error = "reg_bad_xml.xml:32: element ic_file_input_name: Schemas validity error : Element 'ic_file_input_name': This element is not expected. Expected is one of ( initial_value, ic_file_input_names )."
split_exception = str(cerr.exception).split('\n')
amsg = f"Test failure: exception raised is {len(split_exception)} lines long and is expected to be 4"
self.assertEqual(len(split_exception), 4, msg=amsg)
amsg = f"Test failure: exception raised is {len(split_exception)} lines long and is expected to be 5"
self.assertEqual(len(split_exception), 5, msg=amsg)
# Check that the full xmllint message was returned
self.assertTrue(split_exception[2].endswith(expected_error))

Expand Down