[cig-commits] r5684 - in long/3D/Gale/trunk/src/Underworld: . InputFiles/BaseApps Rheology/tests Rheology/tests/NonNewtonianShearSolution Utils/tests

walter at geodynamics.org walter at geodynamics.org
Fri Jan 5 11:39:39 PST 2007 

Author: walter
Date: 2007-01-05 11:39:38 -0800 (Fri, 05 Jan 2007)
New Revision: 5684

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/BaseApps/ExtensionBaseApp.xml
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/NonNewtonianShearSolution/NonNewtonianShearSolution.c
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector.xml
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorPerMaterial.xml
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorRandom.xml
   long/3D/Gale/trunk/src/Underworld/Utils/tests/testPressureTemperatureOutput.xml
Log:
 r805 at earth (orig r404):  LukeHodkinson | 2007-01-02 20:46:41 -0800
 Fixing some tests.
 
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:775
c24a034b-ab11-0410-afe6-cfe714e2959e:/branches/decomp3d:403
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:396
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:775
c24a034b-ab11-0410-afe6-cfe714e2959e:/branches/decomp3d:404
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:396

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/BaseApps/ExtensionBaseApp.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/BaseApps/ExtensionBaseApp.xml	2007-01-05 19:39:36 UTC (rev 5683)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/BaseApps/ExtensionBaseApp.xml	2007-01-05 19:39:38 UTC (rev 5684)
@@ -9,7 +9,6 @@
 	</list>
 
 	<!-- Component Stuff -->
-	<include>../StgFEM_Components/ElementLayout.xml              </include>
 	<include>../StgFEM_Components/ConstantMesh.xml               </include>
 	<include>../StgFEM_Components/LinearMesh.xml                 </include>
 	<include>../StgFEM_Components/VelocityField.xml              </include>

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/NonNewtonianShearSolution/NonNewtonianShearSolution.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/NonNewtonianShearSolution/NonNewtonianShearSolution.c	2007-01-05 19:39:36 UTC (rev 5683)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/NonNewtonianShearSolution/NonNewtonianShearSolution.c	2007-01-05 19:39:38 UTC (rev 5684)
@@ -131,7 +131,7 @@
 
 	/* Set Velocity Stuff */
 	EP_AppendClassHook( Context_GetEntryPoint( context, AbstractContext_EP_UpdateClass ),
-								NonNewtonianShearSolution_UpdateVelocityBC, self );
+			    NonNewtonianShearSolution_UpdateVelocityBC, self );
 	self->velocityTopOfBox = Stg_ComponentFactory_GetRootDictDouble( cf, "velocityTopOfBox", 0.5 );
 }
 

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector.xml	2007-01-05 19:39:36 UTC (rev 5683)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector.xml	2007-01-05 19:39:38 UTC (rev 5684)
@@ -20,7 +20,7 @@
 		<!-- Periodic boundary conditions -->
 		<struct name="periodicBCsManager">
 			<param name="Type">PeriodicBoundariesManager</param>
-			<param name="Mesh">mesh-linear</param>
+			<param name="mesh">mesh-linear</param>
 			<param name="Swarm">materialSwarm</param>
 			<param name="TimeIntegrator">timeIntegrator</param>
 			

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorPerMaterial.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorPerMaterial.xml	2007-01-05 19:39:36 UTC (rev 5683)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorPerMaterial.xml	2007-01-05 19:39:38 UTC (rev 5684)
@@ -21,7 +21,7 @@
 		<!-- Periodic boundary conditions -->
 		<struct name="periodicBCsManager">
 			<param name="Type">PeriodicBoundariesManager</param>
-			<param name="Mesh">mesh-linear</param>
+			<param name="mesh">mesh-linear</param>
 			<param name="Swarm">materialSwarm</param>
 			<param name="TimeIntegrator">timeIntegrator</param>
 			

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorRandom.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorRandom.xml	2007-01-05 19:39:36 UTC (rev 5683)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorRandom.xml	2007-01-05 19:39:38 UTC (rev 5684)
@@ -22,7 +22,7 @@
 		<!-- Periodic boundary conditions -->
 		<struct name="periodicBCsManager">
 			<param name="Type">PeriodicBoundariesManager</param>
-			<param name="Mesh">mesh-linear</param>
+			<param name="mesh">mesh-linear</param>
 			<param name="Swarm">materialSwarm</param>
 			<param name="TimeIntegrator">timeIntegrator</param>
 			

Modified: long/3D/Gale/trunk/src/Underworld/Utils/tests/testPressureTemperatureOutput.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/tests/testPressureTemperatureOutput.xml	2007-01-05 19:39:36 UTC (rev 5683)
+++ long/3D/Gale/trunk/src/Underworld/Utils/tests/testPressureTemperatureOutput.xml	2007-01-05 19:39:38 UTC (rev 5684)
@@ -27,10 +27,19 @@
 			<param name="PressureField">PressureField</param>
 			<param name="TemperatureField">TemperatureField</param>
 		</struct>
+
+		<struct name="linearMesh-generator" mergeType="merge">
+			<param name="maxDecomposedDims"> 1 </param>
+			<list name="maxDecompositions">
+				<param> 0 </param>
+				<param> 1 </param>
+				<param> 1 </param>
+			</list>
+		</struct>
 	</struct>
 
 	<list name="plugins" mergeType="Replace">
-		<param>StgFEM_StandardConditionFunctions</param>	
+		<param>StgFEM_StandardConditionFunctions</param>
 	</list>
 	<include>../../InputFiles/VariableConditions/temperatureICs.sinusoid.xml </include>
  
@@ -44,16 +53,16 @@
 	<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="elementResJ">10</param>
+	<param name="elementResK">1</param>
 	<param name="shadowDepth">1</param>
-	<param name="allowUnbalancing">True</param> 
+	<param name="allowUnbalancing">True</param>
 	<param name="buildElementNodeTbl">True</param>
-	<param name="maxTimeSteps">4</param> 
-	<param name="minX">0.0</param> 
-	<param name="minY">0.0</param> 
+	<param name="maxTimeSteps">4</param>
+	<param name="minX">0.0</param>
+	<param name="minY">0.0</param>
 	<param name="minZ">0.0</param>
-	<param name="maxX">1.0</param> 
+	<param name="maxX">1.0</param>
 	<param name="maxY">1.0</param>
 	<param name="maxZ">1.0</param>

More information about the cig-commits mailing list