[cig-commits] r5730 - in long/3D/Gale/trunk: . src/StGermain/Discretisation/Mesh/src src/StgFEM/Discretisation/src src/StgFEM/SLE/LinearAlgebra/src

[walter at geodynamics.org]

Author: walter
Date: 2007-01-09 10:36:56 -0800 (Tue, 09 Jan 2007)
New Revision: 5730

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/SConscript
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/SConscript
Log:
 r1339 at earth:  boo | 2007-01-05 13:05:24 -0800
 Fix up SConscripts from merging



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1338
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1339

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript	2007-01-09 18:36:53 UTC (rev 5729)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript	2007-01-09 18:36:56 UTC (rev 5730)
@@ -38,8 +38,12 @@
 MeshGenerator.h
 MeshVariable.h
 Mesh_Algorithms.h
+Mesh_CentroidAlgorithms.h
+Mesh_CentroidType.h
 Mesh_ElementType.h
+Mesh_HexAlgorithms.h
 Mesh_HexType.h
+Mesh_RegularAlgorithms.h
 SurfaceAdaptor.h
 shortcuts.h
 types.h""")
@@ -60,8 +64,12 @@
 MeshTopology.c
 MeshVariable.c
 Mesh_Algorithms.c
+Mesh_CentroidAlgorithms.c
+Mesh_CentroidType.c
 Mesh_ElementType.c
+Mesh_HexAlgorithms.c
 Mesh_HexType.c
+Mesh_RegularAlgorithms.c
 SurfaceAdaptor.c""")
 
 meta_files=Split("""CartesianGenerator.meta
@@ -76,7 +84,10 @@
 MeshTopology.meta
 MeshVariable.meta
 Mesh_Algorithms.meta
+Mesh_CentroidAlgorithms.meta
 Mesh_ElementType.meta
+Mesh_HexAlgorithms.meta
+Mesh_RegularAlgorithms.meta
 SurfaceAdaptor.meta""")
 
 c_files+=[local_env.Meta(meta_files)]

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/SConscript	2007-01-09 18:36:53 UTC (rev 5729)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/SConscript	2007-01-09 18:36:56 UTC (rev 5730)
@@ -29,8 +29,6 @@
 ElementType_Register.h
 FeEquationNumber.h
 FeMesh.h
-FeMesh_Algorithms.h
-FeMesh_ElementType.h
 FeSwarmVariable.h
 FeVariable.h
 Finalise.h
@@ -53,8 +51,6 @@
 ElementType_Register.c
 FeEquationNumber.c
 FeMesh.c
-FeMesh_Algorithms.c
-FeMesh_ElementType.c
 FeSwarmVariable.c
 FeVariable.c
 Finalise.c
@@ -72,8 +68,6 @@
 ElementType_Register.meta
 FeEquationNumber.meta
 FeMesh.meta
-FeMesh_Algorithms.meta
-FeMesh_ElementType.meta
 FeSwarmVariable.meta
 FeVariable.meta
 LinearTriangleElementType.meta

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/SConscript	2007-01-09 18:36:53 UTC (rev 5729)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/SConscript	2007-01-09 18:36:56 UTC (rev 5730)
@@ -26,10 +26,12 @@
 Matrix.h
 MatrixSolver.h
 MultigridSolver.h
+MGOpGenerator.h
 PETScErrorChecking.h
 PETScMatrix.h
 PETScMatrixSolver.h
 PETScVector.h
+SROpGenerator.h
 types.h
 Vector.h
 """)
@@ -39,18 +41,22 @@
 Matrix.c
 MatrixSolver.c
 MultigridSolver.c
+MGOpGenerator.c
 PETScMatrix.c
 PETScMatrixSolver.c
 PETScVector.c
+SROpGenerator.c
 Vector.c
 """)
 
 meta_files=Split("""Matrix.meta
 MatrixSolver.meta
 MultigridSolver.meta
+MGOpGenerator.meta
 PETScMatrix.meta
 PETScMatrixSolver.meta
 PETScVector.meta
+SROpGenerator.meta
 Vector.meta
 """)