Skip to content

Commit

Permalink
Merge pull request #2757 from jedwards4b/add_timestamp_to_rpointers
Browse files Browse the repository at this point in the history 
add timestamp to rpointer files
  • Loading branch information
@ekluzek
ekluzek authored Dec 19, 2024
2 parents 4781b41 + b14d39d commit f437651
Show file tree
Hide file tree
Showing 608 changed files with 515 additions and 103 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ aa04d1f7d86cc2503b98b7e2b2d84dbfff6c316b
045d90f1d80f713eb3ae0ac58f6c2352937f1eb0
753fda3ff0147837231a73c9c728dd9ce47b5997
f112ba0bbf96a61d5a4d354dc0dcbd8b0c68145c
bd535c710db78420b8e8b9d71d88d8339e899c59
6 changes: 3 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,23 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.37
fxtag = cime6.1.49
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.0.16
fxtag = cmeps1.0.32
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.57
fxtag = cdeps1.0.61
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
Expand Down
4 changes: 2 additions & 2 deletions README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ cime_config/config_tests.xml ----- Define CTSM specific tests
cime_config/config_pes.xml ------- Define Processor layouts for various CTSM grids and compsets
cime_config/testdefs ------------- Directory for specification of CTSM testing
cime_config/testdefs/ExpectedTestFails.xml -- List of tests that are expected to fail
cime_config/usermods_dirs -------- Directories of sets of user-modification subdirs
cime_config/usermods_dirs/clm ---- Directories of sets of user-modification subdirs
(These are directories that add specific user modifications to
simulations created using "cime/scripts/create_newcase --user-mods-dir".)
simulations created using "cime/scripts/create_newcase --user-mods-dir clm/*)

