Skip to content

Commit 151bc34

Browse files
mvdebolskiymvdebolskiy
authored
Merge pull request #214 from mvdebolskiy/drydep-fix-ctsm
ctsm5.4.002_noresm_v7: fix for dry deposition with fates.
2 parents 2109041 + 5660176 commit 151bc34

19 files changed

Lines changed: 249 additions & 51 deletions

File tree

‎.gitmodules‎

Lines changed: 7 additions & 7 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.88.6_api.42.0.0_nor_sci5_api1
31+
fxtag = sci.1.88.6_api.42.0.0_nor_sci2_api2
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/NorESMhub/fates
@@ -52,7 +52,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/RTM
5252
[submodule "mosart"]
5353
path = components/mosart
5454
url = https://github.com/NorESMhub/MOSART
55-
fxtag = mosart1.1.12_noresm_v1
55+
fxtag = mosart1.1.12_noresm_v2
5656
fxrequired = ToplevelRequired
5757
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
5858
fxDONOTUSEurl = https://github.com/NorESMhub/MOSART
@@ -68,39 +68,39 @@ 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.56
71+
fxtag = ccs_config_noresm0.0.65
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
7575

7676
[submodule "cime"]
7777
path = cime
7878
url = https://github.com/NorESMhub/cime
79-
fxtag = cime6.1.143_noresm_v1
79+
fxtag = cime6.1.173_noresm_v0
8080
fxrequired = ToplevelRequired
8181
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
8282
fxDONOTUSEurl = https://github.com/NorESMhub/cime
8383

8484
[submodule "cmeps"]
8585
path = components/cmeps
8686
url = https://github.com/NorESMhub/CMEPS.git
87-
fxtag = cmeps1.1.23_noresm_v1
87+
fxtag = cmeps1.1.41_noresm_v0
8888
fxrequired = ToplevelRequired
8989
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
9090
fxDONOTUSEurl = https://github.com/NorESMhub/CMEPS.git
9191

9292
[submodule "cdeps"]
9393
path = components/cdeps
9494
url = https://github.com/NorESMhub/CDEPS.git
95-
fxtag = cdeps1.0.88_noresm_v0
95+
fxtag = cdeps1.0.88_noresm_v2
9696
fxrequired = ToplevelRequired
9797
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
9898
fxDONOTUSEurl = https://github.com/NorESMhub/CDEPS.git
9999

100100
[submodule "share"]
101101
path = share
102102
url = https://github.com/NorESMhub/NorESM_share
103-
fxtag = share1.1.9_noresm_v0
103+
fxtag = share1.1.18_noresm_v0
104104
fxrequired = ToplevelRequired
105105
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
106106
fxDONOTUSEurl = https://github.com/NorESMhub/NorESM_share

‎bld/namelist_files/namelist_defaults_ctsm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
637637
<!-- ================================================================== -->
638638

639639
<!-- <fates_paramfile>lnd/clm2/paramdata/fates_params_api.36.1.0_14pft_c241003.nc</fates_paramfile> -->
640-
<fates_paramfile>lnd/clm2/paramdata/fates_params_sci.1.88.6_api.42.0.0_14pft_nor_sci2_api1_c260130.nc</fates_paramfile>
640+
<fates_paramfile>lnd/clm2/paramdata/fates_params_sci.1.88.6_api.42.0.0_14pft_nor_sci2_api2_c260415.nc</fates_paramfile>
641641
<!-- ================================================================== -->
642642
<!-- Default surface roughness parameterization -->
643643
<!-- ================================================================== -->

‎ccs_config‎

‎cime‎

Submodule cime updated 104 files

‎cime_config/config_component.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Caveats:
264264
<value compset="DATM[^_]*_CLM[^_]*BGC-CROP" >-bgc bgc -crop</value>
265265
<value compset="DATM[^_]*_CLM[^_]*FATES" >--bgc fates --no-fire_emis --no-megan --no-drydep</value>
266266
<value compset="DATM[^_]*_CLM[^_]*FATES-SP" >--bgc fates --no-fire_emis</value>
267-
<value compset="DATM[^_]*_CLM[^_]*FATES-NO-COMP" >--bgc fates --no-fire_emis</value>
267+
<value compset="DATM[^_]*_CLM[^_]*FATES-NOCOMP" >--bgc fates --no-fire_emis</value>
268268

269269
<!-- ======================================= Coupled to CAM Options ======================================
270270
All versions with CAM - turn off sending test drv_flds_in namelists from CTSM

