[cig-commits] r5626 - in long/3D/Gale/trunk: .
src/StGermain/Discretisation/Mesh/src
src/StgFEM/SLE/LinearAlgebra src/StgFEM/SLE/LinearAlgebra/src
walter at geodynamics.org
walter at geodynamics.org
Fri Dec 22 11:38:27 PST 2006
Author: walter
Date: 2006-12-22 11:38:25 -0800 (Fri, 22 Dec 2006)
New Revision: 5626
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/SConstruct
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshAdaptor.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.c
long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/SConscript
long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/SConscript
Log:
r1279 at earth: boo | 2006-12-22 11:37:28 -0800
Fixes to make the merge from Luke compile
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1266
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1279
Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct 2006-12-22 16:50:50 UTC (rev 5625)
+++ long/3D/Gale/trunk/SConstruct 2006-12-22 19:38:25 UTC (rev 5626)
@@ -29,7 +29,7 @@
env.Append(CPPPATH=['#/build/include'])
env.Append(CPPPATH=['#/build/include/StGermain'])
-env.Append(CPPFLAGS=['-DVERSION=\\"CIG\\"'])
+env.Append(CPPFLAGS=['-DVERSION=\\"CIG\\"','-DHAVE_PETSC'])
# Export all of the variables
Export('env')
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c 2006-12-22 16:50:50 UTC (rev 5625)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c 2006-12-22 19:38:25 UTC (rev 5626)
@@ -63,8 +63,6 @@
SurfaceAdaptor_Type, "0", (Stg_Component_DefaultConstructorFunction*)SurfaceAdaptor_New );
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(),
MeshVariable_Type, "0", (Stg_Component_DefaultConstructorFunction*)MeshVariable_New );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(),
- SurfaceAdaptor_Type, "0", (Stg_Component_DefaultConstructorFunction*)SurfaceAdaptor_New );
RegisterParent( Mesh_Algorithms_Type, Stg_Component_Type );
RegisterParent( MeshTopology_Type, Stg_Component_Type );
@@ -74,7 +72,6 @@
RegisterParent( MeshAdaptor_Type, Stg_Component_Type );
RegisterParent( SurfaceAdaptor_Type, MeshAdaptor_Type );
RegisterParent( MeshVariable_Type, Variable_Type );
- RegisterParent( SurfaceAdaptor_Type, MeshAdaptor_Type );
return True;
}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h 2006-12-22 16:50:50 UTC (rev 5625)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh.h 2006-12-22 19:38:25 UTC (rev 5626)
@@ -62,8 +62,6 @@
#include "MeshAdaptor.h"
#include "SurfaceAdaptor.h"
#include "MeshVariable.h"
- #include "MeshAdaptor.h"
- #include "SurfaceAdaptor.h"
#include "Init.h"
#include "Finalise.h"
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshAdaptor.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshAdaptor.c 2006-12-22 16:50:50 UTC (rev 5625)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshAdaptor.c 2006-12-22 19:38:25 UTC (rev 5626)
@@ -111,7 +111,7 @@
/* Read the source generator. */
self->generator = Stg_ComponentFactory_ConstructByKey( cf, self->name, "sourceGenerator",
MeshGenerator, True, data );
-/* } */
+ }
}
void _MeshAdaptor_Build( void* adaptor, void* data ) {
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.c 2006-12-22 16:50:50 UTC (rev 5625)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.c 2006-12-22 19:38:25 UTC (rev 5626)
@@ -86,7 +86,7 @@
/* Allocate memory */
assert( sizeOfSelf >= sizeof(SurfaceAdaptor) );
- self = (SurfaceAdaptor*)_MeshAdaptor_New( MESHADAPTOR_PASSARGS );
+ self = (SurfaceAdaptor*)_MeshGenerator_New( MESHADAPTOR_PASSARGS );
/* Virtual info */
@@ -110,7 +110,7 @@
SurfaceAdaptor* self = (SurfaceAdaptor*)adaptor;
/* Delete the parent. */
- _MeshAdaptor_Delete( self );
+ _MeshGenerator_Delete( self );
}
void _SurfaceAdaptor_Print( void* adaptor, Stream* stream ) {
@@ -122,7 +122,7 @@
/* Print parent */
Journal_Printf( stream, "SurfaceAdaptor (ptr): (%p)\n", self );
- _MeshAdaptor_Print( self, stream );
+ _MeshGenerator_Print( self, stream );
}
void _SurfaceAdaptor_Construct( void* adaptor, Stg_ComponentFactory* cf, void* data ) {
@@ -232,10 +232,11 @@
/* Loop over domain nodes. */
for( n_i = 0; n_i < MeshTopology_GetDomainSize( mesh->topo, MT_VERTEX ); n_i++ ) {
- double scale_factor;
+ unsigned gNode;
double height;
- RegularMeshUtils_Node_1DTo3D( mesh, Mesh_DomainToGlobal(mesh, MT_VERTEX, n_i), inds );
+ gNode = MeshTopology_DomainToGlobal( mesh->topo, MT_VERTEX, n_i );
+ Grid_Lift( grid, gNode, inds );
/* Calculate a height percentage. */
height = (double)inds[1] / (double)(grid->sizes[1] - 1);
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/SConscript 2006-12-22 16:50:50 UTC (rev 5625)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/SConscript 2006-12-22 19:38:25 UTC (rev 5626)
@@ -16,6 +16,4 @@
# USA
SConscript('src/SConscript')
-#SConscript('Dummy/SConscript')
-SConscript('PETSc/SConscript')
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/SConscript 2006-12-22 16:50:50 UTC (rev 5625)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/SConscript 2006-12-22 19:38:25 UTC (rev 5626)
@@ -18,17 +18,43 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_SLE_LinearAlgebra\\\""])
header_groups['StgFEM/SLE/LinearAlgebra']=Split("""Finalise.h
Init.h
LinearAlgebra.h
Matrix.h
MatrixSolver.h
+MultigridSolver.h
+PETScErrorChecking.h
+PETScMatrix.h
+PETScMatrixSolver.h
+PETScVector.h
types.h
-Utils.h
-Vector.h""")
+Vector.h
+""")
-c_files=Split("""dummy.c""")
+c_files=Split("""Finalise.c
+Init.c
+Matrix.c
+MatrixSolver.c
+MultigridSolver.c
+PETScMatrix.c
+PETScMatrixSolver.c
+PETScVector.c
+Vector.c
+""")
+meta_files=Split("""Matrix.meta
+MatrixSolver.meta
+MultigridSolver.meta
+PETScMatrix.meta
+PETScMatrixSolver.meta
+PETScVector.meta
+Vector.meta
+""")
+
+c_files+=[local_env.Meta(meta_files)]
+
shared_lib_objects+=[local_env.SharedLibrary('StgFEMSLELinearAlgebra',c_files)]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
More information about the cig-commits
mailing list