Skip to content

Remove default value constituent overwrite #374

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
merged 4 commits into from
Mar 20, 2025
Merged

Remove default value constituent overwrite #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0a6b90
remove default value constituent overwrite
peverwhee Mar 18, 2025
6e10867
remove un-outflded diagnostic variables
peverwhee Mar 18, 2025
477cd01
change hack shallow test grid to ne3pg3
peverwhee Mar 19, 2025
b7cef4d
Merge remote-tracking branch 'ESCOMP/development' into no-const-overw…
peverwhee Mar 20, 2025
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
2 changes: 1 addition & 1 deletion cime_config/testdefs/testlist_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<option name="comment">Test for Zhang McFarlane physics</option>
</options>
</test>
<test compset="FPHYStest" grid="ne5_ne5_mg37" name="SMS_Ln2" testmods="cam/outfrq_hack_shallow_derecho">
<test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_hack_shallow_derecho">
<machines>
<machine name="derecho" compiler="gnu" category="aux_sima"/>
</machines>
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/cam/outfrq_hack_shallow_derecho/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ 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_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
hist_precision;h1: REAL64
11 changes: 1 addition & 10 deletions src/data/write_init_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,16 +1133,7 @@ def write_phys_read_subroutine(outfile, host_dict, host_vars, host_imports,
outfile.write("if (constituent_errflg /= 0) then", 4)
outfile.write("call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)", 5)
outfile.write("end if", 4)
outfile.write("if (constituent_has_default) then", 4)
outfile.write("call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)", 5)
outfile.write("if (constituent_errflg /= 0) then", 5)
outfile.write("call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)", 6)
outfile.write("end if", 5)
outfile.write("field_data_ptr(:,:,constituent_idx) = constituent_default_value", 5)
outfile.write("if (masterproc) then", 5)
outfile.write("write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value", 6)
outfile.write("end if", 5)
outfile.write("else", 4)
outfile.write("if (.not. constituent_has_default) then", 4)
outfile.comment("Intialize to constituent's configured minimum value", 5)
outfile.write("call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)", 5)
outfile.write("field_data_ptr(:,:,constituent_idx) = constituent_min_value", 5)
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -201,16 +201,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -205,16 +205,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -197,16 +197,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions 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 @@ -207,16 +207,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions test/unit/python/sample_files/write_init_files/physics_inputs_protect.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions test/unit/python/sample_files/write_init_files/physics_inputs_scalar.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down
11 changes: 1 addition & 10 deletions test/unit/python/sample_files/write_init_files/physics_inputs_simple.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
if (constituent_has_default) then
call const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg, constituent_errmsg)
if (constituent_errflg /= 0) then
call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
end if
field_data_ptr(:,:,constituent_idx) = constituent_default_value
if (masterproc) then
write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
end if
else
if (.not. constituent_has_default) then
! Intialize to constituent's configured minimum value
call const_props(constituent_idx)%minimum(constituent_min_value, constituent_errflg, constituent_errmsg)
field_data_ptr(:,:,constituent_idx) = constituent_min_value
Expand Down