diff --git a/testing_and_setup/compass/general.config.ocean b/testing_and_setup/compass/general.config.ocean
index 10790c2855..f79372af38 100644
--- a/testing_and_setup/compass/general.config.ocean
+++ b/testing_and_setup/compass/general.config.ocean
@@ -48,4 +48,3 @@ jigsaw-geo-matlab = FULL_PATH_TO_JIGSAW_REPO
 mesh_database = FULL_PATH_TO_LOCAL_MESH_DATABASE
 initial_condition_database = FULL_PATH_TO_LOCAL_INITIAL_CONDITION_DATABASE
 bathymetry_database = FULL_PATH_TO_BATHYMETRY_DATABASE
-jigsaw_to_MPAS = FULL_PATH_TO_MPAS_MODEL_REPORT/testing_and_setup/compass/ocean/jigsaw_to_MPAS
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8/init/config_base_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8/init/config_base_mesh.xml
index d1ae0a9ebf..8e5cd04171 100644
--- a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8/init/config_base_mesh.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8/init/config_base_mesh.xml
@@ -4,16 +4,16 @@
 	<add_executable source="mesh_converter" dest="MpasMeshConverter.x"/>
 	<add_executable source="cell_culler"    dest="MpasCellCuller.x"/>
 
-	<add_link source_path="jigsaw_to_MPAS"      source="build_mesh.py"                   dest="build_mesh.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="jigsaw_driver.m"                 dest="jigsaw_driver.m"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="triangle_jigsaw_to_netcdf.py"    dest="triangle_jigsaw_to_netcdf.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="mesh_definition_tools.py"        dest="mesh_definition_tools.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="coastal_tools.py"                dest="coastal_tools.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="inject_meshDensity.py"           dest="inject_meshDensity.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="inject_bathymetry.py"            dest="inject_bathymetry.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/build_mesh.py"                   dest="build_mesh.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/jigsaw_driver.m"                 dest="jigsaw_driver.m"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/triangle_jigsaw_to_netcdf.py"    dest="triangle_jigsaw_to_netcdf.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/mesh_definition_tools.py"        dest="mesh_definition_tools.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/coastal_tools.py"                dest="coastal_tools.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/inject_meshDensity.py"           dest="inject_meshDensity.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/inject_bathymetry.py"            dest="inject_bathymetry.py"/>
 	<add_link source_path="script_test_dir"     source="define_base_mesh.py"             dest="define_base_mesh.py"/>
 	<add_link source_path="jigsaw-geo-matlab"   source="."                               dest="jigsaw-geo-matlab"/>
-        <add_link source_path="bathymetry_database" source="SRTM15_plus/earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
+	<add_link source_path="bathymetry_database" source="SRTM15_plus/earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
 
 	<run_script name="run.py">
 		<step executable="./build_mesh.py">
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8/init/define_base_mesh.py b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8/init/define_base_mesh.py
index 1b704d8e61..8f1850bb13 100755
--- a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8/init/define_base_mesh.py
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8/init/define_base_mesh.py
@@ -91,11 +91,18 @@ def cellWidthVsLatLon():
     cell_width,lon,lat = ct.coastal_refined_mesh(params,cell_width,lon,lat)
 
     print "***Greenland***"
-    Greenland = {"include":[np.array([-49,-45,60,61])],
-                 "exclude":[]}
-    params["region_box"] = Greenland 
+    params["region_box"] = ct.Greenland 
     params["restrict_box"] = ct.Empty
-    params["trans_start"] = 900.0*km
+    params["trans_width"] = 600.0*km
+    params["trans_start"] = 275.0*km
+    cell_width, lon, lat = ct.coastal_refined_mesh(params,cell_width,lon,lat)
+
+    print "***Labrador Sea***" 
+    params["region_box"] = ct.Empty 
+    params["restrict_box"] = ct.Empty
+    params["point_list"] = [np.array([-50.0,55.0])]
+    params["trans_width"] = 600.0*km
+    params["trans_start"] = 400.0*km
     cell_width, lon, lat = ct.coastal_refined_mesh(params,cell_width,lon,lat)
 
     print"***Central America (West Coast)***"
@@ -114,6 +121,7 @@ def cellWidthVsLatLon():
                        "exclude":[]}
     params["region_box"] = Central_America 
     params["restrict_box"] = ct.Empty
