Skip to content

Switch global ocean forward steps to use graph.info from initial state, not mesh #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 10, 2021
Merged

Switch global ocean forward steps to use graph.info from initial state, not mesh #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8890924
Add graph.info as an output in initial_state
xylar Aug 9, 2021
810c225
Switch to graph.info from initial_state in forward steps
xylar Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions compass/ocean/tests/global_ocean/forward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,34 +88,32 @@ def __init__(self, test_case, mesh, init, time_integrator, name='forward',
mesh_package = mesh.mesh_step.package
mesh_package_contents = list(contents(mesh_package))
mesh_namelists = ['namelist.forward',
'namelist.{}'.format(time_integrator.lower())]
f'namelist.{time_integrator.lower()}']
for mesh_namelist in mesh_namelists:
if mesh_namelist in mesh_package_contents:
self.add_namelist_file(mesh_package, mesh_namelist)

mesh_streams = ['streams.forward',
'streams.{}'.format(time_integrator.lower())]
f'streams.{time_integrator.lower()}']
for mesh_stream in mesh_streams:
if mesh_stream in mesh_package_contents:
self.add_streams_file(mesh_package, mesh_stream)

mesh_path = mesh.mesh_step.path

if mesh.with_ice_shelf_cavities:
initial_state_target = '{}/ssh_adjustment/adjusted_init.nc'.format(
init.path)
initial_state_target = \
f'{init.path}/ssh_adjustment/adjusted_init.nc'
else:
initial_state_target = '{}/initial_state/initial_state.nc'.format(
init.path)
initial_state_target = \
f'{init.path}/initial_state/initial_state.nc'
self.add_input_file(filename='init.nc',
work_dir_target=initial_state_target)
self.add_input_file(
filename='forcing_data.nc',
work_dir_target='{}/initial_state/init_mode_forcing_data.nc'
''.format(init.path))
work_dir_target=f'{init.path}/initial_state/'
f'init_mode_forcing_data.nc')
self.add_input_file(
filename='graph.info',
work_dir_target='{}/culled_graph.info'.format(mesh_path))
work_dir_target=f'{init.path}/initial_state/graph.info')
Comment on lines -118 to +116
Copy link
Collaborator Author

@xylar xylar Aug 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the other main change.


self.add_model_as_input()

Expand Down Expand Up @@ -223,7 +221,6 @@ def get_forward_subdir(init_subdir, time_integrator, name):
elif time_integrator == 'RK4':
subdir = os.path.join(init_subdir, time_integrator, name)
else:
raise ValueError('Unexpected time integrator {}'.format(
time_integrator))
raise ValueError(f'Unexpected time integrator {time_integrator}')

return subdir
17 changes: 8 additions & 9 deletions compass/ocean/tests/global_ocean/init/initial_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ def __init__(self, test_case, mesh, initial_condition, with_bgc):
Whether to include biogeochemistry (BGC) in the initial condition
"""
if initial_condition not in ['PHC', 'EN4_1900']:
raise ValueError('Unknown initial_condition {}'.format(
initial_condition))
raise ValueError(f'Unknown initial_condition {initial_condition}')

super().__init__(test_case=test_case, name='initial_state')
self.mesh = mesh
Expand All @@ -51,7 +50,7 @@ def __init__(self, test_case, mesh, initial_condition, with_bgc):
# generate the namelist, replacing a few default options
self.add_namelist_file(package, 'namelist.init', mode='init')
self.add_namelist_file(
package, 'namelist.{}'.format(initial_condition.lower()),
package, f'namelist.{initial_condition.lower()}',
mode='init')
if mesh.with_ice_shelf_cavities:
self.add_namelist_file(package, 'namelist.wisc', mode='init')
Expand Down Expand Up @@ -115,25 +114,25 @@ def __init__(self, test_case, mesh, initial_condition, with_bgc):

self.add_input_file(
filename='mesh.nc',
work_dir_target='{}/culled_mesh.nc'.format(mesh_path))
work_dir_target=f'{mesh_path}/culled_mesh.nc')

self.add_input_file(
filename='critical_passages.nc',
work_dir_target='{}/critical_passages_mask_final.nc'.format(
mesh_path))
work_dir_target=f'{mesh_path}/critical_passages_mask_final.nc')

self.add_input_file(
filename='graph.info',
work_dir_target='{}/culled_graph.info'.format(mesh_path))
work_dir_target=f'{mesh_path}/culled_graph.info')

if mesh.with_ice_shelf_cavities:
self.add_input_file(
filename='land_ice_mask.nc',
work_dir_target='{}/land_ice_mask.nc'.format(mesh_path))
work_dir_target=f'{mesh_path}/land_ice_mask.nc')

self.add_model_as_input()

for file in ['initial_state.nc', 'init_mode_forcing_data.nc']:
for file in ['initial_state.nc', 'init_mode_forcing_data.nc',
'graph.info']:
Comment on lines -136 to +135
Copy link
Collaborator Author

@xylar xylar Aug 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is one of two main change.

self.add_output_file(filename=file)

def setup(self):
Expand Down