Skip to content

Commit edd1e20

Browse files
jgfoucajgfouca
authored
Merge pull request #2961 from E3SM-Project/jgfouca/upstream_merge_2024_08_22
Jgfouca/upstream merge 2024 08 22
2 parents 3b9ff73 + b624485 commit edd1e20

File tree

227 files changed

+13285
-5868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+13285
-5868
lines changed

‎.github/workflows/e3sm-gh-ci-cime-tests.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
test:
30-
- SMS_D_P4.ne4pg2_oQU480.F2010.singularity_gnu
31-
- SMS_P4.ne4pg2_oQU480.F2010.singularity_gnu
32-
- REP_P4.ne4pg2_oQU480.F2010.singularity_gnu
33-
- ERS_P4.ne4pg2_oQU480.F2010.singularity_gnu
34-
- ERS_P4.ne4pg2_oQU480.F2010.singularity_gnu.eam-wcprod_F2010
35-
- ERP_P4.ne4pg2_oQU480.F2010.singularity_gnu
36-
- PET_P4.ne4pg2_oQU480.F2010.singularity_gnu
37-
- PEM_P4.ne4pg2_oQU480.F2010.singularity_gnu
30+
- SMS_D_P4.ne4pg2_oQU480.F2010.singularity2_gnu
31+
- SMS_P4.ne4pg2_oQU480.F2010.singularity2_gnu
32+
- REP_P4.ne4pg2_oQU480.F2010.singularity2_gnu
33+
- ERS_P4.ne4pg2_oQU480.F2010.singularity2_gnu
34+
- ERS_P4.ne4pg2_oQU480.F2010.singularity2_gnu.eam-wcprod_F2010
35+
- ERP_P4.ne4pg2_oQU480.F2010.singularity2_gnu
36+
- PET_P4.ne4pg2_oQU480.F2010.singularity2_gnu
37+
- PEM_P4.ne4pg2_oQU480.F2010.singularity2_gnu
3838
container:
39-
image: ghcr.io/mahf708/e3sm-imgs:v0.0.6
39+
image: ghcr.io/mahf708/e3sm-imgs:v0.0.9
4040

4141
steps:
4242
-

‎.github/workflows/e3sm-gh-ci-w-cime-tests.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
test:
23-
- SMS_D_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
24-
- SMS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
25-
- REP_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
26-
- ERS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
27-
- ERS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu.allactive-wcprod_1850
28-
- ERP_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
29-
- PET_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
30-
- PEM_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
23+
- SMS_D_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
24+
- SMS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
25+
- REP_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
26+
- ERS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
27+
- ERS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu.allactive-wcprod_1850
28+
- ERP_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
29+
- PET_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
30+
- PEM_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
3131
container:
32-
image: ghcr.io/mahf708/e3sm-imgs:v0.0.6
32+
image: ghcr.io/mahf708/e3sm-imgs:v0.0.9
3333

3434
steps:
3535
-

‎.github/workflows/e3sm-gh-md-linter.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
branches: ["master"]
88
paths:
99
- '**/*.md'
10+
# for now let's not lint files in eamxx
11+
- '!components/eamxx/**/*.md'
1012

1113
jobs:
1214
linter:

‎cime‎

Submodule cime updated 52 files

‎cime_config/allactive/config_compsets.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,11 @@
421421
<lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI%SIA_SWAV</lname>
422422
</compset>
423423

424+
<compset>
425+
<alias>MPAS_FOLISIO_JRA1p5</alias>
426+
<lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI_SWAV</lname>
427+
</compset>
428+
424429
<!-- Slab ocean cases -->
425430
<compset>
426431
<alias>E1850C5ELM</alias>

‎cime_config/allactive/config_pesall.xml‎