+    params["point_list"] = None
     params["trans_width"] = 600.0*km
     params["trans_start"] = 400.0*km
     cell_width, lon, lat = ct.coastal_refined_mesh(params,cell_width,lon,lat)
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_base_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_base_mesh.xml
new file mode 100644
index 0000000000..8e5cd04171
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_base_mesh.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<config case="base_mesh">
+
+	<add_executable source="mesh_converter" dest="MpasMeshConverter.x"/>
+	<add_executable source="cell_culler"    dest="MpasCellCuller.x"/>
+
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/build_mesh.py"                   dest="build_mesh.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/jigsaw_driver.m"                 dest="jigsaw_driver.m"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/triangle_jigsaw_to_netcdf.py"    dest="triangle_jigsaw_to_netcdf.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/mesh_definition_tools.py"        dest="mesh_definition_tools.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/coastal_tools.py"                dest="coastal_tools.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/inject_meshDensity.py"           dest="inject_meshDensity.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/inject_bathymetry.py"            dest="inject_bathymetry.py"/>
+	<add_link source_path="script_test_dir"     source="define_base_mesh.py"             dest="define_base_mesh.py"/>
+	<add_link source_path="jigsaw-geo-matlab"   source="."                               dest="jigsaw-geo-matlab"/>
+	<add_link source_path="bathymetry_database" source="SRTM15_plus/earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
+
+	<run_script name="run.py">
+		<step executable="./build_mesh.py">
+		</step>
+	</run_script>
+
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_culled_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_culled_mesh.xml
new file mode 120000
index 0000000000..9c49ba6246
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_culled_mesh.xml
@@ -0,0 +1 @@
+../../config_files/config_culled_mesh.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_driver.xml
new file mode 120000
index 0000000000..6e64036436
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_driver.xml
@@ -0,0 +1 @@
+../../config_files/config_driver_init.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_initial_state.xml
new file mode 120000
index 0000000000..708f1da2f9
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_initial_state.xml
@@ -0,0 +1 @@
+../../config_files/config_initial_state_60_layers.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_mesh_metrics.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_mesh_metrics.xml
new file mode 120000
index 0000000000..1d71c75ff0
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/config_mesh_metrics.xml
@@ -0,0 +1 @@
+../../config_files/config_mesh_metrics.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/define_base_mesh.py b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/define_base_mesh.py
new file mode 120000
index 0000000000..2711c3e7f8
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/init/define_base_mesh.py
@@ -0,0 +1 @@
+../../NAEC60to30cr8/init/define_base_mesh.py
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_driver.xml
new file mode 100644
index 0000000000..411b5a2fba
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_driver.xml
@@ -0,0 +1,28 @@
+<driver_script name="run_test.py">
+	<case name="spin_up1">
+		<step executable="./run.py" quiet="true" pre_message=" * Running spin_up1" post_message=" - Complete"/>
+	</case>
+	<case name="spin_up2">
+		<step executable="./run.py" quiet="true" pre_message=" * Running spin_up2" post_message=" - Complete"/>
+	</case>
+	<case name="spin_up3">
+		<step executable="./run.py" quiet="true" pre_message=" * Running spin_up3" post_message=" - Complete"/>
+	</case>
+	<case name="spin_up4">
+		<step executable="./run.py" quiet="true" pre_message=" * Running spin_up4" post_message=" - Complete"/>
+	</case>
+	<case name="spin_up5">
+		<step executable="./run.py" quiet="true" pre_message=" * Running spin_up5" post_message=" - Complete"/>
+	</case>
+	<case name="spin_up6">
+		<step executable="./run.py" quiet="true" pre_message=" * Running spin_up6" post_message=" - Complete"/>
+	</case>
+	<case name="test_final_settings">
+		<step executable="./run.py" quiet="true" pre_message=" * Running test_final_settings" post_message=" - Complete"/>
+	</case>
+	<validation>
+		<compare_fields file1="test_final_settings/output.nc">
+			<template file="prognostic_comparison.xml" path_base="script_core_dir" path="templates/validations"/>
+		</compare_fields>
+	</validation>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up1.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up1.xml
new file mode 100644
index 0000000000..53e9429b12
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up1.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<config case="spin_up1">
+	<add_link source="../../init/initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../../init/initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../../init/initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+
+	<add_executable source="model" dest="ocean_model"/>
+	<add_executable source="metis" dest="metis"/>
+
+	<namelist name="namelist.ocean" mode="forward">
+		<template file="template_forward.xml" path_base="script_configuration_dir"/>
+		<template file="template_forward.xml" path_base="script_resolution_dir"/>
+		<option name="config_run_duration">'00-00-00_06:00:00'</option>
+		<option name="config_dt">'00:00:30'</option>
+		<option name="config_btr_dt">'00:00:01.5'</option>
+		<option name="config_Rayleigh_friction">.true.</option>
+		<option name="config_Rayleigh_damping_coeff">1.0e-3</option>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+	</namelist>
+
+	<streams name="streams.ocean" keep="immutable" mode="forward">
+		<stream name="mesh">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<stream name="input">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<template file="output.xml" path_base="script_core_dir" path="templates/streams"/>
+		<stream name="output">
+			<attribute name="output_interval">00-00-10_00:00:00</attribute>
+		</stream>
+		<stream name="restart">
+			<attribute name="output_interval">00-00-00_06:00:00</attribute>
+		</stream>
+
+		<template file="forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="shortwave_forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="./metis">
+			<argument flag="graph.info">720</argument>
+		</step>
+
+		<model_run procs="720" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up2.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up2.xml
new file mode 100644
index 0000000000..412f4ff91f
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up2.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<config case="spin_up2">
+	<add_link source="../../init/initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../../init/initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../../init/initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+	<add_link source="../spin_up1/Restart_timestamp" dest="Restart_timestamp"/>
+	<add_link source="../spin_up1/restarts" dest="restarts"/>
+
+	<add_executable source="model" dest="ocean_model"/>
+	<add_executable source="metis" dest="metis"/>
+
+	<namelist name="namelist.ocean" mode="forward">
+		<template file="template_forward.xml" path_base="script_configuration_dir"/>
+		<template file="template_forward.xml" path_base="script_resolution_dir"/>
+		<option name="config_run_duration">'00-00-00_06:00:00'</option>
+		<option name="config_do_restart">.true.</option>
+		<option name="config_start_time">'file'</option>
+		<option name="config_dt">'00:01:00'</option>
+		<option name="config_btr_dt">'00:00:03'</option>
+		<option name="config_Rayleigh_friction">.true.</option>
+		<option name="config_Rayleigh_damping_coeff">4.0e-4</option>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+	</namelist>
+
+	<streams name="streams.ocean" keep="immutable" mode="forward">
+		<stream name="mesh">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<stream name="input">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<template file="output.xml" path_base="script_core_dir" path="templates/streams"/>
+		<stream name="output">
+			<attribute name="output_interval">00-00-10_00:00:00</attribute>
+		</stream>
+		<stream name="restart">
+			<attribute name="output_interval">00-00-00_06:00:00</attribute>
+		</stream>
+
+		<template file="forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="shortwave_forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="./metis">
+			<argument flag="graph.info">720</argument>
+		</step>
+
+		<model_run procs="720" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up3.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up3.xml
new file mode 100644
index 0000000000..f56dbd6f11
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up3.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<config case="spin_up3">
+	<add_link source="../../init/initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../../init/initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../../init/initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+	<add_link source="../spin_up1/Restart_timestamp" dest="Restart_timestamp"/>
+	<add_link source="../spin_up1/restarts" dest="restarts"/>
+
+	<add_executable source="model" dest="ocean_model"/>
+	<add_executable source="metis" dest="metis"/>
+
+	<namelist name="namelist.ocean" mode="forward">
+		<template file="template_forward.xml" path_base="script_configuration_dir"/>
+		<template file="template_forward.xml" path_base="script_resolution_dir"/>
+		<option name="config_run_duration">'00-00-00_12:00:00'</option>
+		<option name="config_do_restart">.true.</option>
+		<option name="config_start_time">'file'</option>
+		<option name="config_dt">'00:02:00'</option>
+		<option name="config_btr_dt">'00:00:06'</option>
+		<option name="config_Rayleigh_friction">.true.</option>
+		<option name="config_Rayleigh_damping_coeff">1.0e-4</option>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+	</namelist>
+
+	<streams name="streams.ocean" keep="immutable" mode="forward">
+		<stream name="mesh">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<stream name="input">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<template file="output.xml" path_base="script_core_dir" path="templates/streams"/>
+		<stream name="output">
+			<attribute name="output_interval">00-00-10_00:00:00</attribute>
+		</stream>
+		<stream name="restart">
+			<attribute name="output_interval">00-00-00_12:00:00</attribute>
+		</stream>
+
+		<template file="forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="shortwave_forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="./metis">
+			<argument flag="graph.info">720</argument>
+		</step>
+
+		<model_run procs="720" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up4.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up4.xml
new file mode 100644
index 0000000000..8de8af4959
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up4.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<config case="spin_up4">
+	<add_link source="../../init/initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../../init/initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../../init/initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+	<add_link source="../spin_up1/Restart_timestamp" dest="Restart_timestamp"/>
+	<add_link source="../spin_up1/restarts" dest="restarts"/>
+
+	<add_executable source="model" dest="ocean_model"/>
+	<add_executable source="metis" dest="metis"/>
+
+	<namelist name="namelist.ocean" mode="forward">
+		<template file="template_forward.xml" path_base="script_configuration_dir"/>
+		<template file="template_forward.xml" path_base="script_resolution_dir"/>
+		<option name="config_run_duration">'00-00-01_00:00:00'</option>
+		<option name="config_do_restart">.true.</option>
+		<option name="config_start_time">'file'</option>
+		<option name="config_dt">'00:03:00'</option>
+		<option name="config_btr_dt">'00:00:09'</option>
+		<option name="config_Rayleigh_friction">.true.</option>
+		<option name="config_Rayleigh_damping_coeff">4.0e-5</option>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+	</namelist>
+
+	<streams name="streams.ocean" keep="immutable" mode="forward">
+		<stream name="mesh">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<stream name="input">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<template file="output.xml" path_base="script_core_dir" path="templates/streams"/>
+		<stream name="output">
+			<attribute name="output_interval">00-00-10_00:00:00</attribute>
+		</stream>
+		<stream name="restart">
+			<attribute name="output_interval">00-00-01_00:00:00</attribute>
+		</stream>
+
+		<template file="forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="shortwave_forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="./metis">
+			<argument flag="graph.info">720</argument>
+		</step>
+
+		<model_run procs="720" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up5.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up5.xml
new file mode 100644
index 0000000000..dfa9c32562
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up5.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<config case="spin_up5">
+	<add_link source="../../init/initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../../init/initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../../init/initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+	<add_link source="../spin_up1/Restart_timestamp" dest="Restart_timestamp"/>
+	<add_link source="../spin_up1/restarts" dest="restarts"/>
+
+	<add_executable source="model" dest="ocean_model"/>
+	<add_executable source="metis" dest="metis"/>
+
+	<namelist name="namelist.ocean" mode="forward">
+		<template file="template_forward.xml" path_base="script_configuration_dir"/>
+		<template file="template_forward.xml" path_base="script_resolution_dir"/>
+		<option name="config_run_duration">'00-00-01_00:00:00'</option>
+		<option name="config_do_restart">.true.</option>
+		<option name="config_start_time">'file'</option>
+		<option name="config_dt">'00:05:00'</option>
+		<option name="config_btr_dt">'00:00:12'</option>
+		<option name="config_Rayleigh_friction">.true.</option>
+		<option name="config_Rayleigh_damping_coeff">2.0e-5</option>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+	</namelist>
+
+	<streams name="streams.ocean" keep="immutable" mode="forward">
+		<stream name="mesh">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<stream name="input">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<template file="output.xml" path_base="script_core_dir" path="templates/streams"/>
+		<stream name="output">
+			<attribute name="output_interval">00-00-10_00:00:00</attribute>
+		</stream>
+		<stream name="restart">
+			<attribute name="output_interval">00-00-01_00:00:00</attribute>
+		</stream>
+
+		<template file="forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="shortwave_forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="./metis">
+			<argument flag="graph.info">720</argument>
+		</step>
+
+		<model_run procs="720" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up6.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up6.xml
new file mode 100644
index 0000000000..c0ecf830f0
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_spin_up6.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<config case="spin_up6">
+	<add_link source="../../init/initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../../init/initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../../init/initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+	<add_link source="../spin_up1/Restart_timestamp" dest="Restart_timestamp"/>
+	<add_link source="../spin_up1/restarts" dest="restarts"/>
+
+	<add_executable source="model" dest="ocean_model"/>
+	<add_executable source="metis" dest="metis"/>
+
+	<namelist name="namelist.ocean" mode="forward">
+		<template file="template_forward.xml" path_base="script_configuration_dir"/>
+		<template file="template_forward.xml" path_base="script_resolution_dir"/>
+		<option name="config_run_duration">'00-00-03_00:00:00'</option>
+		<option name="config_do_restart">.true.</option>
+		<option name="config_start_time">'file'</option>
+		<option name="config_dt">'00:07:30'</option>
+		<option name="config_btr_dt">'00:00:15'</option>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+	</namelist>
+
+	<streams name="streams.ocean" keep="immutable" mode="forward">
+		<stream name="mesh">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<stream name="input">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<template file="output.xml" path_base="script_core_dir" path="templates/streams"/>
+		<stream name="output">
+			<attribute name="output_interval">00-00-10_00:00:00</attribute>
+		</stream>
+		<stream name="restart">
+			<attribute name="output_interval">00-00-03_00:00:00</attribute>
+		</stream>
+
+		<template file="forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="shortwave_forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="./metis">
+			<argument flag="graph.info">720</argument>
+		</step>
+
+		<model_run procs="720" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_test_final_settings.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_test_final_settings.xml
new file mode 100644
index 0000000000..9add21f2d2
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/spin_up/config_test_final_settings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<config case="test_final_settings">
+	<add_link source="../../init/initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../../init/initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../../init/initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+
+	<add_executable source="model" dest="ocean_model"/>
+	<add_executable source="metis" dest="metis"/>
+
+	<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>
+		<option name="config_start_time">'file'</option>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+	</namelist>
+
+	<streams name="streams.ocean" keep="immutable" mode="forward">
+		<stream name="mesh">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<stream name="input">
+			<attribute name="filename_template">init.nc</attribute>
+		</stream>
+		<template file="output.xml" path_base="script_core_dir" path="templates/streams"/>
+		<stream name="output">
+			<attribute name="output_interval">00-00-10_00:00:00</attribute>
+		</stream>
+		<stream name="restart">
+			<attribute name="output_interval">00-01-00_00:00:00</attribute>
+		</stream>
+
+		<template file="forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="shortwave_forcing_data.xml" path_base="script_core_dir" path="templates/streams"/>
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="./metis">
+			<argument flag="graph.info">720</argument>
+		</step>
+		<model_run procs="720" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/template_forward.xml b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/template_forward.xml
new file mode 100644
index 0000000000..1423464062
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/NAEC60to30cr8L60/template_forward.xml
@@ -0,0 +1,17 @@
+<template>
+	<namelist>
+		<option name="config_dt">'00:07:30'</option>
+		<option name="config_btr_dt">'00:00:15'</option>
+		<option name="config_pio_num_iotasks">20</option>
+		<option name="config_pio_stride">36</option>
+		<option name="config_write_output_on_startup">.false.</option>
+		<option name="config_hmix_scaleWithMesh">.true.</option>
+		<option name="config_use_mom_del2">.true.</option>
+		<option name="config_mom_del2">270</option>
+		<option name="config_use_mom_del4">.true.</option>
+		<option name="config_mom_del4">2.3e9</option>
+		<option name="config_use_standardGM">.true.</option>
+		<option name="config_standardGM_tracer_kappa">600.0</option>
+		<option name="config_GM_Bolus_kappa_function">'ramp'</option>
+	</namelist>
+</template>
diff --git a/testing_and_setup/compass/ocean/global_ocean/USDEQU120cr10rr1/init/config_base_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/USDEQU120cr10rr1/init/config_base_mesh.xml
index 94f449fd8a..37f4105c26 100755
--- a/testing_and_setup/compass/ocean/global_ocean/USDEQU120cr10rr1/init/config_base_mesh.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/USDEQU120cr10rr1/init/config_base_mesh.xml
@@ -4,14 +4,15 @@
 	<add_executable source="mesh_converter" dest="MpasMeshConverter.x"/>
 	<add_executable source="cell_culler"    dest="MpasCellCuller.x"/>
 
