[cig-commits] r5254 - in long/3D/Gale/trunk: .
src/StGermain/Base/Foundation/tests src/StGermain/Base/tests
src/StGermain/Discretisation src/StGermain/Discretisation/Geometry
src/StGermain/Discretisation/Geometry/tests
src/StGermain/Discretisation/Mesh
src/StGermain/Discretisation/Mesh/tests
src/StGermain/Discretisation/Shape
src/StGermain/Discretisation/Shape/tests
src/StGermain/Discretisation/Swarm
src/StGermain/Discretisation/Swarm/tests
src/StGermain/Discretisation/Utils
src/StGermain/Discretisation/Utils/tests
src/StGermain/Discretisation/tests
walter at geodynamics.org
walter at geodynamics.org
Mon Nov 13 13:25:01 PST 2006
Author: walter
Date: 2006-11-13 13:24:59 -0800 (Mon, 13 Nov 2006)
New Revision: 5254
Added:
long/3D/Gale/trunk/src/StGermain/Base/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/tests/SConscript
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/SConstruct
long/3D/Gale/trunk/src/StGermain/Base/Foundation/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testBlockGeometry.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexMath.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexVectorMath.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDelaunay.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDimensionMacros.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testEdge.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIJK26Topology.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIJK6Topology.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIrregGeometry.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testLine.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testPlane.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testRefinedRegionsGeometry.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testShellGeometry.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMath.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTrigMath.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testHexaEL.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testIrregEL.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh-large.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testParallelPipedHexaEL.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testParallelPipedQuadEL.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testQuadEL.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testElementCellLayout0.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testElementCellLayout0.0of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSingleCellLayout0.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvection.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of3.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testWithinShapeParticleLayout.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout-remap.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout-saveAndLoad.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testOperatorFieldVariable.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testRegularMeshUtils.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testRegularMeshUtils.0of2.expected
Log:
r1071 at earth: boo | 2006-11-13 13:23:44 -0800
Make StGermain/Discretisation tests work
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1070
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1071
Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/SConstruct 2006-11-13 21:24:59 UTC (rev 5254)
@@ -120,8 +120,8 @@
new_dir=re.sub('build','src',env['TESTDIR'])
os.chdir(new_dir)
r,w,e=os.popen3(test_args)
+ output_file=[w.readlines()]
e.readlines()
- output_file=[w.readlines()]
r.close()
e.close()
w.close()
@@ -145,11 +145,13 @@
expected_file+=[f.readlines()]
f.close()
+ result=None
if expected_file!=output_file:
print "expected and result",test_args, expected
print expected_file
print output_file
- raise TestError
+ result=1
+ return result
def gen_test_suffix(env, sources):
if env.has_key('MPI_PROCS'):
@@ -177,8 +179,7 @@
for s in Split(env['TESTARGS']):
test_args.append(s)
- execute_test_and_compare(test_args,expected,env)
- return None
+ return execute_test_and_compare(test_args,expected,env)
env['BUILDERS']['GeneralTest']=Builder(action=run_general_test,
suffix=gen_test_suffix)
@@ -188,18 +189,22 @@
env['MPI_PROCS']="1"
procs=env['MPI_PROCS']
env['TESTDIR']=os.getcwd()
+ expected_dir=""
+ if env.has_key('EXPECTED'):
+ expected_dir=env['EXPECTED']
for f in test_files:
if env.has_key('OUTFILES'):
if not env.has_key('OUTDIR'):
env['OUTDIR']="."
outfiles=[]
for out in env['OUTFILES']:
- outfiles+=[f[:-1]+"0of"+procs+"."+out+".expected"]
+ outfiles+=[expected_dir+f[:-1]+"0of"+procs+"."+out+".expected"]
tests+=[env.GeneralTest([env.Program(f[:-2],[f,libraries]),
outfiles])]
else:
tests+=[env.GeneralTest([env.Program(f[:-2],[f,libraries]),
- f[:-1]+"0of"+procs+".expected"])]
+ expected_dir+f[:-1]+"0of"
+ +procs+".expected"])]
# def run_test(target,source,env):
@@ -241,6 +246,11 @@
SConscript('build/SConscript')
make_test_deps=True
Export('make_test_deps')
+SConscript('build/StGermain/Discretisation/Utils/SConscript')
+SConscript('build/StGermain/Discretisation/Swarm/SConscript')
+SConscript('build/StGermain/Discretisation/Geometry/SConscript')
+SConscript('build/StGermain/Discretisation/Mesh/SConscript')
+SConscript('build/StGermain/Discretisation/Shape/SConscript')
SConscript('build/StGermain/Base/SConscript')
# We have to do a fake install of the headers, because otherwise the
Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/tests/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/tests/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -20,11 +20,11 @@
local_env=env.Copy()
local_env.Append(CPPPATH=["#/build/include/StGermain"])
-# The memory tests are flaky, and the rest rely on the values of
+# The memory tests are flaky, the TimeMonitor test requires the time
+# to be a particular value, and the rest rely on the values of
# pointers, which is bogus.
test_files=Split("""testCommonRoutines.c
-testObjectList.c
-testTimeMonitor.c""")
+testObjectList.c""")
# test_files=Split("""testCommonRoutines.c
# testMemMonitor.c
Added: long/3D/Gale/trunk/src/StGermain/Base/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/tests/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Base/tests/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -0,0 +1,28 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','tests','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+
+test_files=Split("""testLibBase.c
+""")
+
+add_tests(local_env,tests,test_files,[StGermain_static_library])
+
+
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -15,5 +15,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-SConscript('src/SConscript')
+Import('make_test_deps')
+if not make_test_deps:
+ SConscript('src/SConscript')
+else:
+ SConscript('tests/SConscript')
Added: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -0,0 +1,48 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','tests','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+
+test_files=Split("""testBlockGeometry.c
+testComplexMath.c
+testComplexVectorMath.c
+testDelaunay.c
+testDimensionMacros.c
+testEdge.c
+testIJK26Topology.c
+testIJK6Topology.c
+testIrregGeometry.c
+testLine.c
+testParallelDelaunay.c
+testPlane.c
+testRefinedRegionsGeometry.c
+testShellGeometry.c
+testTensorMath.c
+testTensorMultMath.c
+testTrigMath.c
+testVectorMath.c
+""")
+
+add_tests(local_env,tests,test_files,[StGermain_static_library])
+
+local_env2=local_env.Copy()
+local_env2['MPI_PROCS']="2"
+add_tests(local_env2,tests,["testParallelDelaunay.c"],
+ [StGermain_static_library])
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testBlockGeometry.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testBlockGeometry.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testBlockGeometry.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Individual point test:
Point 0 : { 0, 0, 0 }
Point 1 : { 0.333333, 0, 0 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexMath.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexMath.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexMath.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3839. Copyright (C) 2003-2005 VPAC.
----------------- Testing Complex Journal Printing Macro -----------------
x = 1.0000000 + 2.0000000 i
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexVectorMath.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexVectorMath.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testComplexVectorMath.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3673. Copyright (C) 2003-2005 VPAC.
Basic tests:
d =
d[0] = 1 + 1 i
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDelaunay.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDelaunay.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDelaunay.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3470. Copyright (C) 2003-2005 VPAC.
Testing triangulation of a regular mesh:
Regular mesh triangulation test passed..
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDimensionMacros.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDimensionMacros.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testDimensionMacros.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
+++ 1D Tests +++
(3,0,0) in mesh sized 8*0*0 -> index 3
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testEdge.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testEdge.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testEdge.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Edge: 0, points: { 0, 1 }, faces: { 0, 100 }
Edge: 1, points: { 1, 2 }, faces: { 0, 1 }
Edge: 2, points: { 2, 0 }, faces: { 0, 100 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIJK26Topology.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIJK26Topology.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIJK26Topology.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3570. Copyright (C) 2003-2005 VPAC.
+++++++++++++ 1D Tests +++++++++++++
topology:{ 1, 1, 1, } - isPeriodic = { False, False, False, }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIJK6Topology.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIJK6Topology.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIJK6Topology.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
+++ 1D Tests +++
*** Construction test ***
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIrregGeometry.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIrregGeometry.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testIrregGeometry.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Individual point test:
Point 0 : { 0.2, 0.9, 0.1 }
Point 1 : { 0.1, 0.7, 0 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testLine.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testLine.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testLine.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
True
True
True
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3667. Copyright (C) 2003-2005 VPAC.
Testing irregular parallel triangulation..
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of2.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of2.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3667. Copyright (C) 2003-2005 VPAC.
Testing irregular parallel triangulation..
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testPlane.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testPlane.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testPlane.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Plane: 0x + -0y + 1z = 2
Distance to point: 4
In front A: True
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testRefinedRegionsGeometry.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testRefinedRegionsGeometry.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testRefinedRegionsGeometry.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Total point test:
Point 0 : { 0, 0, 0 }
Point 1 : { 0.05, 0, 0 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testShellGeometry.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testShellGeometry.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testShellGeometry.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Individual point test:
Point 0 : { -0.216506, 0.375, -0.25 }
Point 1 : { -0.0751919, 0.426434, -0.25 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMath.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMath.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMath.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3750. Copyright (C) 2003-2005 VPAC.
****************************************
Check StGermain_nSymmetricTensorVectorComponents function
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3791. Copyright (C) 2003-2005 VPAC.
1e-14
/******************* Test 1 ************************/
Test TensorArray Identity
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTrigMath.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTrigMath.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTrigMath.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
****************************
Test angle conversion macros
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Basic tests:
d = { 1, 1, 1 }
d = { 2, 0.5, 1.5 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -15,5 +15,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-SConscript('src/SConscript')
+Import('make_test_deps')
+if not make_test_deps:
+ SConscript('src/SConscript')
+else:
+ SConscript('tests/SConscript')
Added: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -0,0 +1,33 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','tests','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+
+#Deleted tests rely on pointers
+test_files=Split("""testDecomp.c
+testHexaEL.c
+testIrregEL.c
+testMesh-large.c
+testParallelPipedHexaEL.c
+testParallelPipedQuadEL.c
+testQuadEL.c
+""")
+
+add_tests(local_env,tests,test_files,[StGermain_static_library])
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testHexaEL.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testHexaEL.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testHexaEL.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Element corner indices:
Element 0 : { 0, 1, 5, 4, 16, 17, 21, 20 }
Element 1 : { 1, 2, 6, 5, 17, 18, 22, 21 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testIrregEL.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testIrregEL.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testIrregEL.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Element corner indices:
Element 0 : { 0, 1, 3 }
Element 1 : { 1, 4, 3 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh-large.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh-large.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh-large.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,5 +1,4 @@
Watching rank 0
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Building mesh:
Done.
partitionedAxis: { False, False, False }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testParallelPipedHexaEL.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testParallelPipedHexaEL.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testParallelPipedHexaEL.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3473. Copyright (C) 2003-2005 VPAC.
Element with point:
Node 0 (0.00,0.00,0.00):
Incl 0, Excl 0
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testParallelPipedQuadEL.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testParallelPipedQuadEL.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testParallelPipedQuadEL.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3473. Copyright (C) 2003-2005 VPAC.
Element with point:
Node 0 (0.00,0.00):
Incl 0, Excl 0
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testQuadEL.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testQuadEL.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testQuadEL.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Element corner indices:
Element 0 : { 0, 1, 5, 4 }
Element 1 : { 1, 2, 6, 5 }
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -15,7 +15,13 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-SConscript('src/SConscript')
+Import('make_test_deps')
+
+if not make_test_deps:
+ SConscript('src/SConscript')
+else:
+ SConscript('tests/SConscript')
+
SConscript('Geometry/SConscript')
SConscript('Mesh/SConscript')
SConscript('Shape/SConscript')
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -15,5 +15,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-SConscript('src/SConscript')
+Import('make_test_deps')
+if not make_test_deps:
+ SConscript('src/SConscript')
+else:
+ SConscript('tests/SConscript')
+
Added: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/tests/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/tests/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -0,0 +1,64 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','tests','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+
+testShape=local_env.Program("testShape",["testShape.c",StGermain_static_library])
+
+local_env['OUTFILES']=["output.dat"]
+local_env['OUTDIR']="output"
+import os
+local_env['TESTDIR']=os.getcwd()
+
+def add_single_test(tests,name,dim,postfix):
+ tests+=[local_env.GeneralTest
+ ("test"+name+dim+"D"+postfix,
+ [testShape,"expected/test"+name+dim+"D"
+ +postfix+".0of1.output.dat.expected"],
+ TESTARGS=["test"+name+postfix+".xml","--dim="+dim])]
+
+def add_2D_3D_tests(tests,name,postfix):
+ add_single_test(tests,name,"2",postfix)
+ add_single_test(tests,name,"3",postfix)
+
+for name in Split("""Box
+Intersection
+PolygonShape
+Sphere
+Superellipsoid
+Union
+"""):
+ add_2D_3D_tests(tests,name,"")
+
+add_single_test(tests,"ConvexHull","2","")
+tests+=[local_env.GeneralTest
+ ("testConvexHull3D",
+ [testShape,"expected/testConvexHull3D.0of1.output.dat.expected"],
+ TESTARGS=["testConvexHull3D.xml"])]
+tests+=[local_env.GeneralTest
+ ("testCylinder",
+ [testShape,"expected/testCylinder.0of1.output.dat.expected"],
+ TESTARGS=["testCylinder.xml"])]
+
+add_2D_3D_tests(tests,"Intersection","DoubleNot")
+add_2D_3D_tests(tests,"Intersection","SingleNot")
+add_2D_3D_tests(tests,"Union","SingleNot")
+add_single_test(tests,"Sphere","2","-invert")
+
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -15,5 +15,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-SConscript('src/SConscript')
+Import('make_test_deps')
+if not make_test_deps:
+ SConscript('src/SConscript')
+else:
+ SConscript('tests/SConscript')
+
Added: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -0,0 +1,76 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','tests','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+local_env.Append(CPPFLAGS=['-DCURR_MODULE_NAME=\\"StGermainDiscretisationSwarm\\"'])
+
+test_files=Split("""testElementCellLayout0.c
+testSingleCellLayout0.c
+testSwarmDumpAndLoad.c
+""")
+
+add_tests(local_env,tests,test_files,[StGermain_static_library])
+
+local_env2=local_env.Copy()
+local_env2['MPI_PROCS']="2"
+test_files=Split("""testElementCellLayout0.c
+testSwarmDumpAndLoad.c
+""")
+
+add_tests(local_env2,tests,test_files,[StGermain_static_library])
+
+
+testSwarmParticleAdvection=local_env.Program("testSwarmParticleAdvection",
+ ["testSwarmParticleAdvection.c",
+ "SingleAttractor/SingleAttractor.c",
+ StGermain_static_library])
+tests+=[local_env.GeneralTest
+ ("testSwarmParticleAdvectionSingleAttractor1",
+ [testSwarmParticleAdvection,
+ "testSwarmParticleAdvectionSingleAttractor.0of1.expected"],
+ TESTARGS=["testSwarmParticleAdvectionSingleAttractor.xml",
+ "--particleCommInfo=False"])]
+tests+=[local_env.GeneralTest
+ ("testSwarmParticleAdvectionSingleAttractor2",
+ [testSwarmParticleAdvection,
+ "testSwarmParticleAdvectionSingleAttractor.0of2.expected"],
+ TESTARGS=["testSwarmParticleAdvectionSingleAttractor.xml",
+ "--particleCommInfo=False"],
+ MPI_PROCS="2")]
+tests+=[local_env.GeneralTest
+ ("testSwarmParticleAdvectionSingleAttractor3",
+ [testSwarmParticleAdvection,
+ "testSwarmParticleAdvectionSingleAttractor.0of3.expected"],
+ TESTARGS=["testSwarmParticleAdvectionSingleAttractor.xml",
+ "--particleCommInfo=False"],
+ MPI_PROCS="3")]
+
+local_env5=local_env.Copy()
+local_env5['OUTFILES']=["swarmOutput.00000.dat","swarmOutput.00001.dat",
+ "swarmOutput.00002.dat","swarmOutput.00003.dat",
+ "swarmOutput.00004.dat"]
+local_env5['OUTDIR']="output"
+local_env5['EXPECTED']="expected/"
+local_env5['TESTARGS']=["testSwarmOutput.xml"]
+add_tests(local_env5,tests,["testSwarmOutput.c"],[StGermain_static_library])
+
+local_env6=local_env5.Copy()
+local_env6['MPI_PROCS']="2"
+add_tests(local_env6,tests,["testSwarmOutput.c"],[StGermain_static_library])
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testElementCellLayout0.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testElementCellLayout0.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testElementCellLayout0.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
cellPointTbl [ 0][0-8]:
{0 0 0}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testElementCellLayout0.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testElementCellLayout0.0of2.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testElementCellLayout0.0of2.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
cellPointTbl [ 0][0-8]:
{0 0 0}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSingleCellLayout0.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSingleCellLayout0.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSingleCellLayout0.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
cellPointTbl [ 0][0-8]:
{-1 -1 -1}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3623. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
Swarm (ptr): 0x80682d0
Stg_Component (ptr): 0x80682d0
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3585. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
Calculated attractor point is at (0.333333,0.333333,0.333333):
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of2.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of2.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3585. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
Calculated attractor point is at (0.333333,0.333333,0.333333):
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvection.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvection.c 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvection.c 2006-11-13 21:24:59 UTC (rev 5254)
@@ -78,6 +78,10 @@
/** Global so other funcs can use */
Index procToWatch = 0;
+Index StGermain_SingleAttractor_Register( PluginsManager* pluginsManager );
+char* pluginNames[] = {"StGermain_SingleAttractor"};
+StaticPluginEntry pluginLst[] = {{StGermain_SingleAttractor_Register, NULL, NULL}};
+
int main( int argc, char* argv[] ) {
DiscretisationContext* context;
MPI_Comm CommWorld;
@@ -156,7 +160,8 @@
cf = context->CF = Stg_ComponentFactory_New( dictionary, componentDict, context->register_Register );
LiveComponentRegister_Add( cf->LCRegister, (Stg_Component*) context );
- PluginsManager_Load( context->plugins, context, dictionary );
+ PluginsManager_Load( context->plugins, context, dictionary,
+ 1, pluginNames,pluginLst );
extensionMgr_Register = ExtensionManager_Register_New();
swarmVariable_Register = SwarmVariable_Register_New( NULL );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3556. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
Run until 5 timeSteps have been run
TimeStep = 1, Start time = 0 + 2 prev timeStep dt
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of2.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of2.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3556. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
Run until 5 timeSteps have been run
TimeStep = 1, Start time = 0 + 2 prev timeStep dt
@@ -1442,3 +1441,8 @@
Updating Particles positions in local cell 69:
Updating Particles positions in local cell 70:
Updating Particles positions in local cell 71:
+TimeStep = 1, Start time = 0 + 2 prev timeStep dt
+TimeStep = 2, Start time = 2 + 2 prev timeStep dt
+TimeStep = 3, Start time = 4 + 2 prev timeStep dt
+TimeStep = 4, Start time = 6 + 2 prev timeStep dt
+TimeStep = 5, Start time = 8 + 2 prev timeStep dt
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of3.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvectionSingleAttractor.0of3.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3556. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
Run until 5 timeSteps have been run
TimeStep = 1, Start time = 0 + 2 prev timeStep dt
@@ -736,3 +735,13 @@
Updating Particles positions in local cell 45:
Updating Particles positions in local cell 46:
Updating Particles positions in local cell 47:
+TimeStep = 1, Start time = 0 + 2 prev timeStep dt
+TimeStep = 2, Start time = 2 + 2 prev timeStep dt
+TimeStep = 3, Start time = 4 + 2 prev timeStep dt
+TimeStep = 4, Start time = 6 + 2 prev timeStep dt
+TimeStep = 5, Start time = 8 + 2 prev timeStep dt
+TimeStep = 1, Start time = 0 + 2 prev timeStep dt
+TimeStep = 2, Start time = 2 + 2 prev timeStep dt
+TimeStep = 3, Start time = 4 + 2 prev timeStep dt
+TimeStep = 4, Start time = 6 + 2 prev timeStep dt
+TimeStep = 5, Start time = 8 + 2 prev timeStep dt
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testWithinShapeParticleLayout.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testWithinShapeParticleLayout.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testWithinShapeParticleLayout.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3605. Copyright (C) 2003-2005 VPAC.
Watching rank: 0
WithinShapeParticleLayout (ptr): 0x8062748:
SpaceFillerParticleLayout (ptr): 0x8062748:
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -15,5 +15,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-SConscript('src/SConscript')
+Import('make_test_deps')
+if not make_test_deps:
+ SConscript('src/SConscript')
+else:
+ SConscript('tests/SConscript')
+
Added: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -0,0 +1,42 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','tests','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+local_env.Append(CPPFLAGS=['-DCURR_MODULE_NAME=\\"StGermainDiscretisationUtils\\"'])
+
+# We don't do the timing tests, because they depend on the exact time
+# taken to run a test.
+
+test_files_1=Split("""testOperatorFieldVariable.c
+ testDofLayout.c
+ testDofLayout-remap.c
+ testDofLayout-saveAndLoad.c
+ testRegularMeshUtils.c
+""")
+
+add_tests(local_env,tests,test_files_1,[StGermain_static_library])
+
+test_files_2=Split("""testRegularMeshUtils.c
+""")
+
+local_env2=local_env.Copy()
+local_env2['MPI_PROCS']="2"
+
+add_tests(local_env2,tests,test_files_2,[StGermain_static_library])
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout-remap.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout-remap.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout-remap.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Simple test:
6
6
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout-saveAndLoad.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout-saveAndLoad.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout-saveAndLoad.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 3385. Copyright (C) 2003-2005 VPAC.
Index 0 - 0, 1, 2, 3, 4, 5
Index 1 - 10,11,12,13,14,15
Index 2 - 20,21,22,23,24,25
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testDofLayout.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
Simple test:
6
6
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testOperatorFieldVariable.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testOperatorFieldVariable.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testOperatorFieldVariable.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
coord = {0.400000, 2.000000, 7.000000}
velocity = {-2.000000, 0.400000, 7.000000}
velocity squared 2d = {4.160000}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testRegularMeshUtils.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testRegularMeshUtils.0of1.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testRegularMeshUtils.0of1.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 0. Copyright (C) 2003-2005 VPAC.
Element #: 0, Current Node #: 0, Diagonal Node #: 57, (57)
Element #: 0, Current Node #: 1, Diagonal Node #: 56, (56)
Element #: 0, Current Node #: 8, Diagonal Node #: 49, (49)
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testRegularMeshUtils.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testRegularMeshUtils.0of2.expected 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testRegularMeshUtils.0of2.expected 2006-11-13 21:24:59 UTC (rev 5254)
@@ -1,4 +1,3 @@
-StGermain Framework revision 0. Copyright (C) 2003-2005 VPAC.
Element #: 0, Current Node #: 0, Diagonal Node #: 33, (57)
Element #: 0, Current Node #: 1, Diagonal Node #: 32, (56)
Element #: 0, Current Node #: 5, Diagonal Node #: 28, (49)
Added: long/3D/Gale/trunk/src/StGermain/Discretisation/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/tests/SConscript 2006-11-13 21:24:57 UTC (rev 5253)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/tests/SConscript 2006-11-13 21:24:59 UTC (rev 5254)
@@ -0,0 +1,28 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','tests','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+
+test_files=Split("""testLibDiscretisation.c
+""")
+
+add_tests(local_env,tests,test_files,[StGermain_static_library])
+
+
More information about the cig-commits
mailing list