[cig-commits] r5656 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Swarm/tests

[walter at geodynamics.org]

Author: walter
Date: 2007-01-05 11:35:05 -0800 (Fri, 05 Jan 2007)
New Revision: 5656

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testParticleCoords.xml
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSpaceFillerParticleLayout.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.c
Log:
 r3227 at earth (orig r3918):  LukeHodkinson | 2007-01-01 17:05:28 -0800
 Updating a couple of tests.
 



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:3917
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3918
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testParticleCoords.xml
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testParticleCoords.xml	2007-01-05 19:35:03 UTC (rev 5655)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testParticleCoords.xml	2007-01-05 19:35:05 UTC (rev 5656)
@@ -9,18 +9,27 @@
 		<struct name="cartesianGenerator">
 			<param name="Type"> CartesianGenerator </param>
 			<param name="mesh"> mesh-linear </param>
-			<param name="dim"> dim </param>
+			<param name="dims"> dim </param>
 			<list name="size">
-				<param> 10 </param>
-				<param> 10 </param>
+				<param> elementResI </param>
+				<param> elementResJ </param>
+				<param> elementResK </param>
 			</list>
-			<list name="minCoord">
+			<param name="maxDecomposedDims"> 1 </param>
+			<list name="maxDecompositions">
 				<param> 0 </param>
-				<param> 0 </param>
+				<param> 1 </param>
+				<param> 1 </param>
 			</list>
+			<list name="minCoord">
+				<param> minX </param>
+				<param> minY </param>
+				<param> minZ </param>
+			</list>
 			<list name="maxCoord">
-				<param> 100 </param>
-				<param> 100 </param>
+				<param> maxX </param>
+				<param> maxY </param>
+				<param> maxZ </param>
 			</list>
 		</struct>
  
@@ -42,5 +51,14 @@
 
 	<param name="outputPath">./output</param> 
 	<param name="dim">2</param>
+	<param name="elementResI">10</param>
+	<param name="elementResJ">10</param> 
+	<param name="elementResK">1</param> 
+	<param name="minX">0.0</param> 
+	<param name="minY">0.0</param> 
+	<param name="minZ">0.0</param>
+	<param name="maxX">100.0</param> 
+	<param name="maxY">100.0</param>
+	<param name="maxZ">100.0</param>
 
 </StGermainData>

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSpaceFillerParticleLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSpaceFillerParticleLayout.c	2007-01-05 19:35:03 UTC (rev 5655)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSpaceFillerParticleLayout.c	2007-01-05 19:35:05 UTC (rev 5656)
@@ -76,6 +76,7 @@
 	mesh = Mesh_New( "" );
 	Mesh_SetExtensionManagerRegister( mesh, emReg );
 	Mesh_SetGenerator( mesh, gen );
+	Mesh_SetAlgorithms( mesh, Mesh_RegularAlgorithms_New( "" ) );
 
 	Build( mesh, NULL, False );
 	Initialise( mesh, NULL, False );

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.c	2007-01-05 19:35:03 UTC (rev 5655)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.c	2007-01-05 19:35:05 UTC (rev 5656)
@@ -67,14 +67,22 @@
 };
 
 Mesh* buildMesh( unsigned nDims, unsigned* size, 
-		     double* minCrds, double* maxCrds, 
-		     ExtensionManager_Register* emReg )
+		 double* minCrds, double* maxCrds, 
+		 ExtensionManager_Register* emReg )
 {
 	CartesianGenerator*	gen;
 	Mesh*			mesh;
 
 	gen = CartesianGenerator_New( "" );
 	CartesianGenerator_SetDimSize( gen, nDims );
+	MeshGenerator_SetDimState( gen, 2, False );
+	MeshGenerator_SetDimState( gen, 1, True );
+	MeshGenerator_ClearIncidenceStates( gen );
+	MeshGenerator_SetIncidenceState( gen, 3, 0, True );
+	MeshGenerator_SetIncidenceState( gen, 1, 0, True );
+	MeshGenerator_SetIncidenceState( gen, 0, 3, True );
+	MeshGenerator_SetIncidenceState( gen, 0, 1, True );
+	MeshGenerator_SetIncidenceState( gen, 0, 0, True );
 	CartesianGenerator_SetTopologyParams( gen, size, 0, NULL, NULL );
 	CartesianGenerator_SetGeometryParams( gen, minCrds, maxCrds );
 
@@ -103,7 +111,7 @@
 	int				procToWatch;
 	Dictionary*			dictionary;
 	unsigned	nDims = 3;
-	unsigned	meshSize[3] = {33, 33, 33};
+	unsigned	meshSize[3] = {32, 32, 32};
 	double		minCrds[3] = {0.0, 0.0, 0.0};
 	double		maxCrds[3] = {1.0, 1.0, 1.0};
 	ExtensionManager_Register*	extensionMgr_Register;