From fb0be0a40ab6ebfd444d37e79614b80e7539a3c0 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Thu, 16 Mar 2023 11:56:04 +0100
Subject: [PATCH] Use remapped topography in global_ocean init

---
 .../tests/global_ocean/init/initial_state.py  | 24 +++++++++++++++----
 .../tests/global_ocean/init/streams.topo      | 15 ++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 compass/ocean/tests/global_ocean/init/streams.topo

diff --git a/compass/ocean/tests/global_ocean/init/initial_state.py b/compass/ocean/tests/global_ocean/init/initial_state.py
index 0449148c91..92153c0ad8 100644
--- a/compass/ocean/tests/global_ocean/init/initial_state.py
+++ b/compass/ocean/tests/global_ocean/init/initial_state.py
@@ -1,3 +1,4 @@
+import os
 from importlib.resources import contents
 
 from compass.model import run_model
@@ -79,10 +80,25 @@ def __init__(self, test_case, mesh, initial_condition, with_bgc):
         if mesh_streams in mesh_package_contents:
             self.add_streams_file(mesh_package, mesh_streams, mode='init')
 
-        self.add_input_file(
-            filename='topography.nc',
-            target='BedMachineAntarctica_v2_and_GEBCO_2022_0.05_degree_20220729.nc',  # noqa: E501
-            database='bathymetry_database')
+        if 'remap_topography' in self.mesh.steps:
+            options = {
+                'config_global_ocean_topography_source': "'mpas_variable'",
+                'config_global_ocean_land_ice_topo_source': "'mpas_variable'"
+            }
+            self.add_namelist_options(options, mode='init')
+            self.add_streams_file(package, 'streams.topo', mode='init')
+
+            cull_step = self.mesh.steps['cull_mesh']
+            target = os.path.join(cull_step.path, 'topography_culled.nc')
+            self.add_input_file(filename='topography.nc',
+                                work_dir_target=target)
+
+        else:
+            target = 'BedMachineAntarctica_v2_and_GEBCO_2022_0.05_degree_20220729.nc'  # noqa: E501
+            self.add_input_file(
+                filename='topography.nc',
+                target=target,
+                database='bathymetry_database')
 
         self.add_input_file(
             filename='wind_stress.nc',
diff --git a/compass/ocean/tests/global_ocean/init/streams.topo b/compass/ocean/tests/global_ocean/init/streams.topo
new file mode 100644
index 0000000000..64ec8f1f64
--- /dev/null
+++ b/compass/ocean/tests/global_ocean/init/streams.topo
@@ -0,0 +1,15 @@
+<streams>
+<stream name="topography"
+        type="input"
+        filename_template="topography.nc"
+        input_interval="initial_only" >
+
+	<var name="bed_elevation"/>
+	<var name="landIceDraftObserved"/>
+	<var name="landIceThkObserved"/>
+	<var name="landIceFracObserved"/>
+	<var name="landIceGroundedFracObserved"/>
+	<var name="oceanFracObserved"/>
+</stream>
+
+</streams>