Lines changed: 108 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@
12531253
</grid>
12541254
<grid name="a%ne30np4.pg2_l%r05_oi%IcoswISC30E3r5_r%r05_.+">
12551255
<mach name="chrysalis">
1256-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="T">
1256+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="T">
12571257
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes pure-MPI, ~1.5 sypd </comment>
12581258
<ntasks>
12591259
<ntasks_atm>-4</ntasks_atm>
@@ -1264,7 +1264,7 @@
12641264
<ntasks_lnd>-4</ntasks_lnd>
12651265
</ntasks>
12661266
</pes>
1267-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="S">
1267+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
12681268
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 20 nodes pure-MPI, ~7.25 sypd </comment>
12691269
<ntasks>
12701270
<ntasks_atm>1024</ntasks_atm>
@@ -1283,7 +1283,7 @@
12831283
<rootpe_lnd>640</rootpe_lnd>
12841284
</rootpe>
12851285
</pes>
1286-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="M">
1286+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="M">
12871287
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 54 nodes pure-MPI, ~17.5 sypd </comment>
12881288
<ntasks>
12891289
<ntasks_atm>2752</ntasks_atm>
@@ -1302,7 +1302,7 @@
13021302
<rootpe_lnd>2048</rootpe_lnd>
13031303
</rootpe>
13041304
</pes>
1305-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="L">
1305+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="L">
13061306
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 105 nodes pure-MPI, ~27.7 sypd </comment>
13071307
<ntasks>
13081308
<ntasks_atm>5440</ntasks_atm>
@@ -1322,8 +1322,67 @@
13221322
</rootpe>
13231323
</pes>
13241324
</mach>
1325+
<mach name="anvil">
1326+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+_SESP$" pesize="S">
1327+
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 25 nodes pure-MPI, ~2.9 sypd </comment>
1328+
<ntasks>
1329+
<ntasks_atm>675</ntasks_atm>
1330+
<ntasks_lnd>324</ntasks_lnd>
1331+
<ntasks_rof>324</ntasks_rof>
1332+
<ntasks_ice>360</ntasks_ice>
1333+
<ntasks_ocn>216</ntasks_ocn>
1334+
<ntasks_cpl>684</ntasks_cpl>
1335+
</ntasks>
1336+
<rootpe>
1337+
<rootpe_atm>0</rootpe_atm>
1338+
<rootpe_lnd>360</rootpe_lnd>
1339+
<rootpe_rof>360</rootpe_rof>
1340+
<rootpe_ice>0</rootpe_ice>
1341+
<rootpe_ocn>684</rootpe_ocn>
1342+
<rootpe_cpl>0</rootpe_cpl>
1343+
</rootpe>
1344+
</pes>
1345+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+_SESP$" pesize="M">
1346+
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 50 nodes pure-MPI, ~5.6 sypd </comment>
1347+
<ntasks>
1348+
<ntasks_atm>1350</ntasks_atm>
1349+
<ntasks_lnd>648</ntasks_lnd>
1350+
<ntasks_rof>648</ntasks_rof>
1351+
<ntasks_ice>720</ntasks_ice>
1352+
<ntasks_ocn>432</ntasks_ocn>
1353+
<ntasks_cpl>1368</ntasks_cpl>
1354+
</ntasks>
1355+
<rootpe>
1356+
<rootpe_atm>0</rootpe_atm>
1357+
<rootpe_lnd>720</rootpe_lnd>
1358+
<rootpe_rof>720</rootpe_rof>
1359+
<rootpe_ice>0</rootpe_ice>
1360+
<rootpe_ocn>1368</rootpe_ocn>
1361+
<rootpe_cpl>0</rootpe_cpl>
1362+
</rootpe>
1363+
</pes>
1364+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+_SESP$" pesize="L">
1365+
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 100 nodes pure-MPI, ~8.8 sypd </comment>
1366+
<ntasks>
1367+
<ntasks_atm>2700</ntasks_atm>
1368+
<ntasks_lnd>1260</ntasks_lnd>
1369+
<ntasks_rof>1260</ntasks_rof>
1370+
<ntasks_ice>1440</ntasks_ice>
1371+
<ntasks_ocn>900</ntasks_ocn>
1372+
<ntasks_cpl>2700</ntasks_cpl>
1373+
</ntasks>
1374+
<rootpe>
1375+
<rootpe_atm>0</rootpe_atm>
1376+
<rootpe_lnd>1440</rootpe_lnd>
1377+
<rootpe_rof>1440</rootpe_rof>
1378+
<rootpe_ice>0</rootpe_ice>
1379+
<rootpe_ocn>2700</rootpe_ocn>
1380+
<rootpe_cpl>0</rootpe_cpl>
1381+
</rootpe>
1382+
</pes>
1383+
</mach>
13251384
<mach name="gcp12">
1326-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="any">
1385+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="any">
13271386
<comment> gcp12 --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes </comment>
13281387
<ntasks>
13291388
<ntasks_atm>-4</ntasks_atm>
@@ -1336,7 +1395,7 @@
13361395
</pes>
13371396
</mach>
13381397
<mach name="pm-cpu|muller-cpu|alvarez">
1339-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="any">
1398+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="any">
13401399
<comment> pm-cpu --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 8 nodes, stacked layout, 128x1 4-5 sypd</comment>
13411400
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
13421401
<ntasks>
@@ -1356,7 +1415,7 @@
13561415
<nthrds_cpl>1</nthrds_cpl>
13571416
</nthrds>
13581417
</pes>
1359-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="L">
1418+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="L">
13601419
<comment> pm-cpu --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 30 nodes, 128x1 ~15 sypd</comment>
13611420
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
13621421
<ntasks>
@@ -1384,7 +1443,7 @@
13841443
<rootpe_cpl>0</rootpe_cpl>
13851444
</rootpe>
13861445
</pes>
1387-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="XL">
1446+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="XL">
13881447
<comment> pm-cpu: -compset WCYCL* -res ne30pg2_r05_IcoswISC30E3r5 on 61 nodes, 120x1, ~23 sypd</comment>
13891448
<MAX_MPITASKS_PER_NODE>120</MAX_MPITASKS_PER_NODE>
13901449
<ntasks>
@@ -1416,7 +1475,7 @@
14161475
</grid>
14171476
<grid name="a%ne30np4.pg2_l%r05_oi%IcosXISC30E3r7_r%r05_.+">
14181477
<mach name="chrysalis">
1419-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="S">
1478+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
14201479
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 20 nodes pure-MPI, ~7.25 sypd </comment>
14211480
<ntasks>
14221481
<ntasks_atm>1024</ntasks_atm>
@@ -1435,7 +1494,7 @@
14351494
<rootpe_lnd>640</rootpe_lnd>
14361495
</rootpe>
14371496
</pes>
1438-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="M">
1497+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="M">
14391498
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 54 nodes pure-MPI, ~17.5 sypd </comment>
14401499
<ntasks>
14411500
<ntasks_atm>2752</ntasks_atm>
@@ -1454,7 +1513,7 @@
14541513
<rootpe_lnd>2048</rootpe_lnd>
14551514
</rootpe>
14561515
</pes>
1457-
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="L">
1516+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="L">
14581517
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 105 nodes pure-MPI, ~27.7 sypd </comment>
14591518
<ntasks>
14601519
<ntasks_atm>5440</ntasks_atm>
@@ -2442,4 +2501,42 @@
24422501
</pes>
24432502
</mach>
24442503
</grid>
2504+
<grid name="a%ne30np4.pg2_l%r05_oi%IcoswISC30E3r5_r%r05_g%mpas.gis20km_w%null_z%null_m%IcoswISC30E3r5">
2505+
<mach name="chrysalis|pm-cpu|alvarez">
2506+
<pes compset="1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI_SWAV" pesize="any">
2507+
<comment>GIS 20km (low-res) testing config</comment>
2508+
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
2509+
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
2510+
<ntasks>
2511+
<ntasks_atm>512</ntasks_atm>
2512+
<ntasks_lnd>512</ntasks_lnd>
2513+
<ntasks_rof>512</ntasks_rof>
2514+
<ntasks_ice>512</ntasks_ice>
2515+
<ntasks_ocn>512</ntasks_ocn>
2516+
<ntasks_glc>256</ntasks_glc>
2517+
<ntasks_wav>512</ntasks_wav>
2518+
<ntasks_cpl>512</ntasks_cpl>
2519+
</ntasks>
2520+
<nthrds>
2521+
<nthrds_atm>1</nthrds_atm>
2522+
<nthrds_lnd>1</nthrds_lnd>
2523+
<nthrds_rof>1</nthrds_rof>
2524+
<nthrds_ice>1</nthrds_ice>
2525+
<nthrds_ocn>1</nthrds_ocn>
2526+
<nthrds_glc>1</nthrds_glc>
2527+
<nthrds_wav>1</nthrds_wav>
2528+
<nthrds_cpl>1</nthrds_cpl>
2529+
</nthrds>
2530+
<rootpe>
2531+
<rootpe_atm>0</rootpe_atm>
2532+
<rootpe_lnd>0</rootpe_lnd>
2533+
<rootpe_rof>0</rootpe_rof>
2534+
<rootpe_ice>0</rootpe_ice>
2535+
<rootpe_ocn>0</rootpe_ocn>
2536+
<rootpe_glc>0</rootpe_glc>
2537+
<rootpe_cpl>0</rootpe_cpl>
2538+
</rootpe>
2539+
</pes>
2540+
</mach>
2541+
</grid>
24452542
</config_pes>

‎cime_config/config_archive.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
</test_file_names>
118118
</comp_archive_spec>
119119

120-
<comp_archive_spec compname="mali" compclass="glc" exclude_testing="true">
120+
<comp_archive_spec compname="mali" compclass="glc">
121121
<rest_file_extension>rst</rest_file_extension>
122122
<hist_file_extension>hist</hist_file_extension>
123123
<rest_history_varname>unset</rest_history_varname>

‎cime_config/config_files.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@
351351
<value component="mpaso" >$COMP_ROOT_DIR_OCN/cime_config/testdefs/testmods_dirs</value>
352352
<value component="mpassi" >$COMP_ROOT_DIR_ICE/cime_config/testdefs/testmods_dirs</value>
353353
<value component="ww3" >$COMP_ROOT_DIR_WAV/cime_config/testdefs/testmods_dirs</value>
354+
<value component="mali" >$COMP_ROOT_DIR_GLC/cime_config/testdefs/testmods_dirs</value>
354355
</values>
355356
<group>case_last</group>
356357
<file>env_case.xml</file>

0 commit comments

Comments
 (0)