diff --git a/compass/ocean/tests/global_ocean/mesh/qu/dynamic_adjustment/__init__.py b/compass/ocean/tests/global_ocean/mesh/qu/dynamic_adjustment/__init__.py index 5a6b10859b..d453f0f720 100644 --- a/compass/ocean/tests/global_ocean/mesh/qu/dynamic_adjustment/__init__.py +++ b/compass/ocean/tests/global_ocean/mesh/qu/dynamic_adjustment/__init__.py @@ -28,7 +28,8 @@ def __init__(self, test_group, mesh, init, time_integrator): time_integrator : {'split_explicit', 'RK4'} The time integrator to use for the forward run """ - restart_times = ['0001-01-02_00:00:00', '0001-01-03_00:00:00'] + restart_times = ['0001-01-11_00:00:00', '0001-01-21_00:00:00', + '0001-01-31_00:00:00'] restart_filenames = [ f'restarts/rst.{restart_time.replace(":", ".")}.nc' for restart_time in restart_times] @@ -52,21 +53,44 @@ def __init__(self, test_group, mesh, init, time_integrator): subdir=step_name, get_dt_from_min_res=True) namelist_options = { - 'config_run_duration': "'00-00-01_00:00:00'", + 'config_run_duration': "'00-00-10_00:00:00'", 'config_implicit_bottom_drag_type': "'constant_and_rayleigh'", 'config_Rayleigh_damping_coeff': '1.0e-4'} namelist_options.update(shared_options) step.add_namelist_options(namelist_options) stream_replacements = { - 'output_interval': '00-00-01_00:00:00', - 'restart_interval': '00-00-01_00:00:00'} + 'output_interval': '00-00-10_00:00:00', + 'restart_interval': '00-00-10_00:00:00'} step.add_streams_file(module, 'streams.template', template_replacements=stream_replacements) step.add_output_file(filename=f'../{restart_filenames[0]}') self.add_step(step) + # second step + step_name = 'damped_adjustment_2' + step = ForwardStep(test_case=self, mesh=mesh, init=init, + time_integrator=time_integrator, name=step_name, + subdir=step_name, get_dt_from_min_res=True) + + namelist_options = { + 'config_run_duration': "'00-00-10_00:00:00'", + 'config_implicit_bottom_drag_type': "'constant_and_rayleigh'", + 'config_Rayleigh_damping_coeff': '1.0e-5'} + namelist_options.update(shared_options) + step.add_namelist_options(namelist_options) + + stream_replacements = { + 'output_interval': '00-00-10_00:00:00', + 'restart_interval': '00-00-10_00:00:00'} + step.add_streams_file(module, 'streams.template', + template_replacements=stream_replacements) + + step.add_input_file(filename=f'../{restart_filenames[0]}') + step.add_output_file(filename=f'../{restart_filenames[1]}') + self.add_step(step) + # final step step_name = 'simulation' step = ForwardStep(test_case=self, mesh=mesh, init=init, @@ -74,19 +98,19 @@ def __init__(self, test_group, mesh, init, time_integrator): subdir=step_name, get_dt_from_min_res=True) namelist_options = { - 'config_run_duration': "'00-00-01_00:00:00'", + 'config_run_duration': "'00-00-10_00:00:00'", 'config_do_restart': '.true.', - 'config_start_time': f"'{restart_times[0]}'"} + 'config_start_time': f"'{restart_times[1]}'"} namelist_options.update(shared_options) step.add_namelist_options(namelist_options) stream_replacements = { - 'output_interval': '00-00-01_00:00:00', - 'restart_interval': '00-00-01_00:00:00'} + 'output_interval': '00-00-10_00:00:00', + 'restart_interval': '00-00-10_00:00:00'} step.add_streams_file(module, 'streams.template', template_replacements=stream_replacements) - step.add_input_file(filename=f'../{restart_filenames[0]}') - step.add_output_file(filename=f'../{restart_filenames[1]}') + step.add_input_file(filename=f'../{restart_filenames[1]}') + step.add_output_file(filename=f'../{restart_filenames[2]}') step.add_output_file(filename='output.nc') self.add_step(step)