Merge PR #555 'mark-petersen/ocean/cusp_coastal_US_plus_mesh' into oc…

…ean/develop

New Mesh: WC12to60kmL60E3SMv2r01 #555

Design discussion Water Cycle mesh, 12km high resolution region.

testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_E3SM_coupling_files.ini → testing_and_setup/compass/ocean/global_ocean/WC12/init/config_E3SM_coupling_files.ini

@@ -10,7 +10,7 @@ initial_condition = ../../spin_up/simulation/restarts/restart.0001-01-21_00.00.0
 [mesh]
 short_name = ${prefix}${min_res}to${max_res}E${e3sm_version}r${mesh_version}
 long_name = ${prefix}${min_res}to${max_res}kmL${levels}E3SMv${e3sm_version}r${mesh_version}
-prefix = CUSP
+prefix = WC
 description = MPAS Contiguous United States Plus mesh for E3SM version
               ${e3sm_version}, with a focused ${min_res}-km resolution
               around North America and ${levels} vertical levels

testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_base_mesh.xml → testing_and_setup/compass/ocean/global_ocean/WC12/init/config_base_mesh.xml

@@ -6,7 +6,7 @@
 
 	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS" dest="jigsaw_to_MPAS"/>
 	<add_link source_path="bathymetry_database" source="SRTM15_plus_earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
-	<add_link source_path="script_test_dir" source="define_base_mesh.py" dest="define_base_mesh.py"/>
+	<copy_file source_path="script_test_dir" source="define_base_mesh.py" dest="define_base_mesh.py"/>
 	<add_link source_path="script_test_dir" source="coastline_CUSP.geojson" dest="coastline_CUSP.geojson"/>
 	<add_link source_path="script_test_dir" source="land_mask_Mexico.geojson" dest="land_mask_Mexico.geojson"/>
 	<add_link source_path="script_test_dir" source="region_Bering_Sea.geojson" dest="region_Bering_Sea.geojson"/>

testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_base_mesh.py → testing_and_setup/compass/ocean/global_ocean/WC12/init/define_base_mesh.py

@@ -169,10 +169,10 @@ def plot_cartopy(nPlot, varName, var, map_name):
         alpha=0.5,
         linestyle='-', zorder=2)
     ax.coastlines()
-    gl.xlabels_top = False
-    gl.xlabels_bottom = False
-    gl.ylabels_right = False
-    gl.ylabels_left = False
+    gl.top_labels = False
+    gl.bottom_labels = False
+    gl.right_labels = False
+    gl.left_labels = False
     plt.colorbar(im, shrink=.9)
     plt.title(varName)
 

testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Arctic_Ocean.geojson → testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Arctic_Ocean.geojson

@@ -7,15 +7,15 @@
         "name": "region for CUSP mesh",
         "component": "ocean",
         "object": "region",
-        "author": "Mark Petersen"
+        "author": "Mark Petersen, Xylar Asay-Davis"
       },
       "geometry": {
         "type": "Polygon",
         "coordinates": [
           [
             [
               26.015625,
-              69.53451763078358
+              67.20403234340081
             ],
             [
               34.80468749999999,
@@ -30,19 +30,19 @@
               68.13885164925573
             ],
             [
-              180.0,
+              180,
               65.80277639340238
             ],
             [
-              180.0,
-              90.0
+              180,
+              90
             ],
             [
-              -180.0,
-              90.0
+              -180,
+              90
             ],
             [
-              -180.0,
+              -180,
               65.80277639340238
             ],
             [
@@ -59,11 +59,11 @@
             ],
             [
               26.015625,
-              69.53451763078358
+              67.20403234340081
             ]
           ]
         ]
       }
     }
   ]
-}
+}

testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Gulf_Stream_extension.geojson → testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Gulf_Stream_extension.geojson

@@ -7,7 +7,7 @@
         "name": "region for CUSP mesh",
         "component": "ocean",
         "object": "region",
-        "author": "Mark Petersen"
+        "author": "Mark Petersen, Xylar Asay-Davis"
       },
       "geometry": {
         "type": "Polygon",
@@ -26,16 +26,16 @@
               47.635783590864854
             ],
             [
-              32.6953125,
-              52.802761415419674
+              38.67187499999999,
+              54.470037612805754
             ],
             [
-              27.0703125,
-              66.08936427047088
+              31.9921875,
+              65.5129625532949
             ],
             [
-              19.86328125,
-              72.97118902284586
+              25.6640625,
+              73.27735320192473
             ],
             [
               -29.8828125,
@@ -54,4 +54,4 @@
       }
     }
   ]
-}
+}

testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_test_final_settings.xml → testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_test_final_settings.xml

@@ -10,7 +10,6 @@
 
 	<namelist name="namelist.ocean" mode="forward">
 		<template file="template_forward.xml" path_base="script_configuration_dir"/>
-		<template file="template_monthly_output.xml" path_base="script_configuration_dir"/>
 		<template file="template_forward.xml" path_base="script_resolution_dir"/>
 		<option name="config_run_duration">'00-01-00_00:00:00'</option>
 		<option name="config_do_restart">.true.</option>