From e33e14a9dec59b848f035f40e57eb99dbddba26c Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 30 Nov 2023 13:06:59 -0700 Subject: [PATCH] Fix shared topo config name --- polaris/ocean/tasks/isomip_plus/__init__.py | 2 +- polaris/ocean/tasks/isomip_plus/mesh/cull.py | 2 +- polaris/ocean/tasks/isomip_plus/mesh/planar.py | 2 +- polaris/ocean/tasks/isomip_plus/topo/map.py | 2 +- polaris/ocean/tasks/isomip_plus/topo/remap.py | 2 +- polaris/ocean/tasks/isomip_plus/topo/scale.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/polaris/ocean/tasks/isomip_plus/__init__.py b/polaris/ocean/tasks/isomip_plus/__init__.py index aecf56133..f2636507f 100644 --- a/polaris/ocean/tasks/isomip_plus/__init__.py +++ b/polaris/ocean/tasks/isomip_plus/__init__.py @@ -72,7 +72,7 @@ def _get_shared_steps(mesh_type, resolution, mesh_name, resdir, component, base_mesh = SphericalMesh(component=component, cell_width=resolution, subdir=subdir) - base_mesh.config = config + base_mesh.set_shared_config(config, link='isomip_plus_topo.cfg') subdir = f'{resdir}/topo/map_base' # we remap the topography onto the base mesh without smoothing and with diff --git a/polaris/ocean/tasks/isomip_plus/mesh/cull.py b/polaris/ocean/tasks/isomip_plus/mesh/cull.py index bb516e10e..08cd19363 100644 --- a/polaris/ocean/tasks/isomip_plus/mesh/cull.py +++ b/polaris/ocean/tasks/isomip_plus/mesh/cull.py @@ -50,7 +50,7 @@ def __init__(self, component, subdir, config, base_mesh, topo_remap): super().__init__(component=component, name='cull_mesh', subdir=subdir) self.base_mesh = base_mesh self.topo_remap = topo_remap - self.set_shared_config(config, link='isomip_plus.cfg') + self.set_shared_config(config, link='isomip_plus_topo.cfg') base_path = base_mesh.path target = os.path.join(base_path, 'base_mesh.nc') diff --git a/polaris/ocean/tasks/isomip_plus/mesh/planar.py b/polaris/ocean/tasks/isomip_plus/mesh/planar.py index 6323aa2ad..a23a14402 100644 --- a/polaris/ocean/tasks/isomip_plus/mesh/planar.py +++ b/polaris/ocean/tasks/isomip_plus/mesh/planar.py @@ -41,7 +41,7 @@ def __init__(self, component, resolution, subdir, config): super().__init__(component=component, name='base_mesh', subdir=subdir) self.resolution = resolution - self.set_shared_config(config, link='isomip_plus.cfg') + self.set_shared_config(config, link='isomip_plus_topo.cfg') self.add_output_file('base_mesh.nc') diff --git a/polaris/ocean/tasks/isomip_plus/topo/map.py b/polaris/ocean/tasks/isomip_plus/topo/map.py index 8d5c935ee..586039934 100644 --- a/polaris/ocean/tasks/isomip_plus/topo/map.py +++ b/polaris/ocean/tasks/isomip_plus/topo/map.py @@ -55,7 +55,7 @@ def __init__(self, component, name, subdir, config, mesh_name, mesh_step, self.mesh_name = mesh_name self.method = method self.smooth = smooth - self.set_shared_config(config, link='isomip_plus.cfg') + self.set_shared_config(config, link='isomip_plus_topo.cfg') # since all geometry is on the same mesh, we'll use Ocean1 here geom_filename = 'Ocean1_input_geom_v1.01.nc' diff --git a/polaris/ocean/tasks/isomip_plus/topo/remap.py b/polaris/ocean/tasks/isomip_plus/topo/remap.py index 9d11a2cda..0ec4cc966 100644 --- a/polaris/ocean/tasks/isomip_plus/topo/remap.py +++ b/polaris/ocean/tasks/isomip_plus/topo/remap.py @@ -39,7 +39,7 @@ def __init__(self, component, name, subdir, config, topo_map, experiment): """ super().__init__(component=component, name=name, subdir=subdir) - self.set_shared_config(config, link='isomip_plus.cfg') + self.set_shared_config(config, link='isomip_plus_topo.cfg') geom_filenames = dict( ocean1='Ocean1_input_geom_v1.01.nc', diff --git a/polaris/ocean/tasks/isomip_plus/topo/scale.py b/polaris/ocean/tasks/isomip_plus/topo/scale.py index edca56a14..e02a0f6da 100644 --- a/polaris/ocean/tasks/isomip_plus/topo/scale.py +++ b/polaris/ocean/tasks/isomip_plus/topo/scale.py @@ -44,7 +44,7 @@ def __init__(self, component, subdir, config, topo_remap, experiment): super().__init__(component=component, name='topo_scale', subdir=subdir) self.experiment = experiment - self.set_shared_config(config, link='isomip_plus.cfg') + self.set_shared_config(config, link='isomip_plus_topo.cfg') topo_filename = os.path.join(topo_remap.path, 'topography_remapped.nc') self.add_input_file(filename='topography_unscaled.nc',