-	<add_link source_path="jigsaw_to_MPAS"      source="build_mesh.py"                   dest="build_mesh.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="jigsaw_driver.m"                 dest="jigsaw_driver.m"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="triangle_jigsaw_to_netcdf.py"    dest="triangle_jigsaw_to_netcdf.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="mesh_definition_tools.py"        dest="mesh_definition_tools.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="coastal_tools.py"                dest="coastal_tools.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/build_mesh.py"                   dest="build_mesh.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/jigsaw_driver.m"                 dest="jigsaw_driver.m"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/triangle_jigsaw_to_netcdf.py"    dest="triangle_jigsaw_to_netcdf.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/mesh_definition_tools.py"        dest="mesh_definition_tools.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/coastal_tools.py"                dest="coastal_tools.py"/>
 	<add_link source_path="script_test_dir"     source="define_base_mesh.py"             dest="define_base_mesh.py"/>
 	<add_link source_path="jigsaw-geo-matlab"   source="."                               dest="jigsaw-geo-matlab"/>
-        <add_link source_path="bathymetry_database" source="SRTM15_plus/earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
+
+	<add_link source_path="bathymetry_database" source="SRTM15_plus/earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
 
 	<run_script name="run.py">
 		<step executable="./build_mesh.py">
diff --git a/testing_and_setup/compass/ocean/global_ocean/USDEQU300cr20rr3/init/config_base_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/USDEQU300cr20rr3/init/config_base_mesh.xml
index 94f449fd8a..acd2a0c23d 100755
--- a/testing_and_setup/compass/ocean/global_ocean/USDEQU300cr20rr3/init/config_base_mesh.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/USDEQU300cr20rr3/init/config_base_mesh.xml
@@ -4,14 +4,14 @@
 	<add_executable source="mesh_converter" dest="MpasMeshConverter.x"/>
 	<add_executable source="cell_culler"    dest="MpasCellCuller.x"/>
 
