[cig-commits] r5577 - long/3D/Gale/trunk

[walter at geodynamics.org]

Author: walter
Date: 2006-12-10 02:29:23 -0800 (Sun, 10 Dec 2006)
New Revision: 5577

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/shortening.xml
Log:
 r1210 at earth:  boo | 2005-05-05 02:34:10 -0700
 Make shortening.xml have a wedge on top



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1206
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1210

Modified: long/3D/Gale/trunk/shortening.xml
===================================================================
--- long/3D/Gale/trunk/shortening.xml	2006-12-10 09:39:06 UTC (rev 5576)
+++ long/3D/Gale/trunk/shortening.xml	2006-12-10 10:29:23 UTC (rev 5577)
@@ -317,19 +317,7 @@
     <struct name="backgroundShape">
       <param name="Type">Everywhere</param>
     </struct>
-    <struct name="triangleShape">
-      <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.35
-					2.0      0.5
-	</asciidata>
-      </list>
-    </struct>
-    <struct name="beadsBoxShape">
+    <struct name="beadsShape">
       <param name="Type">Box</param>
       <param name="startX">minX</param>
       <param name="endX">maxX</param>
@@ -338,13 +326,6 @@
       <param name="startZ">minZ</param>
       <param name="endZ">maxZ</param>
     </struct>
-    <struct name="beadsShape">
-      <param name="Type">Union</param>
-      <list name="shapes">
-        <param>beadsBoxShape</param>
-        <!--param>triangleShape</param-->
-      </list>
-    </struct>
     <struct name="crustShape">
       <param name="Type">Intersection</param>
       <list name="shapes">
@@ -404,6 +385,17 @@
         <param>storeViscosity</param>
       </list>
     </struct>
+    <struct name="surfaceAdaptor">
+      <param name="Type">SurfaceAdaptor</param>
+      <param name="mesh">mesh-linear</param>
+      <param name="sourceGenerator">linearMesh-generator</param>
+      <param name="surfaceType">wedge</param>
+      <list name="origin">
+        <param>0.0</param>
+      </list>
+      <param name="offset">1.5</param>
+      <param name="gradient">0.1763269807</param>
+    </struct>
     <struct name="escapedRoutine">
       <param name="Type">EscapedRoutine</param>
       <param name="idealParticleCount">0</param>