Skip to content

Commit

Permalink
Add settings for EC60to30v2 RRS30to10v2 grids
Browse files Browse the repository at this point in the history
  • Loading branch information
@mark-petersen
mark-petersen committed Nov 18, 2016
1 parent 7a17edb commit aa0f10f
Show file tree
Hide file tree
Showing 6 changed files with 168 additions and 6 deletions.
121 changes: 119 additions & 2 deletions cime/scripts/Tools/config_grid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ Each grid is associated with five names
<GRID sname="T62_oQU120" alias="T62_oQU120" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oQU120_r%rx1_m%oQU120_g%null_w%null</GRID>
<GRID sname="T62_mpasgx1" alias="T62_mgx1" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%mpasgx1_r%rx1_m%mpasgx1_g%null_w%null</GRID>
<GRID sname="T62_oEC60to30" alias="T62_oEC60to30" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oEC60to30_r%rx1_m%oEC60to30_g%null_w%null</GRID>
<GRID sname="T62_oEC60to30v2" alias="T62_oEC60to30v2" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oEC60to30v2_r%rx1_m%oEC60to30v2_g%null_w%null</GRID>
<GRID sname="T62_oEC60to30wLI" alias="T62_oEC60to30wLI" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oEC60to30wLI_r%rx1_m%oEC60to30wLI_g%null_w%null</GRID>
<GRID sname="T62_oRRS30to10" alias="T62_oRRS30to10" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oRRS30to10_r%rx1_m%oRRS30to10_g%null_w%null</GRID>
<GRID sname="T62_oRRS30to10v2" alias="T62_oRRS30to10v2" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oRRS30to10v2_r%rx1_m%oRRS30to10v2_g%null_w%null</GRID>
<GRID sname="T62_oRRS30to10wLI" alias="T62_oRRS30to10wLI" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oRRS30to10wLI_r%rx1_m%oRRS30to10wLI_g%null_w%null</GRID>
<GRID sname="T62_oRRS18to6" alias="T62_oRRS18to6" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oRRS18to6_r%rx1_m%oRRS18to6_g%null_w%null</GRID>
<GRID sname="T62_oRRS15to5" alias="T62_oRRS15to5" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oRRS15to5_r%rx1_m%oRRS15to5_g%null_w%null</GRID>
Expand All @@ -82,7 +84,7 @@ Each grid is associated with five names
<!-- spectral element grids -->