-	<add_link source_path="jigsaw_to_MPAS"      source="build_mesh.py"                   dest="build_mesh.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="jigsaw_driver.m"                 dest="jigsaw_driver.m"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="triangle_jigsaw_to_netcdf.py"    dest="triangle_jigsaw_to_netcdf.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="mesh_definition_tools.py"        dest="mesh_definition_tools.py"/>
-	<add_link source_path="jigsaw_to_MPAS"      source="coastal_tools.py"                dest="coastal_tools.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/build_mesh.py"                   dest="build_mesh.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/jigsaw_driver.m"                 dest="jigsaw_driver.m"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/triangle_jigsaw_to_netcdf.py"    dest="triangle_jigsaw_to_netcdf.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/mesh_definition_tools.py"        dest="mesh_definition_tools.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/coastal_tools.py"                dest="coastal_tools.py"/>
 	<add_link source_path="script_test_dir"     source="define_base_mesh.py"             dest="define_base_mesh.py"/>
 	<add_link source_path="jigsaw-geo-matlab"   source="."                               dest="jigsaw-geo-matlab"/>
-        <add_link source_path="bathymetry_database" source="SRTM15_plus/earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
+	<add_link source_path="bathymetry_database" source="SRTM15_plus/earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
 
 	<run_script name="run.py">
 		<step executable="./build_mesh.py">
diff --git a/testing_and_setup/compass/ocean/global_ocean/config_files/config_initial_state_60_layers.xml b/testing_and_setup/compass/ocean/global_ocean/config_files/config_initial_state_60_layers.xml
new file mode 100644
index 0000000000..d46bf14149
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/config_files/config_initial_state_60_layers.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<config case="initial_state">
+	<get_file dest_path="initial_condition_database" file_name="Salinity.01.filled.60levels.PHC.151106.nc">
+		<mirror protocol="wget" url="http://oceans11.lanl.gov/mpas_data/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="PotentialTemperature.01.filled.60levels.PHC.151106.nc">
+		<mirror protocol="wget" url="http://oceans11.lanl.gov/mpas_data/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="windStress.ncep_1958-2000avg.interp3600x2431.151106.nc">
+		<mirror protocol="wget" url="http://oceans11.lanl.gov/mpas_data/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="ETOPO2v2c_f4_151106.nc">
+		<mirror protocol="wget" url="http://oceans11.lanl.gov/mpas_data/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="chlorophyllA_monthly_averages_1deg.151201.nc">
+		<mirror protocol="wget" url="http://oceans11.lanl.gov/mpas_data/initial_condition_database/"/>
+	</get_file>
+
+	<add_executable source="metis" dest="metis"/>
+
+	<add_link source="../culled_mesh/culled_mesh.nc" dest="mesh.nc"/>
+	<add_link source="../culled_mesh/culled_graph.info" dest="graph.info"/>
+	<add_link source="../culled_mesh/critical_passages_mask_final.nc" dest="critical_passages.nc"/>
+	<add_link source_path="initial_condition_database" source="Salinity.01.filled.60levels.PHC.151106.nc" dest="layer_depth.nc"/>
+	<add_link source_path="initial_condition_database" source="PotentialTemperature.01.filled.60levels.PHC.151106.nc" dest="temperature.nc"/>
+	<add_link source_path="initial_condition_database" source="Salinity.01.filled.60levels.PHC.151106.nc" dest="salinity.nc"/>
+	<add_link source_path="initial_condition_database" source="windStress.ncep_1958-2000avg.interp3600x2431.151106.nc" dest="wind_stress.nc"/>
+	<add_link source_path="initial_condition_database" source="ETOPO2v2c_f4_151106.nc" dest="topography.nc"/>
+	<add_link source_path="initial_condition_database" source="chlorophyllA_monthly_averages_1deg.151201.nc" dest="swData.nc"/>
+	<add_link source_path="mpas_tools" source="visualization/paraview_vtk_field_extractor/paraview_vtk_field_extractor.py" dest="paraview_vtk_field_extractor.py"/>
+
+	<namelist name="namelist.ocean" mode="init">
+		<template file="template_initial_state.xml" path_base="script_configuration_dir"/>
+		<template file="template_critical_passages.xml" path_base="script_core_dir" path="global_ocean"/>
+		<option name="config_global_ocean_depth_file">'layer_depth.nc'</option>
+		<option name="config_global_ocean_depth_conversion_factor">0.01</option>
+		<option name="config_global_ocean_tracer_depth_conversion_factor">0.01</option>
+		<option name="config_global_ocean_minimum_depth">10</option>
+		<option name="config_global_ocean_deepen_critical_passages">.false.</option>               
+	</namelist>
+
+	<streams name="streams.ocean" keep="immutable" mode="init">
+		<template file="template_initial_state.xml" path_base="script_configuration_dir"/>
+		<template file="template_critical_passages.xml" path_base="script_core_dir" path="global_ocean"/>
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="./metis">
+			<argument flag="graph.info">36</argument>
+		</step>
+		<model_run procs="36" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/config_files/config_mesh_metrics.xml b/testing_and_setup/compass/ocean/global_ocean/config_files/config_mesh_metrics.xml
index b698471f63..4639185150 100755
--- a/testing_and_setup/compass/ocean/global_ocean/config_files/config_mesh_metrics.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/config_files/config_mesh_metrics.xml
@@ -2,16 +2,16 @@
 <config case="mesh_metrics">
 
 	<add_executable source="mesh_converter" dest="MpasMeshConverter.x"/>
