Skip to content

Map time integrator for convergence tests #239

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
Oct 31, 2024
Merged

Map time integrator for convergence tests #239

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
3ccb2a2
Revert config change in task
cbegeman Oct 22, 2024
b25f885
Add namelist change in framework
cbegeman Oct 22, 2024
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
11 changes: 10 additions & 1 deletion polaris/ocean/convergence/forward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ def dynamic_model_config(self, at_setup):
section = config['convergence_forward']

time_integrator = section.get('time_integrator')

# dt is proportional to resolution: default 30 seconds per km
if time_integrator == 'RK4':
dt_per_km = section.getfloat('rk4_dt_per_km')
Expand All @@ -139,6 +138,16 @@ def dynamic_model_config(self, at_setup):
output_interval_str = get_time_interval_string(
seconds=output_interval * s_per_hour)

time_integrator_map = dict([('RK4', 'RungeKutta4')])
model = config.get('ocean', 'model')
if model == 'omega':
if time_integrator in time_integrator_map.keys():
time_integrator = time_integrator_map[time_integrator]
else:
print('Warning: mapping from time integrator '
f'{time_integrator} to omega not found, '
'retaining name given in config')

replacements = dict(
time_integrator=time_integrator,
dt=dt_str,
Expand Down
10 changes: 0 additions & 10 deletions polaris/ocean/tasks/manufactured_solution/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,3 @@ def __init__(self, component):
self.config.add_from_package(
'polaris.ocean.tasks.manufactured_solution',
'manufactured_solution.cfg')

def configure(self):
"""
Set omega default config options
"""
super().configure()
config = self.config
model = config.get('ocean', 'model')
if model == 'omega':
config.set('convergence_forward', 'time_integrator', 'RungeKutta4')
Loading