[cig-commits] r6079 - in long/3D/Gale/trunk/src/StGermain: .
Base/Automation/src Base/Container/tests Base/Context/src
Base/Context/tests Base/FlattenXML/test Base/IO/src
Discretisation/Geometry/src Discretisation/Geometry/tests
Discretisation/Mesh/src Discretisation/Shape/src
Discretisation/Swarm/src Discretisation/Swarm/tests
Discretisation/Utils/src compatibility/libpetsc
walter at geodynamics.org
walter at geodynamics.org
Fri Feb 23 10:01:54 PST 2007
Author: walter
Date: 2007-02-23 10:01:05 -0800 (Fri, 23 Feb 2007)
New Revision: 6079
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.meta
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.meta
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.meta
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.meta
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableCondition.meta
long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testLinkedList.c
long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.meta
long/3D/Gale/trunk/src/StGermain/Base/Context/tests/
long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext-noDtDefined.c
long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext0.c
long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext1.c
long/3D/Gale/trunk/src/StGermain/Base/FlattenXML/test/
long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/BlockGeometry.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/GeometryClass.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK26Topology.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK6Topology.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJKTopology.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregGeometry.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregTopology.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/RefinedRegionsGeometry.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ShellGeometry.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Topology.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/stg_lapack.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CommTopology.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/DecompTransfer.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Negotiate.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HMesh.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshAdaptor.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshClass.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshTopology.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowPlane.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Box.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Cylinder.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Everywhere.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PolygonShape.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Sphere.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Superellipsoid.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/FileParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/GaussParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/GlobalParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/LineParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ManualParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/MeshParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/OperatorSwarmVariable.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/PerCellParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/PlaneParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/RandomParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SpaceFillerParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmDump.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmOutput.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriGaussParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/UnionParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/WithinShapeParticleLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/types.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllElementsVC.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllNodesVC.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CellRemesher.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CornerVC.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/DofLayout.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FrictionVC.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/InnerWallVC.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/OperatorFieldVariable.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Remesher.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SemiRegDeform.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/ShapeAdvector.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/ShapeVC.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SplitFrictionWallVC.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/StripRemesher.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/TimeIntegratee.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/TimeIntegrator.meta
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/WallVC.meta
long/3D/Gale/trunk/src/StGermain/compatibility/libpetsc/petsccompat.h
Log:
r3330 at earth (orig r3994): LukeHodkinson | 2007-02-05 15:18:39 -0800
Merging changes on the trunk into the branch.
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3992
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3994
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">CompositeVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Base/Automation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SetVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Base/Automation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Variable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Base/Automation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Base/Automation/src/VariableAllVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">VariableAllVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Base/Automation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableCondition.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableCondition.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableCondition.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">VariableCondition</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Base/Automation/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Base/Container/tests/testLinkedList.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testLinkedList.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testLinkedList.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -163,7 +163,12 @@
}
}
}
+
+ for(i=0; i<NUM_DATA; i++){
+ Memory_Free( array[i] );
+ }
+ Memory_Free( data );
Journal_Printf( myStream, "\nDeleting the List\n" );
Stg_Class_Delete( (void*)numList );
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -113,6 +113,10 @@
/* General info */
self->dictionary = dictionary;
+
+ Journal_Firewall( self->dictionary->count,
+ Journal_Register( Error_Type, "Error Stream" ),
+ "Error in %s: The dictionary is empty, meaning no input parameters have been feed into your program. Perhaps you've forgot to pass any input files ( or command-line arguments ) in.\n", __func__);
/* Virtual info */
self->_setDt = _setDt;
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">AbstractContext</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Base/Context/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Property changes on: long/3D/Gale/trunk/src/StGermain/Base/Context/tests
___________________________________________________________________
Name: svn:ignore
- profile.*
input.xml
+ profile.*
input.xml
input.*.xml
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext-noDtDefined.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext-noDtDefined.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext-noDtDefined.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -125,8 +125,13 @@
}
if( rank == procToWatch ) Journal_Printf( (void*) stream, "Watching rank: %i\n", rank );
- /* Read input */
+ /* Read input:
+ Added an entry to the dictionary to pass a logic check, in function _AbstractContext_New.
+ The logic check fails if the dictionary is empty, thus I've added one here. JulianGiordani 12-Dec-2006
+ */
dictionary = Dictionary_New();
+ Dictionary_Add( dictionary, "test_string_For_AbstractContext_Test",
+ Dictionary_Entry_Value_FromString( "This is Abstract" ) );
/* Build the context */
abstractContext = _AbstractContext_New( sizeof(AbstractContext), "TestContext", MyDelete, MyPrint, NULL,
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext0.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext0.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext0.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -118,8 +118,13 @@
}
if( rank == procToWatch ) Journal_Printf( (void*) stream, "Watching rank: %i\n", rank );
- /* Read input */
+ /* Read input:
+ Added an entry to the dictionary to pass a logic check, in function _AbstractContext_New.
+ The logic check fails if the dictionary is empty, thus I've added one here. JulianGiordani 12-Dec-2006
+ */
dictionary = Dictionary_New();
+ Dictionary_Add( dictionary, "test_string_For_AbstractContext_Test",
+ Dictionary_Entry_Value_FromString( "This is Abstract" ) );
/* Build the context */
abstractContext = _AbstractContext_New(
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext1.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext1.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/tests/testAbstractContext1.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -125,8 +125,13 @@
}
if( rank == procToWatch ) Journal_Printf( (void*) stream, "Watching rank: %i\n", rank );
- /* Read input */
+ /* Read input:
+ Added an entry to the dictionary to pass a logic check, in function _AbstractContext_New.
+ The logic check fails if the dictionary is empty, thus I've added one here. JulianGiordani 12-Dec-2006
+ */
dictionary = Dictionary_New();
+ Dictionary_Add( dictionary, "test_string_For_AbstractContext_Test",
+ Dictionary_Entry_Value_FromString( "This is Abstract" ) );
/* Build the context */
abstractContext = _AbstractContext_New(
Property changes on: long/3D/Gale/trunk/src/StGermain/Base/FlattenXML/test
___________________________________________________________________
Name: svn:ignore
+ FlattenXML
Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -464,7 +464,7 @@
/* 1. Current directory */
/* 2. XML, searched paths */
/* 3. Environment Variable */
- /* 4. Default STG_MODULE_PATH */
+ /* 4. Default STG_INCLUDE_PATH */
/* 1. Current directory */
{
@@ -487,7 +487,7 @@
{
char* envValue;
- envValue = getenv( "STG_MODULE_PATH" );
+ envValue = getenv( "STG_INCLUDE_PATH" );
if ( envValue != NULL ) {
char* envCopy;
char* token;
@@ -503,9 +503,9 @@
}
}
- /* 4. Default STG_MODULE_PATH */
- #ifdef STG_MODULE_PATH
- _XML_IO_Handler_AddSearchPath( self, STG_MODULE_PATH );
+ /* 4. Default STG_INCLUDE_PATH */
+ #ifdef STG_INCLUDE_PATH
+ _XML_IO_Handler_AddSearchPath( self, STG_INCLUDE_PATH );
#endif
/* open the file and check syntax */
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/BlockGeometry.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/BlockGeometry.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/BlockGeometry.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">BlockGeometry</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Geometry</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Delaunay</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-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/StGermain/Discretisation/Geometry/src/FullTensorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -41,9 +41,7 @@
#include "ComplexVectorMath.h"
#include "ComplexMath.h"
#include "stg_lapack.h"
-#include "petscksp.h"
-
#include <math.h>
#include <string.h>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/GeometryClass.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/GeometryClass.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/GeometryClass.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Geometry</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Geometry/src/IJK26Topology.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK26Topology.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK26Topology.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">IJK26Topology</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">IJKTopology</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK6Topology.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK6Topology.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK6Topology.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">IJK6Topology</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">IJKTopology</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJKTopology.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJKTopology.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJKTopology.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">IJKTopology</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Topology</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregGeometry.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregGeometry.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregGeometry.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">IrregGeometry</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Geometry</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregTopology.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregTopology.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregTopology.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">IrregTopology</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Topology</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ParallelDelaunay</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Delaunay</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/RefinedRegionsGeometry.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/RefinedRegionsGeometry.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/RefinedRegionsGeometry.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">RefinedRegionsGeometry</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Geometry</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ShellGeometry.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ShellGeometry.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ShellGeometry.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ShellGeometry</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Geometry</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -175,6 +175,12 @@
}
+void ZeroMatrix( double** matrix, Index rows, Index cols ) {
+ Index count_I;
+ for( count_I = 0 ; count_I < rows ; count_I++ ) {
+ memset( matrix[ count_I ], 0, (cols*sizeof(double)) );
+ }
+}
/** This function extracts out the antiSymmetric part of a tensor Array
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.h 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMath.h 2007-02-23 18:01:05 UTC (rev 6079)
@@ -183,6 +183,7 @@
/* Define Null / Zero matrices */
void TensorArray_Zero( TensorArray tensor ) ;
void SymmetricTensor_Zero( SymmetricTensor tensor ) ;
+void ZeroMatrix( double** matrix, Index rows, Index cols ) ;
/* Define tensorArray Vector functions */
double TensorArray_MultiplyByVectors( TensorArray tensor, double* a, double* b, Dimension_Index dim ) ;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Topology.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Topology.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Topology.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Topology</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Geometry/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Geometry/src/stg_lapack.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/stg_lapack.h 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/stg_lapack.h 2007-02-23 18:01:05 UTC (rev 6079)
@@ -47,6 +47,9 @@
#define stg_dgeev dgeev__
#elif FORTRAN_UPPERCASE
#define stg_dgeev DGEEV
+#else
+ /* FALLBACK - eg for Intel MKL C implementation*/
+ #define stg_dgeev dgeev
#endif
#endif
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.0of1.expected 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.0of1.expected 2007-02-23 18:01:05 UTC (rev 6079)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3927. Copyright (C) 2003-2005 VPAC.
Basic tests:
d = { 1, 1, 1 }
d = { 2, 0.5, 1.5 }
@@ -1009,6 +1010,7 @@
{ 5.66238, 5.66238, 7.07797 }
{ 5.39547, 5.39547, 5.99497 }
{ 5.19615, 5.19615, 5.19615 }
+2D: { 5, 9 }
****************************
K Rotated 1.000 degrees around I axis - 0.000 -0.841 0.540
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testVectorMath.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -116,6 +116,9 @@
}
}
}
+ Vec_SetScalar2D( a, 5.0, 9.0);
+ printf( "2D: { %g, %g }\n", a[0], a[1]);
+
}
if( rank == procToWatch ) {
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CartesianGenerator.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">CartesianGenerator</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Mesh/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent"></param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CommTopology.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CommTopology.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CommTopology.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">CommTopology</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Decomp</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/DecompTransfer.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/DecompTransfer.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/DecompTransfer.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">DecompTransfer</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Decomp_Sync</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Decomp_Sync_Claim</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Negotiate.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Negotiate.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Negotiate.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Decomp_Sync_Negotiate</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HMesh.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HMesh.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HMesh.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">HMesh</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Mesh/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">Mesh</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshAdaptor.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshAdaptor.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshAdaptor.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">MeshAdaptor</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Mesh/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent"></param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshClass.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshClass.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshClass.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Mesh</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Mesh/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Mesh/src/MeshGenerator.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">MeshGenerator</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Mesh/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent"></param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshTopology.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshTopology.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshTopology.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">MeshTopology</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Mesh/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-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/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SurfaceAdaptor</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Mesh/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent"></param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -57,7 +57,7 @@
double gamma,
double offset,
XYZ width,
- double delta,
+ double amplitude,
double period,
double phase )
{
@@ -72,7 +72,7 @@
gamma,
offset,
width,
- delta,
+ amplitude,
period,
phase ) ;
return self;
@@ -122,13 +122,12 @@
return self;
}
-void _BelowCosinePlane_Init( void* belowPlane, double offset, XYZ width, double delta, double period, double phase ) {
+void _BelowCosinePlane_Init( void* belowPlane, double offset, XYZ width, double amplitude, double period, double phase ) {
BelowCosinePlane* self = (BelowCosinePlane*)belowPlane;
_BelowPlane_Init( self, offset, width );
- self->delta = delta;
+ self->amplitude = amplitude;
self->period = period;
- self->radPeriod = M_PI * period / 180.0;
self->phase = phase;
}
@@ -142,14 +141,14 @@
double gamma,
double offset,
XYZ width,
- double delta,
+ double amplitude,
double period,
double phase )
{
BelowCosinePlane* self = (BelowCosinePlane*)belowPlane;
BelowPlane_InitAll( self, dim, centre, alpha, beta, gamma, offset, width );
- _BelowCosinePlane_Init( self, offset, width, delta, period, phase );
+ _BelowCosinePlane_Init( self, offset, width, amplitude, period, phase );
}
@@ -180,7 +179,7 @@
newBelowCosinePlane = (BelowCosinePlane*)_BelowPlane_Copy( self, dest, deep, nameExt, ptrMap );
- newBelowCosinePlane->delta = self->delta;
+ newBelowCosinePlane->amplitude = self->amplitude;
newBelowCosinePlane->period = self->period;
newBelowCosinePlane->phase = self->phase;
@@ -208,17 +207,17 @@
void _BelowCosinePlane_Construct( void* belowPlane, Stg_ComponentFactory* cf, void* data ) {
BelowCosinePlane* self = (BelowCosinePlane*) belowPlane;
- double delta;
+ double amplitude;
double period;
double phase;
_BelowPlane_Construct( self, cf, data );
- delta = Stg_ComponentFactory_GetDouble( cf, self->name, "delta", 0.5 );
+ amplitude = Stg_ComponentFactory_GetDouble( cf, self->name, "amplitude", 0.1 );
period = Stg_ComponentFactory_GetDouble( cf, self->name, "period", 1.0 );
phase = Stg_ComponentFactory_GetDouble( cf, self->name, "phase", 0.0 );
- _BelowCosinePlane_Init( self, self->offset, self->width, delta, period, phase );
+ _BelowCosinePlane_Init( self, self->offset, self->width, amplitude, period, phase );
}
void _BelowCosinePlane_Build( void* belowPlane, void* data ) {
@@ -261,7 +260,7 @@
x = newCoord[ I_AXIS ];
- y = self->offset + self->delta * cos( ( self->radPeriod * x ) + self->phase );
+ y = self->offset + self->amplitude * cos( (self->period * M_PI * x) + self->phase );
if ( fabs( newCoord[ J_AXIS ] < y) ) {
return True;
@@ -272,27 +271,12 @@
double _BelowCosinePlane_CalculateVolume( void* belowPlane ) {
BelowCosinePlane* self = (BelowCosinePlane*)belowPlane;
double volume;
+ double dx = self->width[ I_AXIS ];
- if ( self->dim == 2 ) {
- /*
- * y = delta * cos( radPeriod * x + phase ) + offset
- *
- * A = [ (delta/radPeriod) * sin( radPeriod * x + phase ) + offset * x ] (from phase to width)
- */
- volume =
- (
- ( self->delta / self->radPeriod ) * sin( (self->radPeriod * self->width[ I_AXIS ]) + self->phase ) +
- ( self->offset * self->width[ I_AXIS ] )
- )
- -
- (
- ( self->delta / self->radPeriod ) * sin( self->phase ) + ( self->offset * self->phase )
- );
- }
- else {
- /* does not work in 3D right now...work out the integral later */
- volume = 1.0;
- }
+ volume = self->offset*dx + ( self->amplitude/self->period )* sin( dx*self->period + self->phase );
+
+ if ( self->dim == 3 )
+ volume = self->width[ K_AXIS ] * volume;
return volume;
}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.h 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.h 2007-02-23 18:01:05 UTC (rev 6079)
@@ -48,7 +48,7 @@
__BelowPlane \
/* Virtual Info */\
\
- double delta; \
+ double amplitude; \
double period; \
double radPeriod; \
double phase;
@@ -75,7 +75,7 @@
Stg_Shape_CalculateVolumeFunction* _calculateVolume,
Name name );
- void _BelowCosinePlane_Init( void* belowPlane, double offset, XYZ width, double delta, double period, double phase ) ;
+ void _BelowCosinePlane_Init( void* belowPlane, double offset, XYZ width, double amplitude, double period, double phase ) ;
void BelowCosinePlane_InitAll(
void* belowPlane,
Dimension_Index dim,
@@ -85,7 +85,7 @@
double gamma,
double offset,
XYZ width,
- double delta,
+ double amplitude,
double period,
double phase );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowCosinePlane.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">BelowCosinePlane</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
@@ -19,20 +22,20 @@
<struct>
<param name="Name">offset</param>
<param name="Type">Double</param>
- <param name="Default">0.5</param>
- <param name="Description">...</param>
+ <param name="Default">1.0</param>
+ <param name="Description">The offset in the dependent variable. Traditionally this would be the y-axis.</param>
</struct>
<struct>
- <param name="Name">delta</param>
+ <param name="Name">amplitude</param>
<param name="Type">Double</param>
- <param name="Default">0.5</param>
- <param name="Description">...</param>
+ <param name="Default">0.1</param>
+ <param name="Description">Is the amplitude of the oscillations</param>
</struct>
<struct>
- <param name="Name">preiod</param>
+ <param name="Name">period</param>
<param name="Type">Double</param>
<param name="Default">1.0</param>
- <param name="Description">...</param>
+ <param name="Description">period calculated as " period * PI "</param>
</struct>
<struct>
<param name="Name">phase</param>
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowPlane.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowPlane.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/BelowPlane.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">BelowPlane</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Box.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Box.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Box.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Box</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ConvexHull</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Cylinder.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Cylinder.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Cylinder.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Cylinder</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Everywhere.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Everywhere.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Everywhere.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Everywhere</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Intersection</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PolygonShape.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PolygonShape.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PolygonShape.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">PolygonShape</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/PythonShape.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">PythonShape</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ShapeClass.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Stg_Shape</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Shape/src/Sphere.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Sphere.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Sphere.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Sphere</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Superellipsoid.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Superellipsoid.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Superellipsoid.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Superellipsoid</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Union</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Shape/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Shape</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/FileParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/FileParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/FileParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">FileParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">GlobalParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/GaussParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/GaussParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/GaussParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">GaussParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">PerCellParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">Lays out particles on points optimised for integrating over a cell. This layout also sets the particle weights as well. See http://mathworld.wolfram.com/Legendre-GaussQuadrature.html</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/GlobalParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/GlobalParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/GlobalParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">GlobalParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">ParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/LineParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/LineParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/LineParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">LineParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">GlobalParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">This lays equally spaced particles out on a continuous set of line segments.</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ManualParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ManualParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ManualParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ManualParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">GlobalParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">This lays out a particle in each of the positions manually specified in the dictionary.</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/MeshParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/MeshParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/MeshParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">MeshParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">PerCellParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">Randomly distributes particles within cells.</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/OperatorSwarmVariable.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/OperatorSwarmVariable.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/OperatorSwarmVariable.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">OperatorSwarmVariable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Swarm/src/ParticleCommHandler.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ParticleCommHandler</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Swarm/src/ParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Swarm/src/PerCellParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/PerCellParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/PerCellParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">PerCellParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">ParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/PlaneParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/PlaneParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/PlaneParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">PlaneParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">SpaceFillerParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">This uses the SpaceFillerParticleLayout class to choose quasi-random particle positions and then projects them onto a plane</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/RandomParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/RandomParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/RandomParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">RandomParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">PerCellParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">Randomly distributes particles within cells.</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SpaceFillerParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SpaceFillerParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SpaceFillerParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SpaceFillerParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">GlobalParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">This uses the SobolGenerator class to quasi-randomly fill particles throughout the whole global domain.</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -835,6 +835,87 @@
}
+void Swarm_DeleteParticle( void* swarm, Particle_Index particleToDelete_lI ) {
+ Swarm* self = (Swarm*)swarm;
+ Particle_InCellIndex cParticle_I = 0;
+ Particle_Index lastParticle_I = 0;
+ GlobalParticle* lastParticle = NULL;
+ GlobalParticle* particleToDelete = NULL;
+ SizeT particleSize = self->particleExtensionMgr->finalSize;
+ Stream* errorStr = Journal_Register( Error_Type, self->type );
+
+ Journal_Firewall( particleToDelete_lI < self->particleLocalCount, errorStr,
+ "Error- in %s(): particleToDelete_lI passed in (%u) is >= swarm's local particle count %u.\n",
+ __func__, particleToDelete_lI, self->particleLocalCount );
+
+ particleToDelete = (GlobalParticle*)Swarm_ParticleAt( self, particleToDelete_lI );
+ cParticle_I = Swarm_GetParticleIndexWithinCell( self, particleToDelete->owningCell, particleToDelete_lI );
+
+ Swarm_RemoveParticleFromCell( self, particleToDelete->owningCell, cParticle_I );
+
+ lastParticle_I = self->particleLocalCount - 1;
+ lastParticle = (GlobalParticle*)Swarm_ParticleAt( self, lastParticle_I );
+
+ /* In the current data structure for particles (a regular array), if we delete a particle we need to "swap"
+ * the 'last' particle into the hole we just created, and update it's cell's reference to it.
+ * The only special case is if the particle we are deleting happens to be the last particle, in which case
+ * no swap is necessary. */
+ if ( particleToDelete_lI != lastParticle_I ) {
+ /* Get last Particle information */
+ Cell_Index lastParticle_CellIndex = lastParticle->owningCell;
+ Particle_InCellIndex lastParticle_IndexWithinCell = 0;
+
+ lastParticle_IndexWithinCell = Swarm_GetParticleIndexWithinCell( self, lastParticle_CellIndex, lastParticle_I);
+
+ Journal_DPrintfL( self->debug, 2,
+ "Copying over particle %u using last particle %u from cell %u (cell particle index - %u)\n",
+ particleToDelete_lI, lastParticle_I, lastParticle_CellIndex, lastParticle_IndexWithinCell );
+
+ /* Copy over particle */
+ memcpy( particleToDelete, lastParticle, particleSize );
+
+ /* Change value in cell particle table to point to new index in array */
+ self->cellParticleTbl[lastParticle_CellIndex][ lastParticle_IndexWithinCell ] = particleToDelete_lI;
+ }
+
+ /* Re-set memory at location of last particle to zero so it is clear that it's been deleted */
+ memset( lastParticle, 0, particleSize );
+
+ self->particleLocalCount--;
+ /* Call the memory management function in case we need to re-allocate the swarm size smaller now */
+ Swarm_Realloc( swarm );
+}
+
+
+void Swarm_DeleteParticleAndReplaceWithNew( void* swarm, Particle_Index particleToDelete_lI,
+ void* replacementParticle, Cell_Index replacementParticle_cellIndex )
+{
+ Swarm* self = (Swarm*)swarm;
+ Particle_InCellIndex cParticle_I = 0;
+ GlobalParticle* particleToDelete = NULL;
+ Stream* errorStr = Journal_Register( Error_Type, self->type );
+
+ Journal_Firewall( particleToDelete_lI < self->particleLocalCount, errorStr,
+ "Error- in %s(): particleToDelete_lI passed in (%u) is >= swarm's local particle count %u.\n",
+ __func__, particleToDelete_lI, self->particleLocalCount );
+
+ particleToDelete = (GlobalParticle*)Swarm_ParticleAt( self, particleToDelete_lI );
+ cParticle_I = Swarm_GetParticleIndexWithinCell( self, particleToDelete->owningCell, particleToDelete_lI );
+
+ Swarm_RemoveParticleFromCell( self, particleToDelete->owningCell, cParticle_I );
+
+ Journal_DPrintfL( self->debug, 2,
+ "Copying over particle %u using replacement particle, and adding it to cell %u\n",
+ particleToDelete_lI, replacementParticle_cellIndex );
+
+ /* Copy over particle to delete with it's replacement */
+ memcpy( particleToDelete, replacementParticle, self->particleExtensionMgr->finalSize );
+
+ /* Add a reference to replacement particle in appropriate cell entry */
+ Swarm_AddParticleToCell( self, replacementParticle_cellIndex, particleToDelete_lI );
+}
+
+
void Swarm_AddParticleToCell( void* swarm, Cell_DomainIndex dCell_I, Particle_Index particle_I ) {
Swarm* self = (Swarm*)swarm;
Particle_InCellIndex* newCountPtr = &self->cellParticleCountTbl[dCell_I];
@@ -1222,12 +1303,15 @@
self->particleExtensionMgr->finalSize,
self->particlesArraySize );
+
+#ifdef DEBUG
/* Set extra memory at end of array to zero */
if ( self->particlesArraySize > particleLocalCount ) {
Particle_Index newParticleCount = self->particlesArraySize - particleLocalCount;
void* startNewParticlePtr = Swarm_ParticleAt( self, particleLocalCount );
memset( startNewParticlePtr, 0, self->particleExtensionMgr->finalSize * newParticleCount );
}
+#endif
}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.h 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.h 2007-02-23 18:01:05 UTC (rev 6079)
@@ -29,7 +29,7 @@
** Role:
** This module represents the state of a particle swarm on a serial or parallel implementation.
** Its behaviour is dedicated to ensuring the integrity of the swarm.. it does not effect the state of what the swarm contains.
-** An swarm is an organised collection of particles... equivlant to a mesh being a collection of organised nodes.
+** An swarm is an organised collection of particles... equivalent to a mesh being a collection of organised nodes.
**
** Assumptions: stream = Journal_Register (Info_Type, "myStream");
** The cell layout does not change... i.e. number of cells does not change.
@@ -229,6 +229,18 @@
/** Removes a particle from a cell: the cell will have no record of owning that particle. */
void Swarm_RemoveParticleFromCell( void* swarm, Cell_DomainIndex dCell_I, Particle_InCellIndex cParticle_I );
+ /** Removes a particle from both its cell, and the particles array. Current implementation will switch the last
+ * particle to the empty hole created by the one being removed, but a linked list algorithm would
+ * be different. */
+ void Swarm_DeleteParticle( void* swarm, Particle_Index lParticle_I );
+
+ /** Removes a particle from both its cell, and the particles array - replacing it with a new particle.
+ * This function should be used, as compared to Swarm_DeleteParticle(), when you have a new/incoming
+ * particle needing to be inserted at the same time. Using this function will save overhead by
+ * combining the two operations. */
+ void Swarm_DeleteParticleAndReplaceWithNew( void* swarm, Particle_Index particleToDelete_lI,
+ void* replacementParticle, Cell_Index replacementParticle_cellIndex );
+
/** Adds a particle to a cell: the cell will now have that particle's index stored in its table of owned cells. */
void Swarm_AddParticleToCell( void* swarm, Cell_DomainIndex dCell_I, Particle_Index particle_I );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmClass.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Swarm</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Swarm/src/SwarmDump.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmDump.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmDump.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SwarmDump</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Swarm/src/SwarmOutput.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmOutput.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmOutput.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SwarmOutput</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Swarm/src/SwarmVariable.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SwarmVariable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Swarm/src/TriGaussParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriGaussParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriGaussParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">TriGaussParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">PerCellParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/UnionParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/UnionParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/UnionParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">UnionParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">GlobalParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">This is a particle layout that simply combines many particle layouts together into one. When one particle layout finishes initialises all its particles, then the next one begins.</param>
<list name="Params">
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/WithinShapeParticleLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/WithinShapeParticleLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/WithinShapeParticleLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">WithinShapeParticleLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Swarm/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">SpaceFillerParticleLayout</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">This uses the SpaceFillerParticleLayout class to choose quasi-random particle positions, but it only places a particle there if it is within a particular shape.</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/types.h 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/types.h 2007-02-23 18:01:05 UTC (rev 6079)
@@ -85,8 +85,8 @@
typedef struct GaussParticleLayout GaussParticleLayout;
typedef struct TriGaussParticleLayout TriGaussParticleLayout;
typedef struct GlobalParticleLayout GlobalParticleLayout;
- typedef struct SpaceFillerParticleLayout SpaceFillerParticleLayout;
- typedef struct WithinShapeParticleLayout WithinShapeParticleLayout;
+ typedef struct SpaceFillerParticleLayout SpaceFillerParticleLayout;
+ typedef struct WithinShapeParticleLayout WithinShapeParticleLayout;
typedef struct PlaneParticleLayout PlaneParticleLayout;
typedef struct UnionParticleLayout UnionParticleLayout;
typedef struct ManualParticleLayout ManualParticleLayout;
Property changes on: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests
___________________________________________________________________
Name: svn:ignore
- profile.*
*.out
*.error
*.diffs
+ profile.*
*.out
*.error
*.diffs
testSwarm
testManualParticleLayout
testElementCellLayout0
testSwarmOutput
testParticleCoords
testSpaceFillerParticleLayout
testGaussLayoutSingleCell
testGaussLayout
testSingleCellLayout0
testSwarmDumpAndLoad
testWithinShapeParticleLayout
testSwarmParticleAdvection
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllElementsVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllElementsVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllElementsVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">AllElementsVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllNodesVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllNodesVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllNodesVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">AllNodesVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CellRemesher.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CellRemesher.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CellRemesher.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">CellRemesher</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/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"></param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CornerVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CornerVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CornerVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">CornerVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description"> This function is designed so that a user can specify BC's at the corners of a region. See xml file: ../tests/data/CornerVC.xml </param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/DofLayout.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/DofLayout.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/DofLayout.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">DofLayout</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Utils/src/FieldVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c 2007-02-23 18:01:05 UTC (rev 6079)
@@ -41,6 +41,7 @@
#include "FieldVariable_Register.h"
#include <assert.h>
+#include <string.h>
const Type FieldVariable_Type = "FieldVariable";
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">FieldVariable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Utils/src/FrictionVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FrictionVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FrictionVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">FrictionVC</param>
+<param name="Author">...</param>
<param name="Organisation">CIG</param>
<param name="Project">Gale</param>
<param name="Location">./Gale/BoundaryConditions/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC. Copyright (c) 2006 California Institute of Technology</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/InnerWallVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/InnerWallVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/InnerWallVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">InnerWallVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/OperatorFieldVariable.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/OperatorFieldVariable.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/OperatorFieldVariable.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">OperatorFieldVariable</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Utils/src/Remesher.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Remesher.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Remesher.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">Remesher</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/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"></param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SemiRegDeform.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SemiRegDeform.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SemiRegDeform.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SemiRegDeform</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Utils/src/ShapeAdvector.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/ShapeAdvector.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/ShapeAdvector.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ShapeAdvector</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</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/StGermain/Discretisation/Utils/src/ShapeVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/ShapeVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/ShapeVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">ShapeVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SplitFrictionWallVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SplitFrictionWallVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SplitFrictionWallVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SplitFrictionWallVC</param>
+<param name="Author">...</param>
<param name="Organisation">CIG</param>
<param name="Project">Gale</param>
<param name="Location">./Gale/BoundaryConditions/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC. Copyright (c) 2006 California Institute of Technology</param>
<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/StripRemesher.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/StripRemesher.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/StripRemesher.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">StripRemesher</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StgFEM</param>
<param name="Location">./StgFEM/SLE/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"></param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/TimeIntegratee.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/TimeIntegratee.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/TimeIntegratee.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">TimeIntegratee</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">A general class which integrates each element in a Variable through time. It does this through a TimeDerivative method which it calls for each element in the Variable. This happens every time the TimeIntegrator that this object is attached to executes (This should happen on the AbstractContext_EP_Step EntryPoint.</param>
<list name="Params">
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/TimeIntegrator.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/TimeIntegrator.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/TimeIntegrator.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">TimeIntegrator</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">Stg_Component</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">This is a general class designed to integrate several TimeIntegratee objects through time. When one of these is created, it puts a Hook on the AbstractContext_EP_StepClass EntryPoint so that the Execute function for this class runs at the end of every timestep. This execute function then integrates every TimeIntegratee that has been registered to it through time.</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/WallVC.meta
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/WallVC.meta 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/WallVC.meta 2007-02-23 18:01:05 UTC (rev 6079)
@@ -3,6 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">WallVC</param>
+<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
<param name="Location">./StGermain/Discretisation/Utils/src/</param>
@@ -10,6 +11,8 @@
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License http://www.gnu.org/licenses/lgpl.html</param>
<param name="Parent">VariableCondition</param>
+<param name="Reference">...</param>
+<param name="Summary">...</param>
<param name="Description">...</param>
<!--Now the interesting stuff-->
Modified: long/3D/Gale/trunk/src/StGermain/compatibility/libpetsc/petsccompat.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/compatibility/libpetsc/petsccompat.h 2007-02-23 18:01:00 UTC (rev 6078)
+++ long/3D/Gale/trunk/src/StGermain/compatibility/libpetsc/petsccompat.h 2007-02-23 18:01:05 UTC (rev 6079)
@@ -256,7 +256,6 @@
#endif
-
/* Additional forward compatibility to 2.3.x and greater */
#if (( PETSC_VERSION_MAJOR == 2 ) && ( PETSC_VERSION_MINOR >= 3 )) || ( PETSC_VERSION_MAJOR > 2 )
@@ -269,30 +268,62 @@
#define VecScale( value, vec ) \
VecScale( vec, *value )
- #define VecAXPY( a, x, y ) \
- VecAXPY( y, *a, x )
-
- #define VecAYPX( a, x, y ) \
- VecAYPX( y, *a, x )
-
#define MatCreate( comm, rowLocal, colLocal, rowGlobal, colGlobal, mat ) \
MatCreate( comm, mat ); MatSetSizes( *mat, rowLocal, colLocal, rowGlobal, colGlobal )
#define VecPointwiseDivide( dividend, denominator, destination ) \
VecPointwiseDivide( destination, dividend, denominator )
- #define MatAXPY( a, x, y, matStructure ) \
- MatAXPY( y, *a, x, matStructure )
-
- #define MatAYPX( a, x, y ) \
- MatAYPX( y, *a, x )
-
#define MatScale( v, m ) \
MatScale( m, *v )
+#endif
+
+#if (( PETSC_VERSION_MAJOR == 2 ) && ( PETSC_VERSION_MINOR == 2 ))
+ #define VecAXPY( a, x, y ) \
+ VecAXPY( &a, x, y )
+
+ #define VecAYPX( a, x, y ) \
+ VecAYPX( &a, x, y )
+
+ #define MatAXPY( a, x, y ) \
+ MatAXPY( &a, x, y, DIFFERENT_NONZERO_PATTERN )
+
+ #define MatAYPX( a, x, y ) \
+ MatAYPX( &a, x, y )
+
#endif
+#if (( PETSC_VERSION_MAJOR == 2 ) && ( PETSC_VERSION_MINOR >= 3 )) && ( ( PETSC_VERSION_SUBMINOR == 0 ) || ( PETSC_VERSION_SUBMINOR == 1 ) )
+ #define VecAXPY( a, x, y ) \
+ VecAXPY( y, a, x )
+ #define VecAYPX( a, x, y ) \
+ VecAYPX( y, a, x )
+
+ #define MatAXPY( a, x, y ) \
+ MatAXPY( y, a, x, DIFFERENT_NONZERO_PATTERN )
+
+ #define MatAYPX( a, x, y ) \
+ MatAYPX( y, a, x )
+
+#endif
+
+#if (( PETSC_VERSION_MAJOR == 2 ) && ( PETSC_VERSION_MINOR >= 3 )) && ( PETSC_VERSION_SUBMINOR >= 2 ) || ( PETSC_VERSION_MAJOR > 2 )
+ #define VecAXPY( a, x, y ) \
+ VecAXPY( y, a, x )
+
+ #define VecAYPX( a, x, y ) \
+ VecAYPX( y, a, x )
+
+ #define MatAXPY( a, x, y ) \
+ MatAXPY( y, a, x, DIFFERENT_NONZERO_PATTERN )
+
+ #define MatAYPX( a, x, y ) \
+ MatAYPX( y, a, x, DIFFERENT_NONZERO_PATTERN )
+
+#endif
+
#endif /* ndef __PETSCCOMPAT_H */
More information about the cig-commits
mailing list