Skip to content

Commit a49657f

Browse files
trhilletrhille
committed
Use RK2 time integration
Use RK2 time integration with all tests in fct_integration suite.
1 parent 0b17b35 commit a49657f

10 files changed

Lines changed: 45 additions & 26 deletions

File tree

‎compass/landice/tests/dome/decomposition_test/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ def __init__(self, test_group, velo_solver, mesh_type, advection_type):
5959
if advection_type == 'fct':
6060
step.add_namelist_options(
6161
{'config_thickness_advection': "'fct'",
62-
'config_tracer_advection': "'fct'"},
62+
'config_tracer_advection': "'fct'",
63+
'config_time_integration': "'runge_kutta'"},
6364
out_name='namelist.landice')
6465
self.add_step(step)
6566

‎compass/landice/tests/dome/restart_test/__init__.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ def __init__(self, test_group, velo_solver, mesh_type, advection_type):
6262
if advection_type == 'fct':
6363
step.add_namelist_options(
6464
{'config_thickness_advection': "'fct'",
65-
'config_tracer_advection': "'fct'"},
65+
'config_tracer_advection': "'fct'",
66+
'config_time_integration': "'runge_kutta'"},
6667
out_name='namelist.landice')
6768

6869
step.add_streams_file(
@@ -90,7 +91,8 @@ def __init__(self, test_group, velo_solver, mesh_type, advection_type):
9091
if advection_type == 'fct':
9192
step.add_namelist_options(
9293
{'config_thickness_advection': "'fct'",
93-
'config_tracer_advection': "'fct'"},
94+
'config_tracer_advection': "'fct'",
95+
'config_time_integration': "'runge_kutta'"},
9496
out_name='namelist.landice')
9597

9698
step.add_streams_file(
@@ -104,7 +106,8 @@ def __init__(self, test_group, velo_solver, mesh_type, advection_type):
104106
if advection_type == 'fct':
105107
step.add_namelist_options(
106108
{'config_thickness_advection': "'fct'",
107-
'config_tracer_advection': "'fct'"},
109+
'config_tracer_advection': "'fct'",
110+
'config_time_integration': "'runge_kutta'"},
108111
out_name='namelist.landice.rst')
109112

110113
step.add_streams_file(

‎compass/landice/tests/dome/smoke_test/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ def __init__(self, test_group, velo_solver, mesh_type, advection_type):
6060
if advection_type == 'fct':
6161
step.add_namelist_options(
6262
{'config_thickness_advection': "'fct'",
63-
'config_tracer_advection': "'fct'"})
63+
'config_tracer_advection': "'fct'",
64+
'config_time_integration': "'runge_kutta'"})
6465
self.add_step(step)
6566

6667
step = Visualize(test_case=self, mesh_type=mesh_type)

‎compass/landice/tests/greenland/decomposition_test/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ def configure(self):
8080
if self.advection_type == 'fct':
8181
step.add_namelist_options(
8282
{'config_thickness_advection': "'fct'",
83-
'config_tracer_advection': "'fct'"},
83+
'config_tracer_advection': "'fct'",
84+
'config_time_integration': "'runge_kutta'"},
8485
out_name='namelist.landice')
8586
self.add_step(step)
8687

‎compass/landice/tests/greenland/restart_test/__init__.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ def __init__(self, test_group, velo_solver, advection_type):
4848
if advection_type == 'fct':
4949
step.add_namelist_options(
5050
{'config_thickness_advection': "'fct'",
51-
'config_tracer_advection': "'fct'"},
51+
'config_tracer_advection': "'fct'",
52+
'config_time_integration': "'runge_kutta'"},
5253
out_name='namelist.landice')
5354
step.add_streams_file(
5455
'compass.landice.tests.greenland.restart_test',
@@ -67,7 +68,8 @@ def __init__(self, test_group, velo_solver, advection_type):
6768
if advection_type == 'fct':
6869
step.add_namelist_options(
6970
{'config_thickness_advection': "'fct'",
70-
'config_tracer_advection': "'fct'"},
71+
'config_tracer_advection': "'fct'",
72+
'config_time_integration': "'runge_kutta'"},
7173
out_name='namelist.landice')
7274
step.add_streams_file(
7375
'compass.landice.tests.greenland.restart_test',
@@ -79,7 +81,8 @@ def __init__(self, test_group, velo_solver, advection_type):
7981
if advection_type == 'fct':
8082
step.add_namelist_options(
8183
{'config_thickness_advection': "'fct'",
82-
'config_tracer_advection': "'fct'"},
84+
'config_tracer_advection': "'fct'",
85+
'config_time_integration': "'runge_kutta'"},
8386
out_name='namelist.landice.rst')
8487
# same streams file for both restart stages
8588
step.add_streams_file(

‎compass/landice/tests/greenland/smoke_test/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ def __init__(self, test_group, velo_solver, advection_type):
4040
if advection_type == 'fct':
4141
step.add_namelist_options(
4242
{'config_thickness_advection': "'fct'",
43-
'config_tracer_advection': "'fct'"},
43+
'config_tracer_advection': "'fct'",
44+
'config_time_integration': "'runge_kutta'"},
4445
out_name='namelist.landice')
4546
self.add_step(step)
4647

