[cig-commits] commit: Getting rid of window xml file and using the one in glucifer.

[Mercurial]

changeset:   83:849032ee3278
user:        RobertTurnbull
date:        Fri Mar 28 04:22:04 2008 +0000
files:       Apps/LidDrivenPIC/Viewport.xml Apps/LidDrivenPIC/Visualisation.xml Apps/LidDrivenPIC/demo.xml Apps/LidDrivenPIC/window.xml
description:
Getting rid of window xml file and using the one in glucifer.


diff -r c9a4bb550fe7 -r 849032ee3278 Apps/LidDrivenPIC/Viewport.xml
--- a/Apps/LidDrivenPIC/Viewport.xml	Fri Mar 28 04:11:31 2008 +0000
+++ b/Apps/LidDrivenPIC/Viewport.xml	Fri Mar 28 04:22:04 2008 +0000
@@ -10,17 +10,17 @@
 			<param name="CentreFieldVariable">VelocityField</param>
 			<param name="coordZ">1.4762</param>
 		</struct>
-		<struct name="pressureColourMap">
+		<struct name="pressureColourMap" mergeType="replace">
 			<param name="Type">lucColourMap</param>
 			<param name="colours">Black Grey White Orange Red</param>
 			<param name="dynamicRange">true</param>
 		</struct>
 		<!-- Drawing Objects -->
-		<struct name="pressureColourBar">
+		<struct name="pressureColourBar" mergeType="replace">
 			<param name="Type">lucColourBar</param>
 			<param name="ColourMap">pressureColourMap</param>
 		</struct>			
-		<struct name="pressureMap">
+		<struct name="pressureMap" mergeType="replace">
 			<param name="Type">lucScalarField</param>
 			<param name="FieldVariable">PressureField</param>
 			<param name="ColourMap">pressureColourMap</param>
@@ -38,7 +38,7 @@
 			<param name="colour">black</param>
 			<param name="pointSize">2.0</param>
 		</struct>		
-		<struct name="border">
+		<struct name="border" mergeType="replace">
 			<param name="Type">lucFieldVariableBorder</param>
 			<param name="FieldVariable">VelocityField</param>
 		</struct>
@@ -47,9 +47,11 @@
 			<param name="Type">lucViewport</param>
 			<param name="Camera">camera</param>
 			<list name="DrawingObject">
+<!--
 				<param>pressureMap</param>
+-->
+				<param>particleDots</param>
 				<param>velocityArrows</param>
-				<param>particleDots</param>
 				<param>border</param>
 				<param>pressureColourBar</param>
 			</list>
diff -r c9a4bb550fe7 -r 849032ee3278 Apps/LidDrivenPIC/Visualisation.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Apps/LidDrivenPIC/Visualisation.xml	Fri Mar 28 04:22:04 2008 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+ 	
+	<include>./Viewport.xml</include>
+	<include>gLucifer/window.xml</include>
+	<struct name="components" mergeType="merge">
+		<struct name="window" mergeType="merge">
+			<param name="Viewport">SolutionViewport</param>
+		</struct>
+	</struct>
+
+</StGermainData>
diff -r c9a4bb550fe7 -r 849032ee3278 Apps/LidDrivenPIC/demo.xml
--- a/Apps/LidDrivenPIC/demo.xml	Fri Mar 28 04:11:31 2008 +0000
+++ b/Apps/LidDrivenPIC/demo.xml	Fri Mar 28 04:22:04 2008 +0000
@@ -4,14 +4,6 @@
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
  	
 	<include>./LidDrivenPIC.xml</include>
-	<include>./Viewport.xml</include>
-	<include>./window.xml</include>
-	<struct name="components" mergeType="merge">
-		<struct name="window" mergeType="merge">
-			<param name="Viewport">SolutionViewport</param>
-		</struct>
-	</struct>
-	<param name="outputPath">./output</param>
-	
+	<include>./Visualisation.xml</include>
 
 </StGermainData>
diff -r c9a4bb550fe7 -r 849032ee3278 Apps/LidDrivenPIC/window.xml
--- a/Apps/LidDrivenPIC/window.xml	Fri Mar 28 04:11:31 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
-
-<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- 	
-	<list name="plugins" mergeType="merge">
-		<param>lucPlugin</param>
-	</list>
-	<struct name="components" mergeType="merge">
-		<struct name="renderingEngine">
-			<param name="Type">lucRenderingEngineGL</param>
-		</struct>
-		<struct name="imageOutput">
-			<param name="Type">lucOutputPNG</param>
-		</struct>
-		<struct name="window">
-			<param name="Type">lucDefaultWindow</param>
-			<param name="RenderingEngine">renderingEngine</param>
-			<list name="OutputFormat">
-				<param>imageOutput</param>
-			</list>
-			<param name="height">592</param>
-			<param name="width">592</param>
-			<param name="interactive">t</param>
-			<param name="backgroundColour">white</param>
-		</struct>
-		<struct name="movie">
-			<param name="Type">lucEncoderLibfame</param>
-			<param name="Window">window</param>
-		</struct>	
-	</struct>
-
-</StGermainData>