[cig-commits] commit:
Mercurial
hg at geodynamics.org
Mon Nov 24 11:59:08 PST 2008
changeset: 102:4be466fe68ae
user: JulianGiordani
date: Wed May 14 06:22:58 2008 +0000
files: Geometry/src/makefile Shape/src/Box.meta Shape/src/Cylinder.meta Swarm/src/UnionParticleLayout.meta Swarm/src/WithinShapeParticleLayout.meta Utils/src/makefile
description:
changes to makefiles and updates to some .meta, but VMake still brakes as the tests directories need changing....
diff -r d3083a024e0a -r 4be466fe68ae Geometry/src/makefile
--- a/Geometry/src/makefile Wed May 14 05:33:12 2008 +0000
+++ b/Geometry/src/makefile Wed May 14 06:22:58 2008 +0000
@@ -50,16 +50,6 @@ SRCS = \
Plane.c \
Edge.c \
RMatrix.c \
- Topology.c \
- IJKTopology.c \
- IJK6Topology.c \
- IJK26Topology.c \
- IrregTopology.c \
- GeometryClass.c \
- BlockGeometry.c \
- RefinedRegionsGeometry.c \
- ShellGeometry.c \
- IrregGeometry.c \
QuadEdge.c \
Delaunay.c \
ParallelDelaunay.c \
@@ -86,16 +76,6 @@ HDRS = \
Plane.h \
Edge.h \
RMatrix.h \
- Topology.h \
- IJKTopology.h \
- IJK6Topology.h \
- IJK26Topology.h \
- IrregTopology.h \
- GeometryClass.h \
- ShellGeometry.h \
- BlockGeometry.h \
- RefinedRegionsGeometry.h \
- IrregGeometry.h \
QuadEdge.h \
Delaunay.h \
ParallelDelaunay.h \
diff -r d3083a024e0a -r 4be466fe68ae Shape/src/Box.meta
--- a/Shape/src/Box.meta Wed May 14 05:33:12 2008 +0000
+++ b/Shape/src/Box.meta Wed May 14 06:22:58 2008 +0000
@@ -5,37 +5,74 @@
<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>
+<param name="Project">StgDomain</param>
+<param name="Location">./StgDomain/Shape/src/</param>
<param name="Project Web">https://csd.vpac.org/twiki/bin/view/Stgermain/WebHome</param>
<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>
+<param name="Description">Defines a Box shape</param>
<!--Now the interesting stuff-->
<list name="Params">
<struct>
- <param name="Name">startKey</param>
+ <param name="Name">startX</param>
<param name="Type">Double</param>
<param name="Default">0.0</param>
- <param name="Description">...</param>
+ <param name="Description">minimum x coord of box shape. (Will override widthX)</param>
</struct>
<struct>
- <param name="Name">endKey</param>
+ <param name="Name">endX</param>
<param name="Type">Double</param>
<param name="Default">0.0</param>
- <param name="Description">...</param>
+ <param name="Description">maximum x coord of box shape. (Will override widthX)</param>
</struct>
<struct>
- <param name="Name">widthKey</param>
+ <param name="Name">widthX</param>
<param name="Type">Double</param>
<param name="Default">0.0</param>
- <param name="Description">...</param>
+ <param name="Description">Can use this to define the width in x, centred around the centre coords of the shape</param>
+ </struct>
+ <struct>
+ <param name="Name">startY</param>
+ <param name="Type">Double</param>
+ <param name="Default">0.0</param>
+ <param name="Description">minimum y coord of box shape. (Will override widthY)</param>
+ </struct>
+ <struct>
+ <param name="Name">endY</param>
+ <param name="Type">Double</param>
+ <param name="Default">0.0</param>
+ <param name="Description">maximum y coord of box shape. (Will override widthY)</param>
+ </struct>
+ <struct>
+ <param name="Name">widthY</param>
+ <param name="Type">Double</param>
+ <param name="Default">0.0</param>
+ <param name="Description">Can use this to define the width in y, centred around the centre coords of the shape</param>
+ </struct>
+
+ <struct>
+ <param name="Name">startZ</param>
+ <param name="Type">Double</param>
+ <param name="Default">0.0</param>
+ <param name="Description">minimum z coord of box shape. (Will override widthZ)</param>
+ </struct>
+ <struct>
+ <param name="Name">endZ</param>
+ <param name="Type">Double</param>
+ <param name="Default">0.0</param>
+ <param name="Description">maximum z coord of box shape. (Will override widthZ)</param>
+ </struct>
+ <struct>
+ <param name="Name">widthZ</param>
+ <param name="Type">Double</param>
+ <param name="Default">0.0</param>
+ <param name="Description">Can use this to define the width in z, centred around the centre coords of the shape</param>
</struct>
</list>
diff -r d3083a024e0a -r 4be466fe68ae Shape/src/Cylinder.meta
--- a/Shape/src/Cylinder.meta Wed May 14 05:33:12 2008 +0000
+++ b/Shape/src/Cylinder.meta Wed May 14 06:22:58 2008 +0000
@@ -5,15 +5,15 @@
<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>
+<param name="Project">StgDomain</param>
+<param name="Location">./StgDomain/Shape/src/</param>
<param name="Project Web">https://csd.vpac.org/twiki/bin/view/Stgermain/WebHome</param>
<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>
+<param name="Description">Defines a cylinder shape.</param>
<!--Now the interesting stuff-->
@@ -23,49 +23,49 @@
<param name="Name">radius</param>
<param name="Type">Double</param>
<param name="Default">0.0</param>
- <param name="Description">...</param>
+ <param name="Description">The radius of the cylinder</param>
</struct>
<struct>
<param name="Name">startX</param>
<param name="Type">Double</param>
- <param name="Default">-BIG</param>
- <param name="Description">...</param>
+ <param name="Default">-1e99</param>
+ <param name="Description">x-coord the cylinder starts</param>
</struct>
<struct>
<param name="Name">startY</param>
<param name="Type">Double</param>
- <param name="Default">-BIG</param>
- <param name="Description">...</param>
+ <param name="Default">-1e99</param>
+ <param name="Description">y-coord the cylinder starts</param>
</struct>
<struct>
<param name="Name">startZ</param>
<param name="Type">Double</param>
- <param name="Default">-BIG</param>
- <param name="Description">...</param>
+ <param name="Default">-1e99</param>
+ <param name="Description">z-coord the cylinder starts</param>
</struct>
<struct>
<param name="Name">endX</param>
<param name="Type">Double</param>
<param name="Default">BIG</param>
- <param name="Description">...</param>
+ <param name="Description">x-coord the cylinder ends at</param>
</struct>
<struct>
<param name="Name">endY</param>
<param name="Type">Double</param>
<param name="Default">BIG</param>
- <param name="Description">...</param>
+ <param name="Description">y-coord the cylinder ends at</param>
</struct>
<struct>
<param name="Name">endZ</param>
<param name="Type">Double</param>
<param name="Default">BIG</param>
- <param name="Description">...</param>
+ <param name="Description">z-coord the cylinder ends at</param>
</struct>
<struct>
<param name="Name">perpendicularAxis</param>
<param name="Type">String</param>
- <param name="Default">"x"</param>
- <param name="Description">...</param>
+ <param name="Default">x</param>
+ <param name="Description">axis the cylinder is perpdenicular to</param>
</struct>
</list>
diff -r d3083a024e0a -r 4be466fe68ae Swarm/src/UnionParticleLayout.meta
--- a/Swarm/src/UnionParticleLayout.meta Wed May 14 05:33:12 2008 +0000
+++ b/Swarm/src/UnionParticleLayout.meta Wed May 14 06:22:58 2008 +0000
@@ -5,14 +5,13 @@
<param name="Name">UnionParticleLayout</param>
<param name="Author">...</param>
<param name="Organisation">VPAC</param>
-<param name="Project">StGermain</param>
-<param name="Location">./</param>
+<param name="Project">StgDomain</param>
+<param name="Location">./StgDomain/Swarm/src</param>
<param name="Project Web">https://csd.vpac.org/twiki/bin/view/Stgermain/WebHome</param>
<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">A particle layout that sequentially combines many particle layouts.<br/>When one particle layout finishes initialising all its particles then the next one begins.</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">
@@ -24,6 +23,7 @@
<param name="Name">ParticleLayoutList</param>
<param name="Type">GlobalParticleLayout</param>
<param name="Description">This is a list of all the particle layouts that you want to combine into one.</param>
+ <param name="Fallback Key"></param>
</struct>
</list>
<!-- Add an exmaple XML if possible -->
diff -r d3083a024e0a -r 4be466fe68ae Swarm/src/WithinShapeParticleLayout.meta
--- a/Swarm/src/WithinShapeParticleLayout.meta Wed May 14 05:33:12 2008 +0000
+++ b/Swarm/src/WithinShapeParticleLayout.meta Wed May 14 06:22:58 2008 +0000
@@ -26,6 +26,7 @@
<param name="Name">shape</param>
<param name="Type">Stg_Shape</param>
<param name="Description">This is the shape within which all the particles will be laid out.</param>
+ <param name="Fallback Key"></param>
</struct>
</list>
diff -r d3083a024e0a -r 4be466fe68ae Utils/src/makefile
--- a/Utils/src/makefile Wed May 14 05:33:12 2008 +0000
+++ b/Utils/src/makefile Wed May 14 06:22:58 2008 +0000
@@ -49,7 +49,6 @@ SRCS = \
FieldVariable.c \
FieldVariable_Register.c \
Finalise.c \
- FrictionVC.c \
Init.c \
InnerWallVC.c \
LinearRegression.c \
@@ -63,7 +62,6 @@ SRCS = \
Remesher.c \
ShapeAdvector.c \
SobolGenerator.c \
- SplitFrictionWallVC.c \
TimeIntegratee.c \
TimeIntegrator.c \
WallVC.c
@@ -82,7 +80,6 @@ HDRS = \
FieldVariable.h \
FieldVariable_Register.h \
Finalise.h \
- FrictionVC.h \
Init.h \
InnerWallVC.h \
LinearRegression.h \
@@ -98,7 +95,6 @@ HDRS = \
Remesher.h \
ShapeAdvector.h \
SobolGenerator.h \
- SplitFrictionWallVC.h \
TimeIntegratee.h \
TimeIntegrator.h \
Utils.h \
More information about the CIG-COMMITS
mailing list