Skip to content

Commit

Permalink
Remove deprecated ECwISC30to60E3r1 mesh, add new RRSwISC6to18E3r1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonbob
jonbob committed Sep 14, 2023
1 parent d283027 commit a49cdc7
Showing 1 changed file with 45 additions and 45 deletions.
90 changes: 45 additions & 45 deletions cime_config/config_grids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,14 +399,14 @@
<mask>ECwISC30to60E2r1</mask>
</model_grid>

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

<model_grid alias="TL319_oEC60to30v3" compset="(DATM|XATM|SATM)">
Expand Down Expand Up @@ -519,14 +519,14 @@
<mask>ECwISC30to60E2r1</mask>
</model_grid>

<model_grid alias="TL319_ECwISC30to60E3r1" compset="(DATM|XATM|SATM)">
<model_grid alias="TL319_RRSwISC6to18E3r1" compset="(DATM|XATM|SATM)">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">ECwISC30to60E3r1</grid>
<grid name="ocnice">RRSwISC6to18E3r1</grid>
<grid name="rof">JRA025</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>ECwISC30to60E3r1</mask>
<mask>RRSwISC6to18E3r1</mask>
</model_grid>

<model_grid alias="TL319_oRRS18to6v3" compset="(DATM|XATM|SATM)">
Expand Down Expand Up @@ -1203,14 +1203,14 @@
<mask>ECwISC30to60E2r1</mask>
</model_grid>

<model_grid alias="ne30pg2_ECwISC30to60E3r1">
<model_grid alias="ne30pg2_RRSwISC6to18E3r1">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">ne30np4.pg2</grid>
<grid name="ocnice">ECwISC30to60E3r1</grid>
<grid name="ocnice">RRSwISC6to18E3r1</grid>
<grid name="rof">r05</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>ECwISC30to60E3r1</mask>
<mask>RRSwISC6to18E3r1</mask>
</model_grid>

<model_grid alias="northamericax4v1_r0125_northamericax4v1" compset="(DOCN|XOCN|SOCN|AQP1)">
Expand Down Expand Up @@ -2323,7 +2323,7 @@
<file grid="atm|lnd" mask="WCAtl12to45E2r4">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_WCAtl12to45E2r4.210318.nc</file>
<file grid="atm|lnd" mask="SOwISC12to60E2r4">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to60E2r4.210119.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E2r1.201007.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E3r1.230817.nc</file>
<file grid="atm|lnd" mask="RRSwISC6to18E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_RRSwISC6to18E3r1.230914.nc</file>
<desc>T62 is Gaussian grid:</desc>
</domain>

Expand Down Expand Up @@ -2366,8 +2366,8 @@
<file grid="ice|ocn" mask="SOwISC12to60E2r4">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_SOwISC12to60E2r4.210119.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ECwISC30to60E2r1.201007.nc</file>
<file grid="ice|ocn" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E2r1.201007.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ECwISC30to60E3r1.230817.nc</file>
<file grid="ice|ocn" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E3r1.230817.nc</file>
<file grid="atm|lnd" mask="RRSwISC6to18E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_RRSwISC6to18E3r1.230914.nc</file>
<file grid="ice|ocn" mask="RRSwISC6to18E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_RRSwISC6to18E3r1.230914.nc</file>
<file grid="atm|lnd" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc</file>
<file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc</file>
<desc>TL319 is JRA lat/lon grid:</desc>
Expand Down Expand Up @@ -2471,8 +2471,8 @@
<file grid="ice|ocn" mask="SOwISC12to60E2r4">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_SOwISC12to60E2r4.210119.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ECwISC30to60E2r1.201007.nc</file>
<file grid="ice|ocn" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ECwISC30to60E2r1.201007.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ECwISC30to60E3r1.230817.nc</file>
<file grid="ice|ocn" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ECwISC30to60E3r1.230817.nc</file>
<file grid="atm|lnd" mask="RRSwISC6to18E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_RRSwISC6to18E3r1.230914.nc</file>
<file grid="ice|ocn" mask="RRSwISC6to18E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_RRSwISC6to18E3r1.230914.nc</file>
<file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc</file>
<file grid="ice|ocn" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc</file>
<desc>ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element:</desc>
Expand Down Expand Up @@ -2738,11 +2738,11 @@
<desc>ECwISC30to60E2r1 is a MPAS ocean grid generated with the jigsaw/compass process using the eddy closure density function that has 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. Additionally, it has ocean in ice-shelf cavities:</desc>
</domain>

