[cig-commits] r4895 - in long/3D/Gale/trunk/src/StgFEM: .
Apps/ThermalConvection Apps/ThermalConvection/tests
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:50:09 PDT 2006
Author: walter
Date: 2006-10-11 13:50:08 -0700 (Wed, 11 Oct 2006)
New Revision: 4895
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/AnalyticVelocityMagnitudeVP.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/TemperatureAndVelocityArrowsVP.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/VelocityMagnitudeVP.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/demo.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testAnalyticHyperbolic.xml
Log:
r781 at earth: boo | 2006-10-11 13:49:34 -0700
r755 at earth (orig r634): PatrickSunter | 2006-08-31 19:31:58 -0700
Got the demo.xml working again in thermal convection. Put some titles on
the viewports again too.
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:780
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:633
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:781
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:634
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/AnalyticVelocityMagnitudeVP.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/AnalyticVelocityMagnitudeVP.xml 2006-10-11 20:50:06 UTC (rev 4894)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/AnalyticVelocityMagnitudeVP.xml 2006-10-11 20:50:08 UTC (rev 4895)
@@ -4,6 +4,10 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components" mergeType="merge">
+ <struct name="analyticVelMagTitle" mergeType="replace">
+ <param name="Type">lucTitle</param>
+ <param name="string">Analytic Vel. Mag.</param>
+ </struct>
<struct name="camera" mergeType="replace">
<param name="Type">lucCamera</param>
<param name="CentreFieldVariable">VelocityMagnitudeField</param>
@@ -34,6 +38,7 @@
<param name="Type">lucViewport</param>
<param name="Camera">camera</param>
<list name="DrawingObject">
+ <param>analyticVelMagTitle</param>
<param>analyticVelocityMagnitudeMap</param>
<param>border</param>
<param>analyticVelocityMagnitudeColourBar</param>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/TemperatureAndVelocityArrowsVP.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/TemperatureAndVelocityArrowsVP.xml 2006-10-11 20:50:06 UTC (rev 4894)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/TemperatureAndVelocityArrowsVP.xml 2006-10-11 20:50:08 UTC (rev 4895)
@@ -4,6 +4,10 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components" mergeType="merge">
+ <struct name="tempAndVelTitle" mergeType="replace">
+ <param name="Type">lucTitle</param>
+ <param name="string">Temp. and Velocity</param>
+ </struct>
<struct name="camera" mergeType="replace">
<param name="Type">lucCamera</param>
<param name="CentreFieldVariable">TemperatureField</param>
@@ -42,6 +46,7 @@
<param name="Camera">camera</param>
<param name="compositeEachObject">t</param>
<list name="DrawingObject">
+ <param>tempAndVelTitle</param>
<param>temperatureMap</param>
<param>border</param>
<param>velocityArrows</param>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml 2006-10-11 20:50:06 UTC (rev 4894)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml 2006-10-11 20:50:08 UTC (rev 4895)
@@ -2,27 +2,50 @@
<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <param name="journal.info.Context-verbose">True</param>
- <param name="journal-level.info.Stg_ComponentFactory"> 2 </param>
- <param name="journal.debug">f</param>
- <param name="journal-enable-branch.debug.StG_FEM">t</param>
- <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
-
- <!-- Load the plugin that sets up the app, plus any others you require -->
+ <!-- Load plugins that provide features you need for this model or your analysis -->
<list name="plugins">
+ <param>StG_FEM_StandardConditionFunctions</param>
<!-- Output Plugins -->
<param>StG_FEM_FrequentOutput</param>
<param>StG_FEM_CPUTime</param>
-
- <param>StG_FEM_StandardConditionFunctions</param>
</list>
+ <!-- Include Components that define the basic model -->
+ <include>../StgFEM_Components/ElementLayout.xml </include>
+ <include>../StgFEM_Components/ConstantMesh.xml </include>
+ <include>../StgFEM_Components/LinearMesh.xml </include>
+ <include>../StgFEM_Components/VelocityField.xml </include>
+ <include>../StgFEM_Components/TemperatureField.xml </include>
+ <include>../StgFEM_Components/PressureField.xml </include>
+ <include>../StgFEM_Components/GaussSwarm.xml </include>
+ <include>../StgFEM_Components/StokesFlowUzawa.xml </include>
+ <include>../StgFEM_Components/TempAdvDiff.xml </include>
+
+ <!-- Specialised components for this particular model -->
+ <struct name="components" mergeType="merge">
+ <struct name="thermalForcingTerm">
+ <param name="Type">ThermalBuoyancyForceTerm</param>
+ <param name="Swarm">gaussSwarm</param>
+ <param name="ForceVector">mom_force</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="Ra">Ra</param>
+ </struct>
+ </struct>
+
<!-- Simulation control -->
<param name="maxTimeSteps"> 1 </param>
<param name="outputPath"> ./output </param>
<param name="dumpEvery"> 1 </param>
<param name="checkpointEvery"> 1 </param>
+ <!-- Control Journal output -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory"> 2 </param>
+ <param name="journal.debug">f</param>
+ <param name="journal-enable-branch.debug.StG_FEM">t</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
+
+ <!-- Global physics paramters -->
<param name="Ra"> 1e6 </param>
<!-- Geometry & Mesh setup -->
@@ -39,34 +62,14 @@
<param name="maxZ"> 1.0f </param>
<param name="allowUnbalancing"> True </param>
+ <!-- Integration Scheme configuration -->
+ <param name="gaussParticlesX"> 2 </param>
+ <param name="gaussParticlesY"> 2 </param>
+ <param name="gaussParticlesZ"> 2 </param>
+
<!-- Set up BCs -->
<include> temperatureBCs.xml </include>
<include> temperatureICs.xml </include>
<include> velocityFreeslipBCs.xml </include>
- <!-- Integration Scheme configuration -->
- <param name="gaussParticlesX"> 2 </param>
- <param name="gaussParticlesY"> 2 </param>
- <param name="gaussParticlesZ"> 2 </param>
-
- <!-- Component Stuff -->
- <include>../StgFEM_Components/ElementLayout.xml </include>
- <include>../StgFEM_Components/ConstantMesh.xml </include>
- <include>../StgFEM_Components/LinearMesh.xml </include>
- <include>../StgFEM_Components/VelocityField.xml </include>
- <include>../StgFEM_Components/TemperatureField.xml </include>
- <include>../StgFEM_Components/PressureField.xml </include>
- <include>../StgFEM_Components/GaussSwarm.xml </include>
- <include>../StgFEM_Components/StokesFlowUzawa.xml </include>
- <include>../StgFEM_Components/TempAdvDiff.xml </include>
- <struct name="components" mergeType="merge">
- <struct name="thermalForcingTerm">
- <param name="Type">ThermalBuoyancyForceTerm</param>
- <param name="Swarm">gaussSwarm</param>
- <param name="ForceVector">mom_force</param>
- <param name="TemperatureField">TemperatureField</param>
- <param name="Ra">Ra</param>
- </struct>
- </struct>
-
</StGermainData>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/VelocityMagnitudeVP.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/VelocityMagnitudeVP.xml 2006-10-11 20:50:06 UTC (rev 4894)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/VelocityMagnitudeVP.xml 2006-10-11 20:50:08 UTC (rev 4895)
@@ -4,6 +4,10 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components" mergeType="merge">
+ <struct name="velMagTitle" mergeType="replace">
+ <param name="Type">lucTitle</param>
+ <param name="string">Velocity Mag.</param>
+ </struct>
<struct name="camera" mergeType="replace">
<param name="Type">lucCamera</param>
<param name="CentreFieldVariable">VelocityMagnitudeField</param>
@@ -12,7 +16,8 @@
<struct name="velocityMagnitudeColourMap">
<param name="Type">lucColourMap</param>
<param name="colours">Purple Blue Green Yellow Orange Red Black</param>
- <param name="dynamicRange">true</param>
+ <param name="dynamicRange">False</param>
+ <param name="maximum">10000</param>
</struct>
<!-- Drawing Objects -->
<struct name="velocityMagnitudeMap">
@@ -26,7 +31,9 @@
<param name="VectorVariable">VelocityField</param>
<param name="Colour">black</param>
<param name="arrowHeadSize">0.15</param>
- <param name="lengthScale">0.15</param>
+ <param name="lengthScale">0.2</param>
+ <param name="maximum">10000</param>
+ <param name="dynamicRange">False</param>
</struct>
<struct name="border" mergeType="replace">
<param name="Type">lucFieldVariableBorder</param>
@@ -41,6 +48,7 @@
<param name="Type">lucViewport</param>
<param name="Camera">camera</param>
<list name="DrawingObject">
+ <param>velMagTitle</param>
<param>velocityMagnitudeMap</param>
<param>border</param>
<param>velocityArrows</param>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/demo.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/demo.xml 2006-10-11 20:50:06 UTC (rev 4894)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/demo.xml 2006-10-11 20:50:08 UTC (rev 4895)
@@ -12,6 +12,12 @@
<include>./AnalyticPressureVP.xml</include>
<include>./window.xml</include>
<struct name="components" mergeType="merge">
+ <struct name="velocityMagnitudeColourMap" mergeType="merge">
+ <param name="dynamicRange" mergeType="replace">False</param>
+ </struct>
+ <struct name="velocityArrows" mergeType="merge">
+ <param name="dynamicRange" mergeType="replace">False</param>
+ </struct>
<struct name="window" mergeType="merge">
<list name="Viewport">
<param>TemperatureAndVelocityArrowsVP VelocityMagnitudeVP AnalyticVelocityMagnitudeVP</param>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testAnalyticHyperbolic.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testAnalyticHyperbolic.xml 2006-10-11 20:50:06 UTC (rev 4894)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testAnalyticHyperbolic.xml 2006-10-11 20:50:08 UTC (rev 4895)
@@ -23,7 +23,7 @@
<struct>
<param name="name">temperature</param>
<param name="type">func</param>
- <param name="value"> VelicTemperatureIC_Hyperbolic </param>
+ <param name="value"> VelicTemperatureIC_SolB </param>
</struct>
</list>
</struct>
More information about the cig-commits
mailing list