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

walter at geodynamics.org walter at geodynamics.org
Thu Aug 17 17:18:14 PDT 2006


Author: walter
Date: 2006-08-17 17:18:11 -0700 (Thu, 17 Aug 2006)
New Revision: 4356

Added:
   long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionFMM.xml
   long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionFMM3D.xml
Removed:
   long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionMC.xml
   long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionMC3D.xml
Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/Extension3DVP.xml
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/Shear3DVP.xml
Log:
 r492 at earth:  boo | 2006-08-17 17:15:28 -0700
  r466 at earth (orig r297):  VincentLemiale | 2006-08-03 22:57:02 -0700
  Updating input files as a result of recent renaming
  
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:491
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:296
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:492
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:297

Added: long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionFMM.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionFMM.xml	2006-08-18 00:18:11 UTC (rev 4355)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionFMM.xml	2006-08-18 00:18:11 UTC (rev 4356)
@@ -0,0 +1,302 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<include> BaseApps/ExtensionBaseApp.xml </include>
+	
+	<list name="plugins" mergeType="merge">
+		<!-- Output Plugins -->
+		<param>StG_FEM_FrequentOutput</param>	
+		<param>Underworld_Vrms</param>	
+		<param>StG_FEM_CPUTime</param>
+	</list>
+
+	<!-- Rheology Components -->
+	<struct name="components" mergeType="merge">
+
+
+       <!--
+            Geometry of the problem
+	 ____________________________________________
+	I                                            I    
+	I         Compressible background            I   
+	I ___________________________________________I
+	I           Incompressible Layer             I
+	I ___________________________________________I
+	I                                            I
+	I                                            I
+	I                  Crust                     I
+	I                    _                       I
+	I___________________[ ]______________________I
+	I                    l> small notch          I
+	I                                            I
+	I                 Mantle                     I
+	I                                            I
+	I____________________________________________I
+
+       -->
+
+
+		<!-- Definition of the geometry -->
+		<struct name="backgroundShape">
+		        <!--Compressible background-->
+			<param name="Type">Everywhere</param>
+		</struct>	
+		<struct name="incompressibleShape">
+		        <!--Incompressible layer-->
+			<param name="Type">Box</param>
+			<param name="startX"> minX </param> <param name="endX"> maxX </param>
+			<param name="startY"> 0.8 </param>  <param name="endY"> 0.85 </param>
+			<param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
+		</struct>
+		<struct name="crustShape">
+			<param name="Type">Box</param>
+			<param name="startX"> minX </param> <param name="endX"> maxX </param>
+			<param name="startY"> 0.4 </param>   <param name="endY"> 0.8 </param>
+			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
+		</struct>		
+		<struct name="weakZoneShape">
+			<param name="Type">Box</param>
+			<param name="startX"> 0.975 </param> <param name="endX"> 1.025 </param>
+			<param name="startY"> 0.4 </param>   <param name="endY"> 0.45 </param>
+			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
+		</struct>		
+		<struct name="crustShape2">
+			<!--Crust = Box - small notch -->
+			<param name="Type">Intersection</param>
+			<list name="shapes">
+				<param>crustShape</param>
+				<param>!weakZoneShape</param>
+			</list>
+		</struct>		
+		<struct name="mantleShape">
+			<param name="Type">Box</param>
+			<param name="startX"> minX </param> <param name="endX"> maxX </param>
+			<param name="startY"> 0.0 </param>   <param name="endY"> 0.4 </param>
+			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
+		</struct>		
+		<struct name="mantleShape2">
+			<!--Mantle = Box + small notch -->
+			<param name="Type">Union</param>
+			<list name="shapes">
+				<param>mantleShape</param>
+				<param>weakZoneShape</param>
+			</list>
+		</struct>
+		
+		<!-- Definition of the materials -->
+		<struct name="backgroundViscosity">
+		        <!--Compressible background-->
+			<param name="Type">MaterialViscosity</param>
+			<param name="eta0">1.0e-1</param>
+		</struct>	
+		<struct name="compresibility">
+		        <!--This component is necessary when you use a compressible layer-->
+		        <!--Fortunately, you don't have to change anything here-->
+			<param name="Type">Compressible</param>
+			<param name="GeometryMesh">mesh-linear</param>
+			<param name="StiffnessMatrix">c_matrix</param>
+			<param name="Swarm">picIntegrationPoints</param>			
+			<param name="oneOnLambda">10.0</param>
+		</struct>
+
+		<struct name="crustViscosity">
+			<param name="Type">MaterialViscosity</param>
+			<param name="eta0">10.000</param>
+		</struct>	
+
+		<struct name="director">
+			<param name="Type">Director</param>
+			<param name="TimeIntegrator">timeIntegrator</param>
+			<param name="VelocityGradientsField">VelocityGradientsField</param>
+			<param name="MaterialPointsSwarm">materialSwarm</param>
+			<param name="initialDirectionX">0.0</param>
+			<param name="initialDirectionY">1.0</param>
+			<param name="initialDirectionZ">0.0</param>
+			<param name="dontUpdate">True</param>
+		</struct>	
+
+		<struct name="strainWeakening">
+			<param name="Type">StrainWeakening</param>
+			<param name="TimeIntegrator">timeIntegrator</param>
+			<param name="MaterialPointsSwarm">materialSwarm</param>
+			<param name="softeningStrain">0.1</param>
+			<param name="initialDamageFraction">0.0</param>
+			<param name="initialDamageWavenumber">0.5</param>
+			<param name="initialDamageFactor">0.5</param>
+			<param name="healingRate">0.0</param>
+		</struct>
+
+		<struct name="yielding">
+			<param name="Type">FaultingMoresiMuhlhaus2006</param>
+			<param name="PressureField">PressureField</param>
+			<param name="VelocityGradientsField">VelocityGradientsField</param>
+			<param name="MaterialPointsSwarm">materialSwarm</param>
+			<param name="Director">director</param>
+			<param name="Context">context</param>
+			<param name="StrainWeakening">strainWeakening</param>
+			<param name="cohesion">10.0</param>
+			<param name="cohesionAfterSoftening">0.0001</param>
+			<param name="frictionCoefficient">0.0</param>
+			<param name="frictionCoefficientAfterSoftening">0.0</param>
+			<param name="minimumYieldStress">0.00001</param>
+			<param name="ignoreOldOrientation">false</param>
+		</struct>
+
+		<struct name="mantleViscosity">
+			<param name="Type">MaterialViscosity</param>
+			<param name="eta0">1.000</param>
+		</struct>	
+
+
+		<!-- Assembly of the geometry and the material -->
+		<struct name="background">
+		        <!--Compressible background-->
+			<param name="Type">RheologyMaterial</param>
+			<param name="Shape">backgroundShape</param>
+			<param name="Compressible">compresibility</param>
+			<param name="Rheology">backgroundViscosity</param>
+		</struct>
+		<struct name="incompressible">
+			<param name="Type">RheologyMaterial</param>
+			<param name="Shape">incompressibleShape</param>
+			<param name="Rheology">backgroundViscosity</param>
+		</struct>	
+		
+		<struct name="crust">
+			<param name="Type">RheologyMaterial</param>
+			<param name="Shape">crustShape2</param>
+			<list name="Rheology">
+				<param>crustViscosity</param>
+				<param>yielding</param>
+			</list>
+			<!--param name="density">1.0</param-->
+		</struct>
+		
+		<struct name="mantle"> 
+			<param name="Type">RheologyMaterial</param>
+			<param name="Shape">mantleShape2</param>
+			<param name="Rheology">mantleViscosity</param>
+		</struct>
+	</struct>
+
+
+	<!-- Simulation control -->
+	<param name="maxTimeSteps"> 50 </param>    <!--The simulation ends after solving for the number of timesteps indicated here-->
+	<param name="outputPath"> ./output </param><!--The name of the directory where the results are stored-->
+	<param name="dumpEvery"> 1 </param>        <!--Frequency of the ouput-->	
+
+	<!--param name="gravity"> 1.00    </param-->
+
+	<!-- Non-linear stuff -->
+	<param name="nonLinearMaxIterations"> 20 </param><!--number of iterations before considering that the algorithme fails to converge within a timestep-->	
+	
+	<!-- Journal Control -->
+	<!-- These parameters are needed to control the amount of informations printed on screen-->
+	<param name="journal.info.Context-verbose">True</param>
+	<param name="journal-level.info.Stg_ComponentFactory">2</param>
+	<param name="journal.debug">t</param>
+	<param name="journal-enable-branch.debug.StG_FEM">t</param>
+	<param name="journal-level-branch.debug.StG_FEM"> 2 </param>	
+	
+	<!-- Geometry & Mesh setup -->
+	<param name="dim"> 2 </param>             <!--this is a 2D problem-->
+	<param name="elementResI"> 120 </param>   <!--number of elements in x-direction-->
+	<param name="elementResJ"> 60 </param>    <!--number of elements in y-direction-->
+	<param name="elementResK"> 10 </param>    <!--number of elements in z-direction (not necessary here)-->
+	<param name="shadowDepth"> 1 </param>     <!--used for parallel purpose-->
+
+         <!--The following 6 parameters define the size of the box (or the cube in 3D)-->
+	<param name="minX"> 0.0 </param>       
+	<param name="minY"> 0.0 </param>
+	<param name="minZ"> 0.0 </param>
+	<param name="maxX"> 2.0 </param>
+	<param name="maxY"> 1.0 </param>
+	<param name="maxZ"> 2.0 </param>
+
+	<param name="allowUnbalancing"> True </param>
+	<param name="particlesPerCell"> 30 </param>
+	<param name="cellParticleCount"> 30 </param>
+	<param name="seed"> 13 </param>
+		
+	<!-- Set up BCs and ICs -->
+	<!--This file defines the boundary conditions for this problem-->
+	<include> VariableConditions/velocityBCs.extension.xml </include>
+
+	<!-- Integration Scheme configuration -->
+
+	<!--
+	<param name="Gravity">10.0</param>
+	-->
+	<!-- Visualisation stuff -->
+	<!--The end of the file is for vizualisation purpose-->
+	<include>./window.xml</include>
+	<struct name="components" mergeType="merge">
+		<struct name="camera" mergeType="replace">
+			<param name="Type">lucCamera</param>
+			<param name="CentreFieldVariable">StrainRateInvariantField</param>
+			<param name="coordZ">1.5</param>
+		</struct>	
+		<struct name="strainRateInvColourMap">
+			<param name="Type">lucColourMap</param>
+			<param name="colours">#111111 #220044 DarkSlateBlue Blue green yellow orange DarkRed red</param>
+			<param name="dynamicRange">f</param>
+			<param name="minimum">0.0</param>
+			<param name="maximum">2.0</param>
+		</struct>		
+		<struct name="strainRateInvMap">
+			<param name="Type">lucScalarField</param>
+			<param name="FieldVariable">StrainRateInvariantField</param>
+			<param name="ColourMap">strainRateInvColourMap</param>
+		</struct>
+		<struct name="strainRateInvTitle" mergeType="replace">
+			<param name="Type">lucTitle</param>
+			<param name="string">Strain Rate Invariant</param>
+		</struct>
+		<struct name="border" mergeType="replace">
+			<param name="Type">lucFieldVariableBorder</param>
+			<param name="FieldVariable">StrainRateInvariantField</param>
+		</struct>
+		<struct name="strainRateInvColourBar">
+			<param name="Type">lucColourBar</param>
+			<param name="ColourMap">strainRateInvColourMap</param>
+		</struct>		
+		<struct name="faultSquares">
+			<param name="Type">lucSwarmVectors</param>
+			<param name="Swarm">materialSwarm</param>
+			<param name="colour">white</param>
+			<param name="ColourVariable">materialSwarm-FaultingMoresiMuhlhaus2006Brightness</param>
+			<param name="ColourMap">brightnessColourMap</param>
+			<param name="OpacityVariable">materialSwarm-FaultingMoresiMuhlhaus2006Opacity</param>
+			<param name="MaskVariable">materialSwarm-MaterialIndex</param>
+			<param name="maskValue">2</param>
+			<param name="maskType">EqualTo</param>
+			<param name="DirectionVariable">materialSwarm-SlipVector</param>
+			<param name="arrowHeadSize">0.0</param>
+			<param name="NormalVariable">materialSwarm-Director</param>
+			<param name="PlaneVectorVariable">materialSwarm-SlipVector</param>
+			<param name="LengthVariable">materialSwarm-FaultingMoresiMuhlhaus2006Length</param>
+			<param name="ThicknessVariable">materialSwarm-FaultingMoresiMuhlhaus2006Thickness</param>
+		</struct>
+		<struct name="StrainRateInvariantVP">
+			<param name="Type">lucViewport</param>
+			<param name="Camera">camera</param>
+			<list name="DrawingObject">
+				<param>strainRateInvTitle</param>
+				<param>strainRateInvMap</param>
+				<param>border</param>
+				<param>faultSquares</param>
+				<param>strainRateInvColourBar</param>
+			</list>
+		</struct>		
+		<include>./Viewports/ParticleMaterialAndNodalVelocityVP.xml</include>
+		<struct name="window" mergeType="merge">
+			<list name="Viewport">
+				<param>StrainRateInvariantVP</param>
+				<param>ParticleMaterialAndNodalVelocityVP</param>
+			</list>	
+		</struct>
+	</struct>	
+
+</StGermainData>