-        <add_link source="../culled_mesh/culled_mesh.nc" dest="mesh.nc"/>
+	<add_link source="../culled_mesh/culled_mesh.nc" dest="mesh.nc"/>
 	<add_link source_path="mpas_tools" source="visualization/paraview_vtk_field_extractor/paraview_vtk_field_extractor.py" dest="paraview_vtk_field_extractor.py"/>
 	<add_link source_path="mpas_tools" source="mesh_tools/mesh_comparison.py" dest="mesh_comparison.py"/>
 	<add_link source_path="bathymetry_database" source="SRTM15_plus/earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
-	<add_link source_path="jigsaw_to_MPAS" source="inject_bathymetry.py" dest="inject_bathymetry.py"/>
+	<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS/inject_bathymetry.py" dest="inject_bathymetry.py"/>
 
 	<run_script name="run.py">
 		<step executable="./MpasMeshConverter.x">
-                     <argument flag="mesh.nc"></argument>
-                     <argument flag="mesh_with_metrics.nc"></argument>
+			<argument flag="mesh.nc"></argument>
+			<argument flag="mesh_with_metrics.nc"></argument>
 		</step>
 
 		<step executable="./inject_bathymetry.py">
@@ -19,14 +19,14 @@
 		</step>
 
 		<step executable="./paraview_vtk_field_extractor.py">
