From 4801bfcbcb239df093eed78566f0e91a3e24ec33 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Thu, 12 Aug 2021 08:40:00 +0200
Subject: [PATCH] Remove critical_passages stream from initial_state

We do not deepen critical passages in any mesh configuration,
so the critical_passages mask is not needed during init. Requiring
the file in `stream.ocean` makes it difficult to swap the mesh
used in `initial_state` for another mesh (e.g. one generated on
a different machine or with a previous version of compass).
---
 compass/ocean/tests/global_ocean/init/initial_state.py | 4 ----
 compass/ocean/tests/global_ocean/init/streams.init     | 9 ---------
 2 files changed, 13 deletions(-)

diff --git a/compass/ocean/tests/global_ocean/init/initial_state.py b/compass/ocean/tests/global_ocean/init/initial_state.py
index 1f3575ed67..f9e3d7644c 100644
--- a/compass/ocean/tests/global_ocean/init/initial_state.py
+++ b/compass/ocean/tests/global_ocean/init/initial_state.py
@@ -116,10 +116,6 @@ def __init__(self, test_case, mesh, initial_condition, with_bgc):
             filename='mesh.nc',
             work_dir_target=f'{mesh_path}/culled_mesh.nc')
 
-        self.add_input_file(
-            filename='critical_passages.nc',
-            work_dir_target=f'{mesh_path}/critical_passages_mask_final.nc')
-
         self.add_input_file(
             filename='graph.info',
             work_dir_target=f'{mesh_path}/culled_graph.info')
diff --git a/compass/ocean/tests/global_ocean/init/streams.init b/compass/ocean/tests/global_ocean/init/streams.init
index befb0b6c67..342d69ca0f 100644
--- a/compass/ocean/tests/global_ocean/init/streams.init
+++ b/compass/ocean/tests/global_ocean/init/streams.init
@@ -77,13 +77,4 @@
     <var name="xtime"/>
 </stream>
 
-<stream name="critical_passages"
-        filename_template="critical_passages.nc"
-        input_interval="initial_only"
-        type="input">
-
-    <var name="transectCellMasks"/>
-    <var name="depthTransects"/>
-</stream>
-
 </streams>