Commit 8525d099 authored by Dion Häfner's avatar Dion Häfner

[legacy] fix isoneutral streamfunction handling

parent 28a3c5a8
......@@ -227,7 +227,7 @@ class FourDegreeTest(VerosPyOMSystemTest):
for s, (v1, v2) in differing_scalars.items():
print('{}, {}, {}'.format(s, v1, v2))
for a, (v1, v2) in differing_arrays.items():
if a in ('B1_gm', 'B2_gm', 'Ai_ez', 'Ai_nz', 'Ai_bx', 'Ai_by'):
if a in ('Ai_ez', 'Ai_nz', 'Ai_bx', 'Ai_by'):
# usually very small differences being amplified
continue
self.check_variable(a, atol=1e-4, data=(v1, v2))
......
......@@ -16,7 +16,8 @@ class ACC2NoEnergyConservationTest(VerosPyOMSystemTest):
for s, (v1, v2) in differing_scalars.items():
print('{}, {}, {}'.format(s, v1, v2))
for a, (v1, v2) in differing_arrays.items():
if 'salt' in a or a in ('B1_gm', 'B2_gm'): # salt and isoneutral streamfunctions aren't used by this example
if 'salt' in a:
# salt isn't used by this example
continue
self.check_variable(a, atol=1e-6, data=(v1, v2))
......
......@@ -180,7 +180,8 @@ class ACC2Test(VerosPyOMSystemTest):
for s, (v1, v2) in differing_scalars.items():
print('{}, {}, {}'.format(s, v1, v2))
for a, (v1, v2) in differing_arrays.items():
if 'salt' in a or a in ('B1_gm', 'B2_gm'): # salt and isoneutral streamfunctions aren't used by this example
if 'salt' in a:
# salt isn't used by this example
continue
self.check_variable(a, atol=1e-6, data=(v1, v2))
......
......@@ -230,6 +230,9 @@ class VerosLegacy(veros.VerosSetup):
# diagnose vertical velocity at taup1
f.vertical_velocity()
# diagnose isoneutral streamfunction regardless of output settings
f.isoneutral_diag_streamfunction()
# shift time
m.itt += 1
vs.time += m.dt_tracer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment