[cig-commits] r4047 - in long/3D/Gale/trunk/src/StgFEM: .
Apps/Components
walter at geodynamics.org
walter at geodynamics.org
Thu Jul 20 20:04:35 PDT 2006
Author: walter
Date: 2006-07-20 20:04:34 -0700 (Thu, 20 Jul 2006)
New Revision: 4047
Removed:
long/3D/Gale/trunk/src/StgFEM/Apps/Components/VelocityFieldComponents.xml
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/Apps/Components/VelocityField.xml
Log:
r697 at earth: boo | 2006-07-20 20:02:57 -0700
r690 at earth (orig r608): WendySharples | 2006-07-12 00:54:55 -0700
(Wendy and pat):
* Corrected the velocity and strain rate component Field Variables
* Merged back into standard VelocityField.xml as these are of
general usefulness
* deleted extra VelocityFieldComponents.xml
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:685
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:607
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:697
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:608
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/Components/VelocityField.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/Components/VelocityField.xml 2006-07-21 03:04:33 UTC (rev 4046)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/Components/VelocityField.xml 2006-07-21 03:04:34 UTC (rev 4047)
@@ -57,6 +57,22 @@
<param name="Operator">Gradient</param>
<param name="FeVariable">VelocityField</param>
</struct>
+ <struct name="VelocityXXField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeFirstComponent</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+ <struct name="VelocityYYField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeSecondComponent</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+ <struct name="VelocityZZField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeThirdComponent</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+
<struct name="StrainRateField">
<param name="Type">OperatorFeVariable</param>
<param name="Operator">TensorSymmetricPart</param>
@@ -71,7 +87,23 @@
<param name="Type">OperatorFeVariable</param>
<param name="Operator">SymmetricTensor_Invariant</param>
<param name="FeVariable">StrainRateField</param>
+ </struct>
+ <struct name="StrainRateXXField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeFirstComponent</param>
+ <param name="FeVariable">StrainRateField</param>
</struct>
+ <struct name="StrainRateYYField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeSecondComponent</param>
+ <param name="FeVariable">StrainRateField</param>
+ </struct>
+ <struct name="StrainRateZZField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeThirdComponent</param>
+ <param name="FeVariable">StrainRateField</param>
+ </struct>
+
</struct>
</StGermainData>
Deleted: long/3D/Gale/trunk/src/StgFEM/Apps/Components/VelocityFieldComponents.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/Components/VelocityFieldComponents.xml 2006-07-21 03:04:33 UTC (rev 4046)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/Components/VelocityFieldComponents.xml 2006-07-21 03:04:34 UTC (rev 4047)
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
-<!-- A StGermain input file -->
-<!-- DTD to validate against -->
-<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
-
- <!-- VelocityField Stuff -->
- <struct name="components" mergeType="merge">
- <struct name="velocity">
- <param name="Type">Variable</param>
- <param name="Rank">Vector</param>
- <param name="Dependency">decomp-linear</param>
- <param name="DataType">Double</param>
- <param name="Count">decomp-linear-nodeDomainCount</param>
- <param name="VectorComponentCount">dim</param>
- <list name="names">
- <param>vx</param>
- <param>vy</param>
- <param>vz</param>
- </list>
- </struct>
- <struct name="velocityBCs">
- <param name="Type">CompositeVC</param>
- <param name="Data">mesh-linear</param>
- </struct>
- <struct name="velocityICs">
- <param name="Type">CompositeVC</param>
- <param name="Data">mesh-linear</param>
- </struct>
- <struct name="velocityDofLayout">
- <param name="Type">DofLayout</param>
- <param name="Count">decomp-linear-nodeDomainCount</param>
- <param name="BaseVariableCount">dim</param>
- <list name="BaseVariables">
- <param>vx</param>
- <param>vy</param>
- <param>vz</param>
- </list>
- </struct>
- <struct name="VelocityField">
- <param name="Type">FeVariable</param>
- <param name="FEMesh">mesh-linear</param>
- <param name="DofLayout">velocityDofLayout</param>
- <param name="BC">velocityBCs</param>
- <param name="IC">velocityICs</param>
- <param name="LinkedDofInfo">velocityLinkedDofs</param>
- <!--struct name="VelocityXXField">
- <param>vx</param>
- </struct-->
-
- </struct>
-
- <!-- Standard Operators on velocity field -->
- <struct name="VelocityMagnitudeField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">VectorMag</param>
- <param name="FeVariable">VelocityField</param>
- </struct>
- <struct name="VelocityGradientsField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">Gradient</param>
- <param name="FeVariable">VelocityField</param>
- </struct>
- <struct name="VelocityXXField">
- <param name="Type">FeVariable</param>
- <param name="FEMesh">mesh-linear</param>
- <param name="DofLayout">velocityDofLayout</param>
- <param name="BC">velocityBCs</param>
- <param name="IC">velocityICs</param>
- <param name="LinkedDofInfo">velocityLinkedDofs</param>
- <param>vx</param>
- </struct>
- <!--struct name="VelocityYYField">
- <param name="FEMesh">mesh-linear</param>
- <param name="DofLayout">velocityDofLayout</param>
- <param name="BC">velocityBCs</param>
- <param name="IC">velocityICs</param>
- <param name="LinkedDofInfo">velocityLinkedDofs</param>
- <param>vy</param>
- </struct>
- <struct name="VelocityZZField">
- <param name="FEMesh">mesh-linear</param>
- <param name="DofLayout">velocityDofLayout</param>
- <param name="BC">velocityBCs</param>
- <param name="IC">velocityICs</param>
- <param name="LinkedDofInfo">velocityLinkedDofs</param>
- <param>vz</param>
- </struct-->
- <struct name="StrainRateField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">TensorSymmetricPart</param>
- <param name="FeVariable">VelocityGradientsField</param>
- </struct>
- <struct name="VorticityField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">TensorAntisymmetricPart</param>
- <param name="FeVariable">VelocityGradientsField</param>
- </struct>
- <struct name="StrainRateInvariantField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">SymmetricTensor_Invariant</param>
- <param name="FeVariable">StrainRateField</param>
- </struct>
- <struct name="StrainRateXXField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">TakeFirstComponent</param>
- <param name="FeVariable">StrainRateField</param>
- </struct>
- <struct name="StrainRateYYField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">TakeSecondComponent</param>
- <param name="FeVariable">StrainRateField</param>
- </struct>
- <struct name="StrainRateZZField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">TakeThirdComponent</param>
- <param name="FeVariable">StrainRateField</param>
- </struct>
-
- </struct>
-
-</StGermainData>
More information about the cig-commits
mailing list