[cig-commits] r4386 - in long/3D/Gale/trunk: .
src/StGermain/Base/Container/src src/StGermain/Base/Foundation/src
src/StGermain/Discretisation/Geometry/src
src/StGermain/Discretisation/Mesh/src
src/StGermain/Discretisation/Utils/src src/Underworld/Rheology/src
walter at geodynamics.org
walter at geodynamics.org
Fri Aug 18 12:35:25 PDT 2006
Author: walter
Date: 2006-08-18 12:35:24 -0700 (Fri, 18 Aug 2006)
New Revision: 4386
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript
long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.h
long/3D/Gale/trunk/src/Underworld/Rheology/src/SConscript
Log:
r691 at earth: boo | 2006-08-18 01:04:29 -0700
Fix up SConscript's so everything builds
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:690
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:691
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript 2006-08-18 19:35:22 UTC (rev 4385)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript 2006-08-18 19:35:24 UTC (rev 4386)
@@ -26,7 +26,6 @@
"Container.h",
"Finalise.h",
"HashTable.h",
- "HashTableIterator.h",
"Heap.h",
"IndexMap.h",
"IndexSet.h",
@@ -37,33 +36,39 @@
"List.h",
"Map.h",
"MaxHeap.h",
+ "MPIRoutines.h",
"PtrMap.h",
"PtrSet.h",
+ "RangeSet.h",
"Set.h",
"types.h",
+ "UIntMap.h",
"UniqueList.h",
"units.h"]
-c_files=Split("""IndexSet.c
- PtrMap.c
- IndexMap.c
- List.c
- Array.c
- UniqueList.c
- BTreeNode.c
- BTree.c
- BTreeIterator.c
- LinkedListNode.c
- LinkedList.c
- LinkedListIterator.c
- Heap.c
- HashTable.c
- Set.c
- PtrSet.c
- Map.c
- MaxHeap.c
- Init.c
- Finalise.c""")
+c_files=Split("""Array.c
+BTree.c
+BTreeIterator.c
+BTreeNode.c
+Finalise.c
+HashTable.c
+Heap.c
+IndexMap.c
+IndexSet.c
+Init.c
+LinkedList.c
+LinkedListIterator.c
+LinkedListNode.c
+List.c
+Map.c
+MaxHeap.c
+MPIRoutines.c
+PtrMap.c
+PtrSet.c
+RangeSet.c
+Set.c
+UIntMap.c
+UniqueList.c""")
shared_lib_objects+=[local_env.SharedLibrary('StGermainBaseContainer',c_files)]
StGermain_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript 2006-08-18 19:35:22 UTC (rev 4385)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript 2006-08-18 19:35:24 UTC (rev 4386)
@@ -19,42 +19,44 @@
local_env=env.Copy()
-header_groups['StGermain/Base/Foundation']=["Class.h",
- "CommonRoutines.h",
- "Finalise.h",
- "forwardDecl.h",
- "Foundation.h",
- "Init.h",
- "MemMonitor.h",
- "MemoryField.h",
- "Memory.h",
- "MemoryPointer.h",
- "MemoryReport.h",
- "MemoryTag.h",
- "NamedObject_Register.h",
- "ObjectAdaptor.h",
- "Object.h",
- "ObjectList.h",
- "PrimitiveObject.h",
- "shortcuts.h",
- "TimeMonitor.h",
- "types.h"]
+header_groups['StGermain/Base/Foundation']=Split("""Class.h
+CommonRoutines.h
+Finalise.h
+forwardDecl.h
+Foundation.h
+Init.h
+MemMonitor.h
+MemoryField.h
+Memory.h
+MemoryPointer.h
+MemoryReport.h
+MemoryTag.h
+NamedObject_Register.h
+ObjectAdaptor.h
+Object.h
+ObjectList.h
+PrimitiveObject.h
+shortcuts.h
+TestSuite.h
+TimeMonitor.h
+types.h""")
c_files=Split("""Class.c
- MemMonitor.c
- MemoryReport.c
- ObjectList.c
- CommonRoutines.c
- Memory.c
- NamedObject_Register.c
- PrimitiveObject.c
- Finalise.c
- MemoryField.c
- ObjectAdaptor.c
- TimeMonitor.c
- Init.c
- MemoryPointer.c
- Object.c""")
+CommonRoutines.c
+Finalise.c
+Init.c
+MemMonitor.c
+Memory.c
+MemoryField.c
+MemoryPointer.c
+MemoryReport.c
+NamedObject_Register.c
+ObjectAdaptor.c
+Object.c
+ObjectList.c
+PrimitiveObject.c
+TestSuite.c
+TimeMonitor.c""")
shared_lib_objects+=[local_env.SharedLibrary('StGermainBaseFoundation',
c_files)]
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript 2006-08-18 19:35:22 UTC (rev 4385)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript 2006-08-18 19:35:24 UTC (rev 4386)
@@ -20,78 +20,80 @@
local_env=env.Copy()
local_env.Append(CPPFLAGS=['-DCURR_MODULE_NAME=\\"StGermainDiscretisationGeometry\\"'])
-header_groups['StGermain/Discretisation/Geometry']=["units.h",
- "types.h",
- "isinf.h",
-# "stg_lapack.h",
- "ComplexVectorMath.h",
- "Dimension.h",
-# "FullTensorMath.h",
- "ParallelDelaunay.h",
- "Delaunay.h",
- "VectorMath.h",
- "TensorMath.h",
- "TrigMath.h",
- "ComplexMath.h",
- "Line.h",
- "Plane.h",
- "Edge.h",
- "QuadEdge.h",
- "RMatrix.h",
- "Topology.h",
- "IJKTopology.h",
- "IJK6Topology.h",
- "IJK26Topology.h",
- "IrregTopology.h",
- "GeometryClass.h",
- "ShellGeometry.h",
- "BlockGeometry.h",
- "RefinedRegionsGeometry.h",
- "IrregGeometry.h",
- "Init.h",
- "Finalise.h",
- "Geometry.h"]
+header_groups['StGermain/Discretisation/Geometry']=Split("""BlockGeometry.h
+ComplexMath.h
+ComplexVectorMath.h
+Delaunay.h
+Dimension.h
+Edge.h
+Finalise.h
+FullTensorMath.h
+GeometryClass.h
+Geometry.h
+IJK26Topology.h
+IJK6Topology.h
+IJKTopology.h
+Init.h
+IrregGeometry.h
+IrregTopology.h
+isinf.h
+Line.h
+ParallelDelaunay.h
+Plane.h
+QuadEdge.h
+RefinedRegionsGeometry.h
+RMatrix.h
+ShellGeometry.h
+stg_lapack.h
+TensorMath.h
+TensorMultMath.h
+Topology.h
+TrigMath.h
+types.h
+units.h
+VectorMath.h""")
+c_files=Split("""BlockGeometry.c
+ComplexMath.c
+ComplexVectorMath.c
+Delaunay.c
+Dimension.c
+Edge.c
+Finalise.c
+FullTensorMath.c
+GeometryClass.c
+IJK26Topology.c
+IJK6Topology.c
+IJKTopology.c
+Init.c
+IrregGeometry.c
+IrregTopology.c
+Line.c
+ParallelDelaunay.c
+Plane.c
+QuadEdge.c
+RefinedRegionsGeometry.c
+RMatrix.c
+ShellGeometry.c
+TensorMath.c
+TensorMultMath.c
+Topology.c
+TrigMath.c
+VectorMath.c""")
-c_files=["ComplexVectorMath.c",
- "Dimension.c",
-# "FullTensorMath.c",
- "ParallelDelaunay.c",
- "Delaunay.c",
- "VectorMath.c",
- "TensorMath.c",
- "TrigMath.c",
- "ComplexMath.c",
- "Line.c",
- "Plane.c",
- "Edge.c",
- "QuadEdge.c",
- "RMatrix.c",
- "Topology.c",
- "IJKTopology.c",
- "IJK6Topology.c",
- "IJK26Topology.c",
- "IrregTopology.c",
- "GeometryClass.c",
- "BlockGeometry.c",
- "RefinedRegionsGeometry.c",
- "ShellGeometry.c",
- "IrregGeometry.c",
- "Init.c",
- "Finalise.c"]
-
meta_files=Split("""BlockGeometry.meta
Delaunay.meta
+GeometryClass.meta
+IJK26Topology.meta
+IJK6Topology.meta
+IJKTopology.meta
+IrregGeometry.meta
+IrregTopology.meta
ParallelDelaunay.meta
-IJKTopology.meta
+RefinedRegionsGeometry.meta
ShellGeometry.meta
-GeometryClass.meta
-IrregGeometry.meta
Topology.meta
-IJK26Topology.meta
-IrregTopology.meta
-IJK6Topology.meta
-RefinedRegionsGeometry.meta""")
+""")
c_files+=[local_env.Meta(meta_files)]
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript 2006-08-18 19:35:22 UTC (rev 4385)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript 2006-08-18 19:35:24 UTC (rev 4386)
@@ -19,58 +19,63 @@
local_env=env.Copy()
-header_groups['StGermain/Discretisation/Mesh']=["types.h",
- "shortcuts.h",
- "ShadowInfo.h",
- "ElementLayout.h",
- "HexaEL.h",
- "ParallelPipedHexaEL.h",
- "IrregEL.h",
- "NodeLayout.h",
- "CornerNL.h",
- "BodyNL.h",
- "MeshDecomp.h",
- "HexaMD.h",
- "DummyMD.h",
- "MeshGeometry.h",
- "MeshLayout.h",
- "MeshClass.h",
- "HMesh.h",
- "Init.h",
- "Finalise.h",
- "Mesh.h"]
+header_groups['StGermain/Discretisation/Mesh']=Split("""
+BodyNL.h
+CornerNL.h
+Decomp.h
+DummyMD.h
+ElementLayout.h
+Finalise.h
+HexaEL.h
+HexaMD.h
+HMesh.h
+Init.h
+IrregEL.h
+MeshClass.h
+MeshDecomp.h
+MeshGeometry.h
+Mesh.h
+MeshLayout.h
+NodeLayout.h
+ParallelPipedHexaEL.h
+ShadowInfo.h
+shortcuts.h
+StencilMD.h
+types.h""")
-c_files=["MeshDecomp.c",
- "ElementLayout.c",
- "HexaEL.c",
- "ParallelPipedHexaEL.c",
- "IrregEL.c",
- "NodeLayout.c",
- "CornerNL.c",
- "BodyNL.c",
- "HexaMD.c",
- "DummyMD.c",
- "MeshGeometry.c",
- "MeshLayout.c",
- "MeshClass.c",
- "HMesh.c",
- "Init.c",
- "Finalise.c"]
+c_files=Split("""BodyNL.c
+CornerNL.c
+Decomp.c
+DummyMD.c
+ElementLayout.c
+Finalise.c
+HexaEL.c
+HexaMD.c
+HMesh.c
+Init.c
+IrregEL.c
+MeshClass.c
+MeshDecomp.c
+MeshGeometry.c
+MeshLayout.c
+NodeLayout.c
+ParallelPipedHexaEL.c""")
meta_files=Split("""BodyNL.meta
+CornerNL.meta
+Decomp.meta
+DummyMD.meta
+ElementLayout.meta
HexaEL.meta
+HexaMD.meta
+HMesh.meta
+IrregEL.meta
+MeshClass.meta
MeshDecomp.meta
-ParallelPipedHexaEL.meta
-CornerNL.meta
-HexaMD.meta
MeshGeometry.meta
-StencilMD.meta
-DummyMD.meta
-IrregEL.meta
MeshLayout.meta
-ElementLayout.meta
-MeshClass.meta
-NodeLayout.meta""")
+NodeLayout.meta
+ParallelPipedHexaEL.meta""")
c_files+=[local_env.Meta(meta_files)]
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c 2006-08-18 19:35:22 UTC (rev 4385)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.c 2006-08-18 19:35:24 UTC (rev 4386)
@@ -24,7 +24,7 @@
** License along with this library; if not, write to the Free Software
** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
**
-** $Id: Sync.c 2453 2004-12-21 04:49:34Z LukeHodkinson $
+** $Id$
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.h 2006-08-18 19:35:22 UTC (rev 4385)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Sync.h 2006-08-18 19:35:24 UTC (rev 4386)
@@ -32,7 +32,7 @@
**
** Comments:
**
-** $Id: Sync.h 2453 2004-12-21 04:49:34Z LukeHodkinson $
+** $Id$
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/SConscript 2006-08-18 19:35:22 UTC (rev 4385)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/SConscript 2006-08-18 19:35:24 UTC (rev 4386)
@@ -30,13 +30,15 @@
DepthDependentViscosity.h
Director.h
DruckerPrager.h
+FaultingMoresiMuhlhaus2006.h
Finalise.h
FrankKamenetskii.h
Init.h
MaterialViscosity.h
-MohrCoulomb.h
MultiRheologyMaterial.h
NonNewtonian.h
+OrthotropicAligned.h
+Orthotropic.h
RheologyClass.h
Rheology.h
RheologyMaterial.h
@@ -60,13 +62,15 @@
DepthDependentViscosity.c
Director.c
DruckerPrager.c
+FaultingMoresiMuhlhaus2006.c
Finalise.c
FrankKamenetskii.c
Init.c
MaterialViscosity.c
-MohrCoulomb.c
MultiRheologyMaterial.c
NonNewtonian.c
+OrthotropicAligned.c
+Orthotropic.c
RheologyClass.c
RheologyMaterial.c
Rheology_Register.c
@@ -88,11 +92,13 @@
DepthDependentViscosity.meta
Director.meta
DruckerPrager.meta
+FaultingMoresiMuhlhaus2006.meta
FrankKamenetskii.meta
MaterialViscosity.meta
-MohrCoulomb.meta
MultiRheologyMaterial.meta
NonNewtonian.meta
+OrthotropicAligned.meta
+Orthotropic.meta
RheologyClass.meta
RheologyMaterial.meta
StoreStress.meta
More information about the cig-commits
mailing list