diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/build_base_mesh.py b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/build_base_mesh.py
similarity index 100%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/build_base_mesh.py
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/build_base_mesh.py
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_base_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/config_base_mesh.xml
similarity index 100%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_base_mesh.xml
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/config_base_mesh.xml
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_culled_mesh.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/config_culled_mesh.xml
similarity index 100%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_culled_mesh.xml
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/config_culled_mesh.xml
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/config_driver.xml
new file mode 100644
index 0000000000..cd6e4806f3
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/build_mesh/config_driver.xml
@@ -0,0 +1,8 @@
+<driver_script name="run.py">
+	<case name="base_mesh">
+		<step executable="./run.py" quiet="true" pre_message=" * Creating 2D global base mesh with jigsaw..." post_message="     complete!  Created file:  base_mesh/base_mesh.nc"/>
+	</case>
+	<case name="culled_mesh">
+		<step executable="./run.py" quiet="true" pre_message=" * Culling land cells from 2D global mesh, including ice shelf cavities..." post_message="     complete!  Created file:  culled_mesh/culled_mesh.nc"/>
+	</case>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_driver.xml
new file mode 100644
index 0000000000..b7331f7fd0
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_driver.xml
@@ -0,0 +1,5 @@
+<driver_script name="run.py">
+	<case name="files_for_e3sm">
+		<step executable="./run.py" quiet="true" pre_message=" * Creating ocean and sea-ice initial conditions and supporting files for E3SM" post_message=" - Complete"/>
+	</case>
+</driver_script>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_E3SM_coupling_files.ini b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_files_for_e3sm.ini
similarity index 85%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_E3SM_coupling_files.ini
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_files_for_e3sm.ini
index 0c59117487..4e11338f99 100644
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_E3SM_coupling_files.ini
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_files_for_e3sm.ini
@@ -5,7 +5,7 @@
 [main]
 nprocs = 1
 # the file name of the initial condition, possibly after spin-up
-initial_condition = ../../spin_up/simulation/restarts/restart.0001-01-21_00.00.00.nc
+initial_condition = ../../spin_up_phc/simulation/restarts/restart.0001-01-21_00.00.00.nc
 
 [mesh]
 short_name = ${prefix}${min_res}to${max_res}E${e3sm_version}r${mesh_version}
@@ -15,7 +15,9 @@ description = MPAS Eddy Closure mesh for E3SM version ${e3sm_version} with
               enhanced resolution around the equator (${min_res} km) and poles
               (35 km), ${max_res}-km resolution at mid latitudes, ${levels}
               vertical levels,  and including cavities under the ice shelves in
-              the Antarctic.
+              the Antarctic. Bathymetry is from GEBCO 2019 combined with
+              BedMachine. The initial condition is from PHC.  The mesh is
+              documented at https://github.com/MPAS-Dev/MPAS-Model/pull/694
 e3sm_version = 2
 mesh_version = 01
 creation_date = autodetect
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_files_for_e3sm.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_files_for_e3sm.xml
new file mode 100644
index 0000000000..8c6fd4431f
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/files_for_e3sm/config_files_for_e3sm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<config case="files_for_e3sm">
+
+	<add_link source="../../spin_up_phc/initial_state/initial_state.nc" dest="mesh_before_metadata.nc"/>
+	<add_link source="../../spin_up_phc/initial_state/graph.info" dest="graph.info"/>
+	<add_link source_path="script_configuration_dir" source="scripts/create_E3SM_coupling_files.py" dest="create_files_for_e3sm.py"/>
+	<add_link source_path="script_configuration_dir" source="scripts/config_E3SM_coupling_files.ini" dest="defaults.ini"/>
+    <copy_file source_path="script_test_dir" source="config_files_for_e3sm.ini" dest="config_files_for_e3sm.ini"/>
+	<add_link source_path="script_configuration_dir" source="scripts/readme_E3SM_coupling_files" dest="readme"/>
+
+	<run_script name="run.py">
+		<step executable="./create_files_for_e3sm.py">
+			<argument flag="--config">config_files_for_e3sm.ini</argument>
+		</step>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_driver.xml
deleted file mode 120000
index 53db69926f..0000000000
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_driver.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files_ISC/config_driver_init.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_e3sm_coupling.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_e3sm_coupling.xml
deleted file mode 120000
index b38d0325db..0000000000
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_e3sm_coupling.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files_ISC/config_e3sm_coupling.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_initial_state.xml
deleted file mode 120000
index b42fcfc63a..0000000000
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_initial_state.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files_ISC/config_initial_state.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_test.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_test.xml
deleted file mode 120000
index b99efc8325..0000000000
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_test.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files_ISC/config_test.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_driver.xml
similarity index 54%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_driver.xml
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_driver.xml
index eae88eb43b..2500bd8fcc 100644
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_driver.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_driver.xml
@@ -1,4 +1,10 @@
 <driver_script name="run.py">
+	<case name="initial_state">
+		<step executable="./run.py" quiet="true" pre_message=" * Initializing ocean state with bathymetry and tracers..." post_message="     complete!  Created file:  initial_state/initial_state.nc"/>
+	</case>
+	<case name="ssh_adjustment">
+		<step executable="./run.py" quiet="true" pre_message=" * Adjusting SSH for ice shelf cavities..." post_message="     complete!  Created file:  ssh_adjustment/init.nc"/>
+	</case>
 	<case name="prep_spin_up1">
 		<step executable="./run.py" quiet="true" pre_message=" * Running prep_spin_up1" post_message=" - Complete"/>
 	</case>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_initial_state.xml
new file mode 100644
index 0000000000..26cf328dbe
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_initial_state.xml
@@ -0,0 +1,65 @@
+<?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="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+	<get_file dest_path="initial_condition_database" file_name="PotentialTemperature.100levels.Levitus.EN4_1900estimate.200813.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="Salinity.100levels.Levitus.EN4_1900estimate.200813.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/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="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="bathymetry_database" file_name="BedMachineAntarctica_and_GEBCO_2019_0.05_degree.200128.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/bathymetry_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="chlorophyllA_monthly_averages_1deg.151201.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+
+	<add_link source="../../build_mesh/culled_mesh/culled_mesh.nc" dest="mesh.nc"/>
+	<add_link source="../../build_mesh/culled_mesh/culled_graph.info" dest="graph.info"/>
+	<add_link source="../../build_mesh/culled_mesh/critical_passages_mask_final.nc" dest="critical_passages.nc"/>
+	<add_link source_path="script_core_dir" source="scripts/plots/plot_initial_state.py" dest="plot_initial_state.py"/>
+	<add_link source="../../build_mesh/culled_mesh/land_ice_mask.nc" dest="land_ice_mask.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.100levels.Levitus.EN4_1900estimate.200813.nc" dest="temperature.nc"/>
+	<add_link source_path="initial_condition_database" source="Salinity.100levels.Levitus.EN4_1900estimate.200813.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="bathymetry_database" source="BedMachineAntarctica_and_GEBCO_2019_0.05_degree.200128.nc" dest="topography.nc"/>
+	<add_link source_path="initial_condition_database" source="chlorophyllA_monthly_averages_1deg.151201.nc" dest="swData.nc"/>
+
+	<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"/>
+		<template file="template_init_with_land_ice.xml" path_base="script_configuration_dir"/>
+		<option name="config_iterative_init_variable">'landIcePressure_from_top_density'</option>
+		<option name="config_global_ocean_depth_file">'layer_depth.nc'</option>
+		<option name="config_global_ocean_minimum_depth">10</option>
+		<option name="config_global_ocean_deepen_critical_passages">.false.</option>
+		<option name="config_global_ocean_depth_conversion_factor">0.01</option>
+		<option name="config_global_ocean_tracer_depth_conversion_factor">1.0</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"/>
+		<template file="template_init_with_land_ice.xml" path_base="script_configuration_dir"/>
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="gpmetis">
+			<argument flag="graph.info">36</argument>
+		</step>
+		<model_run procs="36" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+		<step executable="./plot_initial_state.py">
+		</step>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_initial_state_64_levels.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_initial_state_64_levels.xml
new file mode 100644
index 0000000000..c5727e276f
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_initial_state_64_levels.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<config case="initial_state_64_levels">
+	<get_file dest_path="initial_condition_database" file_name="PotentialTemperature.100levels.Levitus.EN4_1900estimate.200813.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="Salinity.100levels.Levitus.EN4_1900estimate.200813.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/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="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="bathymetry_database" file_name="BedMachineAntarctica_and_GEBCO_2019_0.05_degree.200128.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/bathymetry_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="chlorophyllA_monthly_averages_1deg.151201.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+
+	<add_link source="../../build_mesh/culled_mesh/culled_mesh.nc" dest="mesh.nc"/>
+	<add_link source="../../build_mesh/culled_mesh/culled_graph.info" dest="graph.info"/>
+	<add_link source="../../build_mesh/culled_mesh/critical_passages_mask_final.nc" dest="critical_passages.nc"/>
+	<copy_file source_path="script_test_dir" source="define_vertical_grid.py" dest="define_vertical_grid.py"/>
+	<add_link source="../../build_mesh/culled_mesh/land_ice_mask.nc" dest="land_ice_mask.nc"/>
+	<add_link source_path="script_core_dir" source="scripts/vertical_grid/make_vertical_grid.py" dest="make_vertical_grid.py"/>
+	<add_link source_path="script_core_dir" source="scripts/plots/plot_initial_state.py" dest="plot_initial_state.py"/>
+	<add_link source_path="initial_condition_database" source="PotentialTemperature.100levels.Levitus.EN4_1900estimate.200813.nc" dest="temperature.nc"/>
+	<add_link source_path="initial_condition_database" source="Salinity.100levels.Levitus.EN4_1900estimate.200813.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="bathymetry_database" source="BedMachineAntarctica_and_GEBCO_2019_0.05_degree.200128.nc" dest="topography.nc"/>
+	<add_link source_path="initial_condition_database" source="chlorophyllA_monthly_averages_1deg.151201.nc" dest="swData.nc"/>
+
+	<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"/>
+		<template file="template_init_with_land_ice.xml" path_base="script_configuration_dir"/>
+		<template file="template_initial_state.xml" path_base="script_resolution_dir"/>
+		<option name="config_iterative_init_variable">'landIcePressure_from_top_density'</option>
+		<option name="config_global_ocean_depth_file">'vertical_grid.nc'</option>
+		<option name="config_global_ocean_depth_dimname">'nVertLevels'</option>
+		<option name="config_global_ocean_depth_varname">'refMidDepth'</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"/>
+		<template file="template_init_with_land_ice.xml" path_base="script_configuration_dir"/>
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="gpmetis">
+			<argument flag="graph.info">36</argument>
+		</step>
+		<step executable="./define_vertical_grid.py">
+		</step>
+		<model_run procs="36" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+		<step executable="./plot_initial_state.py">
+		</step>
+	</run_script>
+
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_prep_spin_up1.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_prep_spin_up1.xml
similarity index 86%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_prep_spin_up1.xml
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_prep_spin_up1.xml
index 23403937d6..1b6ee4ebb2 100644
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_prep_spin_up1.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_prep_spin_up1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <config case="prep_spin_up1">
-	<add_link source="../../init/ssh_adjustment/init.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="../ssh_adjustment/init.nc" dest="init.nc"/>
+	<add_link source="../initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
 
 
 	<namelist name="namelist.ocean" mode="forward">
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_simulation.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_simulation.xml
similarity index 86%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_simulation.xml
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_simulation.xml
index 09bc8b9747..fc61e64d41 100644
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up/config_simulation.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_simulation.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <config case="simulation">
-	<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="../initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
 	<add_link source="../prep_spin_up1/Restart_timestamp" dest="Restart_timestamp"/>
 	<add_link source="../prep_spin_up1/restarts" dest="restarts"/>
 
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_ssh_adjustment.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_ssh_adjustment.xml
similarity index 100%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_ssh_adjustment.xml
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/config_ssh_adjustment.xml
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/define_vertical_grid.py b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/define_vertical_grid.py
similarity index 100%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/define_vertical_grid.py
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_en4_1900/define_vertical_grid.py
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_driver.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_driver.xml
new file mode 100644
index 0000000000..2500bd8fcc
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_driver.xml
@@ -0,0 +1,19 @@
+<driver_script name="run.py">
+	<case name="initial_state">
+		<step executable="./run.py" quiet="true" pre_message=" * Initializing ocean state with bathymetry and tracers..." post_message="     complete!  Created file:  initial_state/initial_state.nc"/>
+	</case>
+	<case name="ssh_adjustment">
+		<step executable="./run.py" quiet="true" pre_message=" * Adjusting SSH for ice shelf cavities..." post_message="     complete!  Created file:  ssh_adjustment/init.nc"/>
+	</case>
+	<case name="prep_spin_up1">
+		<step executable="./run.py" quiet="true" pre_message=" * Running prep_spin_up1" post_message=" - Complete"/>
+	</case>
+	<case name="simulation">
+		<step executable="./run.py" quiet="true" pre_message=" * Running simulation" post_message=" - Complete"/>
+	</case>
+	<validation>
+		<compare_fields file1="simulation/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/EC60to30wISC/init/config_initial_state_60_layers.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_initial_state.xml
similarity index 86%
rename from testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_initial_state_60_layers.xml
rename to testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_initial_state.xml
index 0b2e114771..88eb4ac598 100644
--- a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/init/config_initial_state_60_layers.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_initial_state.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<config case="initial_state_60_levels">
+<config case="initial_state">
 	<get_file dest_path="initial_condition_database" file_name="PotentialTemperature.01.filled.60levels.PHC.151106.nc">
 		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
 	</get_file>
