[cig-commits] r4186 - in long/3D/Gale/trunk/src/Underworld: . InputFiles/Viewports

[walter at geodynamics.org]

Author: walter
Date: 2006-08-01 01:56:39 -0700 (Tue, 01 Aug 2006)
New Revision: 4186

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/viscoElasticCylinderVP.xml
Log:
 r435 at earth:  boo | 2006-08-01 01:53:49 -0700
  r415 at earth (orig r286):  RebeccaFarrington | 2006-07-27 00:23:29 -0700
  & VP for cylinder test
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:434
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:285
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:435
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:286

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/viscoElasticCylinderVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/viscoElasticCylinderVP.xml	2006-08-01 08:56:35 UTC (rev 4185)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/viscoElasticCylinderVP.xml	2006-08-01 08:56:39 UTC (rev 4186)
@@ -26,7 +26,7 @@
 			<param name="Type">lucCamera</param>
 			<param name="coordX">0.5</param>
 			<param name="coordY">2.4683</param>
-			<param name="coordZ">0.49656</param>
+			<param name="coordZ">0.50344</param>
 			<param name="focalPointX">0.5</param>
 			<param name="focalPointY">0.5</param>
 			<param name="focalPointZ">0.5</param>
@@ -57,6 +57,15 @@
 			<param name="MaskVariable">materialSwarm-MaterialIndex</param>
 			<param name="colour">red</param>
 		</struct>
+		<struct name="vizParticles2">
+			<param name="Type">lucSwarmViewer</param>
+			<param name="Swarm">materialSwarm</param>
+			<param name="pointSize">0.2</param>
+			<param name="maskValue">2</param>
+			<param name="maskType">EqualTo</param>
+			<param name="MaskVariable">materialSwarm-MaterialIndex</param>
+			<param name="colour">blue</param>
+		</struct>
 		<struct name="vizParticlesVP">
 			<param name="Type">lucViewport</param>
 			<param name="Camera">particleCamera</param>
@@ -64,6 +73,7 @@
 				<param>title</param>
 				<param>strainRateInvBorder</param>
 				<param>vizParticles</param>
+				<param>vizParticles2</param>
 			</list>
 		</struct>
 		<struct name="vizParticlesVP2">
@@ -73,6 +83,7 @@
 				<param>title</param>
 				<param>strainRateInvBorder</param>
 				<param>vizParticles</param>
+				<param>vizParticles2</param>
 			</list>
 		</struct>
 		
@@ -82,11 +93,11 @@
 			<!--param name="logScale">true</param-->
 			<param name="dynamicRange">true</param>
 		</struct>
-		<struct name="strainRateInvMap">
+		<!--struct name="strainRateInvMap">
 			<param name="Type">lucScalarField</param>
 			<param name="FieldVariable">recoveredStrainRateInvariantField</param>
 			<param name="ColourMap">strainRateColourMap</param>
-		</struct>
+		</struct-->
 		<struct name="strainRateInvBorder">
 			<param name="Type">lucFieldVariableBorder</param>
 			<param name="FieldVariable">StrainRateInvariantField</param>
@@ -111,20 +122,31 @@
 
 		
 		<struct name="cylinderSurfaceWithStrainRateInv">
-			<!--param name="Type">lucIsosurface</param>
-			<param name="IsosurfaceField">cylinderField</param-->
-			<param name="Type">lucScalarField</param>
-			<param name="FieldVariable">StrainRateInvariantField</param>
+			<param name="Type">lucIsosurface</param>
+			<param name="IsosurfaceField">cylinderField</param>
+			<!--param name="Type">lucScalarField</param>
+			<param name="FieldVariable">StrainRateInvariantField</param-->
 			<param name="ColourMap">strainRateColourMap</param>
 			<param name="ColourField">StrainRateInvariantField</param>
 			<param name="isovalue">0.1</param>
 			<param name="drawWalls">true</param>
 		</struct>
+		<struct name="cylinder2SurfaceWithStrainRateInv">
+			<param name="Type">lucIsosurface</param>
+			<param name="IsosurfaceField">cylinderField2</param>
+			<!--param name="Type">lucScalarField</param>
+			<param name="FieldVariable">StrainRateInvariantField</param-->
+			<param name="ColourMap">strainRateColourMap</param>
+			<param name="ColourField">StrainRateInvariantField</param>
+			<param name="isovalue">0.1</param>
+			<param name="drawWalls">true</param>
+		</struct>
 		<struct name="cylinderWithStrainRateInvVP">
 			<param name="Type">lucViewport</param>
 			<param name="Camera">particleCamera</param>
 			<list name="DrawingObject">
 				<param>cylinderSurfaceWithStrainRateInv</param>
+				<param>cylinder2SurfaceWithStrainRateInv</param>
 				<param>title</param>
 				<param>strainRateColourBar</param>
 				<param>strainRateInvBorder</param>
@@ -175,8 +197,8 @@
 	<struct name="components" mergeType="merge">
 		<struct name="window" mergeType="merge">
 			<list name="Viewport">
-				<param> cylinderWithStrainRateInvVP2 cylinderWithStrainRateInvVP </param>
-				<param> vizParticlesVP2 vizParticlesVP </param>
+				<param> cylinderWithStrainRateInvVP cylinderWithStrainRateInvVP2  </param>
+				<param> vizParticlesVP vizParticlesVP2 </param>
 			</list>
 		</struct>
 	</struct>