[cig-commits] r5653 - in long/3D/Gale/trunk/src/StGermain: .
Discretisation/Mesh/tests
walter at geodynamics.org
walter at geodynamics.org
Fri Jan 5 11:34:58 PST 2007
Author: walter
Date: 2007-01-05 11:34:57 -0800 (Fri, 05 Jan 2007)
New Revision: 5653
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of3.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of4.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of3.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of4.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.2of3.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.2of4.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.3of4.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of3.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of4.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of3.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of4.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.2of3.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.2of4.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.3of4.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.c
Log:
r3224 at earth (orig r3915): LukeHodkinson | 2007-01-01 17:03:22 -0800
Fixing a test and adding a new one.
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3914
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3915
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of1.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of1.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of2.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of2.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of3.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of3.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of4.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of4.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.0of4.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of2.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of2.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of3.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of3.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of4.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of4.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.1of4.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.2of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.2of3.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.2of3.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.2of4.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.2of4.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.2of4.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.3of4.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.3of4.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testCartesianGenerator.3of4.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,2 +1,3 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'generate 1D mesh'... passed
Running test 'generate shadowed 1D mesh'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of1.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of1.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of2.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of2.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of3.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of3.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of4.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of4.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.0of4.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of2.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of2.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of3.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of3.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of4.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of4.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.1of4.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.2of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.2of3.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.2of3.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.2of4.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.2of4.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.2of4.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.3of4.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.3of4.expected 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.3of4.expected 2007-01-05 19:34:57 UTC (rev 5653)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
Running test 'test nearest vertex'... passed
Running test 'test element search (1D)'... passed
Running test 'test element search (2D)'... passed
@@ -2 +3,2 @@
Running test 'test element search (3D)'... passed
+ Running test 'test minimum element search (3D)'... passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.c 2007-01-05 19:34:54 UTC (rev 5652)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/tests/testMesh.c 2007-01-05 19:34:57 UTC (rev 5653)
@@ -373,7 +373,7 @@
double minCrd[3];
double maxCrd[3];
- sizes[0] = sizes[1] = sizes[2] = nProcs * 64;
+ sizes[0] = sizes[1] = sizes[2] = nProcs;
minCrd[0] = minCrd[1] = minCrd[2] = 0.0;
maxCrd[0] = maxCrd[1] = maxCrd[2] = (double)nProcs;
@@ -381,20 +381,10 @@
MeshGenerator_SetDimSize( gen, 3 );
MeshGenerator_SetDimState( gen, 2, False );
MeshGenerator_SetDimState( gen, 1, True );
- MeshGenerator_SetIncidenceState( gen, 3, 3, False );
- MeshGenerator_SetIncidenceState( gen, 3, 2, False );
- MeshGenerator_SetIncidenceState( gen, 3, 1, False );
+ MeshGenerator_ClearIncidenceStates( gen );
MeshGenerator_SetIncidenceState( gen, 3, 0, True );
- MeshGenerator_SetIncidenceState( gen, 2, 3, False );
- MeshGenerator_SetIncidenceState( gen, 2, 2, False );
- MeshGenerator_SetIncidenceState( gen, 2, 1, False );
- MeshGenerator_SetIncidenceState( gen, 2, 0, False );
- MeshGenerator_SetIncidenceState( gen, 1, 3, False );
- MeshGenerator_SetIncidenceState( gen, 1, 2, False );
- MeshGenerator_SetIncidenceState( gen, 1, 1, False );
MeshGenerator_SetIncidenceState( gen, 1, 0, True );
MeshGenerator_SetIncidenceState( gen, 0, 3, True );
- MeshGenerator_SetIncidenceState( gen, 0, 2, False );
MeshGenerator_SetIncidenceState( gen, 0, 1, True );
MeshGenerator_SetIncidenceState( gen, 0, 0, True );
CartesianGenerator_SetTopologyParams( gen, sizes, 0, NULL, NULL );
More information about the cig-commits
mailing list