-                     <argument flag="-l"></argument>
-                     <argument flag="-f"></argument>
-                     <argument flag="mesh.nc"></argument>
-                     <argument flag="-o"></argument>
-                     <argument flag="hex_mesh"></argument>
-                     <argument flag="-v"></argument>
-                     <argument flag="areaCell"></argument>
-                     <argument flag="--ignore_time"></argument>
+			<argument flag="-l"></argument>
+			<argument flag="-f"></argument>
+			<argument flag="mesh.nc"></argument>
+			<argument flag="-o"></argument>
+			<argument flag="hex_mesh"></argument>
+			<argument flag="-v"></argument>
+			<argument flag="areaCell"></argument>
+			<argument flag="--ignore_time"></argument>
 		</step>
 	</run_script>
 
diff --git a/testing_and_setup/compass/ocean/jigsaw_to_MPAS/coastal_tools.py b/testing_and_setup/compass/ocean/jigsaw_to_MPAS/coastal_tools.py
index 8cf5656aad..e9959208c4 100755
--- a/testing_and_setup/compass/ocean/jigsaw_to_MPAS/coastal_tools.py
+++ b/testing_and_setup/compass/ocean/jigsaw_to_MPAS/coastal_tools.py
@@ -94,6 +94,20 @@
 Aleutian_Islands_W = {"include": [np.array([164.9, 180.0, 50.77, 56.31])],
                       "exclude": [np.array([178.5, 179.5, 51.25, 51.75])]}
 
