From a534df310d711ca7791e38331dc89c41f891b96a Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Mon, 1 Jul 2024 09:50:34 -0500 Subject: [PATCH] Fix initial state filename in files for E3SM Following https://github.com/MPAS-Dev/compass/pull/813, the initial state is the same whether ice shelf cavities are present or not. It is the result of the `init/initial_state` step --- .../ocean/tests/global_ocean/files_for_e3sm/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/compass/ocean/tests/global_ocean/files_for_e3sm/__init__.py b/compass/ocean/tests/global_ocean/files_for_e3sm/__init__.py index 211bccd520..afa6ead955 100644 --- a/compass/ocean/tests/global_ocean/files_for_e3sm/__init__.py +++ b/compass/ocean/tests/global_ocean/files_for_e3sm/__init__.py @@ -162,12 +162,8 @@ def configure(self): base_mesh_filename) if init is not None: - if mesh.with_ice_shelf_cavities: - initial_state_filename = \ - f'{init.path}/ssh_adjustment/adjusted_init.nc' - else: - initial_state_filename = \ - f'{init.path}/initial_state/initial_state.nc' + initial_state_filename = \ + f'{init.path}/initial_state/initial_state.nc' initial_state_filename = os.path.join(self.base_work_dir, initial_state_filename) config.set('files_for_e3sm', 'ocean_initial_state_filename',