@@ -21,11 +21,11 @@
 	</get_file>
 
 
-	<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="../../build_mesh/culled_mesh/culled_mesh.nc" dest="mesh.nc"/>
+	<add_link source="../../build_mesh/culled_mesh/culled_graph.info" dest="graph.info"/>
+	<add_link source="../../build_mesh/culled_mesh/critical_passages_mask_final.nc" dest="critical_passages.nc"/>
 	<add_link source_path="script_core_dir" source="scripts/plots/plot_initial_state.py" dest="plot_initial_state.py"/>
-	<add_link source="../culled_mesh/land_ice_mask.nc" dest="land_ice_mask.nc"/>
+	<add_link source="../../build_mesh/culled_mesh/land_ice_mask.nc" dest="land_ice_mask.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"/>
@@ -53,9 +53,9 @@
 
 	<run_script name="run.py">
 		<step executable="gpmetis">
-			<argument flag="graph.info">4</argument>
+			<argument flag="graph.info">36</argument>
 		</step>
-		<model_run procs="4" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+		<model_run procs="36" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
 		<step executable="./plot_initial_state.py">
 		</step>
 	</run_script>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_initial_state_64_levels.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_initial_state_64_levels.xml
new file mode 100644
index 0000000000..fb4b0752d8
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_initial_state_64_levels.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<config case="initial_state_64_levels">
+	<get_file dest_path="initial_condition_database" file_name="PTemp.Jan_p3.filled.mpas100levs.160127.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="Salt.Jan_p3.noBlackCaspian.filled.mpas100levs.160127.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/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="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+	<get_file dest_path="bathymetry_database" file_name="BedMachineAntarctica_and_GEBCO_2019_0.05_degree.200128.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/bathymetry_database/"/>
+	</get_file>
+
+	<get_file dest_path="initial_condition_database" file_name="chlorophyllA_monthly_averages_1deg.151201.nc">
+		<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/initial_condition_database/"/>
+	</get_file>
+
+
+	<add_link source="../../build_mesh/culled_mesh/culled_mesh.nc" dest="mesh.nc"/>
+	<add_link source="../../build_mesh/culled_mesh/culled_graph.info" dest="graph.info"/>
+	<add_link source="../../build_mesh/culled_mesh/critical_passages_mask_final.nc" dest="critical_passages.nc"/>
+	<copy_file source_path="script_test_dir" source="define_vertical_grid.py" dest="define_vertical_grid.py"/>
+	<add_link source="../../build_mesh/culled_mesh/land_ice_mask.nc" dest="land_ice_mask.nc"/>
+	<add_link source_path="script_core_dir" source="scripts/vertical_grid/make_vertical_grid.py" dest="make_vertical_grid.py"/>
+	<add_link source_path="script_core_dir" source="scripts/plots/plot_initial_state.py" dest="plot_initial_state.py"/>
+	<add_link source_path="initial_condition_database" source="PTemp.Jan_p3.filled.mpas100levs.160127.nc" dest="temperature.nc"/>
+	<add_link source_path="initial_condition_database" source="Salt.Jan_p3.noBlackCaspian.filled.mpas100levs.160127.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="bathymetry_database" source="BedMachineAntarctica_and_GEBCO_2019_0.05_degree.200128.nc" dest="topography.nc"/>
+	<add_link source_path="initial_condition_database" source="chlorophyllA_monthly_averages_1deg.151201.nc" dest="swData.nc"/>
+
+	<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"/>
+		<template file="template_init_with_land_ice.xml" path_base="script_configuration_dir"/>
+		<template file="template_initial_state.xml" path_base="script_resolution_dir"/>
+		<option name="config_iterative_init_variable">'landIcePressure_from_top_density'</option>
+		<option name="config_global_ocean_depth_file">'vertical_grid.nc'</option>
+		<option name="config_global_ocean_depth_dimname">'nVertLevels'</option>
+		<option name="config_global_ocean_depth_varname">'refMidDepth'</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"/>
+		<template file="template_init_with_land_ice.xml" path_base="script_configuration_dir"/>
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="gpmetis">
+			<argument flag="graph.info">36</argument>
+		</step>
+		<step executable="./define_vertical_grid.py">
+		</step>
+		<model_run procs="36" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+		<step executable="./plot_initial_state.py">
+		</step>
+	</run_script>
+
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_prep_spin_up1.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_prep_spin_up1.xml
new file mode 100644
index 0000000000..1b6ee4ebb2
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_prep_spin_up1.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<config case="prep_spin_up1">
+	<add_link source="../ssh_adjustment/init.nc" dest="init.nc"/>
+	<add_link source="../initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+
+
+	<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-10_00:00:00'</option>
+		<option name="config_dt">'00:20:00'</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-10_00:00:00</attribute>
+		</stream>
+
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+		<template file="template_forward.xml" path_base="script_configuration_dir"/>
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="gpmetis">
+			<argument flag="graph.info">144</argument>
+		</step>
+
+		<model_run procs="144" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_simulation.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_simulation.xml
new file mode 100644
index 0000000000..fc61e64d41
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_simulation.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<config case="simulation">
+	<add_link source="../initial_state/initial_state.nc" dest="init.nc"/>
+	<add_link source="../initial_state/graph.info" dest="graph.info"/>
+	<add_link source="../initial_state/init_mode_forcing_data.nc" dest="forcing_data.nc"/>
+	<add_link source="../prep_spin_up1/Restart_timestamp" dest="Restart_timestamp"/>
+	<add_link source="../prep_spin_up1/restarts" dest="restarts"/>
+
+
+	<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-10_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-00-10_00:00:00</attribute>
+		</stream>
+
+		<template file="global_stats.xml" path_base="script_core_dir" path="templates/analysis_members"/>
+		<template file="template_forward.xml" path_base="script_configuration_dir"/>
+	</streams>
+
+	<run_script name="run.py">
+		<step executable="gpmetis">
+			<argument flag="graph.info">144</argument>
+		</step>
+
+		<model_run procs="144" threads="1" namelist="namelist.ocean" streams="streams.ocean"/>
+	</run_script>
+</config>
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_ssh_adjustment.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_ssh_adjustment.xml
new file mode 120000
index 0000000000..0c75d94e97
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/config_ssh_adjustment.xml
@@ -0,0 +1 @@
+../../config_files_ISC/config_ssh_adjustment.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/define_vertical_grid.py b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/define_vertical_grid.py
new file mode 120000
index 0000000000..4e1cac8e2b
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/EC60to30wISC/spin_up_phc/define_vertical_grid.py
@@ -0,0 +1 @@
+../../../scripts/vertical_grid/define_vertical_grid_64_layers.py
\ No newline at end of file