Skip to content

Commit

Permalink
Merge branch 'mark-petersen/mpas/EC60to30km_with_land_ice' (PR #1036)
Browse files Browse the repository at this point in the history 
Add the EC60to30wLI, QU240wLI, and RRS30to10wLI grids, which all include ocean cavities below ice shelves in Antarctica.

[BFB]
  • Loading branch information
@rljacob
rljacob authored Nov 17, 2016
2 parents 42254d4 + 02cd81e commit b0982b8
Show file tree
Hide file tree
Showing 6 changed files with 193 additions and 2 deletions.
126 changes: 126 additions & 0 deletions cime/scripts/Tools/config_grid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,13 @@ Each grid is associated with five names
<GRID sname="T62_tx0.1v2" alias="T62_t12" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%tx0.1v2_r%rx1_m%tx0.1v2_g%null_w%null</GRID>
<GRID sname="T62_gx1v6" alias="T62_g16" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%gx1v6_r%rx1_m%gx1v6_g%null_w%null</GRID>
<GRID sname="T62_oQU240" alias="T62_oQU240" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oQU240_r%rx1_m%oQU240_g%null_w%null</GRID>
<GRID sname="T62_oQU240wLI" alias="T62_oQU240wLI" compset="(DATM|XATM|SATM)">a%T62_l%T62_oi%oQU240wLI_r%rx1_m%oQU240wLI_g%null_w%null</GRID>
<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_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_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 @@ -79,6 +82,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="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 @@ -88,7 +92,9 @@ Each grid is associated with five names
<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_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_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_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 @@ -409,6 +415,12 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<desc>oQU240 is an MPAS ocean mesh with quasi-uniform 240 km grid cells, nominally 2 degree resolution:</desc>
</gridhorz>

<gridhorz name="oQU240wLI">
<support_level>Experimental, under development</support_level>
<nx>7268</nx> <ny>1</ny>
<desc>oQU240wLI is an MPAS ocean mesh with quasi-uniform 240 km grid cells, nominally 2 degree resolution. Additionally, it has ocean under landice cavities.</desc>
</gridhorz>

<gridhorz name="oQU120">
<support_level>Experimental, under development</support_level>
<nx>28571</nx> <ny>1</ny>
Expand All @@ -427,12 +439,24 @@ 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="oEC60to30wLI">
<support_level>Experimental, under development</support_level>
<nx>236689</nx> <ny>1</ny>
<desc>oEC60to30wLI is a 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. Additionally, it has ocean under landice cavities:</desc>
</gridhorz>

<gridhorz name="oRRS30to10">
<support_level>Experimental, under development</support_level>
<nx>1444565</nx> <ny>1</ny>
<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="oRRS30to10wLI">
<support_level>Experimental, under development</support_level>
<nx>1462411</nx> <ny>1</ny>
<desc>oRRS30to10wLI 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="oRRS18to6">
<support_level>Experimental, under development</support_level>
<nx>3697425</nx> <ny>1</ny>
Expand Down Expand Up @@ -583,6 +607,11 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN_DOMAIN_FILE>domain.ocn.oQU240.151209.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="oQU240wLI" mask="oQU240wLI">
<ICE_DOMAIN_FILE>domain.ocn.oQU240wLI_mask.160929.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oQU240wLI_mask.160929.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="oQU120" mask="oQU120">
<ICE_DOMAIN_FILE>domain.ocn.oQU120.160401.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oQU120.160401.nc</OCN_DOMAIN_FILE>
Expand All @@ -598,11 +627,21 @@ 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="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>
</griddom>

<griddom grid="oRRS30to10" mask="oRRS30to10">
<ICE_DOMAIN_FILE>domain.ocn.oRRS30to10.150722.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oRRS30to10.150722.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>
</griddom>

<griddom grid="oRRS18to6" mask="oRRS18to6">
<ICE_DOMAIN_FILE>domain.ocn.oRRS18to6.160831.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.oRRS18to6.160831.nc</OCN_DOMAIN_FILE>
Expand Down Expand Up @@ -1134,13 +1173,27 @@ 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="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>
<ICE_DOMAIN_FILE>domain.ocn.ne30np4_oEC60to30wLI_mask.160915.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_oEC60to30wLI_mask.160915.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="ne30np4" mask="oRRS30to10">
<ATM_DOMAIN_FILE>domain.lnd.ne30np4_oRRS30to10.160419.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.ne30np4_oRRS30to10.160419.nc</LND_DOMAIN_FILE>
<ICE_DOMAIN_FILE>domain.ocn.ne30np4_oRRS30to10.160419.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_oRRS30to10.160419.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>
<ICE_DOMAIN_FILE>domain.ocn.ne30np4_oRRS30to10wLI.160930.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_oRRS30to10wLI.160930.nc</OCN_DOMAIN_FILE>
</griddom>

<gridmap atm_grid="ne30np4" ocn_grid="gx1v6">
<ATM2OCN_FMAPNAME>cpl/cpl6/map_ne30np4_to_gx1v6_aave_110121.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/cpl6/map_ne30np4_to_gx1v6_native_110328.nc</ATM2OCN_SMAPNAME>
Expand Down Expand Up @@ -1173,6 +1226,14 @@ 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="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>
<ATM2OCN_VMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30wLI_mask_aave.160915.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30wLI/map_oEC60to30wLI_mask_to_ne30np4_aave.160915.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30wLI/map_oEC60to30wLI_mask_to_ne30np4_aave.160915.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" ocn_grid="oRRS30to10">
<ATM2OCN_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10_aave.160419.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10_aave.160419.nc</ATM2OCN_SMAPNAME>
Expand All @@ -1181,6 +1242,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="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>
<ATM2OCN_VMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10wLI_mask_aave.160930.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oRRS30to10wLI/map_oRRS30to10wLI_mask_to_ne30np4_aave.160930.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oRRS30to10wLI/map_oRRS30to10wLI_mask_to_ne30np4_aave.160930.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" lnd_grid="0.9x1.25">
<ATM2LND_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_TO_fv0.9x1.25_aave.120712.nc</ATM2LND_FMAPNAME>
<ATM2LND_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_TO_fv0.9x1.25_aave.120712.nc</ATM2LND_SMAPNAME>
Expand Down Expand Up @@ -1396,6 +1465,11 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<LND_DOMAIN_FILE>domain.lnd.T62_oQU240.151209.nc</LND_DOMAIN_FILE>
</griddom>

<griddom grid="T62" mask="oQU240wLI"> <!--- datm/slnd/drof only -->
<ATM_DOMAIN_FILE>domain.lnd.T62_oQU240wLI_mask.160929.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.T62_oQU240wLI_mask.160929.nc</LND_DOMAIN_FILE>
</griddom>

<griddom grid="T62" mask="oQU120"> <!--- datm/slnd/drof only -->
<ATM_DOMAIN_FILE>domain.lnd.T62_oQU120.151209.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.T62_oQU120.151209.nc</LND_DOMAIN_FILE>
Expand All @@ -1406,11 +1480,21 @@ 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="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>
</griddom>

<griddom grid="T62" mask="oRRS30to10"> <!--- datm/slnd/drof only -->
<ATM_DOMAIN_FILE>domain.lnd.T62_oRRS30to10.150722.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.T62_oRRS30to10.150722.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>
</griddom>

<griddom grid="T62" mask="oRRS18to6"> <!--- datm/slnd/drof only -->
<ATM_DOMAIN_FILE>domain.lnd.T62_oRRS18to6.160831.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.T62_oRRS18to6.160831.nc</LND_DOMAIN_FILE>
Expand Down Expand Up @@ -1461,6 +1545,14 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN2ATM_SMAPNAME>cpl/gridmaps/oQU240/map_oQU240_TO_T62_aave.151209.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oQU240wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oQU240wLI_mask_aave.160929.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oQU240wLI_nomask_aave.160929.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oQU240wLI_mask_patc.160929.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oQU240wLI/map_oQU240wLI_mask_TO_T62_aave.160929.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oQU240wLI/map_oQU240wLI_mask_TO_T62_aave.160929.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oQU120">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oQU120_aave.151209.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oQU120_blin.151209.nc</ATM2OCN_SMAPNAME>
Expand All @@ -1485,6 +1577,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="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>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_aave.160830.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30wLI/map_oEC60to30wLI_TO_T62_aave.160830.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30wLI/map_oEC60to30wLI_TO_T62_aave.160830.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oRRS30to10">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10_aave.150722.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10_blin.150722.nc</ATM2OCN_SMAPNAME>
Expand All @@ -1493,6 +1593,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="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>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_mask_aave.160930.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oRRS30to10wLI/map_oRRS30to10wLI_mask_TO_T62_aave.160930.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oRRS30to10wLI/map_oRRS30to10wLI_mask_TO_T62_aave.160930.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oRRS18to6">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_to_oRRS18to6_aave.160831.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_to_oRRS18to6_blin.160831.nc</ATM2OCN_SMAPNAME>
Expand Down Expand Up @@ -1762,15 +1870,24 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<gridmap rof_grid="rx1" ocn_grid="oQU240" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oQU240_nn.160527.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oQU240wLI" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oQU240wLI_nn.160929.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oQU120" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oQU120_nn.160527.nc</ROF2OCN_RMAPNAME>
</gridmap>
<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="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="oRRS30to10wLI" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oRRS30to10wLI_smoothed.r500e1000.160930.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oRRS18to6" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_rx1_to_oRRS18to6_nn.160830.nc</ROF2OCN_RMAPNAME>
</gridmap>
Expand All @@ -1794,6 +1911,9 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<gridmap rof_grid="r05" ocn_grid="oQU240" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oQU240_nn.160714.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oQU240wLI" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oQU240wLI_nn.160929.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oQU120" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oQU120_nn.160718.nc</ROF2OCN_RMAPNAME>
</gridmap>
Expand All @@ -1803,9 +1923,15 @@ 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="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="oRRS30to10wLI" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oRRS30to10wLI_nn.160930.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oRRS15to5" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_oRRS15to5_nn.160203.nc</ROF2OCN_RMAPNAME>
</gridmap>
Expand Down
4 changes: 2 additions & 2 deletions components/clm/bld/namelist_files/namelist_definition_clm4_5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1120,9 +1120,9 @@ Representative concentration pathway for future scenarios [radiative forcing at
-999.9 means do NOT use a future scenario, just use historical data.
</entry>

<entry id="mask" type="char*10" category="default_settings"
<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,oRRS18to6,oRRS15to5,mp120v1,oQU240,oQU120,oRRS30to10,360x720cru,NLDASww3a">
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,cruncep,oEC60to30,oEC60to30wLI,oRRS18to6,oRRS15to5,mp120v1,oQU240,oQU240wLI,oQU120,oRRS30to10,oRRS30to10wLI,360x720cru,NLDASww3a">
Land mask description
</entry>

Expand Down
Loading

0 comments on commit b0982b8

Please sign in to comment.