Added: long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionFMM3D.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionFMM3D.xml	2006-08-18 00:18:11 UTC (rev 4355)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionFMM3D.xml	2006-08-18 00:18:11 UTC (rev 4356)
@@ -0,0 +1,233 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<include> BaseApps/ExtensionBaseApp.xml </include>
+	<include> PIC_Components/PopulationControl.xml </include>
+	
+	<list name="plugins" mergeType="merge">
+		<!-- Output Plugins -->
+		<param>StG_FEM_FrequentOutput</param>	
+		<param>Underworld_Vrms</param>	
+		<param>StG_FEM_CPUTime</param>
+	</list>
+
+	<!-- Rheology Components -->
+	<struct name="components" mergeType="merge">
+		<!-- Shape Stuff -->
+		<struct name="backgroundShape">
+			<param name="Type">Everywhere</param>
+		</struct>	
+		<struct name="incompressibleShape">
+			<param name="Type">Box</param>
+			<param name="startX"> minX </param> <param name="endX"> maxX </param>
+			<param name="startY"> 0.8 </param>  <param name="endY"> 0.85 </param>
+			<param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
+		</struct>
+		<struct name="crustShape">
+			<param name="Type">Box</param>
+			<param name="startX"> minX </param> <param name="endX"> maxX </param>
+			<param name="startY"> 0.4 </param>   <param name="endY"> 0.8 </param>
+			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
+		</struct>		
+		<struct name="weakZoneShape1">
+			<param name="Type">Box</param>
+			<param name="startX"> 0.775 </param> <param name="endX"> 0.825 </param>
+			<param name="startY"> 0.4 </param>   <param name="endY"> 0.45 </param>
+			<param name="startZ"> minZ </param>  <param name="endZ"> 0.66666 </param>
+		</struct>		
+		<struct name="weakZoneShape2">
+			<param name="Type">Box</param>
+			<param name="startX"> 1.175 </param> <param name="endX"> 1.225 </param>
+			<param name="startY"> 0.4 </param>   <param name="endY"> 0.45 </param>
+			<param name="startZ"> 1.33333 </param>  <param name="endZ"> maxZ </param>
+		</struct>		
+		<struct name="weakZoneShape">
+			<param name="Type">Union</param>
+			<list name="shapes">
+				<param>weakZoneShape1</param>
+				<param>weakZoneShape2</param>
+			</list>
+		</struct>
+		<struct name="crustShape2">
+			<param name="Type">Intersection</param>
+			<list name="shapes">
+				<param>crustShape</param>
+				<param>!weakZoneShape</param>
+			</list>
+		</struct>		
+		<struct name="mantleShape">
+			<param name="Type">Box</param>
+			<param name="startX"> minX </param> <param name="endX"> maxX </param>
+			<param name="startY"> 0.0 </param>   <param name="endY"> 0.4 </param>
+			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
+		</struct>		
+		<struct name="mantleShape2">
+			<param name="Type">Union</param>
+			<list name="shapes">
+				<param>mantleShape</param>
+				<param>weakZoneShape</param>
+			</list>
+		</struct>
+		
+		<!-- Material Stuff -->
+		<struct name="backgroundViscosity">
+			<param name="Type">MaterialViscosity</param>
+			<param name="eta0">1.0e-1</param>
+		</struct>	
+		<struct name="compresibility">
+			<param name="Type">Compressible</param>
+			<param name="GeometryMesh">mesh-linear</param>
+			<param name="StiffnessMatrix">c_matrix</param>
+			<param name="Swarm">picIntegrationPoints</param>
+			<param name="oneOnLambda">10.0</param>
+		</struct>
+		<struct name="background">
+			<param name="Type">RheologyMaterial</param>
+			<param name="Shape">backgroundShape</param>
+			<!--param name="density">0.0</param-->
+			<param name="Compressible">compresibility</param>
+			<param name="Rheology">backgroundViscosity</param>
+		</struct>
+		<struct name="incompressible">
+			<param name="Type">RheologyMaterial</param>
+			<param name="Shape">incompressibleShape</param>
+			<!--param name="density">0.0</param-->
+			<param name="Rheology">backgroundViscosity</param>
+		</struct>	
+		
+		<!-- Crust Rheology -->
+		<struct name="crustViscosity">
+			<param name="Type">MaterialViscosity</param>
+			<param name="eta0">10.000</param>
+		</struct>	
+		<struct name="strainWeakening">
+			<param name="Type">StrainWeakening</param>
+			<param name="TimeIntegrator">timeIntegrator</param>
+			<param name="MaterialPointsSwarm">materialSwarm</param>
+			<param name="softeningStrain">0.1</param>
+			<param name="initialDamageFraction">0.0</param>
+			<param name="initialDamageWavenumber">0.5</param>
+			<param name="initialDamageFactor">0.5</param>
+			<param name="healingRate">0.0</param>
+		</struct>
+		<struct name="director">
+			<param name="Type">Director</param>
+			<param name="TimeIntegrator">timeIntegrator</param>
+			<param name="VelocityGradientsField">VelocityGradientsField</param>
+			<param name="MaterialPointsSwarm">materialSwarm</param>
+			<param name="initialDirectionX">0.0</param>
+			<param name="initialDirectionY">1.0</param>
+			<param name="initialDirectionZ">0.0</param>
+			<param name="dontUpdate">True</param>
+		</struct>	
+		<struct name="yielding">
+			<param name="Type">FaultingMoresiMuhlhaus2006</param>
+			<param name="PressureField">PressureField</param>
+			<param name="VelocityGradientsField">VelocityGradientsField</param>
+			<param name="MaterialPointsSwarm">materialSwarm</param>
+			<param name="Director">director</param>
+			<param name="Context">context</param>
+			<param name="StrainWeakening">strainWeakening</param>
+			<param name="cohesion">10.0</param>
+			<param name="cohesionAfterSoftening">0.0001</param><!--0.0001-->
+			<param name="frictionCoefficient">0.0</param><!--0.5-->
+			<param name="frictionCoefficientAfterSoftening">0.0</param><!--0.0-->
+			<param name="minimumYieldStress">0.00001</param>
+			<param name="ignoreOldOrientation">false</param>
+		</struct>
+		<struct name="crust">
+			<param name="Type">RheologyMaterial</param>
+			<param name="Shape">crustShape2</param>
+	        <!--param name="density">1.0</param-->
+			<list name="Rheology">
+				<param>crustViscosity</param>
+				<param>yielding</param>
+			</list>
+		</struct>
+		
+		<struct name="mantleViscosity">
+			<param name="Type">MaterialViscosity</param>
+			<param name="eta0">1.000</param>
+		</struct>	
+		<struct name="mantle"> 
+			<param name="Type">RheologyMaterial</param>
+			<param name="Shape">mantleShape2</param>
+			<!--	<param name="density">1.1</param>-->
+			<!-- Rheology Stuff -->
+			<param name="Rheology">mantleViscosity</param>
+		</struct>
+
+		<!-- Mantle Field Stuff -->
+		<struct name="MantleField">
+			<param name="Type">MaterialFeVariable</param>
+			<param name="Swarm">picIntegrationPoints</param>
+			<param name="Material">mantle</param>
+			<param name="Context">context</param>
+			<param name="Mesh">mesh-linear</param>
+		</struct>	
+
+		<!-- Compressible Field Stuff -->
+		<struct name="CompressibleField">
+			<param name="Type">MaterialFeVariable</param>
+			<param name="Swarm">picIntegrationPoints</param>
+			<param name="Material">background</param>
+			<param name="Context">context</param>
+			<param name="Mesh">mesh-linear</param>
+		</struct>	
+	</struct>
+
+
+	<!-- Simulation control -->
+	<param name="maxTimeSteps"> 300 </param>
+	<param name="outputPath"> ./output </param>
+	<param name="dumpEvery"> 1 </param>	
+
+	<!-- Non-linear stuff -->
+	<param name="nonLinearMaxIterations"> 20 </param>	
+	
+	<!-- Journal Control -->
+	<param name="journal.info.Context-verbose">True</param>
+	<param name="journal-level.info.Stg_ComponentFactory">2</param>
+	<param name="journal.debug">t</param>
+	<param name="journal-enable-branch.debug.StG_FEM">t</param>
+	<param name="journal-enable-branch.debug.lucDebug">t</param>
+	<param name="journal-level-branch.debug.lucDebug">2</param>
+	<param name="journal-level-branch.debug.StG_FEM"> 2 </param>	
+	
+	<!-- Geometry & Mesh setup -->
+	<param name="dim"> 3 </param>
+	<!-- Note : for proper resolution of the problem, it is strongly recommended you run
+	     this problem in parallel, with at least 100 * 50 * 100 elements. The values below are for
+	     small testing / demonstration only. -->
+	<param name="elementResI"> 32 </param>
+	<param name="elementResJ"> 16 </param>
+	<param name="elementResK"> 32 </param>
+	<param name="shadowDepth"> 1 </param>
+	<param name="minX"> 0.0 </param>
+	<param name="minY"> 0.0 </param>
+	<param name="minZ"> 0.0 </param>
+	<param name="maxX"> 2.0 </param>
+	<param name="maxY"> 1.0 </param>
+	<param name="maxZ"> 2.0 </param>
+	<param name="allowUnbalancing"> True </param>
+
+	<param name="particlesPerCell"> 25 </param>
+	<param name="cellParticleCount"> 25 </param>
+	<param name="seed"> 13 </param>
+		
+	<!-- Set up BCs and ICs -->
+	<include> VariableConditions/velocityBCs.extension.xml </include>
+
+	<!-- Integration Scheme configuration -->
+
+	<!--
+	<param name="Gravity">10.0</param>
+	-->
+	<!-- Visualisation stuff -->
+	<include>./Viewports/Extension3DVP.xml</include>
+<!--
+-->
+
+</StGermainData>

