Skip to content

Commit

Permalink
Fix shared topo config name
Browse files Browse the repository at this point in the history
  • Loading branch information
xylar committed Nov 30, 2023
1 parent e4bd4e8 commit e33e14a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion polaris/ocean/tasks/isomip_plus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion polaris/ocean/tasks/isomip_plus/mesh/cull.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion polaris/ocean/tasks/isomip_plus/mesh/planar.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion polaris/ocean/tasks/isomip_plus/topo/map.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion polaris/ocean/tasks/isomip_plus/topo/remap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion polaris/ocean/tasks/isomip_plus/topo/scale.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit e33e14a

Please sign in to comment.