From 5df6a3389a1998018b8663bdb826df0f51fc223c Mon Sep 17 00:00:00 2001 From: Stephen Roberts Date: Fri, 3 Jun 2022 19:18:21 +0930 Subject: [PATCH] Added timezone unittests --- anuga/shallow_water/shallow_water.c | 3 ++- anuga/shallow_water/tests/test_shallow_water_domain.py | 1 - runtests.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anuga/shallow_water/shallow_water.c b/anuga/shallow_water/shallow_water.c index 5052a78a1..2f5e3f835 100644 --- a/anuga/shallow_water/shallow_water.c +++ b/anuga/shallow_water/shallow_water.c @@ -1763,7 +1763,8 @@ int _extrapolate_second_order_sw_old(int number_of_elements, double dx1, dx2, dy1, dy2, dxv0, dxv1, dxv2, dyv0, dyv1, dyv2, dq0, dq1, dq2, area2, inv_area2; double dqv[3], qmin, qmax, hmin, hmax; double hc, h0, h1, h2, beta_tmp, hfactor; - double xmom_centroid_store[number_of_elements], ymom_centroid_store[number_of_elements], dk, dv0, dv1, dv2; + double xmom_centroid_store[number_of_elements], ymom_centroid_store[number_of_elements]; + double dk, dv0, dv1, dv2; if (extrapolate_velocity_second_order == 1) { // Replace momentum centroid with velocity centroid to allow velocity diff --git a/anuga/shallow_water/tests/test_shallow_water_domain.py b/anuga/shallow_water/tests/test_shallow_water_domain.py index aac14074f..d6cd20e41 100644 --- a/anuga/shallow_water/tests/test_shallow_water_domain.py +++ b/anuga/shallow_water/tests/test_shallow_water_domain.py @@ -4615,7 +4615,6 @@ def x_slope(x, y): tt += t except AssertionError: # Getting here is good as outputstep is not an integer multiple of yieldstep - os.remove(domain.get_name() + '.sww') return # Shouldn't get here diff --git a/runtests.py b/runtests.py index c2fe8b3e1..f02c7a31c 100755 --- a/runtests.py +++ b/runtests.py @@ -440,12 +440,12 @@ def build_project(args): # add flags used as werrors warnings_as_errors = ' '.join([ # from tools/travis-test.sh - '-Werror=vla', + #'-Werror=vla', '-Werror=nonnull', '-Werror=pointer-arith', '-Wlogical-op', # from sysconfig - '-Werror=unused-function', + #'-Werror=unused-function', ]) env['CFLAGS'] = warnings_as_errors + ' ' + env.get('CFLAGS', '') if args.debug or args.gcov: