Skip to content

Commit

Permalink
Merge branch 'jonbob/add-qu480-configurations' (PR #2426)
Browse files Browse the repository at this point in the history 
Add ne4_oQU480 and T62_oQU480 configurations

This PR brings in necessary script modifications to support an ultra-low
ocn/ice testing configuration, using ne4np4_oQU480 for fully-coupled
testing and T62_oQU480 for ocn/ice testing. This capability had been
requested for faster testing - but it should be stressed that neither of
these is suitable for scientific results. All necessary files are on the
lcrc disk. A test G-case on one anvil node got ~200 sypd and a B-case
using four nodes ran at ~50 sypd.

Tested with:
* A_WCYCL1850.ne4_oQU480.anvil
* T62_oQU480.GMPAS-IAF.anvil
* A_WCYCL1850.ne4_oQU480.edison

[BFB]
  • Loading branch information
@jonbob
jonbob committed Jul 17, 2018
2 parents 3bb9ac7 + feefcb0 commit 0aa4eaa
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 0 deletions.
56 changes: 56 additions & 0 deletions 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 Down Expand Up @@ -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
2 changes: 2 additions & 0 deletions src/drivers/mct/cime_config/config_component_e3sm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@
<value compset="_DLND.*_MALI">1</value>
<value compset="_SLND.*SOCN.*_MALI">1</value>
<value compset="_DATM.*_SLND.*MPASO.*_MALI">24</value>
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oQU480">12</value>
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oQU240">12</value>
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oQU240wLI">12</value>
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oQU120">24</value>
Expand Down Expand Up @@ -376,6 +377,7 @@
<value compset="_DLND.*_MALI">1</value>
<value compset="_SLND.*SOCN.*_MALI">1</value>
<value compset="_DATM.*_SLND.*MPASO.*_MALI">24</value>
<value compset="_MPASO" grid="oi%oQU480">6</value>
<value compset="_MPASO" grid="oi%oQU240">12</value>
<value compset="_MPASO" grid="oi%oQU240wLI">12</value>
<value compset="_MPASO" grid="oi%oQU120">24</value>
Expand Down

0 comments on commit 0aa4eaa

Please sign in to comment.