Skip to content

Commit cc0c0a9

Browse files
mvdebolskiymvdebolskiy
authored
Merge pull request #129 from mvdebolskiy/fates-cpl-hist
Update fates and add ne16 tests and PE layout for n16pg3.Bug fixes for radiation in fates and cplhist tests added.
2 parents e5aa917 + 24f16ca commit cc0c0a9

14 files changed

Lines changed: 102 additions & 6 deletions

File tree

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[submodule "fates"]
2929
path = src/fates
3030
url = https://github.com/NorESMhub/fates
31-
fxtag = sci.1.82.3_api.39.0.0_noresm_v1
31+
fxtag = sci.1.82.3_api.39.0.0_noresm_v2
3232
fxrequired = AlwaysRequired
3333
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
3434
fxDONOTUSEurl = https://github.com/NCAR/fates-release
@@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
6868
[submodule "ccs_config"]
6969
path = ccs_config
7070
url = https://github.com/NorESMhub/ccs_config_noresm.git
71-
fxtag = ccs_config_noresm0.0.44
71+
fxtag = ccs_config_noresm0.0.45
7272
fxrequired = ToplevelRequired
7373
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
7474
fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm

‎ccs_config‎

‎cime_config/config_compsets.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,21 @@
331331
<lname>2000_DATM%CRUJRA2024_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV</lname>
332332
</compset>
333333

334+
<compset>
335+
<alias>I1850Clm60FatesNoCompSpinup</alias>
336+
<lname>1850_DATM%CPLHIST_CLM60%FATES-NOCOMP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
337+
</compset>
338+
339+
<compset>
340+
<alias>I1850Clm60FatesNoComp</alias>
341+
<lname>1850_DATM%GSWP3v1_CLM60%FATES-NOCOMP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
342+
</compset>
343+
<compset>
344+
<alias>I1850Clm60FatesSp</alias>
345+
<lname>1850_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
346+
</compset>
347+
348+
334349
<compset>
335350
<alias>I1850Clm50Bgc</alias>
336351
<lname>1850_DATM%GSWP3v1_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>

‎cime_config/config_pes.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2121,6 +2121,46 @@
21212121
</mach>
21222122
</grid>
21232123

2124+
<grid name="l%1.9x2.5|l%ne16np4.pg3">
2125+
<mach name="betzy">
2126+
<pes pesize="L" compset="any">
2127+
<comment>none</comment>
2128+
<ntasks>
2129+
<ntasks_atm>-1</ntasks_atm>
2130+
<ntasks_lnd>-4</ntasks_lnd>
2131+
<ntasks_rof>-4</ntasks_rof>
2132+
<ntasks_ice>-4</ntasks_ice>
2133+
<ntasks_ocn>-4</ntasks_ocn>
2134+
<ntasks_glc>-4</ntasks_glc>
2135+
<ntasks_wav>-4</ntasks_wav>
2136+
<ntasks_cpl>-4</ntasks_cpl>
2137+
</ntasks>
2138+
<nthrds>
2139+
<nthrds_atm>1</nthrds_atm>
2140+
<nthrds_lnd>1</nthrds_lnd>
2141+
<nthrds_rof>1</nthrds_rof>
2142+
<nthrds_ice>1</nthrds_ice>
2143+
<nthrds_ocn>1</nthrds_ocn>
2144+
<nthrds_glc>1</nthrds_glc>
2145+
<nthrds_wav>1</nthrds_wav>
2146+
<nthrds_cpl>1</nthrds_cpl>
2147+
</nthrds>
2148+
<rootpe>
2149+
<rootpe_atm>0</rootpe_atm>
2150+
<rootpe_lnd>-1</rootpe_lnd>
2151+
<rootpe_rof>-1</rootpe_rof>
2152+
<rootpe_ice>-1</rootpe_ice>
2153+
<rootpe_ocn>-1</rootpe_ocn>
2154+
<rootpe_glc>-1</rootpe_glc>
2155+
<rootpe_wav>-1</rootpe_wav>
2156+
<rootpe_cpl>-1</rootpe_cpl>
2157+
</rootpe>
2158+
</pes>
2159+
</mach>
2160+
</grid>
2161+
2162+
2163+
21242164
<grid name="l%10x15">
21252165
<mach name="betzy">
21262166
<pes pesize="any" compset="any">

‎cime_config/testdefs/testlist_clm.xml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4371,7 +4371,16 @@
43714371
<option name="comment">""</option>
43724372
</options>
43734373
</test>
4374-
<test name="SMS_D" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdDryDepSatPhen">
4374+
<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="I1850Clm60FatesSp" testmods="clm/FatesColdClm60Cam7LndTuningMode">
4375+
<machines>
4376+
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
4377+
</machines>
4378+
<options>
4379+
<option name="wallclock">00:30:00</option>
4380+
<option name="comment">""</option>
4381+
</options>
4382+
</test>
4383+
<test name="SMS_D" grid="ne16pg3_ne16pg3_mtn14" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdDryDepSatPhen">
43754384
<machines>
43764385
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
43774386
</machines>
@@ -4392,6 +4401,15 @@
43924401
<option name="comment">""</option>
43934402
</options>
43944403
</test>
4404+
<test name="ERS_D_Ln11" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60FatesNocompSpinup" testmods="clm/FatesColdSpinup">
4405+
<machines>
4406+
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
4407+
</machines>
4408+
<options>
4409+
<option name="wallclock">01:50:00</option>
4410+
<option name="comment">""</option>
4411+
</options>
4412+
</test>
43954413
<test name="ERS_D_Ld5" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdMeganNoComp">
43964414
<machines>
43974415
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
@@ -4410,7 +4428,7 @@
44104428
<option name="comment">""</option>
44114429
</options>
44124430
</test>
4413-
<test name="ERI_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/FatesColdTwoStreamNoCompFixedBioGeo">
4431+
<test name="ERI_D_Ld20" grid="ne16pg3_ne16pg3_mtn14" compset="I2000Clm60FatesRs" testmods="clm/FatesColdNormanNoCompFixedBioGeo">
44144432
<machines>
44154433
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
44164434
</machines>

‎cime_config/testdefs/testmods_dirs/clm/FatesColdClm60Cam7LndTuningMode/include_user_mods‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../FatesColdBasic

‎cime_config/testdefs/testmods_dirs/clm/FatesColdClm60Cam7LndTuningMode/shell_commands‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
./xmlchange LND_TUNING_MODE="clm6_0_cam7.0"
2+
./xmlchange ROF_NCPL='$ATM_NCPL'

‎cime_config/testdefs/testmods_dirs/clm/FatesColdClm60Cam7LndTuningMode/user_nl_datm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
iradsw = -1
2+
nextsw_cday_calc = "cam7"
3+

‎cime_config/testdefs/testmods_dirs/clm/FatesColdNormanNoCompFixedBioGeo/include_user_mods‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
../Fates
2+
../FatesCold
3+
../FatesColdNoComp

‎cime_config/testdefs/testmods_dirs/clm/FatesColdNormanNoCompFixedBioGeo/user_nl_clm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
use_fates_fixed_biogeog=.true.
2+
fates_radiation_model = 'norman'

0 commit comments

Comments
 (0)
⚡