Merge branch 'eroesler/ATM/RRM-meshfilefixer' into master (PR #168)

These additions allow the user to create the CONUS RRM case in a more
out-of-the-box way without having to enter namelist values in the
user_nl* files, the grid location, or edit env_run.xml. Two namelist
parameters were not in build.namelist when the RRM case configuration
for the CONUS grid was first developed and recently pushed to master.
This update required a change to namelist_mod.F90 so that when using
structured grids, a grid file is not needed.

It should be noted that the tuning paramters (i.e. zmconv_tau, etc) have
not been tuned for the CONUS grid but have been transferred from ne30
and armx8v3 configurations.

Machine files for Sandia computers were also updated.

The settings for the tuning parameters are removed so that the RRM grid
will now run with the defaults. I've retested with these changes and
have rerun the acme_developer's tests, which all passed.

Also it fixes automatic appending of FY to job on redsky and skybridge.

[BFB] [NML]

[AG-120]

Conflicts:
	models/atm/cam/bld/namelist_files/namelist_defaults_cam.xml

models/atm/cam/bld/build-namelist

@@ -2713,6 +2713,7 @@ add_default($nl, 'cldfrc_icecrit');
 add_default($nl, 'zmconv_c0_lnd');
 add_default($nl, 'zmconv_c0_ocn');
 add_default($nl, 'zmconv_ke');
+add_default($nl, 'zmconv_tau');
 
 # moist convection rainwater coefficients
 add_default($nl, 'hkconv_cmftau');
@@ -3145,7 +3146,7 @@ if ($cfg->get('dyn') =~ /se/) {
                   integration nu nu_div nu_p nu_q nu_top  se_phys_tscale
                   interpolate_analysis interp_nlat interp_nlon vert_remap_q_alg
                   interp_type interp_gridtype se_limiter_option qsplit rsplit tstep_type
-                  hypervis_scaling );
+                  hypervis_scaling mesh_file);
 
     foreach my $var (@vars) {
 	add_default($nl, $var);

models/atm/cam/bld/namelist_files/namelist_defaults_cam.xml

@@ -698,6 +698,7 @@
 <soil_erod_file  hgrid="64x128"  >atm/cam/dst/dst_64x128_c090203.nc</soil_erod_file>
 <soil_erod_file  hgrid="128x256" >atm/cam/dst/dst_128x256_c090203.nc</soil_erod_file>
 
+
 <!-- Turbulent Mountain Stress -->
 <do_tms                                                     > .false. </do_tms>
 <do_tms    hgrid="48x96"                                    > .true.  </do_tms>
@@ -816,7 +817,6 @@
 <resus_fix>.false.</resus_fix>
 <!-- BSINGH - Ends -->
 
-
 <!-- in-cloud scav for cloud-borne aerosol tuning factor -->
 <sol_facti_cloud_borne                 >1.0D0</sol_facti_cloud_borne>
 <sol_facti_cloud_borne clubb_sgs="1"   >0.6D0</sol_facti_cloud_borne>
@@ -887,6 +887,7 @@
 <cldfrc_rhminl hgrid="48x96"     phys="cam4"                          > 0.880D0 </cldfrc_rhminl>
 <cldfrc_rhminl dyn="se"       phys="cam4"                             > 0.910D0 </cldfrc_rhminl>
 
+
 <cldfrc_rhminl_adj_land                                               > 0.100D0 </cldfrc_rhminl_adj_land>
 <cldfrc_rhminl_adj_land                      carma="cirrus"           > 0.000D0 </cldfrc_rhminl_adj_land>
 
@@ -917,7 +918,6 @@
 <cldfrc_dp1             phys="cam5"                                   > 0.10D0 </cldfrc_dp1>
 <cldfrc_dp1 dyn="fv"    phys="cam4"                                   > 0.10D0 </cldfrc_dp1>
 <cldfrc_dp1 dyn="se" phys="cam4"                                      > 0.10D0 </cldfrc_dp1>
-
 <cldfrc_dp2                                                           > 500.0D0 </cldfrc_dp2>
 <cldfrc_dp2          phys="cam5"                                      > 500.0D0 </cldfrc_dp2>
 
@@ -1025,6 +1025,8 @@
 <zmconv_c0_ocn                   hgrid="256x512"  phys="cam4"         > 0.0040D0 </zmconv_c0_ocn>
 <zmconv_c0_ocn                   hgrid="512x1024" phys="cam4"         > 0.0040D0 </zmconv_c0_ocn>
 
+<zmconv_tau			                                                      > 3600</zmconv_tau>
+
 <zmconv_ke                                                            > 3.0E-6 </zmconv_ke>
 <zmconv_ke      dyn="fv"                                              > 1.0E-6 </zmconv_ke>
 <zmconv_ke      dyn="se"                                           > 1.0E-6 </zmconv_ke>
@@ -1102,6 +1104,7 @@
 <statefreq> 480 </statefreq>
 <integration> "explicit" </integration>
 
+<mesh_file>/dev/null</mesh_file>
 <mesh_file hgrid="ne0np4_arm_x8v3_lowcon"  >atm/cam/inic/homme/arm_x8v3_lowcon.g</mesh_file>
 <mesh_file hgrid="ne0np4_conus_x4v1_lowcon"  >atm/cam/inic/homme/conusx4v1.g</mesh_file>
 <mesh_file hgrid="ne0np4_svalbard_x8v1_lowcon"  >atm/cam/inic/homme/svalbardx8v1.g</mesh_file>

models/atm/cam/src/dynamics/se/share/namelist_mod.F90

@@ -955,7 +955,9 @@ subroutine readnl(par)
       write (*,*) "namelist_mod: mesh_file:",mesh_file, &
                   " and ne:",ne," are both sepcified in the input file."
       write (*,*) "Specify one or the other, but not both."
-      call abortmp("Do not specify ne if using a mesh file input.")
+      ! Don't abort if not refined (i.e., ne /= 0).
+      ! mesh_file is set to /dev/null in namelist_defaults_cam.xml
+      !call abortmp("Do not specify ne if using a mesh file input.")
     end if 
     if (par%masterproc) write (iulog,*) "Mesh File:", trim(mesh_file)
     if (ne.eq.0) then

scripts/ccsm_utils/Case.template/config_grid.xml

@@ -528,6 +528,10 @@ do not use scientific experiments; use the T62_g16 resolution instead:
 <EPS_AGRID atm_grid=".+"   >1.0e-12</EPS_AGRID>
 
 <EPS_AAREA atm_grid=".+"   >9.0e-07</EPS_AAREA>
+<EPS_AAREA atm_grid="ne0np4_arm_x8v3_lowcon">9.0e-06</EPS_AAREA>
+<EPS_AAREA atm_grid="ne0np4_conus_x4v1_lowcon">9.0e-06</EPS_AAREA>
+<EPS_AAREA atm_grid="ne0np4_svalbard_x8v1_lowcon">9.0e-06</EPS_AAREA>
+<EPS_AAREA atm_grid="ne0np4_sooberingoa_x4x8v1_lowcon">9.0e-06</EPS_AAREA>
 
 <EPS_OMASK ocn_grid=".+">1.0e-06</EPS_OMASK>
 <EPS_OGRID ocn_grid=".+">1.0e-02</EPS_OGRID>