[cig-commits] r6103 - in long/3D/Gale/trunk/src/StgFEM: . Apps
Apps/EnergySolver Apps/StokesMomentumUzawa Apps/TempDiffusion
Apps/ThermalConvection Assembly/src Discretisation/src
SLE/ProvidedSystems/AdvectionDiffusion/src
SLE/ProvidedSystems/Energy/src
SLE/ProvidedSystems/StokesFlow/src SLE/SystemSetup/src
plugins plugins/StandardConditionFunctions
walter at geodynamics.org
walter at geodynamics.org
Fri Feb 23 12:19:56 PST 2007
Author: walter
Date: 2007-02-23 12:19:55 -0800 (Fri, 23 Feb 2007)
New Revision: 6103
Added:
long/3D/Gale/trunk/src/StgFEM/Apps/src
Removed:
long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/demo.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/demo.xml
long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml
long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/demo.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/AnalyticViewport.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/demo.xml
long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.meta
long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.meta
long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.meta
long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ConstantElementType.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeSwarmVariable.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinearTriangleElementType.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinkedDofInfo.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.meta
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.meta
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.meta
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.meta
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.meta
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.meta
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.meta
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.meta
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.meta
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.meta
long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h
Log:
Fix merge conflicts in StandardConditionFunctions and removal of LevelSetPlugin
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:728
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:731
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/demo.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/demo.xml 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/demo.xml 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,11 +3,12 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>./EnergySolver2D.xml</include>
- <include>./tests/cosineHillRotate.xml</include>
- <include>./TemperatureSurfaceVP.xml</include>
- <include>./TemperatureAndVelocityArrowsVP.xml</include>
- <include>./window.xml</include>
+ <include>EnergySolver2D.xml</include>
+ <include>tests/cosineHillRotate.xml</include>
+ <include>TemperatureSurfaceVP.xml</include>
+ <include>TemperatureAndVelocityArrowsVP.xml</include>
+ <include>window.xml</include>
+
<struct name="components" mergeType="merge">
<struct name="window" mergeType="merge">
<list name="Viewport">
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/demo.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/demo.xml 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/demo.xml 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,13 +3,13 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>./AnalyticSinusoid.xml</include>
+ <include>AnalyticSinusoid.xml</include>
- <include>./VelocityMagnitudeVP.xml</include>
- <include>./AnalyticVelocityMagnitudeVP.xml</include>
- <include>./PressureAndVelocityArrowsVP.xml</include>
- <include>./AnalyticPressureVP.xml</include>
- <include>./window.xml</include>
+ <include>VelocityMagnitudeVP.xml</include>
+ <include>AnalyticVelocityMagnitudeVP.xml</include>
+ <include>PressureAndVelocityArrowsVP.xml</include>
+ <include>AnalyticPressureVP.xml</include>
+ <include>window.xml</include>
<struct name="components" mergeType="merge">
<struct name="window" mergeType="merge">
<list name="Viewport">
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml 2007-02-23 20:19:55 UTC (rev 6103)
@@ -395,9 +395,9 @@
</struct>
</struct>
- <include>../StgFEM_Components/TemperatureField.xml </include>
- <include>../StgFEM_Components/GaussSwarm.xml </include>
- <include>../StgFEM_Components/TempDiffusionSolver.xml </include>
+ <include>StgFEM/TemperatureField.xml </include>
+ <include>StgFEM/GaussSwarm.xml </include>
+ <include>StgFEM/TempDiffusionSolver.xml </include>
<!-- set up bcs -->
<struct name="temperatureBCs">
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/demo.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/demo.xml 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/demo.xml 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,12 +3,12 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>./TempDiffusion.xml</include>
- <include>./analyticTemperature.xml</include>
+ <include>TempDiffusion.xml</include>
+ <include>analyticTemperature.xml</include>
- <include>./TemperatureVP.xml</include>
- <include>./AnalyticTemperatureVP.xml</include>
- <include>./window.xml</include>
+ <include>TemperatureVP.xml</include>
+ <include>AnalyticTemperatureVP.xml</include>
+ <include>window.xml</include>
<struct name="components" mergeType="merge">
<struct name="window" mergeType="merge">
<param name="Viewport">TemperatureVP AnalyticTemperatureVP</param>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/AnalyticViewport.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/AnalyticViewport.xml 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/AnalyticViewport.xml 2007-02-23 20:19:55 UTC (rev 6103)
@@ -4,11 +4,11 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<!-- Visualisation stuff -->
- <include>./TemperatureAndVelocityArrowsVP.xml</include>
- <include>./VelocityMagnitudeVP.xml</include>
- <include>./AnalyticVelocityMagnitudeVP.xml</include>
- <include>./VelocityErrorMagnitudeVP.xml</include>
- <include>./window.xml</include>
+ <include>TemperatureAndVelocityArrowsVP.xml</include>
+ <include>VelocityMagnitudeVP.xml</include>
+ <include>AnalyticVelocityMagnitudeVP.xml</include>
+ <include>VelocityErrorMagnitudeVP.xml</include>
+ <include>window.xml</include>
<struct name="components" mergeType="merge">
<struct name="window" mergeType="merge">
<list name="Viewport">
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml 2007-02-23 20:19:55 UTC (rev 6103)
@@ -19,7 +19,7 @@
<include>../StgFEM_Components/GaussSwarm.xml </include>
<include>../StgFEM_Components/StokesFlowUzawa.xml </include>
<include>../StgFEM_Components/TempAdvDiff.xml </include>
- <include>../StgFEM_Components/Multigrid.xml </include>
+ <!--include>../StgFEM_Components/Multigrid.xml </include-->
<param name="mgLevels"> 2 </param>
<struct name="components" mergeType="merge">
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/demo.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/demo.xml 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/demo.xml 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,14 +3,14 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>./tests/testAnalyticHyperbolic.xml</include>
+ <include>tests/testAnalyticHyperbolic.xml</include>
- <include>./TemperatureAndVelocityArrowsVP.xml</include>
- <include>./VelocityMagnitudeVP.xml</include>
- <include>./AnalyticVelocityMagnitudeVP.xml</include>
- <include>./PressureAndVelocityArrowsVP.xml</include>
- <include>./AnalyticPressureVP.xml</include>
- <include>./window.xml</include>
+ <include>TemperatureAndVelocityArrowsVP.xml</include>
+ <include>VelocityMagnitudeVP.xml</include>
+ <include>AnalyticVelocityMagnitudeVP.xml</include>
+ <include>PressureAndVelocityArrowsVP.xml</include>
+ <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>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/src
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/src 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/src 2007-02-23 20:19:55 UTC (rev 6103)
@@ -0,0 +1 @@
+link StgFEM_Components
\ No newline at end of file
Property changes on: long/3D/Gale/trunk/src/StgFEM/Apps/src
___________________________________________________________________
Name: svn:special
+ *
Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">GradientStiffnessMatrixTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Assembly/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">StiffnessMatrixTerm</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">IsoviscousStressTensorTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Assembly/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">StiffnessMatrixTerm</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">LaplacianStiffnessMatrixTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Assembly/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">StiffnessMatrixTerm</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ThermalBuoyancyForceTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Assembly/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">ForceTerm</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">BilinearElementType</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">ElementType</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ConstantElementType.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ConstantElementType.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ConstantElementType.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ConstantElementType</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">ElementType</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ElementType</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ElementType_Register</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">FeEquationNumber</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeSwarmVariable.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeSwarmVariable.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeSwarmVariable.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">FeSwarmVariable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SwarmVariable</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c 2007-02-23 20:19:55 UTC (rev 6103)
@@ -804,6 +804,20 @@
}
}
+void FeVariable_ZeroField( void* feVariable ) {
+ FeVariable* self = (FeVariable*) feVariable;
+ double* values = Memory_Alloc_Array( double, self->fieldComponentCount, "tempValues" );
+ Index lNode_I;
+
+ memset( values, 0, self->fieldComponentCount * sizeof(double) );
+
+ for( lNode_I = 0 ; lNode_I < FeMesh_GetNodeLocalSize( self->feMesh ); lNode_I++ ) {
+ FeVariable_SetValueAtNode( self, lNode_I, values );
+ }
+
+ Memory_Free( values );
+}
+
/* --- Public Functions --- */
InterpolationResult FeVariable_GetElementLocalCoordAtGlobalCoord( void* feVariable, double* globalCoord, double* elLocalCoord,
@@ -1496,7 +1510,7 @@
/* Use feVariable's mesh as geometry mesh if one isn't passed in */
if( Stg_Class_IsInstance( feMesh->algorithms, Mesh_CentroidAlgorithms_Type ) )
- mesh = ((Mesh_CentroidAlgorithms*)feMesh->algorithms)->elMesh;
+ mesh = (FeMesh*)((Mesh_CentroidAlgorithms*)feMesh->algorithms)->elMesh;
else
mesh = feMesh;
elementType = FeMesh_GetElementType( mesh, dElement_I );
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h 2007-02-23 20:19:55 UTC (rev 6103)
@@ -283,8 +283,12 @@
void _FeVariable_GetValueAtNode( void* feVariable, Node_DomainIndex dNode_I, double* value ) ;
+
/* --- Public Functions --- */
+ /** Zeros the value of the field at every nodal position */
+ void FeVariable_ZeroField( void* feVariable ) ;
+
/** Calculates the domain element & element local coord that a particular global coord lives in.
Same return status conventions as for the InterpolateValueAt function. */
InterpolationResult FeVariable_GetElementLocalCoordAtGlobalCoord( void* feVariable, double* globalCoord,
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">FeVariable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">FieldVariable</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinearTriangleElementType.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinearTriangleElementType.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinearTriangleElementType.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">LinearTriangleElementType</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">ElementType</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinkedDofInfo.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinkedDofInfo.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinkedDofInfo.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">LinkedDofInfo</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">OperatorFeVariable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">FeVariable</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ShapeFeVariable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">FeVariable</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">TrilinearElementType</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/Discretisation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">ElementType</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">AdvectionDiffusionSLE</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SystemLinearEquations</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">LumpedMassMatrixForceTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">ForceTerm</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">AdvDiffMulticorrector</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SLE_Solver</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">AdvDiffResidualForceTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">ForceTerm</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Energy_SLE</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/Energy/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SystemLinearEquations</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Energy_SLE_Solver</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/Energy/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SLE_Solver</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Stokes_SLE</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/StokesFlow/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SystemLinearEquations</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Stokes_SLE_PenaltySolver</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/StokesFlow/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SLE_Solver</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Stokes_SLE_UzawaSolver</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/StokesFlow/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SLE_Solver</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">UzawaPreconditionerTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/ProvidedSystems/StokesFlow/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">StiffnessMatrixTerm</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ForceTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/SystemSetup/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ForceVector</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/SystemSetup/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">SolutionVector</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SLE_Solver</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/SystemSetup/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SolutionVector</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/SystemSetup/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">StiffnessMatrix</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/SystemSetup/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">StiffnessMatrixTerm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/SystemSetup/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.meta
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.meta 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.meta 2007-02-23 20:19:55 UTC (rev 6103)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SystemLinearEquations</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/SystemSetup/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">Copyright (C) 2004-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="isAbstractClass">True</param>
<param name="Description">This is an Abstract Class which manages a given system of linear equation. It provides the setting up, building and initialisation of the matricies and vectors which are specified in child classes of this component. The means by which this class does this is through adding build/assembly functions onto Entry Points it creates itself. These functions are kicked off as the first part of a linearExecute statement, which can be found here - the second part of the linearExecute statement is a solve step, which is defined in a child class and is referenced here via a function pointer. Also of interest in this component is the algorithmic flow of the solve step, i.e. linear or nonlinear.</param>
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2007-02-23 20:19:55 UTC (rev 6103)
@@ -91,6 +91,10 @@
ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_TemperatureCosineHill, "Temperature_CosineHill" );
ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
+
+ condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_ConvectionBenchmark, "Temperature_ConvectionBenchmark" );
+ ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
+
condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_LinearWithSinusoidalPerturbation, "LinearWithSinusoidalPerturbation" );
ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
@@ -206,7 +210,7 @@
if ((vector[ I_AXIS ]*vector[ I_AXIS ]+vector[ J_AXIS ]*vector[ J_AXIS ])<=size*size)
*result = -omega * vector[ J_AXIS ];
else
- *result = 0.0;
+ *result = 0.0;
}
void StgFEM_StandardConditionFunctions_PartialRotationY( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
@@ -239,8 +243,8 @@
if ((vector[ I_AXIS ]*vector[ I_AXIS ]+vector[ J_AXIS ]*vector[ J_AXIS ])<=size*size)
*result = omega * vector[ I_AXIS ];
- else
- *result = 0.0;
+ else
+ *result = 0.0;
}
@@ -644,7 +648,7 @@
assert( wavenumberX > 0.0 );
kx = (double)wavenumberX * M_PI / Lx;
- ky = wavenumberY * M_PI;
+ ky = (double)wavenumberY * M_PI;
*result = sigma * sin( ky * y ) * cos( kx * x );
}
@@ -958,7 +962,38 @@
/(width*width));
}
+void StgFEM_StandardConditionFunctions_ConvectionBenchmark( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+ /* This IC is for the 2D ConvectionBenchmark defined in
+ * http://www.mcc.monash.edu.au/twiki/view/Research/ConvectionBenchmarks
+ */
+
+ FiniteElementContext * context = (FiniteElementContext*)_context;
+ FeVariable* feVariable = NULL;
+ FeMesh* mesh;
+ double* result = (double*) _result;
+ double min[3], max[3];
+ double* coord;
+ double x,y;
+ double Lx, Ly;
+ feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "TemperatureField" );
+ mesh = (FeMesh*)feVariable->feMesh;
+
+ Mesh_GetGlobalCoordRange( mesh, min, max );
+
+ Lx = max[ I_AXIS ] - min[ I_AXIS ];
+ Ly = max[ J_AXIS ] - min[ J_AXIS ];
+
+ coord = Mesh_GetVertex( mesh, node_lI );
+
+ x = ( coord[0] - min[ I_AXIS ] ) / Lx;
+ y = ( coord[1] - min[ J_AXIS ] ) / Ly;
+
+
+ *result = ( 1 - y ) + ( cos( M_PI * x ) * sin( M_PI * y ) ) / 100 ;
+}
+
+
Bool StgFEM_StandardConditionFunctions_Init( int* argc, char** argv[] ) {
Stg_ComponentRegister* componentsRegister = Stg_ComponentRegister_Get_ComponentRegister();
Stg_ComponentRegister_Add(componentsRegister,
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h 2007-02-23 19:49:16 UTC (rev 6102)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h 2007-02-23 20:19:55 UTC (rev 6103)
@@ -88,6 +88,7 @@
void StG_FEM_StandardConditionFunctions_StepFunctionProduct4( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
void StG_FEM_StandardConditionFunctions_Gaussian( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_ConvectionBenchmark( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
#endif
More information about the cig-commits
mailing list