Skip to content

Commit

Permalink
Merge pull request #2743 from ESMCI/jgfouca/branch-for-acme-split-201…
Browse files Browse the repository at this point in the history 
…8-08-08

Jgfouca/branch for acme split 2018 08 08

Test suite: scripts_regresion_tests
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1543

User interface changes?: N

Update gh-pages html (Y/N)?: N

Code review: @jedwards4b
  • Loading branch information
@jgfouca
jgfouca authored Aug 8, 2018
2 parents 4723dd2 + 51b0a64 commit 07d476d
Show file tree
Hide file tree
Showing 31 changed files with 1,535 additions and 623 deletions.
14 changes: 7 additions & 7 deletions config/e3sm/allactive/config_pesall.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2649,14 +2649,14 @@
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>384</ntasks_atm>
<ntasks_lnd>384</ntasks_lnd>
<ntasks_rof>384</ntasks_rof>
<ntasks_atm>363</ntasks_atm>
<ntasks_lnd>363</ntasks_lnd>
<ntasks_rof>363</ntasks_rof>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>128</ntasks_ocn>
<ntasks_glc>64</ntasks_glc>
<ntasks_wav>64</ntasks_wav>
<ntasks_cpl>384</ntasks_cpl>
<ntasks_cpl>363</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>2</nthrds_atm>
Expand Down Expand Up @@ -8112,7 +8112,7 @@
</pes>
</mach>
<mach name="edison">
<pes compset=".*CAM5.+CLM45.+MPASSI.+MPASO.+MOSART.*" pesize="any">
<pes compset=".*CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.*" pesize="any">
<comment>"edison ne4 coupled compest on 6 nodes, OCN by itself on 2 nodes sypd=45.2"</comment>
<ntasks>
<ntasks_atm>96</ntasks_atm>
Expand Down Expand Up @@ -8427,7 +8427,7 @@
</grid>
<grid name=".*T62_oi%oRRS18to6*">
<mach name="cori-knl">
<pes compset=".*MPASSI.+MPASO.+" pesize="any">
<pes compset=".*MPASCICE.+MPASO.+" pesize="any">
<comment>cori-knl, hires (18to6) G case on 150 nodes, 64x2, sypd=0.5</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
Expand Down Expand Up @@ -8456,7 +8456,7 @@
</grid>
<grid name=".*T62_oi%oEC60to30.*">
<mach name="cori-knl">
<pes compset=".*MPASSI.+MPASO.+" pesize="any">
<pes compset=".*MPASCICE.+MPASO.+" pesize="any">
<comment>cori-knl, lowres (60to30) G case on 16 nodes, 64x2, sypd=2.42</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
Expand Down
58 changes: 57 additions & 1 deletion config/e3sm/config_grids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,16 @@

<!-- spectral element grids -->

<model_grid alias="ne4_oQU480">
<grid name="atm">ne4np4</grid>
<grid name="lnd">ne4np4</grid>
<grid name="ocnice">oQU480</grid>
<grid name="rof">r05</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>oQU480</mask>
</model_grid>

<model_grid alias="ne4_oQU240">
<grid name="atm">ne4np4</grid>
<grid name="lnd">ne4np4</grid>
Expand Down Expand Up @@ -991,6 +1001,16 @@
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="T62_oQU480" compset="(DATM|XATM|SATM)">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oQU480</grid>
<grid name="rof">rx1</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>oQU480</mask>
</model_grid>

<model_grid alias="T62_oQU240" compset="(DATM|XATM|SATM)">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
Expand Down Expand Up @@ -1346,6 +1366,7 @@
<file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx1v6.090320.nc</file>
<file grid="atm|lnd" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx3v7.090911.nc</file>
<file grid="atm|lnd" mask="mpasgx1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_mpasgx1.150903.nc</file>
<file grid="atm|lnd" mask="oQU480">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU480.151209.nc</file>
<file grid="atm|lnd" mask="oQU240">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU240.151209.nc</file>
<file grid="atm|lnd" mask="oQU240wLI">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU240wLI_mask.160929.nc</file>
<file grid="atm|lnd" mask="oQU120">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU120.151209.nc</file>
Expand All @@ -1367,7 +1388,7 @@
<nx>128</nx>
<ny>64</ny>
<file grid="atm|lnd" mask="usgs">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.T42_USGS.111004.nc</file>
<file grid="ocn" mask="usgs">$DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.64x128_USGS_070807.nc</file>
<file grid="ice|ocn" mask="usgs">$DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.64x128_USGS_070807.nc</file>
<desc>T42 is Gaussian grid:</desc>
</domain>

Expand All @@ -1380,7 +1401,9 @@
<domain name="ne4np4">
<nx>866</nx>
<ny>1</ny>
<file grid="atm|lnd" mask="oQU480">$DIN_LOC_ROOT/share/domains/domain.lnd.ne4np4_oQU480.180702.nc</file>
<file grid="atm|lnd" mask="oQU240">$DIN_LOC_ROOT/share/domains/domain.lnd.ne4np4_oQU240.160614.nc</file>
<file grid="ice|ocn" mask="oQU480">$DIN_LOC_ROOT/share/domains/domain.ocn.ne4np4_oQU480.180702.nc</file>
<file grid="ice|ocn" mask="oQU240">$DIN_LOC_ROOT/share/domains/domain.ocn.ne4np4_oQU240.160614.nc</file>
<desc>ne4np4 is Spectral Elem 7.5-deg grid:</desc>
</domain>
Expand Down Expand Up @@ -1694,6 +1717,13 @@
<desc>tx0.1v2 is an old mask used for CONUS:</desc>
</domain>

<domain name="oQU480">
<nx>1791</nx>
<ny>1</ny>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.oQU480.151209.nc</file>
<desc>oQU480 is an MPAS ocean mesh with quasi-uniform 480 km grid cells, nominally 4 degree resolution:</desc>
</domain>

<domain name="oQU240">
<nx>7153</nx>
<ny>1</ny>
Expand Down Expand Up @@ -1819,6 +1849,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx3v7/</map>
</gridmap>

<gridmap atm_grid="ne4np4" ocn_grid="oQU480">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU480_aave.180702.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU480_conserve.180702.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU480_conserve.180702.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/oQU480/map_oQU480_to_ne4np4_aave.180702.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oQU480/map_oQU480_to_ne4np4_aave.180702.nc</map>
</gridmap>

<gridmap atm_grid="ne4np4" ocn_grid="oQU240">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU240_aave.160614.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU240_aave.160614.nc</map>
Expand Down Expand Up @@ -2036,6 +2074,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/mpasgx1/map_mpasgx1_TO_T62_aave.150827.nc</map>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oQU480">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU480_aave.151209.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU480_patc.151209.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU480_blin.151209.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/oQU480/map_oQU480_TO_T62_aave.151209.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oQU480/map_oQU480_TO_T62_aave.151209.nc</map>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oQU240">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU240_aave.151209.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU240_patc.151209.nc</map>
Expand Down Expand Up @@ -2385,6 +2431,11 @@

<!--- current MPAS grids -->

<gridmap ocn_grid="oQU480" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_oQU480_nn_151209.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_oQU480_nn_151209.nc</map>
</gridmap>

<gridmap ocn_grid="oQU240" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_oQU240_nn.160527.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_oQU240_nn.160527.nc</map>
Expand Down Expand Up @@ -2455,6 +2506,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_oRRS15to5_nn.160527.nc</map>
</gridmap>

<gridmap ocn_grid="oQU480" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_oQU480_nn.180702.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_oQU480_nn.180702.nc</map>
</gridmap>

<gridmap ocn_grid="oQU240" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_oQU240_nn.160714.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_oQU240_nn.160714.nc</map>
Expand Down
12 changes: 12 additions & 0 deletions config/e3sm/machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,18 @@
</queues>
</batch_system>

<batch_system MACH="snl-white" type="lsf" >
<queues>
<queue walltimemax="02:00" default="true">rhel7G</queue>
</queues>
</batch_system>

<batch_system MACH="snl-blake" type="slurm" >
<queues>
<queue walltimemax="02:00" default="true">blake</queue>
</queues>
</batch_system>

<batch_system MACH="lawrencium-lr2" type="slurm" >
<directives>
<directive>--ntasks-per-node={{ tasks_per_node }}</directive>
Expand Down
Loading

0 comments on commit 07d476d

Please sign in to comment.