+Greenland = {"include":[np.array([-81.5,-12.5,60,85])],
+             "exclude":[np.array([[-87.6,58.7],
+                                  [-51.9,56.6],
+                                  [-68.9,75.5], 
+                                  [-107.0,73.3]]),
+                        np.array([[-119.0,74.5],
+                                  [-92.7,75.9],
+                                  [-52.84,83.25],
+                                  [-100.8,84.0]]),
+                        np.array([[-101.3,68.5],
+                                  [-82.4,72.3],
+                                  [-68.7,81.24],
+                                  [-117.29,77.75]]),
+                        np.array([-25.0,-10.0,62.5,67.5])]}  
 
 # Combined coastlines
 CONUS = {"include": [], "exclude": []}
@@ -177,6 +191,7 @@
 
     # Path to bathymetry data and name of file
     "nc_file": "./earth_relief_15s.nc",
+    "nc_vars": ["lon","lat","z"],
 
     # Bounding box of coastal refinement region
     "region_box": Continental_US,
@@ -187,6 +202,7 @@
     "z_contour": 0.0,
     "n_longest": 10,
     "smooth_coastline": 0,
+    "point_list": None,
 
     # Global mesh parameters
     "grd_box": Entire_Globe,
@@ -235,9 +251,11 @@ def coastal_refined_mesh(params, cell_width=None, lon_grd=None, lat_grd=None):
     # Get coastlines from bathy/topo  data set
     coastlines = extract_coastlines(
         params["nc_file"],
+        params["nc_vars"],
         params["region_box"],
         params["z_contour"],
         params["n_longest"],
+        params["point_list"],
         params["plot_option"],
         params["plot_box"],
         call_count)
@@ -331,7 +349,7 @@ def create_background_mesh(grd_box, ddeg, mesh_type, dx_min, dx_max,  # {{{
 ##############################################################
 
 
-def extract_coastlines(nc_file, region_box, z_contour=0, n_longest=10,   # {{{
+def extract_coastlines(nc_file, nc_vars, region_box, z_contour=0, n_longest=10, point_list=None,   # {{{
                        plot_option=False, plot_box=[], call=None):
 
     print "Extract coastlines"
@@ -339,9 +357,9 @@ def extract_coastlines(nc_file, region_box, z_contour=0, n_longest=10,   # {{{
 
     # Open NetCDF file and read cooordintes
     nc_fid = Dataset(nc_file, "r")
-    lon = nc_fid.variables['lon'][:]
-    lat = nc_fid.variables['lat'][:]
-    bathy_data = nc_fid.variables['z']
+    lon = nc_fid.variables[nc_vars[0]][:]
+    lat = nc_fid.variables[nc_vars[1]][:]
+    bathy_data = nc_fid.variables[nc_vars[2]]
 
     # Get coastlines for refined region
     coastline_list = []
@@ -388,6 +406,14 @@ def extract_coastlines(nc_file, region_box, z_contour=0, n_longest=10,   # {{{
 
         print "   Done"
 
+    # Add in user-specified points
+    if point_list:
+        for i,points in enumerate(point_list):
+            cpad = np.vstack((points, [np.nan, np.nan]))
+            coastline_list.append(cpad)
+                    
+
+
     # Combine coastlines
     coastlines = np.concatenate(coastline_list)