Deleted: long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionMC.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionMC.xml	2006-08-18 00:18:11 UTC (rev 4355)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionMC.xml	2006-08-18 00:18:11 UTC (rev 4356)
@@ -1,302 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
-
-<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
-
-	<include> BaseApps/ExtensionBaseApp.xml </include>
-	
-	<list name="plugins" mergeType="merge">
-		<!-- Output Plugins -->
-		<param>StG_FEM_FrequentOutput</param>	
-		<param>Underworld_Vrms</param>	
-		<param>StG_FEM_CPUTime</param>
-	</list>
-
-	<!-- Rheology Components -->
-	<struct name="components" mergeType="merge">
-
-
-       <!--
-            Geometry of the problem
-	 ____________________________________________
-	I                                            I    
-	I         Compressible background            I   
-	I ___________________________________________I
-	I           Incompressible Layer             I
-	I ___________________________________________I
-	I                                            I
-	I                                            I
-	I                  Crust                     I
-	I                    _                       I
-	I___________________[ ]______________________I
-	I                    l> small notch          I
-	I                                            I
-	I                 Mantle                     I
-	I                                            I
-	I____________________________________________I
-
-       -->
-
-
-		<!-- Definition of the geometry -->
-		<struct name="backgroundShape">
-		        <!--Compressible background-->
-			<param name="Type">Everywhere</param>
-		</struct>	
-		<struct name="incompressibleShape">
-		        <!--Incompressible layer-->
-			<param name="Type">Box</param>
-			<param name="startX"> minX </param> <param name="endX"> maxX </param>
-			<param name="startY"> 0.8 </param>  <param name="endY"> 0.85 </param>
-			<param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
-		</struct>
-		<struct name="crustShape">
-			<param name="Type">Box</param>
-			<param name="startX"> minX </param> <param name="endX"> maxX </param>
-			<param name="startY"> 0.4 </param>   <param name="endY"> 0.8 </param>
-			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
-		</struct>		
-		<struct name="weakZoneShape">
-			<param name="Type">Box</param>
-			<param name="startX"> 0.975 </param> <param name="endX"> 1.025 </param>
-			<param name="startY"> 0.4 </param>   <param name="endY"> 0.45 </param>
-			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
-		</struct>		
-		<struct name="crustShape2">
-			<!--Crust = Box - small notch -->
-			<param name="Type">Intersection</param>
-			<list name="shapes">
-				<param>crustShape</param>
-				<param>!weakZoneShape</param>
-			</list>
-		</struct>		
-		<struct name="mantleShape">
-			<param name="Type">Box</param>
-			<param name="startX"> minX </param> <param name="endX"> maxX </param>
-			<param name="startY"> 0.0 </param>   <param name="endY"> 0.4 </param>
-			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
-		</struct>		
-		<struct name="mantleShape2">
-			<!--Mantle = Box + small notch -->
-			<param name="Type">Union</param>
-			<list name="shapes">
-				<param>mantleShape</param>
-				<param>weakZoneShape</param>
-			</list>
-		</struct>
-		
-		<!-- Definition of the materials -->
-		<struct name="backgroundViscosity">
-		        <!--Compressible background-->
-			<param name="Type">MaterialViscosity</param>
-			<param name="eta0">1.0e-1</param>
-		</struct>	
-		<struct name="compresibility">
-		        <!--This component is necessary when you use a compressible layer-->
-		        <!--Fortunately, you don't have to change anything here-->
-			<param name="Type">Compressible</param>
-			<param name="GeometryMesh">mesh-linear</param>
-			<param name="StiffnessMatrix">c_matrix</param>
-			<param name="Swarm">picIntegrationPoints</param>			
-			<param name="oneOnLambda">10.0</param>
-		</struct>
-
-		<struct name="crustViscosity">
-			<param name="Type">MaterialViscosity</param>
-			<param name="eta0">10.000</param>
-		</struct>	
-
-		<struct name="director">
-			<param name="Type">Director</param>
-			<param name="TimeIntegrator">timeIntegrator</param>
-			<param name="VelocityGradientsField">VelocityGradientsField</param>
-			<param name="MaterialPointsSwarm">materialSwarm</param>
-			<param name="initialDirectionX">0.0</param>
-			<param name="initialDirectionY">1.0</param>
-			<param name="initialDirectionZ">0.0</param>
-			<param name="dontUpdate">True</param>
-		</struct>	
-
-		<struct name="strainWeakening">
-			<param name="Type">StrainWeakening</param>
-			<param name="TimeIntegrator">timeIntegrator</param>
-			<param name="MaterialPointsSwarm">materialSwarm</param>
-			<param name="softeningStrain">0.1</param>
-			<param name="initialDamageFraction">0.0</param>
-			<param name="initialDamageWavenumber">0.5</param>
-			<param name="initialDamageFactor">0.5</param>
-			<param name="healingRate">0.0</param>
-		</struct>
-
-		<struct name="yielding">
-			<param name="Type">MohrCoulomb</param>
-			<param name="PressureField">PressureField</param>
-			<param name="VelocityGradientsField">VelocityGradientsField</param>
-			<param name="MaterialPointsSwarm">materialSwarm</param>
-			<param name="Director">director</param>
-			<param name="Context">context</param>
-			<param name="StrainWeakening">strainWeakening</param>
-			<param name="cohesion">10.0</param>
-			<param name="cohesionAfterSoftening">0.0001</param>
-			<param name="frictionCoefficient">0.0</param>
-			<param name="frictionCoefficientAfterSoftening">0.0</param>
-			<param name="minimumYieldStress">0.00001</param>
-			<param name="ignoreOldOrientation">false</param>
-		</struct>
-
-		<struct name="mantleViscosity">
-			<param name="Type">MaterialViscosity</param>
-			<param name="eta0">1.000</param>
-		</struct>	
-
-
-		<!-- Assembly of the geometry and the material -->
-		<struct name="background">
-		        <!--Compressible background-->
-			<param name="Type">RheologyMaterial</param>
-			<param name="Shape">backgroundShape</param>
-			<param name="Compressible">compresibility</param>
-			<param name="Rheology">backgroundViscosity</param>
-		</struct>
-		<struct name="incompressible">
-			<param name="Type">RheologyMaterial</param>
-			<param name="Shape">incompressibleShape</param>
-			<param name="Rheology">backgroundViscosity</param>
-		</struct>	
-		
-		<struct name="crust">
-			<param name="Type">RheologyMaterial</param>
-			<param name="Shape">crustShape2</param>
-			<list name="Rheology">
-				<param>crustViscosity</param>
-				<param>yielding</param>
-			</list>
-			<!--param name="density">1.0</param-->
-		</struct>
-		
-		<struct name="mantle"> 
-			<param name="Type">RheologyMaterial</param>
-			<param name="Shape">mantleShape2</param>
-			<param name="Rheology">mantleViscosity</param>
-		</struct>
-	</struct>
-
-
-	<!-- Simulation control -->
-	<param name="maxTimeSteps"> 50 </param>    <!--The simulation ends after solving for the number of timesteps indicated here-->
-	<param name="outputPath"> ./output </param><!--The name of the directory where the results are stored-->
-	<param name="dumpEvery"> 1 </param>        <!--Frequency of the ouput-->	
-
-	<!--param name="gravity"> 1.00    </param-->
-
-	<!-- Non-linear stuff -->
-	<param name="nonLinearMaxIterations"> 20 </param><!--number of iterations before considering that the algorithme fails to converge within a timestep-->	
-	
-	<!-- Journal Control -->
-	<!-- These parameters are needed to control the amount of informations printed on screen-->
-	<param name="journal.info.Context-verbose">True</param>
-	<param name="journal-level.info.Stg_ComponentFactory">2</param>
-	<param name="journal.debug">t</param>
-	<param name="journal-enable-branch.debug.StG_FEM">t</param>
-	<param name="journal-level-branch.debug.StG_FEM"> 2 </param>	
-	
-	<!-- Geometry & Mesh setup -->
-	<param name="dim"> 2 </param>             <!--this is a 2D problem-->
-	<param name="elementResI"> 120 </param>   <!--number of elements in x-direction-->
-	<param name="elementResJ"> 60 </param>    <!--number of elements in y-direction-->
-	<param name="elementResK"> 10 </param>    <!--number of elements in z-direction (not necessary here)-->
-	<param name="shadowDepth"> 1 </param>     <!--used for parallel purpose-->
-
-         <!--The following 6 parameters define the size of the box (or the cube in 3D)-->
-	<param name="minX"> 0.0 </param>       
-	<param name="minY"> 0.0 </param>
-	<param name="minZ"> 0.0 </param>
-	<param name="maxX"> 2.0 </param>
-	<param name="maxY"> 1.0 </param>
-	<param name="maxZ"> 2.0 </param>
-
-	<param name="allowUnbalancing"> True </param>
-	<param name="particlesPerCell"> 30 </param>
-	<param name="cellParticleCount"> 30 </param>
-	<param name="seed"> 13 </param>
-		
-	<!-- Set up BCs and ICs -->
-	<!--This file defines the boundary conditions for this problem-->
-	<include> VariableConditions/velocityBCs.extension.xml </include>
-
-	<!-- Integration Scheme configuration -->
-
-	<!--
-	<param name="Gravity">10.0</param>
-	-->
-	<!-- Visualisation stuff -->
-	<!--The end of the file is for vizualisation purpose-->
-	<include>./window.xml</include>
-	<struct name="components" mergeType="merge">
-		<struct name="camera" mergeType="replace">
-			<param name="Type">lucCamera</param>
-			<param name="CentreFieldVariable">StrainRateInvariantField</param>
-			<param name="coordZ">1.5</param>
-		</struct>	
-		<struct name="strainRateInvColourMap">
-			<param name="Type">lucColourMap</param>
-			<param name="colours">#111111 #220044 DarkSlateBlue Blue green yellow orange DarkRed red</param>
-			<param name="dynamicRange">f</param>
-			<param name="minimum">0.0</param>
-			<param name="maximum">2.0</param>
-		</struct>		
-		<struct name="strainRateInvMap">
-			<param name="Type">lucScalarField</param>
-			<param name="FieldVariable">StrainRateInvariantField</param>
-			<param name="ColourMap">strainRateInvColourMap</param>
-		</struct>
-		<struct name="strainRateInvTitle" mergeType="replace">
-			<param name="Type">lucTitle</param>
-			<param name="string">Strain Rate Invariant</param>
-		</struct>
-		<struct name="border" mergeType="replace">
-			<param name="Type">lucFieldVariableBorder</param>
-			<param name="FieldVariable">StrainRateInvariantField</param>
-		</struct>
-		<struct name="strainRateInvColourBar">
-			<param name="Type">lucColourBar</param>
-			<param name="ColourMap">strainRateInvColourMap</param>
-		</struct>		
-		<struct name="faultSquares">
-			<param name="Type">lucSwarmVectors</param>
-			<param name="Swarm">materialSwarm</param>
-			<param name="colour">white</param>
-			<param name="ColourVariable">materialSwarm-MohrCoulombBrightness</param>
-			<param name="ColourMap">brightnessColourMap</param>
-			<param name="OpacityVariable">materialSwarm-MohrCoulombOpacity</param>
-			<param name="MaskVariable">materialSwarm-MaterialIndex</param>
-			<param name="maskValue">2</param>
-			<param name="maskType">EqualTo</param>
-			<param name="DirectionVariable">materialSwarm-SlipVector</param>
-			<param name="arrowHeadSize">0.0</param>
-			<param name="NormalVariable">materialSwarm-Director</param>
-			<param name="PlaneVectorVariable">materialSwarm-SlipVector</param>
-			<param name="LengthVariable">materialSwarm-MohrCoulombLength</param>
-			<param name="ThicknessVariable">materialSwarm-MohrCoulombThickness</param>
-		</struct>
-		<struct name="StrainRateInvariantVP">
-			<param name="Type">lucViewport</param>
-			<param name="Camera">camera</param>
-			<list name="DrawingObject">
-				<param>strainRateInvTitle</param>
-				<param>strainRateInvMap</param>
-				<param>border</param>
-				<param>faultSquares</param>
-				<param>strainRateInvColourBar</param>
-			</list>
-		</struct>		
-		<include>./Viewports/ParticleMaterialAndNodalVelocityVP.xml</include>
-		<struct name="window" mergeType="merge">
-			<list name="Viewport">
-				<param>StrainRateInvariantVP</param>
-				<param>ParticleMaterialAndNodalVelocityVP</param>
-			</list>	
-		</struct>
-	</struct>	
-
-</StGermainData>

