[cig-commits] commit: Updated to the StGermain/Discretisation to StgDomain change
Mercurial
hg at geodynamics.org
Mon Nov 24 11:30:36 PST 2008
changeset: 48:fb9d80df5f44
user: SteveQuenette
date: Thu Oct 11 08:07:50 2007 +0000
files: Apps/BuoyancyBenchmark/makefile Apps/BuoyancyBenchmark/tests/AnalyticPressure/AnalyticPressure.c Apps/BuoyancyBenchmark/tests/AnalyticPressure/makefile Apps/BuoyancyBenchmark/tests/makefile Apps/LidDrivenPIC/makefile Apps/LidDrivenPIC/tests/makefile Apps/RayleighTaylor/makefile Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Apps/RayleighTaylor/tests/AnalyticBlock/makefile Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c Apps/RayleighTaylor/tests/AnalyticColumn/makefile Apps/RayleighTaylor/tests/makefile Apps/ThermoChem/makefile MaterialPoints/src/BackgroundParticleLayout.c MaterialPoints/src/CoincidentMapper.c MaterialPoints/src/Context.c MaterialPoints/src/Finalise.c MaterialPoints/src/GaussMapper.c MaterialPoints/src/Init.c MaterialPoints/src/IntegrationPointMapper.c MaterialPoints/src/IntegrationPointsSwarm.c MaterialPoints/src/ManyToOneMapper.c MaterialPoints/src/MappedParticleLayout.c MaterialPoints/src/Material.c MaterialPoints/src/MaterialFeVariable.c MaterialPoints/src/MaterialPoint.c MaterialPoints/src/MaterialPointsSwarm.c MaterialPoints/src/Materials_Register.c MaterialPoints/src/OneToOneMapper.c MaterialPoints/src/ParticleFeVariable.c MaterialPoints/src/PeriodicBoundariesManager.c MaterialPoints/src/SwarmAdvector.c MaterialPoints/src/SwarmAdvectorD.c MaterialPoints/src/SwarmAdvectorW.c MaterialPoints/src/SwarmVariableField.c MaterialPoints/src/makefile MaterialPoints/tests/makefile MaterialPoints/tests/plugins/makefile MaterialPoints/tests/plugins/testAdvection.c MaterialPoints/tests/plugins/testMaterialFeVariable.c MaterialPoints/tests/testPeriodicBCs.c PopulationControl/src/DiscreteVoronoiRemove.c PopulationControl/src/DiscreteVoronoiSplitting.c PopulationControl/src/EscapedRoutine.c PopulationControl/src/Finalise.c PopulationControl/src/Init.c PopulationControl/src/RemovalRoutine.c PopulationControl/src/ReseedSplitting.c PopulationControl/src/SplittingRoutine.c PopulationControl/src/makefile PopulationControl/tests/plugins/makefile PopulationControl/tests/plugins/testDiscrepancy.c PopulationControl/tests/plugins/testParticleCoords.c Utils/src/BuoyancyForceTerm.c Utils/src/BuoyancyForceTermThermoChem.c Utils/src/Finalise.c Utils/src/Init.c Utils/src/MaterialSwarmVariable.c Utils/src/PCDVC.c Utils/src/makefile Utils/tests/makefile Voronoi/src/AdaptiveVoronoi.c Voronoi/src/CellularAutomataVoronoi.c Voronoi/src/DiscreteVoronoi.c Voronoi/src/Finalise.c Voronoi/src/Init.c Voronoi/src/makefile Voronoi/tests/plugins/makefile Voronoi/tests/plugins/testDiscreteVoronoi.c Weights/src/ConstantWeights.c Weights/src/DVCWeights.c Weights/src/DiscreteVoronoiWeights.c Weights/src/Finalise.c Weights/src/Init.c Weights/src/IterativeWeights.c Weights/src/MomentBalanceWeights.c Weights/src/VolumeWeights.c Weights/src/WeightsCalculator.c Weights/src/makefile Weights/tests/makefile Weights/tests/plugins/makefile Weights/tests/plugins/testElementIntegral.c Weights/tests/testDVCWeights.c libPICellerator/Toolbox/Toolbox.c libPICellerator/Toolbox/makefile libPICellerator/src/Finalise.c libPICellerator/src/Init.c libPICellerator/src/makefile libPICellerator/tests/makefile libPICellerator/tests/testLibPICellerator.c plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c plugins/CalculateParticleDisplacement/makefile plugins/Output/MaterialCentroid/MaterialCentroid.c plugins/Output/MaterialCentroid/makefile project-config.sh
description:
Updated to the StGermain/Discretisation to StgDomain change
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/BuoyancyBenchmark/makefile
--- a/Apps/BuoyancyBenchmark/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/BuoyancyBenchmark/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -60,13 +60,9 @@ XMLS = $(wildcard *.xml)
XMLS = $(wildcard *.xml)
PROJ_LIBS = lib${PROJECT}Update.so lib${PROJECT}Materials.so
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${PETSC_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = \
- ${STGFEM_RPATH} ${STGFEM_LIBS} \
- ${STGFEM_RPATH} ${STGERMAIN_LIBS} \
- ${PETSC_RPATH} ${PETSC_LIBS} \
- ${MPI_RPATH} ${MPI_LIBS} \
- ${XML_LIBS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/BuoyancyBenchmark/tests/AnalyticPressure/AnalyticPressure.c
--- a/Apps/BuoyancyBenchmark/tests/AnalyticPressure/AnalyticPressure.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/BuoyancyBenchmark/tests/AnalyticPressure/AnalyticPressure.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: AnalyticPressure.c 509 2007-09-14 06:00:17Z RobertTurnbull $
+** $Id: AnalyticPressure.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/BuoyancyBenchmark/tests/AnalyticPressure/makefile
--- a/Apps/BuoyancyBenchmark/tests/AnalyticPressure/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/BuoyancyBenchmark/tests/AnalyticPressure/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -62,7 +62,9 @@ includes = ${PROJECT}/${modName}
includes = ${PROJECT}/${modName}
# External Libraries and Headers
-packages = STGFEM STGERMAIN PETSC MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/BuoyancyBenchmark/tests/makefile
--- a/Apps/BuoyancyBenchmark/tests/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/BuoyancyBenchmark/tests/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -58,6 +58,8 @@ XMLS_TARGET_DIR = ${EXAMPLES_DIR}/${modN
XMLS_TARGET_DIR = ${EXAMPLES_DIR}/${modName}/tests
XMLS = $(wildcard *.xml)
-packages = STGERMAIN PETSC MPI XML MATH DL HYPRE
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
include ${PROJ_ROOT}/Makefile.vmake
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/LidDrivenPIC/makefile
--- a/Apps/LidDrivenPIC/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/LidDrivenPIC/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,13 +60,10 @@ XMLS = $(wildcard *.xml)
XMLS = $(wildcard *.xml)
PROJ_LIBS = lib${PROJECT}Update.so lib${PROJECT}Materials.so
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${PETSC_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = \
- ${STGFEM_RPATH} ${STGFEM_LIBS} \
- ${STGFEM_RPATH} ${STGERMAIN_LIBS} \
- ${PETSC_RPATH} ${PETSC_LIBS} \
- ${MPI_RPATH} ${MPI_LIBS} \
- ${XML_LIBS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
+
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/LidDrivenPIC/tests/makefile
--- a/Apps/LidDrivenPIC/tests/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/LidDrivenPIC/tests/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 409 2007-01-17 13:01:26Z SteveQuenette $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -56,6 +56,8 @@ XMLS_TARGET_DIR = ${EXAMPLES_DIR}/${modN
XMLS_TARGET_DIR = ${EXAMPLES_DIR}/${modName}/tests
XMLS = $(wildcard *.xml)
-packages = STGERMAIN PETSC MPI XML MATH DL HYPRE
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
include ${PROJ_ROOT}/Makefile.vmake
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/RayleighTaylor/makefile
--- a/Apps/RayleighTaylor/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/RayleighTaylor/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,13 +60,9 @@ XMLS = $(wildcard *.xml)
XMLS = $(wildcard *.xml)
PROJ_LIBS = lib${PROJECT}Update.so lib${PROJECT}Materials.so
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${PETSC_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = \
- ${STGFEM_RPATH} ${STGFEM_LIBS} \
- ${STGFEM_RPATH} ${STGERMAIN_LIBS} \
- ${PETSC_RPATH} ${PETSC_LIBS} \
- ${MPI_RPATH} ${MPI_LIBS} \
- ${XML_LIBS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c
--- a/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: AnalyticBlock.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: AnalyticBlock.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/RayleighTaylor/tests/AnalyticBlock/makefile
--- a/Apps/RayleighTaylor/tests/AnalyticBlock/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/RayleighTaylor/tests/AnalyticBlock/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,7 +62,10 @@ includes = ${PROJECT}/${modName}
includes = ${PROJECT}/${modName}
# External Libraries and Headers
-packages = STGFEM STGERMAIN PETSC MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
+
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c
--- a/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: AnalyticColumn.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: AnalyticColumn.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/RayleighTaylor/tests/AnalyticColumn/makefile
--- a/Apps/RayleighTaylor/tests/AnalyticColumn/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/RayleighTaylor/tests/AnalyticColumn/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,7 +62,9 @@ includes = ${PROJECT}/${modName}
includes = ${PROJECT}/${modName}
# External Libraries and Headers
-packages = STGFEM STGERMAIN PETSC MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/RayleighTaylor/tests/makefile
--- a/Apps/RayleighTaylor/tests/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/RayleighTaylor/tests/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 488 2007-06-28 06:15:39Z PatrickSunter $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -69,11 +69,11 @@ else
checks += testRayTay2D.0of1.sh
endif
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT}
-
XMLS_TARGET_DIR = ${EXAMPLES_DIR}/${modName}/tests
XMLS = $(wildcard *.xml)
-packages = STGERMAIN PETSC MPI XML MATH DL HYPRE
+EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT}
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
include ${PROJ_ROOT}/Makefile.vmake
diff -r 1617f7985e00 -r fb9d80df5f44 Apps/ThermoChem/makefile
--- a/Apps/ThermoChem/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Apps/ThermoChem/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -61,14 +61,10 @@ XMLS = ${wildcard *.xml}
XMLS = ${wildcard *.xml}
PROJ_LIBS = lib${PROJECT}Update.so lib${PROJECT}Materials.so
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${PETSC_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
-EXTERNAL_LIBS = \
- ${STGFEM_RPATH} ${STGFEM_LIBS} \
- ${STGFEM_RPATH} ${STGERMAIN_LIBS} \
- ${PETSC_RPATH} ${PETSC_LIBS} \
- ${MPI_RPATH} ${MPI_LIBS} \
- ${XML_LIBS}
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/BackgroundParticleLayout.c
--- a/MaterialPoints/src/BackgroundParticleLayout.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/BackgroundParticleLayout.c Thu Oct 11 08:07:50 2007 +0000
@@ -33,6 +33,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/CoincidentMapper.c
--- a/MaterialPoints/src/CoincidentMapper.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/CoincidentMapper.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/Context.c
--- a/MaterialPoints/src/Context.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/Context.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Context.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: Context.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/Finalise.c
--- a/MaterialPoints/src/Finalise.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/Finalise.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Finalise.c 272 2006-04-04 00:12:06Z PatrickSunter $
+** $Id: Finalise.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/GaussMapper.c
--- a/MaterialPoints/src/GaussMapper.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/GaussMapper.c Thu Oct 11 08:07:50 2007 +0000
@@ -23,6 +23,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/Init.c
--- a/MaterialPoints/src/Init.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/Init.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Init.c 515 2007-10-04 06:50:24Z DavidLee $
+** $Id: Init.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/IntegrationPointMapper.c
--- a/MaterialPoints/src/IntegrationPointMapper.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/IntegrationPointMapper.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/IntegrationPointsSwarm.c
--- a/MaterialPoints/src/IntegrationPointsSwarm.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/IntegrationPointsSwarm.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: IntegrationPointsSwarm.c 506 2007-08-16 03:47:04Z DavidLee $
+** $Id: IntegrationPointsSwarm.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/ManyToOneMapper.c
--- a/MaterialPoints/src/ManyToOneMapper.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/ManyToOneMapper.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/MappedParticleLayout.c
--- a/MaterialPoints/src/MappedParticleLayout.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/MappedParticleLayout.c Thu Oct 11 08:07:50 2007 +0000
@@ -35,6 +35,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/Material.c
--- a/MaterialPoints/src/Material.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/Material.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Material.c 506 2007-08-16 03:47:04Z DavidLee $
+** $Id: Material.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/MaterialFeVariable.c
--- a/MaterialPoints/src/MaterialFeVariable.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/MaterialFeVariable.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,13 +38,14 @@
** 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: MaterialFeVariable.c 513 2007-09-25 07:55:04Z LukeHodkinson $
+** $Id: MaterialFeVariable.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/MaterialPoint.c
--- a/MaterialPoints/src/MaterialPoint.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/MaterialPoint.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/MaterialPointsSwarm.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/Materials_Register.c
--- a/MaterialPoints/src/Materials_Register.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/Materials_Register.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Materials_Register.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: Materials_Register.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/OneToOneMapper.c
--- a/MaterialPoints/src/OneToOneMapper.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/OneToOneMapper.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/ParticleFeVariable.c
--- a/MaterialPoints/src/ParticleFeVariable.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/ParticleFeVariable.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,13 +38,14 @@
** 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: ParticleFeVariable.c 515 2007-10-04 06:50:24Z DavidLee $
+** $Id: ParticleFeVariable.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
@@ -233,7 +234,7 @@ void _ParticleFeVariable_Build( void* ma
void _ParticleFeVariable_Initialise( void* materialFeVariable, void* data ) {
ParticleFeVariable* self = (ParticleFeVariable*) materialFeVariable;
- DiscretisationContext* context = (DiscretisationContext*)data;
+ DomainContext* context = (DomainContext*)data;
/* Do a Variable_Update() first as well as last, since if we are loading from checkpoint we need
to make sure the variable exists to put ICs onto */
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/PeriodicBoundariesManager.c
--- a/MaterialPoints/src/PeriodicBoundariesManager.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/PeriodicBoundariesManager.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: PeriodicBoundariesManager.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: PeriodicBoundariesManager.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/SwarmAdvector.c
--- a/MaterialPoints/src/SwarmAdvector.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/SwarmAdvector.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: SwarmAdvector.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: SwarmAdvector.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/SwarmAdvectorD.c
--- a/MaterialPoints/src/SwarmAdvectorD.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/SwarmAdvectorD.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/SwarmAdvectorW.c
--- a/MaterialPoints/src/SwarmAdvectorW.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/SwarmAdvectorW.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/SwarmVariableField.c
--- a/MaterialPoints/src/SwarmVariableField.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/SwarmVariableField.c Thu Oct 11 08:07:50 2007 +0000
@@ -45,6 +45,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/src/makefile
--- a/MaterialPoints/src/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/src/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 427 2007-02-23 02:37:11Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -52,8 +52,9 @@ HDRS := $(wildcard *.h)
HDRS := $(wildcard *.h)
# External Libraries and Headers
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS} -DLIB_DIR=\"${LIB_DIR}\"
-EXTERNAL_LIBS = ${STGERMAIN_FEM_LIBS} ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Work out name to call library
lib = ${PROJECT}$(shell basename `pwd | sed s/src//g`)
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/tests/makefile
--- a/MaterialPoints/tests/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/tests/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 427 2007-02-23 02:37:11Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,10 +48,9 @@ include ${PROJ_ROOT}/Makefile.system
include ${PROJ_ROOT}/Makefile.system
# External Libraries and Headers
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS} -DLIB_DIR=\"${LIB_DIR}\"
-EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -l${PROJECT}MaterialPoints -l${PROJECT}Weights -l${PROJECT}Voronoi -l${PROJECT}PopulationControl ${STGFEM_LIBS} ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
-
-packages += STGFEM STGERMAIN PETSC MPI
+EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} -DLIB_DIR=\"${LIB_DIR}\"
+EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -l${PROJECT}MaterialPoints -l${PROJECT}Weights -l${PROJECT}Voronoi -l${PROJECT}PopulationControl
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Subdirectories
subdirs := plugins
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/tests/plugins/makefile
--- a/MaterialPoints/tests/plugins/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/tests/plugins/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,7 +48,10 @@ include ${PROJ_ROOT}/Makefile.system
include ${PROJ_ROOT}/Makefile.system
# External Libraries and Headers
-packages = STGFEM STGERMAIN MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
+
# Note don't put the .c extension. just the base name of the plugin
plugins := testAdvection testMaterialFeVariable
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/tests/plugins/testAdvection.c
--- a/MaterialPoints/tests/plugins/testAdvection.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/tests/plugins/testAdvection.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: testAdvection.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: testAdvection.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
@@ -148,10 +149,10 @@ void check( PICelleratorContext* context
void _testAdvection_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
- DiscretisationContext* context;
+ DomainContext* context;
Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
- context = (DiscretisationContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DiscretisationContext, True, data );
+ context = (DomainContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
ContextEP_Append( context, AbstractContext_EP_ConstructExtensions, construct );
ContextEP_Append( context, AbstractContext_EP_Initialise, storeOriginalPos );
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/tests/plugins/testMaterialFeVariable.c
--- a/MaterialPoints/tests/plugins/testMaterialFeVariable.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/tests/plugins/testMaterialFeVariable.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: testMaterialFeVariable.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: testMaterialFeVariable.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 MaterialPoints/tests/testPeriodicBCs.c
--- a/MaterialPoints/tests/testPeriodicBCs.c Thu Oct 11 05:10:52 2007 +0000
+++ b/MaterialPoints/tests/testPeriodicBCs.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: testPeriodicBCs.c 506 2007-08-16 03:47:04Z DavidLee $
+** $Id: testPeriodicBCs.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
@@ -126,6 +127,7 @@ int main( int argc, char* argv[] ) {
MPI_Comm_rank( CommWorld, &rank );
StGermain_Init( &argc, &argv );
+ StgDomain_Init( &argc, &argv );
StgFEM_Init( &argc, &argv );
PICellerator_Voronoi_Init( &argc, &argv );
PICellerator_PopulationControl_Init( &argc, &argv );
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/DiscreteVoronoiRemove.c
--- a/PopulationControl/src/DiscreteVoronoiRemove.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/DiscreteVoronoiRemove.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: DiscreteVoronoiRemove.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: DiscreteVoronoiRemove.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/DiscreteVoronoiSplitting.c
--- a/PopulationControl/src/DiscreteVoronoiSplitting.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/DiscreteVoronoiSplitting.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: DiscreteVoronoiSplitting.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: DiscreteVoronoiSplitting.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/EscapedRoutine.c
--- a/PopulationControl/src/EscapedRoutine.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/EscapedRoutine.c Thu Oct 11 08:07:50 2007 +0000
@@ -44,6 +44,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "EscapedRoutine.h"
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/Finalise.c
--- a/PopulationControl/src/Finalise.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/Finalise.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Finalise.c 272 2006-04-04 00:12:06Z PatrickSunter $
+** $Id: Finalise.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/Init.c
--- a/PopulationControl/src/Init.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/Init.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Init.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: Init.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/RemovalRoutine.c
--- a/PopulationControl/src/RemovalRoutine.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/RemovalRoutine.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: RemovalRoutine.c 374 2006-10-12 08:59:41Z SteveQuenette $
+** $Id: RemovalRoutine.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "RemovalRoutine.h"
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/ReseedSplitting.c
--- a/PopulationControl/src/ReseedSplitting.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/ReseedSplitting.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: ReseedSplitting.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: ReseedSplitting.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/SplittingRoutine.c
--- a/PopulationControl/src/SplittingRoutine.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/SplittingRoutine.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: SplittingRoutine.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: SplittingRoutine.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/src/makefile
--- a/PopulationControl/src/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/src/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -52,7 +52,9 @@ HDRS := $(wildcard *.h)
HDRS := $(wildcard *.h)
# External Libraries and Headers
-packages = STGFEM STGERMAIN MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Work out name to call library
lib = ${PROJECT}$(shell basename `pwd | sed s/src//g`)
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/tests/plugins/makefile
--- a/PopulationControl/tests/plugins/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/tests/plugins/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,7 +48,9 @@ include ${PROJ_ROOT}/Makefile.system
include ${PROJ_ROOT}/Makefile.system
# External Libraries and Headers
-packages = STGFEM STGERMAIN MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Note don't put the .c extension. just the base name of the plugin
plugins := $(wildcard *.c)
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/tests/plugins/testDiscrepancy.c
--- a/PopulationControl/tests/plugins/testDiscrepancy.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/tests/plugins/testDiscrepancy.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: testDiscrepancy.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: testDiscrepancy.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
@@ -138,7 +139,7 @@ double Swarm_AverageDiscrepancy( void* s
}
-void testDiscrepancy_Function( DiscretisationContext* context ) {
+void testDiscrepancy_Function( DomainContext* context ) {
Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
double discrepancy;
double maxDiscrepancy;
@@ -198,8 +199,8 @@ typedef struct {
} testDiscrepancy;
void _testDiscrepancy_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
- DiscretisationContext* context;
- context = (DiscretisationContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DiscretisationContext, True, data );
+ DomainContext* context;
+ context = (DomainContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
ContextEP_Append( context, AbstractContext_EP_Initialise, testDiscrepancy_Function );
}
diff -r 1617f7985e00 -r fb9d80df5f44 PopulationControl/tests/plugins/testParticleCoords.c
--- a/PopulationControl/tests/plugins/testParticleCoords.c Thu Oct 11 05:10:52 2007 +0000
+++ b/PopulationControl/tests/plugins/testParticleCoords.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: testParticleCoords.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: testParticleCoords.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
@@ -54,7 +55,7 @@
const Type TestParticleCoords_Type = "TestParticleCoords";
-void PICellerator_testParticleCoords( DiscretisationContext* context ) {
+void PICellerator_testParticleCoords( DomainContext* context ) {
Swarm* swarm;
Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
Name filename;
@@ -75,8 +76,8 @@ void PICellerator_testParticleCoords( Di
}
void _testParticleCoords_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
- DiscretisationContext* context;
- context = (DiscretisationContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DiscretisationContext, True, data );
+ DomainContext* context;
+ context = (DomainContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
ContextEP_Append( context, AbstractContext_EP_Dump, PICellerator_testParticleCoords );
}
diff -r 1617f7985e00 -r fb9d80df5f44 Utils/src/BuoyancyForceTerm.c
--- a/Utils/src/BuoyancyForceTerm.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Utils/src/BuoyancyForceTerm.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,13 +38,14 @@
** 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: BuoyancyForceTerm.c 514 2007-10-04 02:55:34Z SteveQuenette $
+** $Id: BuoyancyForceTerm.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Utils/src/BuoyancyForceTermThermoChem.c
--- a/Utils/src/BuoyancyForceTermThermoChem.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Utils/src/BuoyancyForceTermThermoChem.c Thu Oct 11 08:07:50 2007 +0000
@@ -45,6 +45,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Utils/src/Finalise.c
--- a/Utils/src/Finalise.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Utils/src/Finalise.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Finalise.c 272 2006-04-04 00:12:06Z PatrickSunter $
+** $Id: Finalise.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Utils/src/Init.c
--- a/Utils/src/Init.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Utils/src/Init.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Init.c 420 2007-02-09 05:09:54Z RobertTurnbull $
+** $Id: Init.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Utils/src/MaterialSwarmVariable.c
--- a/Utils/src/MaterialSwarmVariable.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Utils/src/MaterialSwarmVariable.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,13 +38,14 @@
** 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: MaterialSwarmVariable.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: MaterialSwarmVariable.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Utils/src/PCDVC.c
--- a/Utils/src/PCDVC.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Utils/src/PCDVC.c Thu Oct 11 08:07:50 2007 +0000
@@ -69,6 +69,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Utils/src/makefile
--- a/Utils/src/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Utils/src/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -52,8 +52,9 @@ HDRS := $(wildcard *.h)
HDRS := $(wildcard *.h)
# External Libraries and Headers
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = ${STGERMAIN_FEM_LIBS} ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Work out name to call library
lib = ${PROJECT}$(shell basename `pwd | sed s/src//g`)
diff -r 1617f7985e00 -r fb9d80df5f44 Utils/tests/makefile
--- a/Utils/tests/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Utils/tests/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -49,11 +49,10 @@ include ${PROJ_ROOT}/Makefile.system
# External Libraries and Headers
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = ${STGERMAIN_FEM_LIBS} ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
-#packages
-packages = STGFEM STGERMAIN PETSC MPI XML MATH
checks = $(wildcard *.sh)
diff -r 1617f7985e00 -r fb9d80df5f44 Voronoi/src/AdaptiveVoronoi.c
--- a/Voronoi/src/AdaptiveVoronoi.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Voronoi/src/AdaptiveVoronoi.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: AdaptiveVoronoi.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: AdaptiveVoronoi.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Voronoi/src/CellularAutomataVoronoi.c
--- a/Voronoi/src/CellularAutomataVoronoi.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Voronoi/src/CellularAutomataVoronoi.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: CellularAutomataVoronoi.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: CellularAutomataVoronoi.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Voronoi/src/DiscreteVoronoi.c
--- a/Voronoi/src/DiscreteVoronoi.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Voronoi/src/DiscreteVoronoi.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: DiscreteVoronoi.c 374 2006-10-12 08:59:41Z SteveQuenette $
+** $Id: DiscreteVoronoi.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "DiscreteVoronoi.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Voronoi/src/Finalise.c
--- a/Voronoi/src/Finalise.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Voronoi/src/Finalise.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Finalise.c 272 2006-04-04 00:12:06Z PatrickSunter $
+** $Id: Finalise.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Voronoi/src/Init.c
--- a/Voronoi/src/Init.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Voronoi/src/Init.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Init.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: Init.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "Voronoi.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Voronoi/src/makefile
--- a/Voronoi/src/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Voronoi/src/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -52,7 +52,9 @@ HDRS := $(wildcard *.h)
HDRS := $(wildcard *.h)
# External Libraries and Headers
-packages = STGFEM STGERMAIN MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Work out name to call library
lib = ${PROJECT}$(shell basename `pwd | sed s/src//g`)
diff -r 1617f7985e00 -r fb9d80df5f44 Voronoi/tests/plugins/makefile
--- a/Voronoi/tests/plugins/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Voronoi/tests/plugins/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,7 +48,9 @@ include ${PROJ_ROOT}/Makefile.system
include ${PROJ_ROOT}/Makefile.system
# External Libraries and Headers
-packages = STGFEM STGERMAIN MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Note don't put the .c extension. just the base name of the plugin
plugins := testDiscreteVoronoi
diff -r 1617f7985e00 -r fb9d80df5f44 Voronoi/tests/plugins/testDiscreteVoronoi.c
--- a/Voronoi/tests/plugins/testDiscreteVoronoi.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Voronoi/tests/plugins/testDiscreteVoronoi.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: testDiscreteVoronoi.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: testDiscreteVoronoi.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
@@ -53,7 +54,7 @@
const Type TestDiscreteVoronoi_Type = "TestDiscreteVoronoi";
-void PICellerator_testDiscreteVoronoi( DiscretisationContext* context ) {
+void PICellerator_testDiscreteVoronoi( DomainContext* context ) {
Swarm* swarm;
DiscreteVoronoi* discreteVoronoi;
Bool particlesCorrectlyAssociated = True;
@@ -121,8 +122,8 @@ void PICellerator_testDiscreteVoronoi( D
void _testDiscreteVoronoi_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
- DiscretisationContext* context;
- context = (DiscretisationContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DiscretisationContext, True, data );
+ DomainContext* context;
+ context = (DomainContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
ContextEP_ReplaceAll( context, AbstractContext_EP_Execute, PICellerator_testDiscreteVoronoi );
}
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/ConstantWeights.c
--- a/Weights/src/ConstantWeights.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/ConstantWeights.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: ConstantWeights.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: ConstantWeights.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/DVCWeights.c
--- a/Weights/src/DVCWeights.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/DVCWeights.c Thu Oct 11 08:07:50 2007 +0000
@@ -62,6 +62,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
#include "WeightsCalculator.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/DiscreteVoronoiWeights.c
--- a/Weights/src/DiscreteVoronoiWeights.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/DiscreteVoronoiWeights.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: DiscreteVoronoiWeights.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: DiscreteVoronoiWeights.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/Finalise.c
--- a/Weights/src/Finalise.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/Finalise.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Finalise.c 272 2006-04-04 00:12:06Z PatrickSunter $
+** $Id: Finalise.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "Finalise.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/Init.c
--- a/Weights/src/Init.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/Init.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Init.c 380 2006-11-23 00:47:17Z KathleenHumble $
+** $Id: Init.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/IterativeWeights.c
--- a/Weights/src/IterativeWeights.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/IterativeWeights.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: IterativeWeights.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: IterativeWeights.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/MomentBalanceWeights.c
--- a/Weights/src/MomentBalanceWeights.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/MomentBalanceWeights.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: MomentBalanceWeights.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: MomentBalanceWeights.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/VolumeWeights.c
--- a/Weights/src/VolumeWeights.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/VolumeWeights.c Thu Oct 11 08:07:50 2007 +0000
@@ -24,6 +24,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "types.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/WeightsCalculator.c
--- a/Weights/src/WeightsCalculator.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/WeightsCalculator.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: WeightsCalculator.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: WeightsCalculator.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "WeightsCalculator.h"
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/src/makefile
--- a/Weights/src/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/src/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -52,7 +52,9 @@ HDRS := $(wildcard *.h)
HDRS := $(wildcard *.h)
# External Libraries and Headers
-packages = STGFEM STGERMAIN MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Work out name to call library
lib = ${PROJECT}$(shell basename `pwd | sed s/src//g`)
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/tests/makefile
--- a/Weights/tests/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/tests/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,11 +48,9 @@ include ${PROJ_ROOT}/Makefile.system
include ${PROJ_ROOT}/Makefile.system
# External Libraries and Headers
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -l${PROJECT}Weights -l${PROJECT}Voronoi -l${PROJECT}PopulationControl ${STGFEM_LIBS} ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
-
-
-packages = STGFEM STGERMAIN PETSC MPI XML MATH
+EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT}
+EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -l${PROJECT}Weights -l${PROJECT}Voronoi -l${PROJECT}PopulationControl
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Subdirectories
subdirs := plugins
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/tests/plugins/makefile
--- a/Weights/tests/plugins/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/tests/plugins/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,7 +48,9 @@ include ${PROJ_ROOT}/Makefile.system
include ${PROJ_ROOT}/Makefile.system
# External Libraries and Headers
-packages = STGFEM STGERMAIN MPI XML
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
# Note don't put the .c extension. just the base name of the plugin
plugins := testElementIntegral
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/tests/plugins/testElementIntegral.c
--- a/Weights/tests/plugins/testElementIntegral.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/tests/plugins/testElementIntegral.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: testElementIntegral.c 492 2007-07-09 23:41:51Z PatrickSunter $
+** $Id: testElementIntegral.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/Weights/Weights.h>
@@ -104,7 +105,7 @@ void CircleInterface( void* feVariable,
}
-void testElementIntegral_CompareAgainstReferenceSolution(DiscretisationContext* context, Stream* stream, double mean, double standardDeviation) {
+void testElementIntegral_CompareAgainstReferenceSolution(DomainContext* context, Stream* stream, double mean, double standardDeviation) {
double meanTolerance, stdDevTolerance;
double expectedMean, expectedStdDev;
double differenceMean, differenceStdDev;
@@ -145,7 +146,7 @@ void testElementIntegral_CompareAgainstR
}
-void PICellerator_testElementIntegral( DiscretisationContext* context ) {
+void PICellerator_testElementIntegral( DomainContext* context ) {
Swarm* integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister,
"integrationSwarm" );
Swarm* materialSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister,
@@ -254,8 +255,8 @@ void PICellerator_testElementIntegral( D
void _testElementIntegral_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
- DiscretisationContext* context;
- context = (DiscretisationContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DiscretisationContext, True, data );
+ DomainContext* context;
+ context = (DomainContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
ContextEP_ReplaceAll( context, AbstractContext_EP_Execute, PICellerator_testElementIntegral );
}
diff -r 1617f7985e00 -r fb9d80df5f44 Weights/tests/testDVCWeights.c
--- a/Weights/tests/testDVCWeights.c Thu Oct 11 05:10:52 2007 +0000
+++ b/Weights/tests/testDVCWeights.c Thu Oct 11 08:07:50 2007 +0000
@@ -33,6 +33,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/Voronoi/Voronoi.h>
#include <PICellerator/PopulationControl/PopulationControl.h>
@@ -56,6 +57,7 @@ int main( int argc, char* argv[] ) {
MPI_Comm_rank( CommWorld, &rank );
StGermain_Init( &argc, &argv );
+ StgDomain_Init( &argc, &argv );
StgFEM_Init( &argc, &argv );
PICellerator_Voronoi_Init( &argc, &argv );
PICellerator_PopulationControl_Init( &argc, &argv );
@@ -404,11 +406,13 @@ int main( int argc, char* argv[] ) {
}
-
- DiscretisationGeometry_Finalise();
-
- Base_Finalise();
-
+ PICellerator_Weights_Finalise();
+ PICellerator_PopulationControl_Finalise();
+ PICellerator_Voronoi_Finalise();
+ StgFEM_Finalise();
+ StgDomain_Finalise();
+ StGermain_Finalise();
+
/* Close off MPI */
MPI_Finalize();
diff -r 1617f7985e00 -r fb9d80df5f44 libPICellerator/Toolbox/Toolbox.c
--- a/libPICellerator/Toolbox/Toolbox.c Thu Oct 11 05:10:52 2007 +0000
+++ b/libPICellerator/Toolbox/Toolbox.c Thu Oct 11 08:07:50 2007 +0000
@@ -42,6 +42,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
#include "Toolbox.h"
diff -r 1617f7985e00 -r fb9d80df5f44 libPICellerator/Toolbox/makefile
--- a/libPICellerator/Toolbox/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/libPICellerator/Toolbox/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -53,7 +53,8 @@ SRCS = $(wildcard *.c)
SRCS = $(wildcard *.c)
HDRS = $(wildcard *.h)
-packages = STGFEM STGERMAIN PETSC MPI XML
+EXTERNAL_INCLUDES =
EXTERNAL_LIBS = -lPICellerator
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
include ${PROJ_ROOT}/Makefile.vmake
diff -r 1617f7985e00 -r fb9d80df5f44 libPICellerator/src/Finalise.c
--- a/libPICellerator/src/Finalise.c Thu Oct 11 05:10:52 2007 +0000
+++ b/libPICellerator/src/Finalise.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Finalise.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: Finalise.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "PICellerator.h"
diff -r 1617f7985e00 -r fb9d80df5f44 libPICellerator/src/Init.c
--- a/libPICellerator/src/Init.c Thu Oct 11 05:10:52 2007 +0000
+++ b/libPICellerator/src/Init.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: Init.c 503 2007-08-02 08:41:48Z SteveQuenette $
+** $Id: Init.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include "PICellerator.h"
diff -r 1617f7985e00 -r fb9d80df5f44 libPICellerator/src/makefile
--- a/libPICellerator/src/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/libPICellerator/src/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 427 2007-02-23 02:37:11Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,10 +62,8 @@ HDRS = Init.h \
PICellerator.h \
PROJ_OBJLISTS = PICelleratorVoronoi PICelleratorPopulationControl PICelleratorWeights PICelleratorMaterialPoints PICelleratorUtils
+EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} -DLIB_DIR=\"${LIB_DIR}\"
EXTERNAL_LIBS = -L${LIB_DIR}
-
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} -DLIB_DIR=\"${LIB_DIR}\"
-
-packages = STGFEM STGERMAIN MPI XML MATH
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
include ${PROJ_ROOT}/Makefile.vmake
diff -r 1617f7985e00 -r fb9d80df5f44 libPICellerator/tests/makefile
--- a/libPICellerator/tests/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/libPICellerator/tests/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -53,9 +53,8 @@ checks = $(wildcard *.sh)
checks = $(wildcard *.sh)
SRCS = $(wildcard *.c)
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS} -DLIB_DIR=\"${LIB_DIR}\"
-EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -l${PROJECT} ${STGFEM_LIBS} ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
-
-packages = STGFEM STGERMAIN MPI XML MATH
+EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} -DLIB_DIR=\"${LIB_DIR}\"
+EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -l${PROJECT}
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
include ${PROJ_ROOT}/Makefile.vmake
diff -r 1617f7985e00 -r fb9d80df5f44 libPICellerator/tests/testLibPICellerator.c
--- a/libPICellerator/tests/testLibPICellerator.c Thu Oct 11 05:10:52 2007 +0000
+++ b/libPICellerator/tests/testLibPICellerator.c Thu Oct 11 08:07:50 2007 +0000
@@ -41,6 +41,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
#include "PICellerator/Init.h"
diff -r 1617f7985e00 -r fb9d80df5f44 plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c
--- a/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Thu Oct 11 05:10:52 2007 +0000
+++ b/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: CalculateParticleDisplacement.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: CalculateParticleDisplacement.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
@@ -56,12 +57,12 @@ const Type PICellerator_CalculateParticl
void _PICellerator_CalculateParticleDisplacement_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
CalculateParticleDisplacementPlugin* self = (CalculateParticleDisplacementPlugin*)component;
- DiscretisationContext* context;
+ DomainContext* context;
MaterialPointsSwarm* materialPointsSwarm;
StandardParticle particle;
ParticleDisplacementInfo* particleExt;
- context = (DiscretisationContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DiscretisationContext, True, data );
+ context = (DomainContext*)Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
ContextEP_Append( context, AbstractContext_EP_Initialise, _PICellerator_CalculateParticleDisplacement_StoreOriginalPos );
ContextEP_Append( context, AbstractContext_EP_Step, _PICellerator_CalculateParticleDisplacement_UpdateDisplacement );
diff -r 1617f7985e00 -r fb9d80df5f44 plugins/CalculateParticleDisplacement/makefile
--- a/plugins/CalculateParticleDisplacement/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/plugins/CalculateParticleDisplacement/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -1,3 +1,4 @@
+
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
##
## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
@@ -62,13 +63,9 @@ includes = ${PROJECT}/${modName}
includes = ${PROJECT}/${modName}
# External Libraries and Headers
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${PETSC_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = \
- ${STGFEM_RPATH} ${STGFEM_LIBS} \
- ${STGFEM_RPATH} ${STGERMAIN_LIBS} \
- ${PETSC_RPATH} ${PETSC_LIBS} \
- ${MPI_RPATH} ${MPI_LIBS} \
- ${XML_LIBS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 plugins/Output/MaterialCentroid/MaterialCentroid.c
--- a/plugins/Output/MaterialCentroid/MaterialCentroid.c Thu Oct 11 05:10:52 2007 +0000
+++ b/plugins/Output/MaterialCentroid/MaterialCentroid.c Thu Oct 11 08:07:50 2007 +0000
@@ -38,12 +38,13 @@
** 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: MaterialCentroid.c 376 2006-10-18 06:58:41Z SteveQuenette $
+** $Id: MaterialCentroid.c 518 2007-10-11 08:07:50Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
#include <assert.h>
diff -r 1617f7985e00 -r fb9d80df5f44 plugins/Output/MaterialCentroid/makefile
--- a/plugins/Output/MaterialCentroid/makefile Thu Oct 11 05:10:52 2007 +0000
+++ b/plugins/Output/MaterialCentroid/makefile Thu Oct 11 08:07:50 2007 +0000
@@ -38,7 +38,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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
+## $Id: makefile 518 2007-10-11 08:07:50Z SteveQuenette $
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,13 +62,9 @@ includes = ${PROJECT}/${modName}
includes = ${PROJECT}/${modName}
# External Libraries and Headers
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${PETSC_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = \
- ${STGFEM_RPATH} ${STGFEM_LIBS} \
- ${STGFEM_RPATH} ${STGERMAIN_LIBS} \
- ${PETSC_RPATH} ${PETSC_LIBS} \
- ${MPI_RPATH} ${MPI_LIBS} \
- ${XML_LIBS}
+EXTERNAL_INCLUDES =
+EXTERNAL_LIBS =
+packages = STGFEM PETSC STGDOMAIN STGERMAIN MPI XML MATH DL
ifdef HAVE_PYTHON
packages += PYTHON
diff -r 1617f7985e00 -r fb9d80df5f44 project-config.sh
--- a/project-config.sh Thu Oct 11 05:10:52 2007 +0000
+++ b/project-config.sh Thu Oct 11 08:07:50 2007 +0000
@@ -16,7 +16,7 @@
## Role:
## Obtain the project configuration.
##
-## $Id: project-config.sh 376 2006-10-18 06:58:41Z SteveQuenette $
+## $Id: project-config.sh 518 2007-10-11 08:07:50Z SteveQuenette $
##
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -38,6 +38,7 @@ setValue PROJECT 'PICellerator'
# Do configurations
. ./VMake/Config/StGermain-config.sh
+. ./VMake/Config/StgDomain-config.sh
. ./VMake/Config/StgFEM-config.sh
. ./VMake/Config/compiler-config.sh
More information about the CIG-COMMITS
mailing list