[cig-commits] r5158 - in long/3D/Gale/trunk/src/Underworld: .
InputFiles/Viewports
walter at geodynamics.org
walter at geodynamics.org
Tue Oct 31 13:33:17 PST 2006
Author: walter
Date: 2006-10-31 13:33:16 -0800 (Tue, 31 Oct 2006)
New Revision: 5158
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/AnalyticVelocityMagnitudeVP.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/VelocityMagnitudeVP.xml
Log:
r696 at earth: boo | 2006-10-31 13:32:08 -0800
r686 at earth (orig r363): JulianGiordani | 2006-10-24 00:17:13 -0700
* Adding error VP definitions into the two AnalyticVP.xml. This enables one to see the diff b/w the analytic field and the numerical field.
* Added the 'time' to the VelocityMagnitudeVP.
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:695
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:362
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:696
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:363
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticPressureVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticPressureVP.xml 2006-10-31 21:33:13 UTC (rev 5157)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticPressureVP.xml 2006-10-31 21:33:16 UTC (rev 5158)
@@ -4,11 +4,6 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components" mergeType="merge">
- <struct name="camera" mergeType="replace">
- <param name="Type">lucCamera</param>
- <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>
@@ -34,10 +29,40 @@
<param name="Camera">camera</param>
<list name="DrawingObject">
<param>analyticPressureMap</param>
- <param>border</param>
<param>analyticPressureTitle</param>
<param>analyticPressureColourBar</param>
</list>
</struct>
+
+ <struct name="pressureErrorColourMap">
+ <param name="Type">lucColourMap</param>
+ <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">Error Pressure</param>
+ </struct>
+ <!-- Drawing Objects -->
+ <struct name="pressureErrorMap">
+ <param name="Type">lucScalarField</param>
+ <param name="FieldVariable">PressureField-ErrorMagnitudeField</param>
+ <param name="ColourMap">pressureErrorColourMap</param>
+ <param name="resolution">128</param>
+ </struct>
+ <struct name="pressureErrorColourBar">
+ <param name="Type">lucColourBar</param>
+ <param name="ColourMap">pressureErrorColourMap</param>
+ </struct>
+ <!-- Put these althogether in a viewport -->
+ <struct name="PressureErrorVP">
+ <param name="Type">lucViewport</param>
+ <param name="Camera">camera</param>
+ <list name="DrawingObject">
+ <param>pressureErrorMap</param>
+ <param>pressureErrorTitle</param>
+ <param>pressureErrorColourBar</param>
+ </list>
+ </struct>
</struct>
</StGermainData>
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticVelocityMagnitudeVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticVelocityMagnitudeVP.xml 2006-10-31 21:33:13 UTC (rev 5157)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/AnalyticVelocityMagnitudeVP.xml 2006-10-31 21:33:16 UTC (rev 5158)
@@ -4,6 +4,11 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components" mergeType="merge">
+ <struct name="analyticVelocityMagnitudeCamera">
+ <param name="Type">lucCamera</param>
+ <param name="CentreFieldVariable">VelocityField-Analytic-Magnitude</param>
+ <param name="coordZ">1.5</param>
+ </struct>
<struct name="analyticVelocityMagnitudeColourMap">
<param name="Type">lucColourMap</param>
<param name="colours">Purple Blue Green Yellow Orange Red Black</param>
@@ -20,15 +25,6 @@
<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>
- <param name="Colour">black</param>
- <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>
@@ -41,9 +37,39 @@
<param>analyticVelocityMagnitudeMap</param>
<param>border</param>
<param>analyticVelocityMagnitudeTitle</param>
- <param>analyticVelocityArrows</param>
<param>analyticVelocityMagnitudeColourBar</param>
</list>
</struct>
+ <struct name="velocityErrorMagnitudeColourMap">
+ <param name="Type">lucColourMap</param>
+ <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">Error Velocity Mag</param>
+ </struct>
+ <!-- Drawing Objects -->
+ <struct name="velocityErrorMagnitudeMap">
+ <param name="Type">lucScalarField</param>
+ <param name="FieldVariable">VelocityField-ErrorMagnitudeField</param>
+ <param name="ColourMap">velocityErrorMagnitudeColourMap</param>
+ <param name="resolution">128</param>
+ </struct>
+ <struct name="velocityErrorMagnitudeColourBar">
+ <param name="Type">lucColourBar</param>
+ <param name="ColourMap">velocityErrorMagnitudeColourMap</param>
+ </struct>
+ <!-- Put these althogether in a viewport -->
+ <struct name="VelocityErrorMagnitudeVP">
+ <param name="Type">lucViewport</param>
+ <param name="Camera">camera</param>
+ <list name="DrawingObject">
+ <param>velocityErrorMagnitudeMap</param>
+ <param>border</param>
+ <param>errorVelocityMagnitudeTitle</param>
+ <param>velocityErrorMagnitudeColourBar</param>
+ </list>
+ </struct>
</struct>
</StGermainData>
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/VelocityMagnitudeVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/VelocityMagnitudeVP.xml 2006-10-31 21:33:13 UTC (rev 5157)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/VelocityMagnitudeVP.xml 2006-10-31 21:33:16 UTC (rev 5158)
@@ -14,6 +14,12 @@
<param name="colours">Purple Blue Green Yellow Orange Red Black</param>
<param name="dynamicRange">true</param>
</struct>
+ <struct name="timeStep">
+ <param name="Type">lucTimeStep</param>
+ <param name="colour">Black</param>
+ <param name="frame">false</param>
+ <param name="time">true</param>
+ </struct>
<!-- Drawing Objects -->
<struct name="velocityMagnitudeTitle" mergeType="replace">
<param name="Type">lucTitle</param>
@@ -47,6 +53,7 @@
<list name="DrawingObject">
<param>velocityMagnitudeTitle</param>
<param>velocityMagnitudeMap</param>
+ <param>timeStep</param>
<param>border</param>
<param>velocityArrows</param>
<param>velocityMagnitudeColourBar</param>
More information about the cig-commits
mailing list