Deleted: long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionMC3D.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionMC3D.xml	2006-08-18 00:18:11 UTC (rev 4355)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/ExtensionMC3D.xml	2006-08-18 00:18:11 UTC (rev 4356)
@@ -1,233 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
-
-<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
-
-	<include> BaseApps/ExtensionBaseApp.xml </include>
-	<include> PIC_Components/PopulationControl.xml </include>
-	
-	<list name="plugins" mergeType="merge">
-		<!-- Output Plugins -->
-		<param>StG_FEM_FrequentOutput</param>	
-		<param>Underworld_Vrms</param>	
-		<param>StG_FEM_CPUTime</param>
-	</list>
-
-	<!-- Rheology Components -->
-	<struct name="components" mergeType="merge">
-		<!-- Shape Stuff -->
-		<struct name="backgroundShape">
-			<param name="Type">Everywhere</param>
-		</struct>	
-		<struct name="incompressibleShape">
-			<param name="Type">Box</param>
-			<param name="startX"> minX </param> <param name="endX"> maxX </param>
-			<param name="startY"> 0.8 </param>  <param name="endY"> 0.85 </param>
-			<param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
-		</struct>
-		<struct name="crustShape">
-			<param name="Type">Box</param>
-			<param name="startX"> minX </param> <param name="endX"> maxX </param>
-			<param name="startY"> 0.4 </param>   <param name="endY"> 0.8 </param>
-			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
-		</struct>		
-		<struct name="weakZoneShape1">
-			<param name="Type">Box</param>
-			<param name="startX"> 0.775 </param> <param name="endX"> 0.825 </param>
-			<param name="startY"> 0.4 </param>   <param name="endY"> 0.45 </param>
-			<param name="startZ"> minZ </param>  <param name="endZ"> 0.66666 </param>
-		</struct>		
-		<struct name="weakZoneShape2">
-			<param name="Type">Box</param>
-			<param name="startX"> 1.175 </param> <param name="endX"> 1.225 </param>
-			<param name="startY"> 0.4 </param>   <param name="endY"> 0.45 </param>
-			<param name="startZ"> 1.33333 </param>  <param name="endZ"> maxZ </param>
-		</struct>		
-		<struct name="weakZoneShape">
-			<param name="Type">Union</param>
-			<list name="shapes">
-				<param>weakZoneShape1</param>
-				<param>weakZoneShape2</param>
-			</list>
-		</struct>
-		<struct name="crustShape2">
-			<param name="Type">Intersection</param>
-			<list name="shapes">
-				<param>crustShape</param>
-				<param>!weakZoneShape</param>
-			</list>
-		</struct>		
-		<struct name="mantleShape">
-			<param name="Type">Box</param>
-			<param name="startX"> minX </param> <param name="endX"> maxX </param>
-			<param name="startY"> 0.0 </param>   <param name="endY"> 0.4 </param>
-			<param name="startZ"> minZ </param>  <param name="endZ"> maxZ </param>
-		</struct>		
-		<struct name="mantleShape2">
-			<param name="Type">Union</param>
-			<list name="shapes">
-				<param>mantleShape</param>
-				<param>weakZoneShape</param>
-			</list>
-		</struct>
-		
-		<!-- Material Stuff -->
-		<struct name="backgroundViscosity">
-			<param name="Type">MaterialViscosity</param>
-			<param name="eta0">1.0e-1</param>
-		</struct>	
-		<struct name="compresibility">
-			<param name="Type">Compressible</param>
-			<param name="GeometryMesh">mesh-linear</param>
-			<param name="StiffnessMatrix">c_matrix</param>
-			<param name="Swarm">picIntegrationPoints</param>
-			<param name="oneOnLambda">10.0</param>
-		</struct>
-		<struct name="background">
-			<param name="Type">RheologyMaterial</param>
-			<param name="Shape">backgroundShape</param>
-			<!--param name="density">0.0</param-->
-			<param name="Compressible">compresibility</param>
-			<param name="Rheology">backgroundViscosity</param>
-		</struct>
-		<struct name="incompressible">
-			<param name="Type">RheologyMaterial</param>
-			<param name="Shape">incompressibleShape</param>
-			<!--param name="density">0.0</param-->
-			<param name="Rheology">backgroundViscosity</param>
-		</struct>	
-		
-		<!-- Crust Rheology -->
-		<struct name="crustViscosity">
-			<param name="Type">MaterialViscosity</param>
-			<param name="eta0">10.000</param>
-		</struct>	
-		<struct name="strainWeakening">
-			<param name="Type">StrainWeakening</param>
-			<param name="TimeIntegrator">timeIntegrator</param>
-			<param name="MaterialPointsSwarm">materialSwarm</param>
-			<param name="softeningStrain">0.1</param>
-			<param name="initialDamageFraction">0.0</param>
-			<param name="initialDamageWavenumber">0.5</param>
-			<param name="initialDamageFactor">0.5</param>
-			<param name="healingRate">0.0</param>
-		</struct>
-		<struct name="director">
-			<param name="Type">Director</param>
-			<param name="TimeIntegrator">timeIntegrator</param>
-			<param name="VelocityGradientsField">VelocityGradientsField</param>
-			<param name="MaterialPointsSwarm">materialSwarm</param>
-			<param name="initialDirectionX">0.0</param>
-			<param name="initialDirectionY">1.0</param>
-			<param name="initialDirectionZ">0.0</param>
-			<param name="dontUpdate">True</param>
-		</struct>	
-		<struct name="yielding">
-			<param name="Type">MohrCoulomb</param>
-			<param name="PressureField">PressureField</param>
-			<param name="VelocityGradientsField">VelocityGradientsField</param>
-			<param name="MaterialPointsSwarm">materialSwarm</param>
-			<param name="Director">director</param>
-			<param name="Context">context</param>
-			<param name="StrainWeakening">strainWeakening</param>
-			<param name="cohesion">10.0</param>
-			<param name="cohesionAfterSoftening">0.0001</param><!--0.0001-->
-			<param name="frictionCoefficient">0.0</param><!--0.5-->
-			<param name="frictionCoefficientAfterSoftening">0.0</param><!--0.0-->
-			<param name="minimumYieldStress">0.00001</param>
-			<param name="ignoreOldOrientation">false</param>
-		</struct>
-		<struct name="crust">
-			<param name="Type">RheologyMaterial</param>
-			<param name="Shape">crustShape2</param>
-	        <!--param name="density">1.0</param-->
-			<list name="Rheology">
-				<param>crustViscosity</param>
-				<param>yielding</param>
-			</list>
-		</struct>
-		
-		<struct name="mantleViscosity">
-			<param name="Type">MaterialViscosity</param>
-			<param name="eta0">1.000</param>
-		</struct>	
-		<struct name="mantle"> 
-			<param name="Type">RheologyMaterial</param>
-			<param name="Shape">mantleShape2</param>
-			<!--	<param name="density">1.1</param>-->
-			<!-- Rheology Stuff -->
-			<param name="Rheology">mantleViscosity</param>
-		</struct>
-
-		<!-- Mantle Field Stuff -->
-		<struct name="MantleField">
-			<param name="Type">MaterialFeVariable</param>
-			<param name="Swarm">picIntegrationPoints</param>
-			<param name="Material">mantle</param>
-			<param name="Context">context</param>
-			<param name="Mesh">mesh-linear</param>
-		</struct>	
-
-		<!-- Compressible Field Stuff -->
-		<struct name="CompressibleField">
-			<param name="Type">MaterialFeVariable</param>
-			<param name="Swarm">picIntegrationPoints</param>
-			<param name="Material">background</param>
-			<param name="Context">context</param>
-			<param name="Mesh">mesh-linear</param>
-		</struct>	
-	</struct>
-
-
-	<!-- Simulation control -->
-	<param name="maxTimeSteps"> 300 </param>
-	<param name="outputPath"> ./output </param>
-	<param name="dumpEvery"> 1 </param>	
-
-	<!-- Non-linear stuff -->
-	<param name="nonLinearMaxIterations"> 20 </param>	
-	
-	<!-- Journal Control -->
-	<param name="journal.info.Context-verbose">True</param>
-	<param name="journal-level.info.Stg_ComponentFactory">2</param>
-	<param name="journal.debug">t</param>
-	<param name="journal-enable-branch.debug.StG_FEM">t</param>
-	<param name="journal-enable-branch.debug.lucDebug">t</param>
-	<param name="journal-level-branch.debug.lucDebug">2</param>
-	<param name="journal-level-branch.debug.StG_FEM"> 2 </param>	
-	
-	<!-- Geometry & Mesh setup -->
-	<param name="dim"> 3 </param>
-	<!-- Note : for proper resolution of the problem, it is strongly recommended you run
-	     this problem in parallel, with at least 100 * 50 * 100 elements. The values below are for
-	     small testing / demonstration only. -->
-	<param name="elementResI"> 32 </param>
-	<param name="elementResJ"> 16 </param>
-	<param name="elementResK"> 32 </param>
-	<param name="shadowDepth"> 1 </param>
-	<param name="minX"> 0.0 </param>
-	<param name="minY"> 0.0 </param>
-	<param name="minZ"> 0.0 </param>
-	<param name="maxX"> 2.0 </param>
-	<param name="maxY"> 1.0 </param>
-	<param name="maxZ"> 2.0 </param>
-	<param name="allowUnbalancing"> True </param>
-
-	<param name="particlesPerCell"> 25 </param>
-	<param name="cellParticleCount"> 25 </param>
-	<param name="seed"> 13 </param>
-		
-	<!-- Set up BCs and ICs -->
-	<include> VariableConditions/velocityBCs.extension.xml </include>
-
-	<!-- Integration Scheme configuration -->
-
-	<!--
-	<param name="Gravity">10.0</param>
-	-->
-	<!-- Visualisation stuff -->
-	<include>./Viewports/Extension3DVP.xml</include>
-<!--
--->
-
-</StGermainData>

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/Extension3DVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/Extension3DVP.xml	2006-08-18 00:18:11 UTC (rev 4355)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/Extension3DVP.xml	2006-08-18 00:18:11 UTC (rev 4356)
@@ -78,14 +78,14 @@
 		<param name="Swarm">materialSwarm</param>
 		<param name="colour">white</param>
 		<param name="MaskVariable">materialSwarm-MaterialIndex</param>