tools/mksurfdata_esmf --------- Directory to build program to create surface dataset
at any resolution.
Expand Down
4 changes: 2 additions & 2 deletions bld/unit_testers/build-namelist_test.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ sub cat_and_create_namelistinfile {
my $phys = "clm6_0";
$mode = "-phys $phys";
&make_config_cache($phys);
my $neondir = "../../cime_config/usermods_dirs/NEON";
my $neondir = "../../cime_config/usermods_dirs/clm/NEON";
foreach my $site ( "ABBY", "BLAN", "CPER", "DEJU", "GRSM", "HEAL", "KONA", "LENO", "NIWO",
"ONAQ", "PUUM", "SERC", "SRER", "TALL", "TREE", "WOOD", "BARR", "BONA",
"DCFS", "DELA", "GUAN", "JERC", "KONZ", "MLBS", "NOGP", "ORNL", "RMNP",
Expand Down Expand Up @@ -421,7 +421,7 @@ sub cat_and_create_namelistinfile {
my $phys = "clm6_0";
$mode = "-phys $phys";
&make_config_cache($phys);
my $plumdir = "../../cime_config/usermods_dirs/PLUMBER2";
my $plumdir = "../../cime_config/usermods_dirs/clm/PLUMBER2";
foreach my $site (
"AR-SLu", "AU-Emr", "AU-TTE", "CA-NS1", "CA-SF3", "CN-HaM", "DE-Obe", "ES-ES1", "FR-Gri", "IE-Dri", "IT-LMa", "IT-SRo", "RU-Fyo", "US-Aud", "US-Ho1", "US-Ne2", "US-Syv", "ZM-Mon",
"AT-Neu", "AU-Gin", "AU-Tum", "CA-NS2", "CH-Cha", "CN-Qia", "DE-Seh", "ES-ES2", "FR-Hes", "IT-Amp", "IT-Mal", "JP-SMF", "RU-Zot", "US-Bar", "US-KS2", "US-Ne3", "US-Ton",
Expand Down
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 38 files
+4 −0 .github/workflows/testing.yml
+1 −1 CIME/BuildTools/configure.py
+33 −6 CIME/SystemTests/eri.py
+6 −7 CIME/SystemTests/err.py
+6 −0 CIME/SystemTests/ers.py
+222 −92 CIME/SystemTests/mvk.py
+6 −0 CIME/SystemTests/restart_tests.py
+80 −9 CIME/SystemTests/system_tests_common.py
+81 −0 CIME/SystemTests/test_mods.py
+112 −30 CIME/XML/env_batch.py
+18 −0 CIME/XML/generic_xml.py
+16 −13 CIME/case/case.py
+10 −1 CIME/case/case_run.py
+63 −45 CIME/case/case_st_archive.py
+4 −3 CIME/case/case_submit.py
+6 −1 CIME/case/check_input_data.py
+95 −33 CIME/config.py
+1 −3 CIME/data/config/config_tests.xml
+0 −8 CIME/data/config/xml_schemas/config_machines_version3.xsd
+1 −1 CIME/data/config/xml_schemas/config_workflow.xsd
+9 −0 CIME/get_timing.py
+8 −1 CIME/hist_utils.py
+43 −14 CIME/namelist.py
+1 −1 CIME/non_py/cprnc
+12 −26 CIME/test_scheduler.py
+87 −14 CIME/tests/test_sys_test_scheduler.py
+1 −11 CIME/tests/test_unit_case_setup.py
+15 −3 CIME/tests/test_unit_system_tests.py
+710 −0 CIME/tests/test_unit_system_tests_mvk.py
+165 −2 CIME/tests/test_unit_xml_env_batch.py
+1 −0 CIME/tests/test_unit_xml_tests.py
+12 −0 CIME/tests/utils.py
+9 −5 CIME/utils.py
+1 −2 CIME/wait_for_tests.py
+1 −0 doc/requirements.txt
+2 −1 doc/source/conf.py
+237 −52 doc/source/users_guide/testing.rst
+1 −0 test-requirements.txt
18 changes: 9 additions & 9 deletions cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,15 +355,15 @@
<valid_values></valid_values>
<default_value></default_value>
<values match="last">
<value compset="_CLM60%[^_]*FATES-SP[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/fates_sp</value>
<value compset="_CLM50%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_deck</value>
<value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_nociso_deck</value>
<value compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_deck</value>
<value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_nociso_deck</value>
<value compset="_CLM60%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_deck</value>
<value grid="l%1.9x2.5" compset="_CLM60%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_nociso_deck</value>
<value compset="_CLM60%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_deck</value>
<value grid="l%1.9x2.5" compset="_CLM60%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_nociso_deck</value>
<value compset="_CLM60%[^_]*FATES-SP[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/fates_sp</value>
<value compset="_CLM50%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_deck</value>
<value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_nociso_deck</value>
<value compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_waccm_deck</value>
<value grid="l%1.9x2.5" compset="_CLM50%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_waccm_nociso_deck</value>
<value compset="_CLM60%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_deck</value>
<value grid="l%1.9x2.5" compset="_CLM60%[^_]*CMIP6DECK[%_]" >$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_nociso_deck</value>
<value compset="_CLM60%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_waccm_deck</value>
<value grid="l%1.9x2.5" compset="_CLM60%[^_]*CMIP6WACCMDECK[%_]">$COMP_ROOT_DIR_LND/cime_config/usermods_dirs/clm/cmip6_waccm_nociso_deck</value>
</values>
<group>run_component_ctsm</group>
<file>env_case.xml</file>
Expand Down
240 changes: 235 additions & 5 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@
</phase>
</test>

<test name="ERP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<test name="ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
<issue>#2619</issue>
<comment>This failure relates to the following REP failure.</comment>
</phase>
</test>
<test name="REP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<test name="REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="COMPARE_base_rep2">
<status>FAIL</status>
<issue>#2619</issue>
<comment>This failure relates to the preceding ERP failure.</comment>
</phase>
</test>
<test name="REP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<test name="REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
<issue>#2619</issue>
Expand All @@ -114,7 +114,7 @@
</test>

<test name="SMS_D.f10_f10_mg37.I2000Clm60BgcCrop.derecho_nvhpc.clm-crop">
<phase name="RUN">
<phase name="BUILD">
<status>FAIL</status>
<issue>#1733</issue>
</phase>
Expand All @@ -127,6 +127,27 @@
</phase>
</test>

<test name="ERP_P64x2_Ld765.f10_f10_mg37.I2000Clm60BgcCrop.derecho_intel.clm-monthly">
<phase name="RUN">
<status>FAIL</status>
<issue>#2914</issue>
</phase>
</test>

<test name="ERS_P128x1_Ld765.f10_f10_mg37.I2000Clm60Fates.derecho_intel.clm-FatesColdNoComp">
<phase name="RUN">
<status>FAIL</status>
<issue>#2914</issue>
</phase>
</test>

<test name="LILACSMOKE_D_Ld2.f10_f10_mg37.I2000Ctsm50NwpSpAsRs.derecho_intel.clm-lilac">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>#2905</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-NEON-MOAB--clm-PRISM">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
Expand All @@ -144,7 +165,28 @@
<issue>#2913</issue>
</phase>
</test>


<test name="SSP_D_Ld10.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-rtmColdSSP">
<phase name="RUN">
<status>FAIL</status>
<issue>#2913</issue>
</phase>
</test>

<test name="SSP_D_Ld4.f10_f10_mg37.I1850Clm50BgcCrop.derecho_intel.clm-ciso_rtmColdSSP">
<phase name="RUN">
<status>FAIL</status>
<issue>#2913</issue>
</phase>
</test>

<test name="SSP_Ld10.f10_f10_mg37.I1850Clm50Bgc.derecho_gnu.clm-rtmColdSSP">
<phase name="RUN">
<status>FAIL</status>
<issue>#2913</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV--clm-matrixcnOn">
<phase name="RUN">
<status>FAIL</status>
Expand All @@ -163,6 +205,194 @@
</phase>
</test>


<!--- Izumi mpi-serial tests failing for me -->

<test name='ERS_D_Ld5_Mmpi-serial.1x1_vancouverCAN.I1PtClm50SpRs.izumi_nag.clm-CLM1PTStartDate' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_D_Ld7_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropRs.izumi_intel.clm-decStart1851_noinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_D_Mmpi-serial_Ld5.1x1_brazil.I2000Clm50FatesRs.izumi_nag.clm-FatesCold' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld1200_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_gnu.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld1600_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld600_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly20_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly20_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial--clm-matrixcnOn' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly3_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_gnu.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly5_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-ciso_monthly' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly5_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-ciso_monthly--clm-matrixcnOn' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_intel.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_intel.clm-cropMonthOutput--clm-matrixcnOn_ignore_warnings' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsRLA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsROA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_nag.clm-ptsRLA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm45BgcCropQianRs.izumi_intel.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Mmpi-serial_Ld5.5x5_amazon.I2000Clm60FatesRs.izumi_nag.clm-FatesCold' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60SpRs.izumi_nag.clm-default--clm-NEON-TOOL' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ld5_Mmpi-serial.1x1_brazil.IHistClm60Bgc.izumi_gnu.clm-mimics' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ly3_Mmpi-serial.1x1_numaIA.I2000Clm50BgcDvCropQianRs.izumi_gnu.clm-ignor_warn_cropMonthOutputColdStart' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ly5_Mmpi-serial.1x1_brazil.IHistClm50BgcQianRs.izumi_intel.clm-newton_krylov_spinup' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ly5_Mmpi-serial.1x1_smallvilleIA.IHistClm60BgcCropQianRs.izumi_gnu.clm-gregorian_cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>

<!-- End of Izumi mpi-serial tests failing -->

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_gnu.clm-FatesPRISM--clm-NEON-FATES-YELL">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
Expand Down
4 changes: 2 additions & 2 deletions cime_config/testdefs/testlist_clm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERP_P64x2_Ld762" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/monthly">
<test name="ERP_P64x2_Ld765" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/monthly">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
</machines>
Expand Down Expand Up @@ -2412,7 +2412,7 @@
</options>
</test>

<test name="ERS_P128x1_Ld762" grid="f10_f10_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
<test name="ERS_P128x1_Ld765" grid="f10_f10_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
<machines>
<!-- no izumi tests since this has a pe layout specific for derecho -->
<machine name="derecho" compiler="intel" category="aux_clm"/>
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/ExcessIceStartup_output_sp_exice/include_user_mods
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
../monthly
../../../../usermods_dirs/output_sp_exice
../../../../usermods_dirs/clm/output_sp_exice
Loading

0 comments on commit f437651

Please sign in to comment.