[cig-commits] r5278 - in long/3D/Gale/trunk/src/Gale: . Apps/Extension

[walter at geodynamics.org]

Author: walter
Date: 2006-11-15 13:03:43 -0800 (Wed, 15 Nov 2006)
New Revision: 5278

Modified:
   long/3D/Gale/trunk/src/Gale/
   long/3D/Gale/trunk/src/Gale/Apps/Extension/surface-process.xml
Log:
 r65 at earth:  boo | 2006-11-15 13:02:20 -0800
  r63 at earth (orig r62):  LukeHodkinson | 2006-11-07 17:48:34 -0800
  Updating the surface process example to use a 
  cosine hill on the top surface. Turns out the
  actual surface process code has a bit of a bug
  in it, so disabling that for now.
  
 



Property changes on: long/3D/Gale/trunk/src/Gale
___________________________________________________________________
Name: svk:merge
   - 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:61
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:64
   + 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:62
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:65

Modified: long/3D/Gale/trunk/src/Gale/Apps/Extension/surface-process.xml
===================================================================
--- long/3D/Gale/trunk/src/Gale/Apps/Extension/surface-process.xml	2006-11-15 21:03:39 UTC (rev 5277)
+++ long/3D/Gale/trunk/src/Gale/Apps/Extension/surface-process.xml	2006-11-15 21:03:43 UTC (rev 5278)
@@ -18,35 +18,14 @@
 	<list name="plugins" mergeType="merge">
 		<param> StgFEM_StandardConditionFunctions </param>
 		<param> Underworld_EulerDeform </param>
-		<param> Gale_SurfaceProcess </param>
+		<!--param> Gale_SurfaceProcess </param-->
 	</list>
 
 	<!-- Rheology Components -->
 	<struct name="components" mergeType="merge">
-		<struct name="backgroundBox">
-			<param name="Type"> Box </param>
-			<param name="startX"> minZ </param>	<param name="endX"> maxX </param>
-			<param name="startY"> minY </param>	<param name="endY"> maxY </param>
-			<param name="startZ"> minZ </param>	<param name="endZ"> maxZ </param>
+		<struct name="background">
+			<param name="Type"> Everywhere </param>
 		</struct>
-		<struct name="backgroundWedge">
-                        <param name="Type">PolygonShape</param>
-                        <list name="verticies">
-                                <asciidata>
-                                        <columnDefinition name="x" type="double"/>
-                                        <columnDefinition name="y" type="double"/>
-                                        1.0    0.35
-                                        2.0    0.60
-                                        2.0    0.35
-                                </asciidata>
-                        </list>
-                </struct>
-		<struct name="backgroundShape">
-			<param name="Type"> Union </param>
-			<list name="shapes">
-				<param> backgroundWedge </param>
-			</list>
-		</struct>
 		<struct name="pdmsShape">
 			<param name="Type"> Box </param>
 			<param name="startX"> 0.5 </param>	<param name="endX"> 1.5 </param>
@@ -62,7 +41,7 @@
 		<struct name="crustShape">
 			<param name="Type"> Intersection </param>
 			<list name="shapes">
-				<param> backgroundWedge </param>
+				<param> background </param>
 				<param> !pdmsShape </param>
 				<param> !stripShape </param>
 			</list>
@@ -147,6 +126,13 @@
 				<param>storeViscosity</param>
 			</list>
 		</struct>
+
+		<!-- Particle layout modification -->
+		<struct name="materialSwarmParticleLayout" mergeType="replace">
+			<param name="Type">MeshParticleLayout</param>
+			<param name="mesh">mesh-linear</param>
+			<param name="cellParticleCount">particlesPerCell</param>
+		</struct>
 	</struct>
 
 	<!-- Simulation control -->
@@ -183,8 +169,12 @@
 			<param name="Type"> SurfaceAdaptor </param>
 			<param name="mesh"> mesh-linear </param>
 			<param name="sourceGenerator"> cartesianGenerator </param>
-			<param name="offset"> 1.0 </param>
-			<param name="gradient"> 0.2 </param>
+			<param name="surfaceType"> cosine </param>
+			<list name="origin">
+				<param> 1.0 </param>
+			</list>
+			<param name="amplitude"> 0.2 </param>
+			<param name="frequency"> 1.570796326791 </param>
 		</struct>
 	</struct>