-		<param name="OpacityVariable">materialSwarm-MohrCoulombOpacity</param>
-		<param name="ColourVariable">materialSwarm-MohrCoulombBrightness</param>
+		<param name="OpacityVariable">materialSwarm-FaultingMoresiMuhlhaus2006Opacity</param>
+		<param name="ColourVariable">materialSwarm-FaultingMoresiMuhlhaus2006Brightness</param>
 		<param name="ColourMap">brightnessColourMap</param>
 		<param name="maskValue">2</param>
 		<param name="maskType">EqualTo</param>
 		<param name="NormalVariable">materialSwarm-Director</param>
 		<param name="PlaneVectorVariable">materialSwarm-SlipVector</param>
-		<param name="LengthVariable">materialSwarm-MohrCoulombLength</param>
+		<param name="LengthVariable">materialSwarm-FaultingMoresiMuhlhaus2006Length</param>
 	</struct>
 	<struct name="border">
 		<param name="Type">lucFieldVariableBorder</param>

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/Shear3DVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/Shear3DVP.xml	2006-08-18 00:18:11 UTC (rev 4355)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/Shear3DVP.xml	2006-08-18 00:18:11 UTC (rev 4356)
@@ -56,14 +56,14 @@
 		<param name="Swarm">materialSwarm</param>
 		<param name="colour">white</param>
 		<param name="MaskVariable">materialSwarm-MaterialIndex</param>
-		<param name="OpacityVariable">materialSwarm-MohrCoulombOpacity</param>
-		<param name="ColourVariable">materialSwarm-MohrCoulombBrightness</param>
+		<param name="OpacityVariable">materialSwarm-FaultingMoresiMuhlhaus2006Opacity</param>
+		<param name="ColourVariable">materialSwarm-FaultingMoresiMuhlhaus2006Brightness</param>
 		<param name="ColourMap">brightnessColourMap</param>
 		<param name="maskValue">0</param>
 		<param name="maskType">EqualTo</param>
 		<param name="NormalVariable">materialSwarm-Director</param>
 		<param name="PlaneVectorVariable">materialSwarm-SlipVector</param>
-		<param name="LengthVariable">materialSwarm-MohrCoulombLength</param>
+		<param name="LengthVariable">materialSwarm-FaultingMoresiMuhlhaus2006Length</param>
 	</struct>
 	<struct name="border">
 		<param name="Type">lucFieldVariableBorder</param>



More information about the cig-commits mailing list