Skip to content

Commit

Permalink
Merge branch 'cesm3_0_beta05_submodules' of github.com:ekluzek/CTSM i…
Browse files Browse the repository at this point in the history 
…nto cesm3_0_beta05_submodules

 Conflicts:
	.gitmodules
  • Loading branch information
@ekluzek
ekluzek committed Jan 5, 2025
2 parents cbe6109 + 1a7b773 commit 2fbbae4
Show file tree
Hide file tree
Showing 15 changed files with 506 additions and 47 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
8 changes: 4 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,23 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.10
fxtag = ccs_config_cesm1.0.16
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.49
fxtag = cime6.1.56
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.32
fxtag = cmeps1.0.33
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
Expand All @@ -100,7 +100,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.6
fxtag = share1.1.7
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
Expand Down
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 15 files
+7 −7 .github/workflows/testing.yml
+37 −13 CIME/SystemTests/system_tests_common.py
+2 −2 CIME/Tools/code_checker
+2 −2 CIME/Tools/xmlconvertors/config_pes_converter.py
+9 −10 CIME/Tools/xmlconvertors/grid_xml_converter.py
+5 −3 CIME/case/case_submit.py
+2 −4 CIME/code_checker.py
+18 −20 CIME/compare_namelists.py
+159 −110 CIME/namelist.py
+6 −11 CIME/test_status.py
+23 −3 CIME/tests/test_unit_system_tests_mvk.py
+1 −1 CIME/utils.py
+1 −1 CIME/wait_for_tests.py
+2 −4 docker/Dockerfile
+1 −0 docker/cime.yaml
245 changes: 241 additions & 4 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 @@ -138,6 +159,34 @@
</phase>
</test>

<test name="SSPMATRIXCN_Ly5_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-ciso_monthly">
<phase name="RUN">
<status>FAIL</status>
<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 @@ -156,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
2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/user_nl_datm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
iradsw = -1
nextsw_cday_calc = "cam7"
2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/user_nl_datm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
iradsw = -1
nextsw_cday_calc = "cam7"
2 changes: 1 addition & 1 deletion components/cdeps
Submodule cdeps updated 33 files
+3 −0 cime_config/stream_cdeps.py
+61 −77 datm/atm_comp_nuopc.F90
+4 −2 datm/cime_config/config_component.xml
+37 −7 datm/cime_config/namelist_definition_datm.xml
+284 −7 datm/cime_config/stream_definition_datm.xml
+0 −40 datm/datm_datamode_cfsr_mod.F90
+0 −38 datm/datm_datamode_clmncep_mod.F90
+0 −39 datm/datm_datamode_core2_mod.F90
+2 −41 datm/datm_datamode_cplhist_mod.F90
+2 −40 datm/datm_datamode_era5_mod.F90
+0 −39 datm/datm_datamode_gefs_mod.F90
+0 −39 datm/datm_datamode_jra_mod.F90
+0 −39 datm/datm_datamode_simple_mod.F90
+13 −3 dglc/cime_config/testdefs/testlist_dglc.xml
+7 −12 dglc/dglc_datamode_noevolve_mod.F90
+10 −6 dglc/glc_comp_nuopc.F90
+12 −9 dice/dice_datamode_ssmi_mod.F90
+12 −6 dice/ice_comp_nuopc.F90
+18 −9 dlnd/lnd_comp_nuopc.F90
+0 −39 docn/docn_datamode_copyall_mod.F90
+0 −39 docn/docn_datamode_cplhist_mod.F90
+0 −44 docn/docn_datamode_iaf_mod.F90
+0 −43 docn/docn_datamode_multilev_dom_mod.F90
+0 −43 docn/docn_datamode_multilev_mod.F90
+10 −9 docn/docn_datamode_som_mod.F90
+33 −33 docn/ocn_comp_nuopc.F90
+4 −2 drof/cime_config/config_component.xml
+2 −1 drof/cime_config/namelist_definition_drof.xml
+32 −0 drof/cime_config/stream_definition_drof.xml
+16 −9 drof/rof_comp_nuopc.F90
+13 −19 dshr/dshr_mod.F90
+16 −8 dwav/wav_comp_nuopc.F90
+109 −13 share/nuopc_shr_methods.F90
2 changes: 1 addition & 1 deletion components/cism
Submodule cism updated 18 files
+107 −0 .lib/git-fleximod/CODE_OF_CONDUCT.md
+18 −8 .lib/git-fleximod/git_fleximod/cli.py
+80 −317 .lib/git-fleximod/git_fleximod/git_fleximod.py
+13 −3 .lib/git-fleximod/git_fleximod/gitinterface.py
+2 −2 .lib/git-fleximod/git_fleximod/gitmodules.py
+403 −0 .lib/git-fleximod/git_fleximod/submodule.py
+6 −6 .lib/git-fleximod/git_fleximod/utils.py
+58 −58 .lib/git-fleximod/poetry.lock
+1 −1 .lib/git-fleximod/pyproject.toml
+1 −1 .lib/git-fleximod/tbump.toml
+16 −4 .lib/git-fleximod/tests/conftest.py
+6 −7 .lib/git-fleximod/tests/test_d_complex.py
+69 −0 .lib/git-fleximod/tests/test_e_complex_update.py
+150 −0 ChangeLog
+18 −18 drivers/cpl/nuopc/glc_comp_nuopc.F90
+10 −6 source_glc/glc_InitMod.F90
+18 −5 source_glc/glc_files.F90
+16 −5 source_glc/glc_io.F90
2 changes: 1 addition & 1 deletion components/cmeps
Submodule cmeps updated 1 files
+2 −1 .github/workflows/srt.yml
Loading

0 comments on commit 2fbbae4

Please sign in to comment.