diff --git a/cime/scripts/Tools/config_grid.xml b/cime/scripts/Tools/config_grid.xml
index 095f2412b2b5..eba4599a00a3 100644
--- a/cime/scripts/Tools/config_grid.xml
+++ b/cime/scripts/Tools/config_grid.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>  
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml b/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml
index cc6a33c2a079..ef4febfbd248 100644
--- a/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml
+++ b/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml
@@ -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> 
 
diff --git a/components/mpas-cice/bld/mpas-cice.buildnml b/components/mpas-cice/bld/mpas-cice.buildnml
index 9606710a8a0c..3e9ffe1ae747 100755
--- a/components/mpas-cice/bld/mpas-cice.buildnml
+++ b/components/mpas-cice/bld/mpas-cice.buildnml
@@ -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';
@@ -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';
diff --git a/components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml b/components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml
index a9f76ce9589a..77d5ab43ab51 100644
--- a/components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml
+++ b/components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml
@@ -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>
diff --git a/components/mpas-o/bld/mpas-o.buildnml b/components/mpas-o/bld/mpas-o.buildnml
index 8456923e31f1..28a3c2f48b95 100755
--- a/components/mpas-o/bld/mpas-o.buildnml
+++ b/components/mpas-o/bld/mpas-o.buildnml
@@ -55,6 +55,18 @@ if ( $OCN_GRID eq 'oEC60to30' ) {
         $ic_date .= '160827';
         $ic_prefix .= 'oEC60to30.restartFrom_eos1b';
 	$decomp_prefix .= 'mpas-o.graph.info.';
+} elsif ( $OCN_GRID eq 'oEC60to30v2' ) {
+	$grid_date .= '160920';
+        $grid_prefix .= 'oEC60to30v2';
+        $ic_date .= '160920';
+        $ic_prefix .= 'oEC60to30v2';
+	$decomp_prefix .= 'mpas-o.graph.info.';
+} elsif ( $OCN_GRID eq 'oEC60to30v2_ICG' ) {
+	$grid_date .= '160920';
+        $grid_prefix .= 'oEC60to30v2';
+        $ic_date .= '161116';
+        $ic_prefix .= 'oEC60to30v2.restartFrom_grizzly02';
+	$decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oEC60to30wLI' ) {
 	$grid_date .= '160830';
 	$grid_prefix .= 'oEC60to30wLI';
@@ -91,6 +103,12 @@ if ( $OCN_GRID eq 'oEC60to30' ) {
 	$grid_prefix .= 'ocean.RRS.30-10km';
 	$ic_prefix .= 'ocean.RRS.30-10km';
         $decomp_prefix .= 'mpas-o.graph.info.';
+} elsif ( $OCN_GRID eq 'oRRS30to10v2' ) {
+	$grid_date .= '161102';
+	$ic_date .= '161102';
+	$grid_prefix .= 'oRRS30to10v2';
+	$ic_prefix .= 'oRRS30to10v2';
+        $decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oRRS30to10wLI' ) {
 	$grid_date .= '160930';
 	$ic_date .= '160930';
diff --git a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
index 6e98e3d80647..0d5e787b7014 100644
--- a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
+++ b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
@@ -48,8 +48,10 @@
 <config_dt ocn_grid="oQU240wLI">'02:00:00'</config_dt>
 <config_dt ocn_grid="oQU120">'00:30:00'</config_dt>
 <config_dt ocn_grid="oEC60to30">'00:15:00'</config_dt>
+<config_dt ocn_grid="oEC60to30v2">'00:30:00'</config_dt>
 <config_dt ocn_grid="oEC60to30wLI">'00:30:00'</config_dt>
 <config_dt ocn_grid="oRRS30to10">'00:06:00'</config_dt>
+<config_dt ocn_grid="oRRS30to10v2">'00:10:00'</config_dt>
 <config_dt ocn_grid="oRRS30to10wLI">'00:10:00'</config_dt>
 <config_dt ocn_grid="oRRS18to6">'00:06:00'</config_dt>
 <config_dt ocn_grid="oRRS15to5">'00:03:45'</config_dt>
@@ -80,8 +82,10 @@
 <config_hmix_scaleWithMesh ocn_grid="oQU240wLI">.false.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="oQU120">.false.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="oEC60to30">.true.</config_hmix_scaleWithMesh>
+<config_hmix_scaleWithMesh ocn_grid="oEC60to30v2">.true.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="oEC60to30wLI">.true.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="oRRS30to10">.true.</config_hmix_scaleWithMesh>
+<config_hmix_scaleWithMesh ocn_grid="oRRS30to10v2">.true.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="oRRS30to10wLI">.true.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="oRRS18to6">.true.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="oRRS15to5">.true.</config_hmix_scaleWithMesh>
@@ -101,8 +105,10 @@
 <config_mom_del4 ocn_grid="oQU240wLI">2.0e14</config_mom_del4>
 <config_mom_del4 ocn_grid="oQU120">2.6e13</config_mom_del4>
 <config_mom_del4 ocn_grid="oEC60to30">4.0e11</config_mom_del4>
+<config_mom_del4 ocn_grid="oEC60to30v2">4.0e11</config_mom_del4>
 <config_mom_del4 ocn_grid="oEC60to30wLI">4.0e11</config_mom_del4>
 <config_mom_del4 ocn_grid="oRRS30to10">1.5e10</config_mom_del4>
+<config_mom_del4 ocn_grid="oRRS30to10v2">1.5e10</config_mom_del4>
 <config_mom_del4 ocn_grid="oRRS30to10wLI">1.5e10</config_mom_del4>
 <config_mom_del4 ocn_grid="oRRS18to6">3.2e09</config_mom_del4>
 <config_mom_del4 ocn_grid="oRRS15to5">1.9e09</config_mom_del4>
@@ -120,9 +126,11 @@
 <config_use_standardGM ocn_grid="oQU240wLI">.true.</config_use_standardGM>
 <config_use_standardGM ocn_grid="oQU120">.true.</config_use_standardGM>
 <config_use_standardGM ocn_grid="oEC60to30">.true.</config_use_standardGM>
+<config_use_standardGM ocn_grid="oEC60to30v2">.true.</config_use_standardGM>
 <config_use_standardGM ocn_grid="oEC60to30wLI">.true.</config_use_standardGM>
-<config_use_standardGM ocn_grid="oRRS30to10">.true.</config_use_standardGM>
-<config_use_standardGM ocn_grid="oRRS30to10wLI">.true.</config_use_standardGM>
+<config_use_standardGM ocn_grid="oRRS30to10">.false.</config_use_standardGM>
+<config_use_standardGM ocn_grid="oRRS30to10v2">.false.</config_use_standardGM>
+<config_use_standardGM ocn_grid="oRRS30to10wLI">.false.</config_use_standardGM>
 <config_use_standardGM ocn_grid="oRRS18to6">.false.</config_use_standardGM>
 <config_use_standardGM ocn_grid="oRRS15to5">.false.</config_use_standardGM>
 <config_use_Redi_surface_layer_tapering>.false.</config_use_Redi_surface_layer_tapering>
@@ -299,9 +307,11 @@
 <config_btr_dt ocn_grid="oQU240wLI">'0000_00:03:00'</config_btr_dt>
 <config_btr_dt ocn_grid="oQU120">'0000_00:01:30'</config_btr_dt>
 <config_btr_dt ocn_grid="oEC60to30">'0000_00:00:45'</config_btr_dt>
+<config_btr_dt ocn_grid="oEC60to30v2">'0000_00:00:45'</config_btr_dt>
 <config_btr_dt ocn_grid="oEC60to30wLI">'0000_00:00:45'</config_btr_dt>
 <config_btr_dt ocn_grid="oRRS30to10">'0000_00:00:18'</config_btr_dt>
-<config_btr_dt ocn_grid="oRRS30to10wLI">'0000_00:00:18'</config_btr_dt>
+<config_btr_dt ocn_grid="oRRS30to10v2">'0000_00:00:24'</config_btr_dt>
+<config_btr_dt ocn_grid="oRRS30to10wLI">'0000_00:00:24'</config_btr_dt>
 <config_btr_dt ocn_grid="oRRS18to6">'0000_00:00:12'</config_btr_dt>
 <config_btr_dt ocn_grid="oRRS15to5">'0000_00:00:11.25'</config_btr_dt>
 <config_n_btr_cor_iter>2</config_n_btr_cor_iter>