-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update regression tests to run! (#323)
Tag name (required for release branches): sima0_00_001 Originator(s): peverwhee Description (include the issue title, and the keyword ['closes', 'fixes', 'resolves'] followed by the issue number): closes #229 (Need ability for ncdata_check routines to end model run) addresses #230 (Need CIME smoke tests for FPHYStest compset and various physics suites) **Updates the regression tests to actually run and compare against previous baselines.** Describe any changes made to build system: - added new compset FCAM7 that exercises the cam7 physics suites - updated config_pes.xml for ne3 grid Describe any changes made to the namelist: - updated namelist defaults for ne3 grid (though these are currently unused; using analytic_ic until the SE dycore is updated) List any changes to the defaults for the input datasets (e.g. boundary datasets): none List all files MOVED and why: cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho_nooutput/user_nl_cam cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho_nooutput/shell_commands cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho_nooutput/shell_commands cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho_nooutput/user_nl_cam cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho_nooutput/shell_commands cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho_nooutput/user_nl_cam cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/user_nl_cam cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/shell_commands - removed "nooutput" from directory name cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/user_nl_cam cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/shell_commands - moved to outfrq_se_sclam/* List all files added and what they do: A cime_config/config_archive.xml - brought over from CAM so tests will run List all existing files that have been modified, and describe the changes: (Helpful git command: `git diff --name-status development...<your_branch_name>`) M cime_config/config_component.xml - added FCAM7 configuration M cime_config/config_compset.xml - added FCAM7 compset M cime_config/config_pes.xml - modified for ne3 grid M cime_config/namelist_definition_cam.xml - added ne3 grid defaults M cime_config/testdefs/testlist_cam.xml - added FHS94 and FTJ16 SE CSLAM tests - modified existing FKESSLER SE CSLAM test to use ne5 M src/dynamics/tests/namelist_definition_analy_ic.xml - use held-suarez initial conditions by default (not "none") M src/physics/utils/phys_comp.F90 M src/physics/utils/physics_data.F90 - add namelist variable to endrun on diff found during ncdata_check M test/system/archive_baseline.sh - update to add a symlink to the ${baseline_dir}/latest_${CAM_FC} directory for easier test_driver usage - add flag to turn off symlink addition M test/system/test_driver.sh - use ${baseline_dir}/latest_${CAM_FC} by default - add flag to turn off default usage (no baseline comparison) If there are new failures (compared to the `test/existing-test-failures.txt` file), have them OK'd by the gatekeeper, note them here, and add them to the file. If there are baseline differences, include the test and the reason for the diff. What is the nature of the change? Roundoff? derecho/intel/aux_sima: SMS_Ln2.mpasa480_mpasa480.FKESSLER.derecho_intel.cam-outfrq_kessler_mpas_derecho - will fail until MPAS is fully integrated derecho/gnu/aux_sima: SMS_Ln2.mpasa480_mpasa480.FKESSLER.derecho_gnu.cam-outfrq_kessler_mpas_derecho - will fail until MPAS is fully integrated If this changes climate describe any run(s) done to evaluate the new climate in enough detail that it(they) could be reproduced: n/a CAM-SIMA date used for the baseline comparison tests if different than latest: first baselines!
- Loading branch information
Showing
45 changed files
with
637 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <components version="2.0"> | ||
|
|
||
| <comp_archive_spec compname="cam" compclass="atm"> | ||
| <rest_file_extension>r</rest_file_extension> | ||
| <rest_file_extension>rh\d*</rest_file_extension> | ||
| <rest_file_extension>rs</rest_file_extension> | ||
| <hist_file_extension>h\d*.*\.nc$</hist_file_extension> | ||
| <hist_file_extension>i\..*\.nc$</hist_file_extension> | ||
| <hist_file_extension>e</hist_file_extension> | ||
| <rest_history_varname>nhfil</rest_history_varname> | ||
| <rpointer> | ||
| <rpointer_file>rpointer.atm$NINST_STRING</rpointer_file> | ||
| <rpointer_content>$CASE.cam$NINST_STRING.r.$DATENAME.nc </rpointer_content> | ||
| </rpointer> | ||
| <test_file_names> | ||
| <tfile disposition="copy">rpointer.atm</tfile> | ||
| <tfile disposition="copy">rpointer.atm_9999</tfile> | ||
| <tfile disposition="copy">casename.cam.r.1976-01-01-00000.nc</tfile> | ||
| <tfile disposition="copy">casename.cam.rh4.1976-01-01-00000.nc</tfile> | ||
| <tfile disposition="move">casename.cam.h0.1976-01-01-00000.nc</tfile> | ||
| <tfile disposition="ignore">casename.cam.h0.1976-01-01-00000.nc.base</tfile> | ||
| <tfile disposition="move">casename.cam_0002.e.postassim.1976-01-01-00000.nc</tfile> | ||
| <tfile disposition="move">casename.cam_0002.e.preassim.1976-01-01-00000.nc</tfile> | ||
| <tfile disposition="move">casename.cam.i.1976-01-01-00000.nc</tfile> | ||
| </test_file_names> | ||
| </comp_archive_spec> | ||
| </components> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
7 changes: 5 additions & 2 deletions
7
..._held_suarez_derecho_nooutput/user_nl_cam → ...am/outfrq_held_suarez_derecho/user_nl_cam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_before.nc | ||
| ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_after.nc | ||
| ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_cam_before_c20240412.nc | ||
| ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_cam_after_c20240412.nc | ||
| debug_output=0 | ||
| pver=30 | ||
| hist_add_inst_fields;h2: ZM, T | ||
| hist_output_frequency;h2: 2*nsteps | ||
| hist_write_nstep0;h2: .true. |
File renamed without changes.
9 changes: 7 additions & 2 deletions
9
...tfrq_kessler_derecho_nooutput/user_nl_cam → ...rs/cam/outfrq_kessler_derecho/user_nl_cam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_before.nc | ||
| ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_after.nc | ||
| ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_before_c20240412.nc | ||
| ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_after_c20240412.nc | ||
| ncdata_check_err=.true. | ||
| min_difference=1.0e-15 | ||
| debug_output=0 | ||
| pver=30 | ||
| hist_add_inst_fields;h2: Q, T | ||
| hist_output_frequency;h2: 2*nsteps | ||
| hist_write_nstep0;h2: .true. |
File renamed without changes.
4 changes: 4 additions & 0 deletions
4
cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho/user_nl_cam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| debug_output=0 | ||
| hist_add_inst_fields;h2: Q,T,U,V,PS | ||
| hist_output_frequency;h2: nsteps | ||
| hist_write_nstep0;h2: .true. |
1 change: 0 additions & 1 deletion
1
cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho_nooutput/user_nl_cam
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
...config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/shell_commands
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/user_nl_cam
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ./xmlchange CAM_LINKED_LIBS=" " |
3 changes: 3 additions & 0 deletions
3
cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/user_nl_cam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| hist_add_inst_fields;h1: T, Q, U, V, PS | ||
| hist_output_frequency;h1: 1*nsteps | ||
| hist_write_nstep0;h1: .true. |
2 changes: 2 additions & 0 deletions
2
cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam_analy_ic/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ./xmlchange CAM_LINKED_LIBS=" " | ||
| ./xmlchange --append CAM_CONFIG_OPTS="--analytic_ic" |
4 changes: 4 additions & 0 deletions
4
cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam_analy_ic/user_nl_cam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| hist_add_inst_fields;h1: T, Q, U, V, PS | ||
| hist_output_frequency;h1: 1*nsteps | ||
| hist_write_nstep0;h1: .true. | ||
| analytic_ic_type=held_suarez_1994 |
1 change: 1 addition & 0 deletions
1
cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_after_coupler_derecho/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites tj2016_sfc_pbl_hs" |
7 changes: 7 additions & 0 deletions
7
cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_after_coupler_derecho/user_nl_cam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_sfc_pbl_hs_ne3pg3mg37_derecho_gnu_before.nc | ||
| ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_sfc_pbl_hs_ne3pg3mg37_derecho_gnu_after.nc | ||
| debug_output=0 | ||
| pver=30 | ||
| hist_add_inst_fields;h2: Q, T | ||
| hist_output_frequency;h2: 2*nsteps | ||
| hist_write_nstep0;h2: .true. |
2 changes: 1 addition & 1 deletion
2
...rq_tj2016_derecho_nooutput/shell_commands → ...016_before_coupler_derecho/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites tj2016" | ||
| ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites tj2016_precip" |
4 changes: 4 additions & 0 deletions
4
...utfrq_tj2016_derecho_nooutput/user_nl_cam → ...tj2016_before_coupler_derecho/user_nl_cam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,8 @@ | ||
| ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_precip_tend_ne3pg3mg37_derecho_gnu_before.nc | ||
| ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_precip_tend_ne3pg3mg37_derecho_gnu_after.nc | ||
| ncdata_check_err=.true. | ||
| debug_output=0 | ||
| pver=30 | ||
| hist_add_inst_fields;h2: Q, T | ||
| hist_output_frequency;h2: 2*nsteps | ||
| hist_write_nstep0;h2: .true. |
Oops, something went wrong.