Skip to content

Verbose physics data check: print out all checked variables #475

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
jimmielin merged 6 commits into from
Mar 10, 2026
Merged

Verbose physics data check: print out all checked variables #475

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
cee8882
Bring in changes from ESCOMP/CAM#1492
nusbaume Mar 3, 2026
0f60d3a
Verbose physics data check: print out all checked variables
jimmielin Mar 9, 2026
5bd35ee
Update test sample files
jimmielin Mar 9, 2026
f3f6209
Merge remote-tracking branch 'upstream/development' into cime_config_…
nusbaume Mar 9, 2026
e7e84bd
Update comment in verbose output
jimmielin Mar 10, 2026
0e38a4d
Merge branch 'cime_config_files_update' into hplin/verbose_physics_da…
jimmielin Mar 10, 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
12 changes: 6 additions & 6 deletions .config_files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
<entry_id>

<!-- This is the same as the default entry in
cime/config/cesm/config_files.xml except for the value for clm:
In a standalone cam checkout, COMP_ROOT_DIR_CAM is $SRCROOT
cime/config/cesm/config_files.xml except for the value for cam-sima:
In a standalone cam-sima checkout, COMP_ROOT_DIR_CAM is $SRCROOT
rather than $SRCROOT/components/cam.
However, because of the way overrides are handled, we need to
re-specify the full information here rather than just overriding
the value for cam.
the value for cam-sima.
-->
<entry id="COMP_ROOT_DIR_ATM">
<type>char</type>
<default_value>unset</default_value>
<values>
<value component="cam" >$SRCROOT</value>
<value component="dlnd" >$CIMEROOT/src/components/data_comps/dlnd</value>
<value component="slnd" >$CIMEROOT/src/components/stub_comps/slnd</value>
<value component="xlnd" >$CIMEROOT/src/components/xcpl_comps/xlnd</value>
<value component="datm" >$SRCROOT/components/cdeps/datm</value>
<value component="satm" >$CIMEROOT/CIME/non_py/src/components/stub_comps_$COMP_INTERFACE/satm</value>
<value component="xatm" >$SRCROOT/components/cmeps/med_test_comps/xatm</value>
</values>
<group>case_comps</group>
<file>env_case.xml</file>
Expand Down
10 changes: 8 additions & 2 deletions src/data/write_init_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,7 +1288,8 @@ def write_phys_check_subroutine(outfile, host_dict, host_vars, host_imports,
["shr_kind_mod", ["SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX"]],
["physics_data", ["check_field", "find_input_name_idx",
"no_exist_idx", "init_mark_idx",
"prot_no_init_idx", "const_idx"]],
"prot_no_init_idx", "const_idx",
"flush_check_field_verbose"]],
["cam_ccpp_cap", ["ccpp_physics_suite_variables",
"cam_advected_constituents_array",
"cam_model_const_properties"]],
Expand Down Expand Up @@ -1501,14 +1502,19 @@ def write_phys_check_subroutine(outfile, host_dict, host_vars, host_imports,
outfile.write("end if", 3)
outfile.write("end do", 2)

# Flush any buffered verbose entries (printed after all diff entries):
outfile.comment("Flush verbose check_field entries (printed after diffs):", 2)
outfile.write("call flush_check_field_verbose()", 2)
outfile.blank_line()

# Close check file
outfile.comment("Close check file:", 2)
outfile.write("call cam_pio_closefile(file)", 2)
outfile.write("deallocate(file)", 2)
outfile.write("nullify(file)", 2)

# Check if no differences were found
outfile.write("if (is_first) then", 2)
outfile.write("if (.not. overall_diff_found) then", 2)
outfile.write("if (masterproc) then", 3)
outfile.write("write(iulog,*) ''", 4)
outfile.write("write(iulog,*) 'No differences found!'", 4)
Expand Down
229 changes: 227 additions & 2 deletions src/physics/utils/physics_data.F90
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_4D.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -382,11 +383,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_bvd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -379,11 +380,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_cnst.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -379,11 +380,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_constituent_dim.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -387,11 +388,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_ddt.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -379,11 +380,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -379,11 +380,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -379,11 +380,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_host_var.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -371,11 +372,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_initial_value.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -379,11 +380,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_mf.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -380,11 +381,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_no_horiz.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -379,11 +380,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_noreq.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -367,11 +368,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
6 changes: 5 additions & 1 deletion test/unit/python/sample_files/write_init_files/physics_inputs_param.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
use cam_abortutils, only: endrun
use shr_kind_mod, only: SHR_KIND_CS, SHR_KIND_CL, SHR_KIND_CX
use physics_data, only: check_field, find_input_name_idx, no_exist_idx, init_mark_idx, prot_no_init_idx, const_idx
use physics_data, only: flush_check_field_verbose
use cam_ccpp_cap, only: ccpp_physics_suite_variables, cam_advected_constituents_array, cam_model_const_properties
use cam_constituents, only: const_get_index
use ccpp_kinds, only: kind_phys
Expand Down Expand Up @@ -382,11 +383,14 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
end if
end if
end do
! Flush verbose check_field entries (printed after diffs):
call flush_check_field_verbose()

! Close check file:
call cam_pio_closefile(file)
deallocate(file)
nullify(file)
if (is_first) then
if (.not. overall_diff_found) then
if (masterproc) then
write(iulog,*) ''
write(iulog,*) 'No differences found!'
Expand Down
Loading