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

walter at geodynamics.org walter at geodynamics.org
Wed Oct 11 13:54:17 PDT 2006 

Author: walter
Date: 2006-10-11 13:54:16 -0700 (Wed, 11 Oct 2006)
New Revision: 4934

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticPressureVP.xml
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticSuiteVP.xml
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticVelocityMagnitudeVP.xml
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/PressureErrorVP.xml
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/VelocityErrorMagnitudeVP.xml
Log:
 r594 at earth:  boo | 2006-10-11 13:52:10 -0700
  r556 at earth (orig r333):  JulianGiordani | 1970-01-01 15:13:06 -0800
  
  The previous commit for the AnalyticSuite.xml was not correct because it was displaying particles position. It should display velocity and pressure VPs only.
  Adding titles to all the other VPs and velocity arrows to AnalyticVelocityMagnitudeVP.xml 
  
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:593
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:332
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:594
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:333

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticPressureVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticPressureVP.xml	2006-10-11 20:54:14 UTC (rev 4933)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticPressureVP.xml	2006-10-11 20:54:16 UTC (rev 4934)
@@ -9,6 +9,10 @@
 			<param name="CentreFieldVariable">PressureField-Analytic</param>
 			<param name="coordZ">1.5</param>
 		</struct>
+		<struct name="analyticPressureTitle">
+			<param name="Type">lucTitle</param>
+			<param name="string">Analytic Pressure</param>
+		</struct>
 		<struct name="analyticPressureColourMap">
 			<param name="Type">lucColourMap</param>
 			<param name="colours">Black Purple DarkRed Orange Yellow</param>
@@ -31,6 +35,7 @@
 			<list name="DrawingObject">
 				<param>analyticPressureMap</param>
 				<param>border</param>
+				<param>analyticPressureTitle</param>
 				<param>analyticPressureColourBar</param>
 			</list>
 		</struct>

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticSuiteVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticSuiteVP.xml	2006-10-11 20:54:14 UTC (rev 4933)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticSuiteVP.xml	2006-10-11 20:54:16 UTC (rev 4934)
@@ -6,9 +6,9 @@
 	<include> ../Viewports/AnalyticPressureVP.xml </include>
 	<include> ../Viewports/PressureVP.xml </include>
 	<include> ../Viewports/PressureErrorVP.xml </include>
+	<!--
 	<include> ../Viewports/ParticleMaterialAndNodalVelocityVP.xml</include>
-	
-	<!--include> ../Viewports/StrainRateInvariantVP.xml </include>
+	<include> ../Viewports/StrainRateInvariantVP.xml </include>
 	<include> ../Viewports/SPR_VP.xml </include>
 	<include> ../Viewports/AnalyticStrainRateInvariantVP.xml </include>
 	-->
@@ -16,7 +16,7 @@
 	<struct name="components" mergeType="merge">
 		<struct name="window" mergeType="merge">
 			<list name="Viewport">
-				<param>ParticleMaterialAndNodalVelocityVP VelocityMagnitudeVP VelocityErrorMagnitudeVP </param>
+				<param> AnalyticVelocityMagnitudeVP VelocityMagnitudeVP VelocityErrorMagnitudeVP </param>
 			        <param> AnalyticPressureVP PressureVP PressureErrorVP </param>
 			        <!--
 				<param> recoveredStrainRateInvariantVP AnalyticStrainRateInvariantVP </param>

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticVelocityMagnitudeVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticVelocityMagnitudeVP.xml	2006-10-11 20:54:14 UTC (rev 4933)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticVelocityMagnitudeVP.xml	2006-10-11 20:54:16 UTC (rev 4934)
@@ -16,7 +16,12 @@
 			<param name="ColourMap">analyticVelocityMagnitudeColourMap</param>
 			<param name="resolution">128</param>
 		</struct>
+		<struct name="analyticVelocityMagnitudeTitle" mergeType="replace">
+			<param name="Type">lucTitle</param>
+			<param name="string">Analytic Velocity Magnitude</param>
+		</struct>
 		<!--
+		-->
 		<struct name="analyticVelocityArrows">
 			<param name="Type">lucVectorArrows</param>
 			<param name="VectorVariable">VelocityField</param>
@@ -24,7 +29,6 @@
 			<param name="arrowHeadSize">0.15</param>	
 			<param name="lengthScale">0.15</param>	
 		</struct>
-		-->
 		<struct name="analyticVelocityMagnitudeColourBar">
 			<param name="Type">lucColourBar</param>
 			<param name="ColourMap">analyticVelocityMagnitudeColourMap</param>
@@ -36,7 +40,8 @@
 			<list name="DrawingObject">
 				<param>analyticVelocityMagnitudeMap</param>
 				<param>border</param>
-				<!--param>analyticVelocityArrows</param-->
+				<param>analyticVelocityMagnitudeTitle</param>
+				<param>analyticVelocityArrows</param>
 				<param>analyticVelocityMagnitudeColourBar</param>
 			</list>
 		</struct>

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/PressureErrorVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/PressureErrorVP.xml	2006-10-11 20:54:14 UTC (rev 4933)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/PressureErrorVP.xml	2006-10-11 20:54:16 UTC (rev 4934)
@@ -9,6 +9,10 @@
 			<param name="colours">Purple Blue Green Yellow Orange Red Black</param>
 			<param name="dynamicRange">true</param>
 		</struct>
+		<struct name="pressureErrorTitle">
+			<param name="Type">lucTitle</param>
+			<param name="string">Relative Error Pressure</param>
+		</struct>
 		<!-- Drawing Objects -->
 		<struct name="pressureErrorMap">
 			<param name="Type">lucScalarField</param>
@@ -27,6 +31,7 @@
 			<list name="DrawingObject">
 				<param>pressureErrorMap</param>
 				<param>border</param>
+				<param>pressureErrorTitle</param>
 				<param>pressureErrorColourBar</param>
 			</list>
 		</struct>

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/VelocityErrorMagnitudeVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/VelocityErrorMagnitudeVP.xml	2006-10-11 20:54:14 UTC (rev 4933)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/VelocityErrorMagnitudeVP.xml	2006-10-11 20:54:16 UTC (rev 4934)
@@ -9,6 +9,10 @@
 			<param name="colours">Purple Blue Green Yellow Orange Red Black</param>
 			<param name="dynamicRange">true</param>
 		</struct>
+		<struct name="errorVelocityMagnitudeTitle" mergeType="replace">
+			<param name="Type">lucTitle</param>
+			<param name="string">Relative Error Velocity Mag</param>
+		</struct>
 		<!-- Drawing Objects -->
 		<struct name="velocityErrorMagnitudeMap">
 			<param name="Type">lucScalarField</param>
@@ -27,6 +31,7 @@
 			<list name="DrawingObject">
 				<param>velocityErrorMagnitudeMap</param>
 				<param>border</param>
+				<param>errorVelocityMagnitudeTitle</param>
 				<param>velocityErrorMagnitudeColourBar</param>
 			</list>
 		</struct>

More information about the cig-commits mailing list