‎cime_config/config_pes.xml‎

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2434,6 +2434,43 @@
24342434
</pes>
24352435
</mach>
24362436
</grid>
2437+
<grid name="l%1.9x2.5|l%0.9x1.25|l%ne30np4.pg3|l%ne16np4.pg3">
2438+
<mach name="olivia">
2439+
<pes pesize="any" compset="any">
2440+
<comment>Need at least 2 nodes to default to large queue</comment>
2441+
<ntasks>
2442+
<ntasks_atm>128</ntasks_atm>
2443+
<ntasks_lnd>640</ntasks_lnd>
2444+
<ntasks_rof>640</ntasks_rof>
2445+
<ntasks_ice>640</ntasks_ice>
2446+
<ntasks_ocn>640</ntasks_ocn>
2447+
<ntasks_glc>640</ntasks_glc>
2448+
<ntasks_wav>640</ntasks_wav>
2449+
<ntasks_cpl>768</ntasks_cpl>
2450+
</ntasks>
2451+
<nthrds>
2452+
<nthrds_atm>1</nthrds_atm>
2453+
<nthrds_lnd>1</nthrds_lnd>
2454+
<nthrds_rof>1</nthrds_rof>
2455+
<nthrds_ice>1</nthrds_ice>
2456+
<nthrds_ocn>1</nthrds_ocn>
2457+
<nthrds_glc>1</nthrds_glc>
2458+
<nthrds_wav>1</nthrds_wav>
2459+
<nthrds_cpl>1</nthrds_cpl>
2460+
</nthrds>
2461+
<rootpe>
2462+
<rootpe_atm>0</rootpe_atm>
2463+
<rootpe_lnd>128</rootpe_lnd>
2464+
<rootpe_rof>128</rootpe_rof>
2465+
<rootpe_ice>128</rootpe_ice>
2466+
<rootpe_ocn>128</rootpe_ocn>
2467+
<rootpe_glc>128</rootpe_glc>
2468+
<rootpe_wav>128</rootpe_wav>
2469+
<rootpe_cpl>128</rootpe_cpl>
2470+
</rootpe>
2471+
</pes>
2472+
</mach>
2473+
</grid>
24372474
<grid name="l%1.9x2.5">
24382475
<mach name="betzy">
24392476
<pes pesize="L" compset="any">
@@ -2508,7 +2545,43 @@
25082545
</pes>
25092546
</mach>
25102547
</grid>
2511-
2548+
<grid name="l%4x5">
2549+
<mach name="olivia">
2550+
<pes pesize="any" compset="any">
2551+
<comment>Need at least 2 nodes to devel queue</comment>
2552+
<ntasks>
2553+
<ntasks_atm>-1</ntasks_atm>
2554+
<ntasks_lnd>-1</ntasks_lnd>
2555+
<ntasks_rof>-1</ntasks_rof>
2556+
<ntasks_ice>-1</ntasks_ice>
2557+
<ntasks_ocn>-1</ntasks_ocn>
2558+
<ntasks_glc>-1</ntasks_glc>
2559+
<ntasks_wav>-1</ntasks_wav>
2560+
<ntasks_cpl>-1</ntasks_cpl>
2561+
</ntasks>
2562+
<nthrds>
2563+
<nthrds_atm>1</nthrds_atm>
2564+
<nthrds_lnd>1</nthrds_lnd>
2565+
<nthrds_rof>1</nthrds_rof>
2566+
<nthrds_ice>1</nthrds_ice>
2567+
<nthrds_ocn>1</nthrds_ocn>
2568+
<nthrds_glc>1</nthrds_glc>
2569+
<nthrds_wav>1</nthrds_wav>
2570+
<nthrds_cpl>1</nthrds_cpl>
2571+
</nthrds>
2572+
<rootpe>
2573+
<rootpe_atm>0</rootpe_atm>
2574+
<rootpe_lnd>0</rootpe_lnd>
2575+
<rootpe_rof>0</rootpe_rof>
2576+
<rootpe_ice>0</rootpe_ice>
2577+
<rootpe_ocn>0</rootpe_ocn>
2578+
<rootpe_glc>0</rootpe_glc>
2579+
<rootpe_wav>0</rootpe_wav>
2580+
<rootpe_cpl>0</rootpe_cpl>
2581+
</rootpe>
2582+
</pes>
2583+
</mach>
2584+
</grid>
25122585
<grid name="l%0.9x1.25|l%ne30np4.pg3">
25132586
<mach name="betzy">
25142587
<pes pesize="L" compset="any">

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
</phase>
405405
</test>
406406

407-
<test name="ERI_D_Ld80_P1024.ne16pg3_ne16pg3_mtn14.I2000Clm60Fates.betzy_gnu.clm-FatesCold">
407+
<test name="ERI_D_Ld80_P1024.ne16pg3_ne16pg3_mtn14.I2000Clm60Fates.olivia_gnu.clm-FatesCold">
408408
<phase name="COMPARE_base_hybrid">
409409
<status>FAIL</status>
410410
<issue>ESCOMP/CTSM#3494</issue>

0 commit comments

Comments
 (0)
⚡