<domain name="ECwISC30to60E3r1">
<nx>237986</nx>
<domain name="RRSwISC6to18E3r1">
<nx>4085395</nx>
<ny>1</ny>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.ECwISC30to60E3r1.230817.nc</file>
<desc>ECwISC30to60E3r1 is a MPAS ocean grid generated with the jigsaw/compass process using the eddy closure density function that has 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. Additionally, it has ocean in ice-shelf cavities:</desc>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.RRSwISC6to18E3r1.230914.nc</file>
<desc>RRSwISC6to18E3r1 is a MPAS ocean grid generated with the jigsaw/compass process using XXXXX. Additionally, it has ocean in ice-shelf cavities:</desc>
</domain>

<!-- ROF (river) grids-->
Expand Down Expand Up @@ -3229,12 +3229,12 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1-nomask_to_ne30pg2_mono.201006.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg2" ocn_grid="ECwISC30to60E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r1_mono.230817.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r1_bilin.230817.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r1-nomask_bilin.230817.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_ne30pg2_mono.230817.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_ne30pg2_mono.230817.nc</map>
<gridmap atm_grid="ne30np4.pg2" ocn_grid="RRSwISC6to18E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_RRSwISC6to18E3r1_mono.230914.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_RRSwISC6to18E3r1_bilin.230914.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_RRSwISC6to18E3r1-nomask_bilin.230914.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/RRSwISC6to18E3r1/map_RRSwISC6to18E3r1_to_ne30pg2_mono.230914.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/RRSwISC6to18E3r1/map_RRSwISC6to18E3r1_to_ne30pg2_mono.230914.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg3" ocn_grid="oEC60to30v3">
Expand Down Expand Up @@ -3940,12 +3940,12 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1_to_T62_aave.201006.nc</map>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="ECwISC30to60E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r1_mono.230817.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r1-nomask_bilin.230817.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r1_patch.230817.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_T62_mono.230817.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_T62_mono.230817.nc</map>
<gridmap atm_grid="T62" ocn_grid="RRSwISC6to18E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_RRSwISC6to18E3r1_mono.230914.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_RRSwISC6to18E3r1-nomask_bilin.230914.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_RRSwISC6to18E3r1_patch.230914.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/RRSwISC6to18E3r1/map_RRSwISC6to18E3r1_to_T62_mono.230914.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/RRSwISC6to18E3r1/map_RRSwISC6to18E3r1_to_T62_mono.230914.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="oEC60to30v3">
Expand Down Expand Up @@ -4036,12 +4036,12 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1_to_TL319_aave.201006.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="ECwISC30to60E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r1_mono.230817.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r1-nomask_bilin.230817.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r1_patch.230817.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_TL319_mono.230817.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_TL319_mono.230817.nc</map>
<gridmap atm_grid="TL319" ocn_grid="RRSwISC6to18E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_RRSwISC6to18E3r1_mono.230914.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_RRSwISC6to18E3r1-nomask_bilin.230914.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_RRSwISC6to18E3r1_patch.230914.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/RRSwISC6to18E3r1/map_RRSwISC6to18E3r1_to_TL319_mono.230914.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/RRSwISC6to18E3r1/map_RRSwISC6to18E3r1_to_TL319_mono.230914.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="oRRS18to6v3">
Expand Down Expand Up @@ -4499,9 +4499,9 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc</map>
</gridmap>

<gridmap ocn_grid="ECwISC30to60E3r1" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<gridmap ocn_grid="RRSwISC6to18E3r1" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_RRSwISC6to18E3r1_smoothed.r100e200.230914.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_RRSwISC6to18E3r1_smoothed.r100e200.230914.nc</map>
</gridmap>

<gridmap ocn_grid="oEC60to30v3" rof_grid="JRA025">
Expand Down Expand Up @@ -4559,9 +4559,9 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc</map>
</gridmap>

<gridmap ocn_grid="ECwISC30to60E3r1" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<gridmap ocn_grid="RRSwISC6to18E3r1" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_RRSwISC6to18E3r1_smoothed.r50e100.230914.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_RRSwISC6to18E3r1_smoothed.r50e100.230914.nc</map>
</gridmap>

<gridmap ocn_grid="oRRS18to6v3" rof_grid="JRA025">
Expand Down Expand Up @@ -4644,9 +4644,9 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc</map>
</gridmap>

<gridmap ocn_grid="ECwISC30to60E3r1" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<gridmap ocn_grid="RRSwISC6to18E3r1" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_RRSwISC6to18E3r1_smoothed.r50e100.230914.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_RRSwISC6to18E3r1_smoothed.r50e100.230914.nc</map>
</gridmap>

<gridmap ocn_grid="WC14to60E2r3" rof_grid="r0125">
Expand Down

0 comments on commit a49cdc7

Please sign in to comment.