<GRID sname="ne4np4_oQU240" alias="ne4_oQU240" >a%ne4np4_l%ne4np4_oi%oQU240_r%r05_m%oQU240_g%null_w%null</GRID>
<GRID sname="ne4np4_oQU240wLI" alias="ne4_oQU240wLI" >a%ne4np4_l%ne4np4_oi%oQU240wLI_r%r05_m%oQU240wLI_g%null_w%null</GRID>
<GRID sname="ne4np4_oQU240wLI" alias="ne4_oQU240wLI" >a%ne4np4_l%ne4np4_oi%oQU240wLI_r%r05_m%oQU240wLI_g%null_w%null</GRID>
<GRID sname="ne11np4_oQU240" alias="ne11_oQU240" >a%ne11np4_l%ne11np4_oi%oQU240_r%r05_m%oQU240_g%null_w%null</GRID>
<GRID sname="ne16np4_oQU240" alias="ne16_oQU240" >a%ne16np4_l%ne16np4_oi%oQU240_r%r05_m%oQU240_g%null_w%null</GRID>
<GRID sname="ne16np4_oQU240_ais20" alias="ne16_oQU240_a" >a%ne16np4_l%ne16np4_oi%oQU240_r%r05_m%oQU240_g%mpas.ais20km_w%null</GRID>
Expand All @@ -91,10 +93,13 @@ Each grid is associated with five names
<GRID sname="ne30np4_oQU120" alias="ne30_oQU120" >a%ne30np4_l%ne30np4_oi%oQU120_r%r05_m%oQU120_g%null_w%null</GRID>
<GRID sname="ne30np4_oQU120_ais20" alias="ne30_oQU120_a" >a%ne30np4_l%ne30np4_oi%oQU120_r%r05_m%oQU120_g%mpas.ais20km_w%null</GRID>
<GRID sname="ne30np4_oEC60to30" alias="ne30_oEC" >a%ne30np4_l%ne30np4_oi%oEC60to30_r%r05_m%oEC60to30_g%null_w%null</GRID>
<GRID sname="ne30np4_oEC60to30v2" alias="ne30_oECv2" >a%ne30np4_l%ne30np4_oi%oEC60to30v2_r%r05_m%oEC60to30v2_g%null_w%null</GRID>
<GRID sname="ne30np4_oEC60to30_ICG" alias="ne30_oEC_ICG" compset="(CAM5.+CLM.+MPASO%SPUNUP)">a%ne30np4_l%ne30np4_oi%oEC60to30_ICG_r%r05_m%oEC60to30_g%null_w%null</GRID>
<GRID sname="ne30np4_oEC60to30v2_ICG" alias="ne30_oECv2_ICG" compset="(CAM5.+CLM.+MPASO%SPUNUP)">a%ne30np4_l%ne30np4_oi%oEC60to30v2_ICG_r%r05_m%oEC60to30v2_g%null_w%null</GRID>
<GRID sname="ne30np4_oEC60to30wLI" alias="ne30_oECwLI" >a%ne30np4_l%ne30np4_oi%oEC60to30wLI_r%r05_m%oEC60to30wLI_g%null_w%null</GRID>
<GRID sname="ne30np4_oRRS30to10" alias="ne30_oRRS30" >a%ne30np4_l%ne30np4_oi%oRRS30to10_r%r05_m%oRRS30to10_g%null_w%null</GRID>
<GRID sname="ne30np4_oRRS30to10wLI" alias="ne30_oRRS30" >a%ne30np4_l%ne30np4_oi%oRRS30to10wLI_r%r05_m%oRRS30to10wLI_g%null_w%null</GRID>
<GRID sname="ne30np4_oRRS30to10v2" alias="ne30_oRRS30v2" >a%ne30np4_l%ne30np4_oi%oRRS30to10v2_r%r05_m%oRRS30to10v2_g%null_w%null</GRID>
<GRID sname="ne30np4_oRRS30to10wLI" alias="ne30_oRRS30wLI" >a%ne30np4_l%ne30np4_oi%oRRS30to10wLI_r%r05_m%oRRS30to10wLI_g%null_w%null</GRID>
<GRID sname="ne30np4_1.9x2.5_gx1v6" alias="ne30_f19_g16" support_level="For testing tri-grid" >a%ne30np4_l%1.9x2.5_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
<GRID sname="ne30np4_0.9x1.25_gx1v6" alias="ne30_f09_g16" support_level="For testing tri-grid" >a%ne30np4_l%0.9x1.25_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
<GRID sname="ne60np4_gx1v6" alias="ne60_g16" >a%ne60np4_l%ne60np4_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
Expand Down Expand Up @@ -439,6 +444,18 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<desc>oEC60to30_ICG is a MPAS ocean grid with initial conditions, generated with the eddy closure density function with 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. It is roughly comparable to the POP 1 degree resolution. This version of initial conditions is spun-up from a G compset run:</desc>
</gridhorz>

<gridhorz name="oEC60to30v2">
<support_level>Experimental, under development</support_level>
<nx>235446</nx> <ny>1</ny>
<desc>oEC60to30v2 is an MPAS ocean grid generated with the eddy closure density function, with 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. It is roughly comparable to the POP 1 degree resolution:</desc>
</gridhorz>

<gridhorz name="oEC60to30v2_ICG">
<support_level>Experimental, under development</support_level>
<nx>235446</nx> <ny>1</ny>
<desc>oEC60to30_ICG is a MPAS ocean grid with initial conditions, generated with the eddy closure density function with 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. It is roughly comparable to the POP 1 degree resolution. This version of initial conditions is spun-up from a G compset run:</desc>
</gridhorz>

<gridhorz name="oEC60to30wLI">
<support_level>Experimental, under development</support_level>
<nx>236689</nx> <ny>1</ny>
Expand All @@ -451,6 +468,12 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<desc>oRRS30to10 is an MPAS ocean grid with a mesh density function that is roughly proportional to the Rossby radius of deformation, with 30 km gridcells at low and 10 km gridcells at high latitudes:</desc>
</gridhorz>

