Merge branch 'jonbob/mpas/new_mpas_grids_V3' into next (PR #1240)

This PR adds support for three new MPAS version3 grids that have removed all
dynamically-locked seaice cells from the earlier versions of ocn/ice meshes. The
three grids are: oEC60to30v3 (and oEC60to30v3_ICG), oECoRRS30to10v3, and
oRRS18to6v3. All required script changes are included, and the referenced
mapping, runoff, grid, and partition files are all committed to the svn inputdata
repo for the following compsets:

oEC60to30v3: C, G, and A_WCYCL compsets
oEC60to30v3_ICG: A_WCYCL1850S and A_WCYCL2000S
oRS30to10v3: C and G compsets
oRRS18to6v3: C and G compsets

[BFB]

components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml

@@ -203,6 +203,14 @@ ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map
 ic_tod="0" sim_year="1850" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/clmi.I1850CLM45.ne30_oEC.e61c667.clm2.r.0021-01-01-00000.nc
 </finidat>
 
+<finidat hgrid="ne30np4"   maxpft="17"  mask="oEC60to30v3" use_cn=".false." ic_ymd="20000101" more_vertlayers=".false."
+ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/clmi.ICRUCLM45.ne30_oECv3.650b665.clm2.r.0021-01-01-00000.nc
+</finidat>
+
+<finidat hgrid="ne30np4"   maxpft="17"  mask="oEC60to30v3" use_cn=".false." ic_ymd="18500101" more_vertlayers=".false."
+ic_tod="0" sim_year="1850" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/clmi.I1850CLM45.ne30_oECv3.650b665.clm2.r.0021-01-01-00000.nc
+</finidat>
+
 <finidat hgrid="ne30np4"   maxpft="17"  mask="oRRS30to10" use_cn=".false." ic_ymd="18500101" more_vertlayers=".false."
 ic_tod="0" sim_year="1850" glc_nec="0" use_crop=".false." >lnd/clm2/initdata_map/clmi.I1850CLM45.ne30_oRRS30.43b6150.clm2.r.0021-01-01-00000.nc
 </finidat>

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,oEC60to30v3,oEC60to30wLI,oRRS18to6,oRRS18to6v3,oRRS15to5,mp120v1,oQU240,oQU240wLI,oQU120,oRRS30to10,oRRS30to10v3,oRRS30to10wLI,360x720cru,NLDASww3a">
 Land mask description
 </entry> 
 

components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml

@@ -10,10 +10,13 @@
 <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="oEC60to30v3">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="oRRS30to10v3">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="oRRS18to6v3">900.0</config_dt>
 <config_dt ice_grid="oRRS15to5">900.0</config_dt>
 <config_calendar_type>'gregorian_noleap'</config_calendar_type>
 <config_start_time>'2000-01-01_00:00:00'</config_start_time>
@@ -86,8 +89,11 @@
 <config_dynamics_subcycle_number ice_grid="oQU120">1</config_dynamics_subcycle_number>
 <config_dynamics_subcycle_number ice_grid="mpas120">1</config_dynamics_subcycle_number>
 <config_dynamics_subcycle_number ice_grid="oEC60to30">1</config_dynamics_subcycle_number>
+<config_dynamics_subcycle_number ice_grid="oEC60to30v3">1</config_dynamics_subcycle_number>
 <config_dynamics_subcycle_number ice_grid="oRRS30to10">1</config_dynamics_subcycle_number>
+<config_dynamics_subcycle_number ice_grid="oRRS30to10v3">1</config_dynamics_subcycle_number>
 <config_dynamics_subcycle_number ice_grid="oRRS18to6">2</config_dynamics_subcycle_number>
+<config_dynamics_subcycle_number ice_grid="oRRS18to6v3">2</config_dynamics_subcycle_number>
 <config_dynamics_subcycle_number ice_grid="oRRS15to5">2</config_dynamics_subcycle_number>
 <config_rotate_cartesian_grid>true</config_rotate_cartesian_grid>
 <config_include_metric_terms>true</config_include_metric_terms>

components/mpas-cice/cime_config/buildnml

@@ -56,6 +56,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 'oEC60to30v3' ) {
+        $grid_date .= '161222';
+	$grid_prefix .= 'seaice.EC60to30v3';
+	$decomp_date .= '161222';
+	$decomp_prefix .= 'mpas-cice.graph.info.';
+} elsif ( $ICE_GRID eq 'oEC60to30v3_ICG' ) {
+        $grid_date .= '170111';
+	$grid_prefix .= 'seaice.EC60to30v3.ICG_a16q_yr60';
+	$decomp_date .= '161222';
+	$decomp_prefix .= 'mpas-cice.graph.info.';
 } elsif ( $ICE_GRID eq 'oEC60to30wLI' ) {
         $grid_date .= '160830';
         $grid_prefix .= 'cice.EC60to30wLI';
@@ -91,6 +101,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 'oRRS30to10v3' ) {
+        $grid_date .= '161221';
+        $grid_prefix .= 'seaice.RRS30to10v3';
+        $decomp_date .= '161221';
+        $decomp_prefix .= 'mpas-cice.graph.info.';
 } elsif ( $ICE_GRID eq 'oRRS30to10wLI' ) {
         $grid_date .= '160930';
         $grid_prefix .= 'seaice.RRS30-10wLI';
@@ -99,7 +114,13 @@ if ( $ICE_GRID eq 'oEC60to30' ) {
 } elsif ( $ICE_GRID eq 'oRRS18to6' ) {
         $grid_date .= '160830';
         $grid_prefix .= 'seaice.RRS.18to6km';
+        $decomp_date .= '160830';
         $decomp_prefix .= 'mpas-cice.graph.info.';
+} elsif ( $ICE_GRID eq 'oRRS18to6v3' ) {
+        $grid_date .= '170111';
+        $grid_prefix .= 'seaice.RRS18to6v3';
+        $decomp_date .= '170111';
+        $decomp_prefix .= 'mpas-cice.graph.info.lblat_3.';
 } elsif ( $ICE_GRID eq 'oRRS15to5' ) {
         $grid_date .= '151209';
         $grid_prefix .= 'seaice.RRS.15to5km';

components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml

@@ -48,10 +48,13 @@
 <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="oEC60to30v3">'00:15: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="oRRS30to10v3">'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="oRRS18to6v3">'00:06:00'</config_dt>
 <config_dt ocn_grid="oRRS15to5">'00:03:45'</config_dt>
 <config_time_integrator>'split_explicit'</config_time_integrator>
 
@@ -80,10 +83,13 @@
 <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="oEC60to30v3">.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="oRRS30to10v3">.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="oRRS18to6v3">.true.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="oRRS15to5">.true.</config_hmix_scaleWithMesh>
 <config_maxMeshDensity>-1.0</config_maxMeshDensity>
 <config_apvm_scale_factor>0.0</config_apvm_scale_factor>
@@ -101,10 +107,13 @@
 <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="oEC60to30v3">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="oRRS30to10v3">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="oRRS18to6v3">3.2e09</config_mom_del4>
 <config_mom_del4 ocn_grid="oRRS15to5">1.9e09</config_mom_del4>
 <config_mom_del4_div_factor>1.0</config_mom_del4_div_factor>
 <config_tracer_del4>0.0</config_tracer_del4>
@@ -120,10 +129,13 @@
 <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="oEC60to30v3">.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="oRRS30to10v3">.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="oRRS18to6v3">.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>
 <config_Redi_surface_layer_tapering_extent>0.0</config_Redi_surface_layer_tapering_extent>
@@ -299,10 +311,13 @@
 <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="oEC60to30v3">'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="oRRS30to10v3">'0000_00:00:24'</config_btr_dt>
 <config_btr_dt ocn_grid="oRRS30to10wLI">'0000_00:00:18'</config_btr_dt>
 <config_btr_dt ocn_grid="oRRS18to6">'0000_00:00:12'</config_btr_dt>
+<config_btr_dt ocn_grid="oRRS18to6v3">'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>
 <config_vel_correction>.true.</config_vel_correction>

components/mpas-o/cime_config/buildnml

@@ -50,11 +50,23 @@ if ( $OCN_GRID eq 'oEC60to30' ) {
 	$ic_prefix .= 'oEC60to30';
 	$decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oEC60to30_ICG' ) {
-       $grid_date .= '151031';
+        $grid_date .= '151031';
         $grid_prefix .= 'oEC60to30';
         $ic_date .= '160827';
         $ic_prefix .= 'oEC60to30.restartFrom_eos1b';
-       $decomp_prefix .= 'mpas-o.graph.info.';
+        $decomp_prefix .= 'mpas-o.graph.info.';
+} elsif ( $OCN_GRID eq 'oEC60to30v3' ) {
+        $grid_date .= '161222';
+        $grid_prefix .= 'oEC60to30v3';
+        $ic_date .= '161222';
+        $ic_prefix .= 'oEC60to30v3';
+        $decomp_prefix .= 'mpas-o.graph.info.';
+} elsif ( $OCN_GRID eq 'oEC60to30v3_ICG' ) {
+        $grid_date .= '161222';
+        $grid_prefix .= 'oEC60to30v3';
+        $ic_date .= '170111';
+        $ic_prefix .= 'oEC60to30v3.ICG_a16q_yr60';
+        $decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oEC60to30wLI' ) {
         $grid_date .= '160830';
         $grid_prefix .= 'oEC60to30wLI';
@@ -63,8 +75,8 @@ if ( $OCN_GRID eq 'oEC60to30' ) {
         $decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oQU240' ) {
 	$grid_date .= '151209';
-	$ic_date .= '151209';
 	$grid_prefix .= 'ocean.QU.240km';
+	$ic_date .= '151209';
 	$ic_prefix .= 'ocean.QU.240km';
 	$decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oQU240wLI' ) {
@@ -75,37 +87,50 @@ if ( $OCN_GRID eq 'oEC60to30' ) {
         $decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oQU120' ) {
 	$grid_date .= '160318';
-	$ic_date .= '160318';
  	$grid_prefix .= 'ocean.QU.120km';
+	$ic_date .= '160318';
  	$ic_prefix .= 'ocean.QU.120km';
 	$decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'mpas120' ) {
 	$grid_date .= '151031';
-	$ic_date .= '151031';
 	$grid_prefix .= 'ocean120km';
+	$ic_date .= '151031';
 	$ic_prefix .= 'ocean120km';
 	$decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oRRS30to10' ) {
 	$grid_date .= '151031';
-	$ic_date .= '151031';
 	$grid_prefix .= 'ocean.RRS.30-10km';
+	$ic_date .= '151031';
 	$ic_prefix .= 'ocean.RRS.30-10km';
         $decomp_prefix .= 'mpas-o.graph.info.';
+} elsif ( $OCN_GRID eq 'oRRS30to10v3' ) {
+	$grid_date .= '161221';
+	$grid_prefix .= 'oRRS30to10v3';
+	$ic_date .= '161221';
+	$ic_prefix .= 'oRRS30to10v3';
+        $decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oRRS30to10wLI' ) {
         $grid_date .= '160930';
-        $ic_date .= '160930';
         $grid_prefix .= 'ocean.RRS30to10wLI';
+        $ic_date .= '160930';
         $ic_prefix .= 'ocean.RRS30to10wLI';
         $decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oRRS18to6' ) {
 	$grid_date .= '160830';
 	$grid_prefix .= 'ocean.RRS.18-6km';
+	$ic_date .= '160830';
 	$ic_prefix .= 'ocean.RRS.18-6km';
 	$decomp_prefix .= 'mpas-o.graph.info.';
+} elsif ( $OCN_GRID eq 'oRRS18to6v3' ) {
+	$grid_date .= '170111';
+	$grid_prefix .= 'oRRS18to6v3';
+	$ic_date .= '170111';
+	$ic_prefix .= 'oRRS18to6v3';
+	$decomp_prefix .= 'mpas-o.graph.info.';
 } elsif ( $OCN_GRID eq 'oRRS15to5' ) {
 	$grid_date .= '151209';
-	$ic_date .= '151209';
 	$grid_prefix .= 'ocean.RRS.15-5km';
+	$ic_date .= '151209';
 	$ic_prefix .= 'ocean.RRS.15-5km';
 	$decomp_prefix .= 'mpas-o.graph.info.';
 }