diff --git a/testing_and_setup/compass/README_ocean.md b/testing_and_setup/compass/README_ocean.md
index b632fe89c7..a0b8411223 100644
--- a/testing_and_setup/compass/README_ocean.md
+++ b/testing_and_setup/compass/README_ocean.md
@@ -6,11 +6,11 @@ To set up and run ocean test cases from COMPASS, you will need a conda
environment. First, install Miniconda3 (if miniconda is not already
installed), then create a new conda environment as follows:
``` bash
-conda create -n compass_0.1.6 -c conda-forge -c e3sm python=3.7 compass=0.1.6
+conda create -n compass_0.1.8 -c conda-forge -c e3sm python=3.7 compass=0.1.8
```
Each time you want to work with COMPASS, you will need to run:
```
-conda activate compass_0.1.6
+conda activate compass_0.1.8
```
An appropriate conda environment is already available on Los Alamos National
diff --git a/testing_and_setup/compass/load_compass_env.sh b/testing_and_setup/compass/load_compass_env.sh
index 54043dc1f1..dc924a679e 100644
--- a/testing_and_setup/compass/load_compass_env.sh
+++ b/testing_and_setup/compass/load_compass_env.sh
@@ -1,4 +1,4 @@
-version=0.1.6
+version=0.1.8
# The rest of the script should not need to be modified
if [[ $HOSTNAME = "cori"* ]] || [[ $HOSTNAME = "dtn"* ]]; then
diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini
index 3ec9d23fea..d175d597b0 100644
--- a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini
+++ b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.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/test_final_settings/restarts/restart.0001-01-31_00.00.00.nc
[mesh]
short_name = ${prefix}${min_res}to${max_res}E${e3sm_version}r${mesh_version}
@@ -14,9 +14,9 @@ prefix = WC
description = MPAS North America and Arctic Focused Water Cycle mesh for E3SM version
${e3sm_version}, with a focused ${min_res}-km resolution
around North America and ${levels} vertical levels as documented at
- https://github.com/MPAS-Dev/MPAS-Model/pull/584
+ https://github.com/MPAS-Dev/MPAS-Model/pull/628
e3sm_version = 2
-mesh_version = 02
+mesh_version = 03
creation_date = autodetect
min_res = 14
max_res = 60
diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml
deleted file mode 120000
index 5c7c5154d7..0000000000
--- a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files/config_initial_state.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml
new file mode 100644
index 0000000000..696fd50d5c
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 36
+
+
+
+
+
+
diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_60_layers.xml b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_60_layers.xml
deleted file mode 120000
index 708f1da2f9..0000000000
--- a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_60_layers.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../config_files/config_initial_state_60_layers.xml
\ No newline at end of file
diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_64_layers.xml b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_64_layers.xml
new file mode 100644
index 0000000000..7872bfa5f2
--- /dev/null
+++ b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_64_layers.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+
+
+
+
+
+
+
+
+
diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/define_base_mesh.py b/testing_and_setup/compass/ocean/global_ocean/WC14/init/define_base_mesh.py
index f26fac66c1..f4215d0b93 100755
--- a/testing_and_setup/compass/ocean/global_ocean/WC14/init/define_base_mesh.py
+++ b/testing_and_setup/compass/ocean/global_ocean/WC14/init/define_base_mesh.py
@@ -186,10 +186,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/WC14/spin_up/config_test_final_settings.xml b/testing_and_setup/compass/ocean/global_ocean/WC14/spin_up/config_test_final_settings.xml
index 471df12bd3..dac955ff04 100644
--- a/testing_and_setup/compass/ocean/global_ocean/WC14/spin_up/config_test_final_settings.xml
+++ b/testing_and_setup/compass/ocean/global_ocean/WC14/spin_up/config_test_final_settings.xml
@@ -11,7 +11,7 @@
-
+
@@ -29,7 +29,7 @@
00-00-10_00:00:00
- 00-01-00_00:00:00
+ 00-00-06_00:00:00