From c37526042bb9540cfededebf8e2d600cf9fd6ab0 Mon Sep 17 00:00:00 2001 From: Courtney Peverley Date: Wed, 4 Jun 2025 10:29:43 -0600 Subject: [PATCH 1/3] update framework submodule and tag --- .gitmodules | 2 +- ccpp_framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e11a5553..247e1e8c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "ccpp-framework"] path = ccpp_framework url = https://github.com/NCAR/ccpp-framework - fxtag = 2025-01-06-dev + fxtag = 2025-06-03-dev fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/NCAR/ccpp-framework [submodule "history"] diff --git a/ccpp_framework b/ccpp_framework index fca3a9e3..9254784f 160000 --- a/ccpp_framework +++ b/ccpp_framework @@ -1 +1 @@ -Subproject commit fca3a9e3df101bd07a228631e5509ec4a93a9906 +Subproject commit 9254784f55757cdc8386509fedc7e6fdd02517ab From 00f1de02b0ea75d215539303f138cc02e75ab6af Mon Sep 17 00:00:00 2001 From: Courtney Peverley Date: Wed, 4 Jun 2025 12:26:35 -0600 Subject: [PATCH 2/3] fix unit tests - better ddt handling and case insensitivity --- .../sample_files/write_init_files/physics_inputs_ddt2.F90 | 6 +++--- .../write_init_files/physics_inputs_ddt_array.F90 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 index 6cd57f99..490a022a 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 @@ -143,7 +143,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia select case (trim(phys_var_stdnames(name_idx))) case ('potential_temperature') - call read_field(file, 'potential_temperature', input_var_names(:,name_idx), 'lev', timestep, phys_state%theta) + call read_field(file, 'potential_temperature', input_var_names(:,name_idx), 'lev', timestep, phys_state%thermo%theta) case ('air_pressure_at_sea_level') call read_field(file, 'air_pressure_at_sea_level', input_var_names(:,name_idx), timestep, phys_state%slp) @@ -321,8 +321,8 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, select case (trim(phys_var_stdnames(name_idx))) case ('potential_temperature') - call check_field(file, input_var_names(:,name_idx), 'lev', timestep, phys_state%theta, 'potential_temperature', min_difference, & - min_relative_value, is_first, diff_found) + call check_field(file, input_var_names(:,name_idx), 'lev', timestep, phys_state%thermo%theta, 'potential_temperature', & + min_difference, min_relative_value, is_first, diff_found) case ('air_pressure_at_sea_level') call check_field(file, input_var_names(:,name_idx), timestep, phys_state%slp, 'air_pressure_at_sea_level', min_difference, & diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 index d5d46fc6..a23b6561 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 @@ -143,7 +143,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia select case (trim(phys_var_stdnames(name_idx))) case ('potential_temperature') - call read_field(file, 'potential_temperature', input_var_names(:,name_idx), 'lev', timestep, phys_state%T(:, :, ix_theta)) + call read_field(file, 'potential_temperature', input_var_names(:,name_idx), 'lev', timestep, phys_state%t(:, :, ix_theta)) case ('air_pressure_at_sea_level') call read_field(file, 'air_pressure_at_sea_level', input_var_names(:,name_idx), timestep, phys_state%slp) @@ -321,7 +321,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, select case (trim(phys_var_stdnames(name_idx))) case ('potential_temperature') - call check_field(file, input_var_names(:,name_idx), 'lev', timestep, phys_state%T(:, :, ix_theta), 'potential_temperature', & + call check_field(file, input_var_names(:,name_idx), 'lev', timestep, phys_state%t(:, :, ix_theta), 'potential_temperature', & min_difference, min_relative_value, is_first, diff_found) case ('air_pressure_at_sea_level') From 663d1d5747a09b4a6aaa36045c251e96ba7b7a04 Mon Sep 17 00:00:00 2001 From: peverwhee Date: Fri, 13 Jun 2025 13:27:16 -0600 Subject: [PATCH 3/3] update atmospheric_physics hash --- .gitmodules | 2 +- src/physics/ncar_ccpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 247e1e8c..c9f0a3c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "ncar-physics"] path = src/physics/ncar_ccpp url = https://github.com/ESCOMP/atmospheric_physics - fxtag = bb7c61028c1d6ead2c09b2c58cfbbfb3c3638a51 + fxtag = e05850ede0571c5c950ed86e4d73e1bab46a348a fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "rrtmgp-data"] diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index bb7c6102..e05850ed 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit bb7c61028c1d6ead2c09b2c58cfbbfb3c3638a51 +Subproject commit e05850ede0571c5c950ed86e4d73e1bab46a348a