From a18868233f6da3ffbbc9fce2185cfdf39de9d1ed Mon Sep 17 00:00:00 2001 From: Ben Dudson Date: Fri, 17 Jan 2025 15:25:19 -0800 Subject: [PATCH] tests/integrated: Fix hypre tests - Mesh variable names are case sensitive - mpirun needs ./ to find executable on some systems --- .../test-laplace-hypre3d/data_circular_core-sol/BOUT.inp | 4 ++-- .../test-laplace-hypre3d/data_circular_core/BOUT.inp | 4 ++-- tests/integrated/test-laplacexy2-hypre/runtest | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integrated/test-laplace-hypre3d/data_circular_core-sol/BOUT.inp b/tests/integrated/test-laplace-hypre3d/data_circular_core-sol/BOUT.inp index 46d3cb55ba..613e01f441 100644 --- a/tests/integrated/test-laplace-hypre3d/data_circular_core-sol/BOUT.inp +++ b/tests/integrated/test-laplace-hypre3d/data_circular_core-sol/BOUT.inp @@ -61,8 +61,8 @@ g_23 = Bt*hthe*Rxy/Bp # zShift = \int_{theta0}^{theta} {nu dtheta} arctanarg = (r - 1)*tan(theta/2.)/sqrt(1. - r^2) -zshift = r^2*(r*sin(theta)/((r^2 - 1)*(r*cos(theta) - 1.)) - 2.*atan(arctanarg)/(1. - r^2)^1.5) -shiftangle = r^2 * 2.*pi/(1. - r^2)^1.5 +zShift = r^2*(r*sin(theta)/((r^2 - 1)*(r*cos(theta) - 1.)) - 2.*atan(arctanarg)/(1. - r^2)^1.5) +ShiftAngle = r^2 * 2.*pi/(1. - r^2)^1.5 [mesh:paralleltransform] type = shiftedinterp diff --git a/tests/integrated/test-laplace-hypre3d/data_circular_core/BOUT.inp b/tests/integrated/test-laplace-hypre3d/data_circular_core/BOUT.inp index be0c697d80..c62e032a95 100644 --- a/tests/integrated/test-laplace-hypre3d/data_circular_core/BOUT.inp +++ b/tests/integrated/test-laplace-hypre3d/data_circular_core/BOUT.inp @@ -58,8 +58,8 @@ g_23 = Bt*hthe*Rxy/Bp # zShift = \int_{theta0}^{theta} {nu dtheta} arctanarg = (r - 1)*tan(theta/2.)/sqrt(1. - r^2) -zshift = r^2*(r*sin(theta)/((r^2 - 1)*(r*cos(theta) - 1.)) - 2.*atan(arctanarg)/(1. - r^2)^1.5) -shiftangle = r^2 * 2.*pi/(1. - r^2)^1.5 +zShift = r^2*(r*sin(theta)/((r^2 - 1)*(r*cos(theta) - 1.)) - 2.*atan(arctanarg)/(1. - r^2)^1.5) +ShiftAngle = r^2 * 2.*pi/(1. - r^2)^1.5 [mesh:paralleltransform] type = shiftedinterp diff --git a/tests/integrated/test-laplacexy2-hypre/runtest b/tests/integrated/test-laplacexy2-hypre/runtest index c35c3609da..0a6a7ea53e 100755 --- a/tests/integrated/test-laplacexy2-hypre/runtest +++ b/tests/integrated/test-laplacexy2-hypre/runtest @@ -44,7 +44,7 @@ success = True for nproc in [8]: print(" %d processors...." % nproc) for args in argslist: - cmd = "test-laplacexy " + args + cmd = "./test-laplacexy " + args shell("rm data/BOUT.dmp.*.nc > /dev/null 2>&1")