<gridhorz name="oRRS30to10v2">
<support_level>Experimental, under development</support_level>
<nx>1447370</nx> <ny>1</ny>
<desc>oRRS30to10v2 is an MPAS ocean grid with a mesh density function that is roughly proportional to the Rossby radius of deformation, with 30 km gridcells at low and 10 km gridcells at high latitudes:</desc>
</gridhorz>

<gridhorz name="oRRS30to10wLI">
<support_level>Experimental, under development</support_level>
<nx>1462411</nx> <ny>1</ny>
Expand Down Expand Up @@ -627,6 +650,16 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN_DOMAIN_FILE>domain.ocn.oEC60to30.150616.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="oEC60to30v2" mask="oEC60to30v2">
<ICE_DOMAIN_FILE>domain.ocn.oEC60to30v2.161011.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oEC60to30v2.161011.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="oEC60to30v2_ICG" mask="oEC60to30v2">
<ICE_DOMAIN_FILE>domain.ocn.oEC60to30v2.161011.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oEC60to30v2.161011.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="oEC60to30wLI" mask="oEC60to30wLI">
<ICE_DOMAIN_FILE>domain.ocn.oEC60to30wLI_mask.160830.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oEC60to30wLI_mask.160830.nc</OCN_DOMAIN_FILE>
Expand All @@ -637,6 +670,11 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN_DOMAIN_FILE>domain.ocn.oRRS30to10.150722.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="oRRS30to10v2" mask="oRRS30to10v2">
<ICE_DOMAIN_FILE>domain.ocn.oRRS30to10v2.161102.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oRRS30to10v2.161102.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="oRRS30to10wLI" mask="oRRS30to10wLI">
<ICE_DOMAIN_FILE>domain.ocn.oRRS30to10wLI_mask.160930.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oRRS30to10wLI_mask.160930.nc</OCN_DOMAIN_FILE>
Expand Down Expand Up @@ -1173,6 +1211,13 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_oEC60to30.20151214.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="ne30np4" mask="oEC60to30v2">
<ATM_DOMAIN_FILE>domain.lnd.ne30np4_oEC60to30v2.161115.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.ne30np4_oEC60to30v2.161115.nc</LND_DOMAIN_FILE>
<ICE_DOMAIN_FILE>domain.ocn.ne30np4_oEC60to30v2.161115.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_oEC60to30v2.161115.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="ne30np4" mask="oEC60to30wLI">
<ATM_DOMAIN_FILE>domain.lnd.ne30np4_oEC60to30wLI_mask.160915.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.ne30np4_oEC60to30wLI_mask.160915.nc</LND_DOMAIN_FILE>
Expand All @@ -1187,6 +1232,13 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_oRRS30to10.160419.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="ne30np4" mask="oRRS30to10v2">
<ATM_DOMAIN_FILE>domain.lnd.ne30np4_oRRS30to10v2.999999.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.ne30np4_oRRS30to10v2.999999.nc</LND_DOMAIN_FILE>
<ICE_DOMAIN_FILE>domain.ocn.ne30np4_oRRS30to10v2.999999.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_oRRS30to10v2.999999.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="ne30np4" mask="oRRS30to10wLI">
<ATM_DOMAIN_FILE>domain.lnd.ne30np4_oRRS30to10wLI.160930.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.ne30np4_oRRS30to10wLI.160930.nc</LND_DOMAIN_FILE>
Expand Down Expand Up @@ -1226,6 +1278,22 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30/map_oEC60to30_TO_ne30np4_aave.151207.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" ocn_grid="oEC60to30v2">
<ATM2OCN_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_to_ne30np4_aave.161115.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_to_ne30np4_aave.161115.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" ocn_grid="oEC60to30v2_ICG">
<ATM2OCN_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_to_ne30np4_aave.161115.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_to_ne30np4_aave.161115.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" ocn_grid="oEC60to30wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30wLI_mask_aave.160915.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30wLI_nomask_aave.160915.nc</ATM2OCN_SMAPNAME>
Expand All @@ -1242,6 +1310,14 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN2ATM_SMAPNAME>cpl/gridmaps/oRRS30to10/map_oRRS30to10_to_ne30np4_aave.160419.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" ocn_grid="oRRS30to10v2">
<ATM2OCN_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10v2_aave.999999.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10v2_aave.999999.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10v2_aave.999999.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oRRS30to10v2/map_oRRS30to10v2_to_ne30np4_aave.999999.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oRRS30to10v2/map_oRRS30to10v2_to_ne30np4_aave.999999.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" ocn_grid="oRRS30to10wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10wLI_mask_aave.160930.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10wLI_nomask_aave.160930.nc</ATM2OCN_SMAPNAME>
Expand Down Expand Up @@ -1480,6 +1556,11 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<LND_DOMAIN_FILE>domain.lnd.T62_oEC60to30.150616.nc</LND_DOMAIN_FILE>
</griddom>

<griddom grid="T62" mask="oEC60to30v2"> <!--- datm/slnd/drof only -->
<ATM_DOMAIN_FILE>domain.lnd.T62_oEC60to30v2.161011.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.T62_oEC60to30v2.161011.nc</LND_DOMAIN_FILE>
</griddom>

<griddom grid="T62" mask="oEC60to30wLI"> <!--- datm/slnd/drof only -->
<ATM_DOMAIN_FILE>domain.lnd.T62_oEC60to30wLI_mask.160830.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.T62_oEC60to30wLI_mask.160830.nc</LND_DOMAIN_FILE>
Expand All @@ -1490,6 +1571,11 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<LND_DOMAIN_FILE>domain.lnd.T62_oRRS30to10.150722.nc</LND_DOMAIN_FILE>
</griddom>

<griddom grid="T62" mask="oRRS30to10v2"> <!--- datm/slnd/drof only -->
<ATM_DOMAIN_FILE>domain.lnd.T62_oRRS30to10v2.161102.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.T62_oRRS30to10v2.161102.nc</LND_DOMAIN_FILE>
</griddom>

<griddom grid="T62" mask="oRRS30to10wLI"> <!--- datm/slnd/drof only -->
<ATM_DOMAIN_FILE>domain.lnd.T62_oRRS30to10wLI_mask.160930.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.T62_oRRS30to10wLI_mask.160930.nc</LND_DOMAIN_FILE>
Expand Down Expand Up @@ -1577,6 +1663,14 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30/map_oEC60to30_TO_T62_aave.150615.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oEC60to30v2">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30v2_aave.160920.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30v2_blin.160920.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30v2_patc.160920.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_TO_T62_aave.160920.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_TO_T62_aave.160920.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oEC60to30wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_aave.160830.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_nm_aave.160830.nc</ATM2OCN_SMAPNAME>
Expand All @@ -1593,6 +1687,14 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN2ATM_SMAPNAME>cpl/gridmaps/oRRS30to10/map_oRRS30to10_TO_T62_aave.150722.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oRRS30to10v2">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10v2_aave.161102.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10v2_blin.161102.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10v2_patc.161102.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oRRS30to10v2/map_oRRS30to10v2_TO_T62_aave.161102.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oRRS30to10v2/map_oRRS30to10v2_TO_T62_aave.161102.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oRRS30to10wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_mask_aave.160930.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_nomask_aave.160930.nc</ATM2OCN_SMAPNAME>
Expand Down Expand Up @@ -1879,12 +1981,18 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<gridmap rof_grid="rx1" ocn_grid="oEC60to30" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oEC60to30_nn.160527.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oEC60to30v2" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oEC60to30v2_smoothed.160920.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oEC60to30wLI" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oEC60to30wLI_nn.160830.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oRRS30to10" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oRRS30to10_nn.160527.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oRRS30to10v2" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oRRS30to10v2_nn.161102.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oRRS30to10wLI" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oRRS30to10wLI_smoothed.r500e1000.160930.nc</ROF2OCN_RMAPNAME>
</gridmap>
Expand Down Expand Up @@ -1923,12 +2031,21 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<gridmap rof_grid="r05" ocn_grid="oEC60to30_ICG" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oEC60to30_smoothed.r175e350.160718.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oEC60to30v2" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oEC60to30v2_smoothed.r300e600.161115.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oEC60to30v2_ICG" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oEC60to30v2_smoothed.r300e600.161115.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oEC60to30wLI" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oEC60to30wLI_nn.160926.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oRRS30to10" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oRRS30to10_nn.160718.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oRRS30to10v2" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oRRS30to10v2_nn.161102.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oRRS30to10wLI" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oRRS30to10wLI_nn.160930.nc</ROF2OCN_RMAPNAME>
</gridmap>
Expand Down
2 changes: 1 addition & 1 deletion components/clm/bld/namelist_files/namelist_definition_clm4_5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ Representative concentration pathway for future scenarios [radiative forcing at

<entry id="mask" type="char*20" category="default_settings"
group="default_settings"
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,cruncep,oEC60to30,oEC60to30wLI,oRRS18to6,oRRS15to5,mp120v1,oQU240,oQU240wLI,oQU120,oRRS30to10,oRRS30to10wLI,360x720cru,NLDASww3a">
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,cruncep,oEC60to30,oEC60to30v2,oEC60to30wLI,oRRS18to6,oRRS15to5,mp120v1,oQU240,oQU240wLI,oQU120,oRRS30to10,oRRS30to10v2,oRRS30to10wLI,360x720cru,NLDASww3a">
Land mask description
</entry>

Expand Down
15 changes: 15 additions & 0 deletions components/mpas-cice/bld/mpas-cice.buildnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ if ( $ICE_GRID eq 'oEC60to30' ) {
$grid_prefix = 'cice.EC60to30km.restartFrom_eos1b';
$decomp_date .= '151020';
$decomp_prefix .= 'mpas-cice.graph.info.';
} elsif ( $ICE_GRID eq 'oEC60to30v2' ) {
$grid_date .= '160920';
$grid_prefix .= 'cice.EC60to30v2';
$decomp_date .= '160920';
$decomp_prefix .= 'mpas-cice.graph.info.';
} elsif ( $ICE_GRID eq 'oEC60to30v2_ICG' ) {
$grid_date .= '161116';
$grid_prefix .= 'cice.EC60to30v2.restartFrom_grizzly02';
$decomp_date .= '160920';
$decomp_prefix .= 'mpas-cice.graph.info.';
} elsif ( $ICE_GRID eq 'oEC60to30wLI' ) {
$grid_date .= '160830';
$grid_prefix .= 'cice.EC60to30wLI';
Expand Down Expand Up @@ -89,6 +99,11 @@ if ( $ICE_GRID eq 'oEC60to30' ) {
$grid_prefix .= 'seaice.RRS.30-10km';
$decomp_date .= '151031';
$decomp_prefix .= 'mpas-cice.graph.info.';
} elsif ( $ICE_GRID eq 'oRRS30to10v2' ) {
$grid_date .= '161102';
$grid_prefix .= 'cice.RRS30to10v2';
$decomp_date .= '161102';
$decomp_prefix .= 'mpas-cice.graph.info.';
} elsif ( $ICE_GRID eq 'oRRS30to10wLI' ) {
$grid_date .= '160930';
$grid_prefix .= 'seaice.RRS30-10wLI';
Expand Down
2 changes: 2 additions & 0 deletions components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
<config_dt ice_grid="oQU120">3600.0</config_dt>
<config_dt ice_grid="mpas120">3600.0</config_dt>
<config_dt ice_grid="oEC60to30">1800.0</config_dt>
<config_dt ice_grid="oEC60to30v2">1800.0</config_dt>
<config_dt ice_grid="oEC60to30wLI">1800.0</config_dt>
<config_dt ice_grid="oRRS30to10">900.0</config_dt>
<config_dt ice_grid="oRRS30to10v2">900.0</config_dt>
<config_dt ice_grid="oRRS30to10wLI">900.0</config_dt>
<config_dt ice_grid="oRRS18to6">900.0</config_dt>
<config_dt ice_grid="oRRS15to5">900.0</config_dt>
Expand Down
Loading

0 comments on commit aa0f10f

Please sign in to comment.