‎compass/landice/tests/humboldt/decomposition_test/__init__.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,21 @@ def configure(self):
138138
if name in self.run_dirs:
139139
name = '{}_{}'.format(name, len(self.run_dirs) + 1)
140140
self.run_dirs.append(name)
141-
step = RunModel(test_case=self, name=name, subdir=name, ntasks=procs,
141+
step = RunModel(test_case=self, name=name, subdir=name,
142+
ntasks=procs,
142143
min_tasks=procs,
143-
openmp_threads=1, velo_solver=self.velo_solver,
144-
calving_law=self.calving_law,
145-
damage=self.damage,
146-
face_melt=self.face_melt,
147-
depth_integrated=self.depth_integrated,
148-
hydro=self.hydro,
149-
mesh_type=self.mesh_type)
144+
openmp_threads=1, velo_solver=self.velo_solver,
145+
calving_law=self.calving_law,
146+
damage=self.damage,
147+
face_melt=self.face_melt,
148+
depth_integrated=self.depth_integrated,
149+
hydro=self.hydro,
150+
mesh_type=self.mesh_type)
150151
if self.advection_type == 'fct':
151152
step.add_namelist_options(
152153
{'config_thickness_advection': "'fct'",
153-
'config_tracer_advection': "'fct'"},
154+
'config_tracer_advection': "'fct'",
155+
'config_time_integration': "'runge_kutta'"},
154156
out_name='namelist.landice')
155157
self.add_step(step)
156158

‎compass/landice/tests/humboldt/restart_test/__init__.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ def __init__(self, test_group, velo_solver, calving_law, mesh_type,
127127
if advection_type == 'fct':
128128
step.add_namelist_options(
129129
{'config_thickness_advection': "'fct'",
130-
'config_tracer_advection': "'fct'"},
130+
'config_tracer_advection': "'fct'",
131+
'config_time_integration': "'runge_kutta'"},
131132
out_name='namelist.landice')
132133
step.add_streams_file(
133134
'compass.landice.tests.humboldt.restart_test',
@@ -162,7 +163,8 @@ def __init__(self, test_group, velo_solver, calving_law, mesh_type,
162163
if advection_type == 'fct':
163164
step.add_namelist_options(
164165
{'config_thickness_advection': "'fct'",
165-
'config_tracer_advection': "'fct'"},
166+
'config_tracer_advection': "'fct'",
167+
'config_time_integration': "'runge_kutta'"},
166168
out_name='namelist.landice')
167169
step.add_streams_file(
168170
'compass.landice.tests.humboldt.restart_test',
@@ -174,7 +176,8 @@ def __init__(self, test_group, velo_solver, calving_law, mesh_type,
174176
if advection_type == 'fct':
175177
step.add_namelist_options(
176178
{'config_thickness_advection': "'fct'",
177-
'config_tracer_advection': "'fct'"},
179+
'config_tracer_advection': "'fct'",
180+
'config_time_integration': "'runge_kutta'"},
178181
out_name='namelist.landice.rst')
179182
step.add_streams_file(
180183
'compass.landice.tests.humboldt.restart_test',

‎compass/landice/tests/thwaites/decomposition_test/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ def configure(self):
7474
if self.advection_type == 'fct':
7575
step.add_namelist_options(
7676
{'config_thickness_advection': "'fct'",
77-
'config_tracer_advection': "'fct'"},
77+
'config_tracer_advection': "'fct'",
78+
'config_time_integration': "'runge_kutta'"},
7879
out_name='namelist.landice')
7980
self.add_step(step)
8081

‎compass/landice/tests/thwaites/restart_test/__init__.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ def __init__(self, test_group, advection_type, depth_integrated=False):
4646
if advection_type == 'fct':
4747
step.add_namelist_options(
4848
{'config_thickness_advection': "'fct'",
49-
'config_tracer_advection': "'fct'"},
49+
'config_tracer_advection': "'fct'",
50+
'config_time_integration': "'runge_kutta'"},
5051
out_name='namelist.landice')
5152
step.add_streams_file(
5253
'compass.landice.tests.thwaites.restart_test',
@@ -66,7 +67,8 @@ def __init__(self, test_group, advection_type, depth_integrated=False):
6667
if advection_type == 'fct':
6768
step.add_namelist_options(
6869
{'config_thickness_advection': "'fct'",
69-
'config_tracer_advection': "'fct'"},
70+
'config_tracer_advection': "'fct'",
71+
'config_time_integration': "'runge_kutta'"},
7072
out_name='namelist.landice')
7173
step.add_streams_file(
7274
'compass.landice.tests.thwaites.restart_test',
@@ -78,7 +80,8 @@ def __init__(self, test_group, advection_type, depth_integrated=False):
7880
if advection_type == 'fct':
7981
step.add_namelist_options(
8082
{'config_thickness_advection': "'fct'",
81-
'config_tracer_advection': "'fct'"},
83+
'config_tracer_advection': "'fct'",
84+
'config_time_integration': "'runge_kutta'"},
8285
out_name='namelist.landice.rst')
8386
# same streams file for both restart stages
8487
step.add_streams_file(

0 commit comments

Comments
 (0)