diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/coastline_CUSP.geojson b/testing_and_setup/compass/ocean/global_ocean/WC12/init/coastline_CUSP.geojson similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/coastline_CUSP.geojson rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/coastline_CUSP.geojson diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_E3SM_coupling_files.ini b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_E3SM_coupling_files.ini similarity index 99% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_E3SM_coupling_files.ini rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/config_E3SM_coupling_files.ini index e2cced6b33..0fa3fed2d7 100644 --- a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_E3SM_coupling_files.ini +++ b/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 diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_base_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_base_mesh.xml similarity index 94% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_base_mesh.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/config_base_mesh.xml index cb3c50c43b..8fd46fe059 100644 --- a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_base_mesh.xml +++ b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_base_mesh.xml @@ -6,7 +6,7 @@ - + diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_culled_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_culled_mesh.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_culled_mesh.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/config_culled_mesh.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_driver.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_driver.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/config_driver.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_e3sm_coupling.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_e3sm_coupling.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_e3sm_coupling.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/config_e3sm_coupling.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_initial_state.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_initial_state.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/config_initial_state.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_initial_state_60_layers.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_initial_state_60_layers.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_initial_state_60_layers.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/config_initial_state_60_layers.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_mesh_metrics.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/init/config_mesh_metrics.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_mesh_metrics.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/config_mesh_metrics.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_base_mesh.py b/testing_and_setup/compass/ocean/global_ocean/WC12/init/define_base_mesh.py similarity index 98% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_base_mesh.py rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/define_base_mesh.py index 3820fd7695..aabfc20f4f 100755 --- a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_base_mesh.py +++ b/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) diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_vertical_grid.py b/testing_and_setup/compass/ocean/global_ocean/WC12/init/define_vertical_grid.py similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_vertical_grid.py rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/define_vertical_grid.py diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/land_mask_Kamchatka.geojson b/testing_and_setup/compass/ocean/global_ocean/WC12/init/land_mask_Kamchatka.geojson similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/land_mask_Kamchatka.geojson rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/land_mask_Kamchatka.geojson diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/land_mask_Mexico.geojson b/testing_and_setup/compass/ocean/global_ocean/WC12/init/land_mask_Mexico.geojson similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/land_mask_Mexico.geojson rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/land_mask_Mexico.geojson diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Arctic_Ocean.geojson b/testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Arctic_Ocean.geojson similarity index 83% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Arctic_Ocean.geojson rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Arctic_Ocean.geojson index 18d4f28395..12d60f9e6c 100644 --- a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Arctic_Ocean.geojson +++ b/testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Arctic_Ocean.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", @@ -15,7 +15,7 @@ [ [ 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 ] ] ] } } ] -} +} \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Bering_Sea.geojson b/testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Bering_Sea.geojson similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Bering_Sea.geojson rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Bering_Sea.geojson diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Central_America.geojson b/testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Central_America.geojson similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Central_America.geojson rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Central_America.geojson diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Gulf_Stream_extension.geojson b/testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Gulf_Stream_extension.geojson similarity index 80% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Gulf_Stream_extension.geojson rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Gulf_Stream_extension.geojson index c0be15fbf0..d558e79aff 100644 --- a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Gulf_Stream_extension.geojson +++ b/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 @@ } } ] -} +} \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Gulf_of_Mexico.geojson b/testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Gulf_of_Mexico.geojson similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Gulf_of_Mexico.geojson rename to testing_and_setup/compass/ocean/global_ocean/WC12/init/region_Gulf_of_Mexico.geojson diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_driver.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_driver.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_driver.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up1.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up1.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up1.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up1.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up2.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up2.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up2.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up2.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up3.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up3.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up3.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up3.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up4.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up4.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up4.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up4.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up5.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up5.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up5.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up5.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up6.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up6.xml similarity index 100% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_spin_up6.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_spin_up6.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_test_final_settings.xml b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_test_final_settings.xml similarity index 95% rename from testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_test_final_settings.xml rename to testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_test_final_settings.xml index 922c3bb0fa..471df12bd3 100644 --- a/testing_and_setup/compass/ocean/global_ocean/CUSP12/spin_up/config_test_final_settings.xml +++ b/testing_and_setup/compass/ocean/global_ocean/WC12/spin_up/config_test_final_settings.xml @@ -10,7 +10,6 @@