[cig-commits] commit: Updated to the StGermain/Discretisation into StgDomain project
Mercurial
hg at geodynamics.org
Mon Nov 24 11:29:01 PST 2008
changeset: 29:5e802cd52184
user: SteveQuenette
date: Thu Oct 11 08:05:31 2007 +0000
files: Base/src/Camera.c Base/src/ColourMap.c Base/src/DrawingObject.c Base/src/DrawingObject_Register.c Base/src/Finalise.c Base/src/Init.c Base/src/InputFormat.c Base/src/InputFormat_Register.c Base/src/Light.c Base/src/Light_Register.c Base/src/OutputFormat.c Base/src/OutputFormat_Register.c Base/src/RenderingEngine.c Base/src/Viewport.c Base/src/Window.c Base/src/WindowInteraction.c Base/src/WindowInteraction_Register.c Base/src/X11Colours.c Base/src/makefile Base/tests/makefile Base/tests/plugins/Others/lucTestColourMaps.c Base/tests/plugins/Others/lucTestOutputing.c Base/tests/plugins/Others/lucTestPlottingObjects.c Base/tests/plugins/RenderingEngineTest.c Base/tests/plugins/lucTestCameras.c Base/tests/plugins/lucTestColourMaps.c Base/tests/plugins/makefile Base/tests/testlucBase.c DrawingObjects/src/Axis.c DrawingObjects/src/ColourBar.c DrawingObjects/src/Contour.c DrawingObjects/src/Eigenvectors.c DrawingObjects/src/EigenvectorsCrossSection.c DrawingObjects/src/FeVariableSurface.c DrawingObjects/src/FieldVariableBorder.c DrawingObjects/src/Finalise.c DrawingObjects/src/HistoricalSwarmTrajectory.c DrawingObjects/src/Init.c DrawingObjects/src/Isosurface.c DrawingObjects/src/MeshViewer.c DrawingObjects/src/OpenGLDrawingObject.c DrawingObjects/src/ScalarField.c DrawingObjects/src/ScalarFieldCrossSection.c DrawingObjects/src/ScalarFieldOnMesh.c DrawingObjects/src/ScalarFieldOnMeshCrossSection.c DrawingObjects/src/SwarmRGBColourViewer.c DrawingObjects/src/SwarmSquares.c DrawingObjects/src/SwarmVectors.c DrawingObjects/src/SwarmViewer.c DrawingObjects/src/SwarmViewerBase.c DrawingObjects/src/TextureMap.c DrawingObjects/src/TimeStep.c DrawingObjects/src/Title.c DrawingObjects/src/VectorArrowCrossSection.c DrawingObjects/src/VectorArrows.c DrawingObjects/src/makefile DrawingObjects/tests/DummyFieldVariable/DummyFieldVariable.c DrawingObjects/tests/DummyFieldVariable/makefile DrawingObjects/tests/DummySwarmVariable/DummySwarmVariable.c DrawingObjects/tests/DummySwarmVariable/makefile DrawingObjects/tests/makefile DrawingObjects/tests/testDrawingObject.c InputFormats/src/Finalise.c InputFormats/src/Init.c InputFormats/src/InputPPM.c InputFormats/src/InputTIFF.c InputFormats/src/makefile InputFormats/tests/plugins/lucTestInputFormat.c OutputFormats/src/EncoderLibavcodec.c OutputFormats/src/EncoderLibfame.c OutputFormats/src/Finalise.c OutputFormats/src/Init.c OutputFormats/src/OutputJPEG.c OutputFormats/src/OutputPNG.c OutputFormats/src/OutputPPM.c OutputFormats/src/OutputTIFF.c OutputFormats/src/makefile OutputFormats/tests/makefile RenderingEngines/src/Finalise.c RenderingEngines/src/Init.c RenderingEngines/src/OpenGlUtil.c RenderingEngines/src/RenderingEngineGL.c RenderingEngines/src/makefile RenderingEngines/tests/DummyOpenGL/DummyOpenGL.c RenderingEngines/tests/DummyOpenGL/makefile RenderingEngines/tests/makefile RenderingEngines/tests/testRenderingEngineGL.c WindowInteractions/src/ColourBarInteraction.c WindowInteractions/src/FieldValueInteraction.c WindowInteractions/src/Finalise.c WindowInteractions/src/Init.c WindowInteractions/src/LightInteraction.c WindowInteractions/src/MeshViewerInteraction.c WindowInteractions/src/SwarmViewerInteraction.c WindowInteractions/src/makefile Windowing/src/CarbonWindow.c Windowing/src/Finalise.c Windowing/src/Init.c Windowing/src/OSMesaWindow.c Windowing/src/SDLWindow.c Windowing/src/X11Window.c Windowing/src/makefile libglucifer/src/Finalise.c libglucifer/src/Init.c libglucifer/src/makefile plugins/lucPlugin/lucPlugin.c plugins/lucPlugin/makefile project-config.sh src/main.c src/makefile
description:
Updated to the StGermain/Discretisation into StgDomain project
diff -r 01e617e68894 -r 5e802cd52184 Base/src/Camera.c
--- a/Base/src/Camera.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/Camera.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Camera.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: Camera.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "Camera.h"
#include "Init.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/ColourMap.c
--- a/Base/src/ColourMap.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/ColourMap.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: ColourMap.c 703 2007-06-29 06:28:56Z CatherineMeriaux $
+** $Id: ColourMap.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "ColourMap.h"
#include "X11Colours.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/DrawingObject.c
--- a/Base/src/DrawingObject.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/DrawingObject.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: DrawingObject.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: DrawingObject.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "ColourMap.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/DrawingObject_Register.c
--- a/Base/src/DrawingObject_Register.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/DrawingObject_Register.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: DrawingObject_Register.c 658 2007-02-05 00:58:07Z CecileDuboz $
+** $Id: DrawingObject_Register.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "ViewportInfo.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/Finalise.c
--- a/Base/src/Finalise.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/Finalise.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Finalise.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Finalise.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "Finalise.h"
#include <stdio.h>
diff -r 01e617e68894 -r 5e802cd52184 Base/src/Init.c
--- a/Base/src/Init.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/Init.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Init.c 658 2007-02-05 00:58:07Z CecileDuboz $
+** $Id: Init.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "Base.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/InputFormat.c
--- a/Base/src/InputFormat.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/InputFormat.c Thu Oct 11 08:05:31 2007 +0000
@@ -45,6 +45,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "InputFormat.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/InputFormat_Register.c
--- a/Base/src/InputFormat_Register.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/InputFormat_Register.c Thu Oct 11 08:05:31 2007 +0000
@@ -45,6 +45,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "InputFormat_Register.h"
#include "Init.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/Light.c
--- a/Base/src/Light.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/Light.c Thu Oct 11 08:05:31 2007 +0000
@@ -45,6 +45,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "Light.h"
#include "ViewportInfo.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/Light_Register.c
--- a/Base/src/Light_Register.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/Light_Register.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/OutputFormat.c
--- a/Base/src/OutputFormat.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/OutputFormat.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OutputFormat.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: OutputFormat.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "OutputFormat.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/OutputFormat_Register.c
--- a/Base/src/OutputFormat_Register.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/OutputFormat_Register.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OutputFormat_Register.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: OutputFormat_Register.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "OutputFormat_Register.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/RenderingEngine.c
--- a/Base/src/RenderingEngine.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/RenderingEngine.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: RenderingEngine.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: RenderingEngine.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "ColourMap.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/Viewport.c
--- a/Base/src/Viewport.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/Viewport.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Viewport.c 658 2007-02-05 00:58:07Z CecileDuboz $
+** $Id: Viewport.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "ColourMap.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/Window.c
--- a/Base/src/Window.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/Window.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Window.c 658 2007-02-05 00:58:07Z CecileDuboz $
+** $Id: Window.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "ColourMap.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/WindowInteraction.c
--- a/Base/src/WindowInteraction.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/WindowInteraction.c Thu Oct 11 08:05:31 2007 +0000
@@ -45,6 +45,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "ColourMap.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/WindowInteraction_Register.c
--- a/Base/src/WindowInteraction_Register.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/WindowInteraction_Register.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "WindowInteraction_Register.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/X11Colours.c
--- a/Base/src/X11Colours.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/X11Colours.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,11 +39,12 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: X11Colours.c 616 2006-08-31 07:08:25Z KathleenHumble $
+** $Id: X11Colours.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "types.h"
#include "ColourMap.h"
diff -r 01e617e68894 -r 5e802cd52184 Base/src/makefile
--- a/Base/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -7,7 +7,7 @@ SRCS := $(wildcard *.c)
SRCS := $(wildcard *.c)
HDRS := $(wildcard *.h)
-packages = STGERMAIN
+packages = STGDOMAIN STGERMAIN
ifdef HAVE_OSMESA
packages += OSMESA
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/makefile
--- a/Base/tests/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -45,7 +45,7 @@ ifdef HAVE_GL
packages += GL
endif
-packages += STGERMAIN DL HYPRE PETSC MPI MATH XML
+packages += STGDOMAIN STGERMAIN DL HYPRE PETSC MPI MATH XML
include ${PROJ_ROOT}/Makefile.vmake
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/plugins/Others/lucTestColourMaps.c
--- a/Base/tests/plugins/Others/lucTestColourMaps.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/plugins/Others/lucTestColourMaps.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,11 +39,12 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: lucTestColourMaps.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: lucTestColourMaps.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/plugins/Others/lucTestOutputing.c
--- a/Base/tests/plugins/Others/lucTestOutputing.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/plugins/Others/lucTestOutputing.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,11 +39,12 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: lucTestOutputing.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: lucTestOutputing.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/plugins/Others/lucTestPlottingObjects.c
--- a/Base/tests/plugins/Others/lucTestPlottingObjects.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/plugins/Others/lucTestPlottingObjects.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,11 +39,12 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: lucTestPlottingObjects.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: lucTestPlottingObjects.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/plugins/RenderingEngineTest.c
--- a/Base/tests/plugins/RenderingEngineTest.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/plugins/RenderingEngineTest.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: RenderingEngineTest.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: RenderingEngineTest.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/plugins/lucTestCameras.c
--- a/Base/tests/plugins/lucTestCameras.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/plugins/lucTestCameras.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,11 +39,12 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: lucTestCameras.c 691 2007-05-16 01:14:04Z LukeHodkinson $
+** $Id: lucTestCameras.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/plugins/lucTestColourMaps.c
--- a/Base/tests/plugins/lucTestColourMaps.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/plugins/lucTestColourMaps.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,11 +39,12 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: lucTestColourMaps.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: lucTestColourMaps.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/plugins/makefile
--- a/Base/tests/plugins/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/plugins/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -7,7 +7,7 @@ include ${PROJ_ROOT}/Makefile.system
#EXTERNAL_INCLUDES = ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
#EXTERNAL_LIBS = ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
-packages = STGERMAIN MPI XML GL
+packages = STGDOMAIN STGERMAIN MPI XML GL
# Note don't put the .c extension. just the base name of the plugin
plugins := $(wildcard *.c)
diff -r 01e617e68894 -r 5e802cd52184 Base/tests/testlucBase.c
--- a/Base/tests/testlucBase.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Base/tests/testlucBase.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: testlucBase.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: testlucBase.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -51,6 +51,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <stdio.h>
@@ -64,7 +65,7 @@ int main( int argc, char* argv[] ) {
int numProcessors;
Dictionary* dictionary;
XML_IO_Handler* ioHandler;
- DiscretisationContext* context = NULL;
+ DomainContext* context = NULL;
/* Initialise PETSc, get world info */
MPI_Init( &argc, &argv );
@@ -73,6 +74,7 @@ int main( int argc, char* argv[] ) {
MPI_Comm_rank( CommWorld, &rank );
StGermain_Init( &argc, &argv );
+ StgDomain_Init( &argc, &argv );
lucBase_Init( &argc, &argv );
#ifdef HAVE_PYTHON
Py_Initialize();
@@ -89,7 +91,7 @@ int main( int argc, char* argv[] ) {
Journal_ReadFromDictionary( dictionary );
/* Construction phase -----------------------------------------------------------------------------------------------*/
- context = DiscretisationContext_New( "context", 0, 0, CommWorld, dictionary );
+ context = DomainContext_New( "context", 0, 0, CommWorld, dictionary );
#if 0
PluginsManager_Load( context->plugins, context, dictionary );
@@ -129,6 +131,7 @@ int main( int argc, char* argv[] ) {
#endif
lucBase_Finalise();
+ StgDomain_Finalise();
StGermain_Finalise();
/* Close off MPI */
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/Axis.c
--- a/DrawingObjects/src/Axis.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/Axis.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -249,7 +250,7 @@ void _lucAxis_Draw( void* drawingObject,
void _lucAxis_Draw( void* drawingObject, lucWindow* window, lucViewportInfo* viewportInfo, void* _context ) {
lucAxis* self = (lucAxis*)drawingObject;
lucViewport* viewport = viewportInfo->viewport;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
Dimension_Index dim = context->dim;
double rodLength = 0.0;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/ColourBar.c
--- a/DrawingObjects/src/ColourBar.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/ColourBar.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: ColourBar.c 646 2006-12-05 02:54:33Z CecileDuboz $
+** $Id: ColourBar.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/Contour.c
--- a/DrawingObjects/src/Contour.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/Contour.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Contour.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: Contour.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/Eigenvectors.c
--- a/DrawingObjects/src/Eigenvectors.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/Eigenvectors.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Eigenvectors.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: Eigenvectors.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -189,7 +190,7 @@ void _lucEigenvectors_CleanUp( void* dra
void _lucEigenvectors_BuildDisplayList( void* drawingObject, void* _context ) {
lucEigenvectors* self = (lucEigenvectors*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
Dimension_Index dim = context->dim;
if ( dim == 2 ) {
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/EigenvectorsCrossSection.c
--- a/DrawingObjects/src/EigenvectorsCrossSection.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/EigenvectorsCrossSection.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: EigenvectorsCrossSection.c 665 2007-02-27 07:10:48Z JulianGiordani $
+** $Id: EigenvectorsCrossSection.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -292,7 +293,7 @@ void _lucEigenvectorsCrossSection_CleanU
void _lucEigenvectorsCrossSection_BuildDisplayList( void* drawingObject, void* _context ) {
lucEigenvectorsCrossSection* self = (lucEigenvectorsCrossSection*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
_lucEigenvectorsCrossSection_DrawCrossSection( self, context->dim, self->crossSectionValue, self->crossSectionAxis );
}
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/FeVariableSurface.c
--- a/DrawingObjects/src/FeVariableSurface.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/FeVariableSurface.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: FeVariableSurface.c 734 2007-09-25 07:55:50Z LukeHodkinson $
+** $Id: FeVariableSurface.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/FieldVariableBorder.c
--- a/DrawingObjects/src/FieldVariableBorder.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/FieldVariableBorder.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: FieldVariableBorder.c 702 2007-06-29 00:43:14Z PatrickSunter $
+** $Id: FieldVariableBorder.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -207,7 +208,7 @@ void _lucFieldVariableBorder_CleanUp( vo
void _lucFieldVariableBorder_BuildDisplayList( void* drawingObject, void* _context ) {
lucFieldVariableBorder* self = (lucFieldVariableBorder*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
Dimension_Index dim = context->dim;
FieldVariable* field = self->fieldVariable;
Coord min;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/Finalise.c
--- a/DrawingObjects/src/Finalise.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/Finalise.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Finalise.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Finalise.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "Finalise.h"
#include <stdio.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/HistoricalSwarmTrajectory.c
--- a/DrawingObjects/src/HistoricalSwarmTrajectory.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/HistoricalSwarmTrajectory.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: HistoricalSwarmTrajectory.c 738 2007-10-04 04:57:51Z BelindaMay $
+** $Id: HistoricalSwarmTrajectory.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -272,7 +273,7 @@ void _lucHistoricalSwarmTrajectory_Clean
void _lucHistoricalSwarmTrajectory_BuildDisplayList( void* drawingObject, void* _context ) {
lucHistoricalSwarmTrajectory* self = (lucHistoricalSwarmTrajectory*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
Swarm* swarm = self->swarm;
lucColourMap* colourMap = self->colourMap;
unsigned int historySteps = self->historySteps;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/Init.c
--- a/DrawingObjects/src/Init.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/Init.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Init.c 667 2007-03-01 06:43:11Z RobertTurnbull $
+** $Id: Init.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/Isosurface.c
--- a/DrawingObjects/src/Isosurface.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/Isosurface.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Isosurface.c 739 2007-10-05 01:23:19Z BelindaMay $
+** $Id: Isosurface.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <glucifer/Base/Base.h>
@@ -241,7 +242,7 @@ void _lucIsosurface_Destroy( void* drawi
void _lucIsosurface_Setup( void* drawingObject, void* _context ) {
lucIsosurface* self = (lucIsosurface*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
FieldVariable* isosurfaceField = self->isosurfaceField;
int i, j, k;
int nx, ny, nz;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/MeshViewer.c
--- a/DrawingObjects/src/MeshViewer.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/MeshViewer.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#ifdef GLUCIFER_USE_PICELLERATOR
#include <StgFEM/StgFEM.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/OpenGLDrawingObject.c
--- a/DrawingObjects/src/OpenGLDrawingObject.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/OpenGLDrawingObject.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OpenGLDrawingObject.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: OpenGLDrawingObject.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/ScalarField.c
--- a/DrawingObjects/src/ScalarField.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/ScalarField.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: ScalarField.c 710 2007-07-11 05:39:26Z LukeHodkinson $
+** $Id: ScalarField.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -209,7 +210,7 @@ void _lucScalarField_CleanUp( void* draw
void _lucScalarField_BuildDisplayList( void* drawingObject, void* _context ) {
lucScalarField* self = (lucScalarField*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
FieldVariable* fieldVariable = self->fieldVariable;
Coord min;
Coord max;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/ScalarFieldCrossSection.c
--- a/DrawingObjects/src/ScalarFieldCrossSection.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/ScalarFieldCrossSection.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: ScalarFieldCrossSection.c 693 2007-05-21 22:10:05Z LukeHodkinson $
+** $Id: ScalarFieldCrossSection.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/ScalarFieldOnMesh.c
--- a/DrawingObjects/src/ScalarFieldOnMesh.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/ScalarFieldOnMesh.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -209,7 +210,7 @@ void _lucScalarFieldOnMesh_CleanUp( void
void _lucScalarFieldOnMesh_BuildDisplayList( void* drawingObject, void* _context ) {
lucScalarFieldOnMesh* self = (lucScalarFieldOnMesh*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
FieldVariable* fieldVariable = self->fieldVariable;
Coord min;
Coord max;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/ScalarFieldOnMeshCrossSection.c
--- a/DrawingObjects/src/ScalarFieldOnMeshCrossSection.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/ScalarFieldOnMeshCrossSection.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#ifdef GLUCIFER_USE_PICELLERATOR
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/SwarmRGBColourViewer.c
--- a/DrawingObjects/src/SwarmRGBColourViewer.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/SwarmRGBColourViewer.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/SwarmSquares.c
--- a/DrawingObjects/src/SwarmSquares.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/SwarmSquares.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: SwarmSquares.c 696 2007-06-01 01:17:56Z StuartClark $
+** $Id: SwarmSquares.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -283,7 +284,7 @@ void _lucSwarmSquares_BuildDisplayList(
void _lucSwarmSquares_PlotParticle( void* drawingObject, void* _context, Particle_Index lParticle_I ) {
lucSwarmSquares* self = (lucSwarmSquares*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
GlobalParticle* particle = (GlobalParticle*)Swarm_ParticleAt( self->swarm, lParticle_I );
SwarmVariable* lengthVariable = self->lengthVariable;
double* coord = particle->coord;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/SwarmVectors.c
--- a/DrawingObjects/src/SwarmVectors.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/SwarmVectors.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: SwarmVectors.c 667 2007-03-01 06:43:11Z RobertTurnbull $
+** $Id: SwarmVectors.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -263,7 +264,7 @@ void _lucSwarmVectors_BuildDisplayList(
void _lucSwarmVectors_PlotParticle( void* drawingObject, void* _context, Particle_Index lParticle_I ) {
lucSwarmVectors* self = (lucSwarmVectors*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
GlobalParticle* particle = (GlobalParticle*)Swarm_ParticleAt( self->swarm, lParticle_I );
SwarmVariable* lengthVariable = self->lengthVariable;
SwarmVariable* thicknessVariable = self->thicknessVariable;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/SwarmViewer.c
--- a/DrawingObjects/src/SwarmViewer.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/SwarmViewer.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: SwarmViewer.c 667 2007-03-01 06:43:11Z RobertTurnbull $
+** $Id: SwarmViewer.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#ifdef GLUCIFER_USE_PICELLERATOR
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
@@ -241,7 +242,7 @@ void _lucSwarmViewer_BuildDisplayList( v
void _lucSwarmViewer_PlotParticle( void* drawingObject, void* _context, Particle_Index lParticle_I ) {
lucSwarmViewer* self = (lucSwarmViewer*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
GlobalParticle* particle = (GlobalParticle*)Swarm_ParticleAt( self->swarm, lParticle_I );
double* coord = particle->coord;
float offset = 0.001;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/SwarmViewerBase.c
--- a/DrawingObjects/src/SwarmViewerBase.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/SwarmViewerBase.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#ifdef GLUCIFER_USE_PICELLERATOR
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
@@ -366,7 +367,7 @@ void _lucSwarmViewerBase_BuildDisplayLis
continue;
}
- if( ((DiscretisationContext*)_context)->dim == 3 ) {
+ if( ((DomainContext*)_context)->dim == 3 ) {
if( coord[2] < minPosition[K_AXIS] || coord[2] > maxPosition[K_AXIS] )
continue;
}
@@ -387,7 +388,7 @@ void lucSwarmViewBase_DrawParticleNumber
void _lucSwarmViewerBase_PlotParticleNumber( void* drawingObject, void* _context, Particle_Index lParticle_I, lucColour colour ) {
lucSwarmViewerBase* self = (lucSwarmViewerBase*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
GlobalParticle* particle = (GlobalParticle*)Swarm_ParticleAt( self->swarm, lParticle_I );
double* coord = particle->coord;
Name particle_number;
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/TextureMap.c
--- a/DrawingObjects/src/TextureMap.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/TextureMap.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: TextureMap.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: TextureMap.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/TimeStep.c
--- a/DrawingObjects/src/TimeStep.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/TimeStep.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/Title.c
--- a/DrawingObjects/src/Title.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/Title.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/VectorArrowCrossSection.c
--- a/DrawingObjects/src/VectorArrowCrossSection.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/VectorArrowCrossSection.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: VectorArrowCrossSection.c 694 2007-05-22 03:17:41Z LukeHodkinson $
+** $Id: VectorArrowCrossSection.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <StgFEM/StgFEM.h>
#include <glucifer/Base/Base.h>
@@ -254,7 +255,7 @@ void _lucVectorArrowCrossSection_CleanUp
void _lucVectorArrowCrossSection_BuildDisplayList( void* drawingObject, void* _context ) {
lucVectorArrowCrossSection* self = (lucVectorArrowCrossSection*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
_lucVectorArrowCrossSection_DrawCrossSection( self, context->dim, self->crossSectionValue, self->crossSectionAxis );
}
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/VectorArrows.c
--- a/DrawingObjects/src/VectorArrows.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/VectorArrows.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: VectorArrows.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: VectorArrows.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -189,7 +190,7 @@ void _lucVectorArrows_CleanUp( void* dra
void _lucVectorArrows_BuildDisplayList( void* drawingObject, void* _context ) {
lucVectorArrows* self = (lucVectorArrows*)drawingObject;
- DiscretisationContext* context = (DiscretisationContext*) _context;
+ DomainContext* context = (DomainContext*) _context;
Dimension_Index dim = context->dim;
if ( dim == 2 ) {
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/src/makefile
--- a/DrawingObjects/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -7,7 +7,7 @@ SRCS := $(wildcard *.c)
SRCS := $(wildcard *.c)
HDRS := $(wildcard *.h)
-packages = PICELLERATOR STGFEM STGERMAIN PETSC MPI XML GL
+packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN PETSC MPI XML GL
# Work out name to call library
lib = luc$(shell basename `pwd | sed s/src//g`)
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/tests/DummyFieldVariable/DummyFieldVariable.c
--- a/DrawingObjects/tests/DummyFieldVariable/DummyFieldVariable.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/tests/DummyFieldVariable/DummyFieldVariable.c Thu Oct 11 08:05:31 2007 +0000
@@ -50,6 +50,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/Windowing/Windowing.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/tests/DummyFieldVariable/makefile
--- a/DrawingObjects/tests/DummyFieldVariable/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/tests/DummyFieldVariable/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -19,6 +19,6 @@ includes = ${PROJECT}/${modName}
includes = ${PROJECT}/${modName}
# External Libraries and Headers
-packages = STGERMAIN MPI XML PYTHON
+packages = STGDOMAIN STGERMAIN MPI XML PYTHON
include ${PROJ_ROOT}/Makefile.vmake
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/tests/DummySwarmVariable/DummySwarmVariable.c
--- a/DrawingObjects/tests/DummySwarmVariable/DummySwarmVariable.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/tests/DummySwarmVariable/DummySwarmVariable.c Thu Oct 11 08:05:31 2007 +0000
@@ -49,6 +49,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/Windowing/Windowing.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/tests/DummySwarmVariable/makefile
--- a/DrawingObjects/tests/DummySwarmVariable/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/tests/DummySwarmVariable/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -19,6 +19,6 @@ includes = ${PROJECT}/${modName}
includes = ${PROJECT}/${modName}
# External Libraries and Headers
-packages = STGERMAIN MPI XML PYTHON
+packages = STGDOMAIN STGERMAIN MPI XML PYTHON
include ${PROJ_ROOT}/Makefile.vmake
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/tests/makefile
--- a/DrawingObjects/tests/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/tests/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -10,7 +10,7 @@ EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_
subdirs = DummyFieldVariable DummySwarmVariable
-packages = PICELLERATOR STGFEM STGERMAIN
+packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN
ifdef HAVE_OSMESA
packages += OSMESA
diff -r 01e617e68894 -r 5e802cd52184 DrawingObjects/tests/testDrawingObject.c
--- a/DrawingObjects/tests/testDrawingObject.c Fri Oct 05 01:23:19 2007 +0000
+++ b/DrawingObjects/tests/testDrawingObject.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: testDrawingObject.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: testDrawingObject.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -51,6 +51,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/Windowing/Windowing.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -69,7 +70,7 @@ int main( int argc, char* argv[] ) {
int numProcessors;
Dictionary* dictionary;
XML_IO_Handler* ioHandler;
- DiscretisationContext* context = NULL;
+ DomainContext* context = NULL;
Stream* dummyOpenGLStream;
char filename[20];
@@ -80,6 +81,7 @@ int main( int argc, char* argv[] ) {
MPI_Comm_rank( CommWorld, &rank );
StGermain_Init( &argc, &argv );
+ StgDomain_Init( &argc, &argv );
lucBase_Init();
/* Add lucWindow as default window for this test */
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), lucDefaultWindow_Type, "0", _lucWindow_DefaultNew );
@@ -104,7 +106,7 @@ int main( int argc, char* argv[] ) {
/* Construction phase -----------------------------------------------------------------------------------------------*/
- context = DiscretisationContext_New( "context", 0, 0, CommWorld, dictionary );
+ context = DomainContext_New( "context", 0, 0, CommWorld, dictionary );
Stg_Component_Construct( context, 0 /* dummy */, &context, True );
if( rank == 0 )
Context_PrintConcise( context, context->verbose );
@@ -138,6 +140,7 @@ int main( int argc, char* argv[] ) {
lucRenderingEngines_Finalise();
lucWindowing_Finalise();
lucBase_Finalise();
+ StgDomain_Finalise();
StGermain_Finalise();
/* Close off MPI */
diff -r 01e617e68894 -r 5e802cd52184 InputFormats/src/Finalise.c
--- a/InputFormats/src/Finalise.c Fri Oct 05 01:23:19 2007 +0000
+++ b/InputFormats/src/Finalise.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "Finalise.h"
#include <stdio.h>
diff -r 01e617e68894 -r 5e802cd52184 InputFormats/src/Init.c
--- a/InputFormats/src/Init.c Fri Oct 05 01:23:19 2007 +0000
+++ b/InputFormats/src/Init.c Thu Oct 11 08:05:31 2007 +0000
@@ -45,6 +45,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include "InputFormats.h"
diff -r 01e617e68894 -r 5e802cd52184 InputFormats/src/InputPPM.c
--- a/InputFormats/src/InputPPM.c Fri Oct 05 01:23:19 2007 +0000
+++ b/InputFormats/src/InputPPM.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 InputFormats/src/InputTIFF.c
--- a/InputFormats/src/InputTIFF.c Fri Oct 05 01:23:19 2007 +0000
+++ b/InputFormats/src/InputTIFF.c Thu Oct 11 08:05:31 2007 +0000
@@ -47,6 +47,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 InputFormats/src/makefile
--- a/InputFormats/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/InputFormats/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -7,7 +7,7 @@ SRCS := $(wildcard *.c)
SRCS := $(wildcard *.c)
HDRS := $(wildcard *.h)
-packages = STGERMAIN MPI XML TIFF JPEG PNG LIBFAME
+packages = STGDOMAIN STGERMAIN MPI XML TIFF JPEG PNG LIBFAME
# Work out name to call library
lib = luc$(shell basename `pwd | sed s/src//g`)
diff -r 01e617e68894 -r 5e802cd52184 InputFormats/tests/plugins/lucTestInputFormat.c
--- a/InputFormats/tests/plugins/lucTestInputFormat.c Fri Oct 05 01:23:19 2007 +0000
+++ b/InputFormats/tests/plugins/lucTestInputFormat.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: lucTestInputFormat.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: lucTestInputFormat.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <math.h>
@@ -53,7 +54,7 @@
const Type TestInputFormat_Type = "TestInputFormat";
-void glucifer_lucTestInputFormat( DiscretisationContext* context ) {
+void glucifer_lucTestInputFormat( DomainContext* context ) {
Pixel_Index width;
Pixel_Index height;
char* imageName;
@@ -79,8 +80,8 @@ void glucifer_lucTestInputFormat( Discre
}
void _lucTestInputFormat_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
- DiscretisationContext* context;
- context = Stg_ComponentFactory_ConstructByName( cf, "context", DiscretisationContext, True, data );
+ DomainContext* context;
+ context = Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
ContextEP_ReplaceAll( context, AbstractContext_EP_Initialise, glucifer_lucTestInputFormat );
}
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/EncoderLibavcodec.c
--- a/OutputFormats/src/EncoderLibavcodec.c Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/EncoderLibavcodec.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: EncoderLibavcodec.c 630 2006-10-13 00:41:43Z KathleenHumble $
+** $Id: EncoderLibavcodec.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -49,6 +49,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/EncoderLibfame.c
--- a/OutputFormats/src/EncoderLibfame.c Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/EncoderLibfame.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: EncoderLibfame.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: EncoderLibfame.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -49,6 +49,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/Finalise.c
--- a/OutputFormats/src/Finalise.c Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/Finalise.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Finalise.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Finalise.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "Finalise.h"
#include <stdio.h>
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/Init.c
--- a/OutputFormats/src/Init.c Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/Init.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Init.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Init.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include "OutputFormats.h"
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/OutputJPEG.c
--- a/OutputFormats/src/OutputJPEG.c Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/OutputJPEG.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OutputJPEG.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: OutputJPEG.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -47,6 +47,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/OutputPNG.c
--- a/OutputFormats/src/OutputPNG.c Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/OutputPNG.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OutputPNG.c 697 2007-06-01 02:29:32Z RobertTurnbull $
+** $Id: OutputPNG.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#ifdef HAVE_PNG
@@ -47,6 +47,7 @@
#include <mpi.h>
#include <png.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/OutputPPM.c
--- a/OutputFormats/src/OutputPPM.c Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/OutputPPM.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OutputPPM.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: OutputPPM.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/OutputTIFF.c
--- a/OutputFormats/src/OutputTIFF.c Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/OutputTIFF.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OutputTIFF.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: OutputTIFF.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -47,6 +47,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/src/makefile
--- a/OutputFormats/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -7,7 +7,7 @@ SRCS := $(wildcard *.c)
SRCS := $(wildcard *.c)
HDRS := $(wildcard *.h)
-packages = STGERMAIN MPI XML TIFF JPEG PNG LIBFAME LIBAVCODEC
+packages = STGDOMAIN STGERMAIN MPI XML TIFF JPEG PNG LIBFAME LIBAVCODEC
# Work out name to call library
lib = luc$(shell basename `pwd | sed s/src//g`)
diff -r 01e617e68894 -r 5e802cd52184 OutputFormats/tests/makefile
--- a/OutputFormats/tests/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/OutputFormats/tests/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -62,6 +62,6 @@ endif
endif
-packages = STGERMAIN MPI XML MATH DL HYPRE
+packages = STGDOMAIN STGERMAIN MPI XML MATH DL HYPRE
include ${PROJ_ROOT}/Makefile.vmake
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/src/Finalise.c
--- a/RenderingEngines/src/Finalise.c Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/src/Finalise.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Finalise.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Finalise.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "Finalise.h"
#include <stdio.h>
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/src/Init.c
--- a/RenderingEngines/src/Init.c Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/src/Init.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Init.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Init.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include "RenderingEngines.h"
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/src/OpenGlUtil.c
--- a/RenderingEngines/src/OpenGlUtil.c Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/src/OpenGlUtil.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OpenGlUtil.c 520 2006-03-15 05:36:31Z LouisMoresi $
+** $Id: OpenGlUtil.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include "types.h"
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/src/RenderingEngineGL.c
--- a/RenderingEngines/src/RenderingEngineGL.c Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/src/RenderingEngineGL.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: RenderingEngineGL.c 659 2007-02-05 01:00:13Z CecileDuboz $
+** $Id: RenderingEngineGL.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/src/makefile
--- a/RenderingEngines/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -7,7 +7,7 @@ SRCS := $(wildcard *.c) $(wildcard *.cxx
SRCS := $(wildcard *.c) $(wildcard *.cxx)
HDRS := $(wildcard *.h)
-packages = STGERMAIN MPI XML GL
+packages = STGDOMAIN STGERMAIN MPI XML GL
ifdef HAVE_VTK
packages += VTK
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/tests/DummyOpenGL/DummyOpenGL.c
--- a/RenderingEngines/tests/DummyOpenGL/DummyOpenGL.c Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/tests/DummyOpenGL/DummyOpenGL.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: DummyOpenGL.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: DummyOpenGL.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -48,6 +48,7 @@
#include "stdio.h"
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
const Type DummyOpenGL_Type = "DummyOpenGL";
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/tests/DummyOpenGL/makefile
--- a/RenderingEngines/tests/DummyOpenGL/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/tests/DummyOpenGL/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -10,7 +10,7 @@ EXTERNAL_INCLUDES = ${GL_INCLUDES}
EXTERNAL_INCLUDES = ${GL_INCLUDES}
# External Libraries and Headers
-packages = STGERMAIN MPI XML
+packages = STGDOMAIN STGERMAIN MPI XML
# Work out name to call library
lib = $(shell basename `pwd | sed s/src//g`)
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/tests/makefile
--- a/RenderingEngines/tests/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/tests/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -10,7 +10,7 @@ EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_
subdirs = DummyOpenGL
-packages = STGERMAIN GL PETSC MPI XML
+packages = STGDOMAIN STGERMAIN GL PETSC MPI XML
tests = lib${PROJECT}_RenderingEngines
SRCS = $(wildcard *.c)
diff -r 01e617e68894 -r 5e802cd52184 RenderingEngines/tests/testRenderingEngineGL.c
--- a/RenderingEngines/tests/testRenderingEngineGL.c Fri Oct 05 01:23:19 2007 +0000
+++ b/RenderingEngines/tests/testRenderingEngineGL.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: testRenderingEngineGL.c 632 2006-10-18 07:54:57Z AlanLo $
+** $Id: testRenderingEngineGL.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -50,6 +50,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/RenderingEngines/RenderingEngines.h>
@@ -64,7 +65,7 @@ int main( int argc, char* argv[] ) {
int numProcessors;
Dictionary* dictionary;
XML_IO_Handler* ioHandler;
- DiscretisationContext* context = NULL;
+ DomainContext* context = NULL;
Stream* dummyOpenGLStream;
/* Initialise PETSc, get world info */
@@ -74,6 +75,7 @@ int main( int argc, char* argv[] ) {
MPI_Comm_rank( CommWorld, &rank );
StGermain_Init( &argc, &argv );
+ StgDomain_Init( &argc, &argv );
lucBase_Init();
lucRenderingEngines_Init();
#ifdef HAVE_PYTHON
@@ -91,7 +93,7 @@ int main( int argc, char* argv[] ) {
Journal_ReadFromDictionary( dictionary );
/* Construction phase -----------------------------------------------------------------------------------------------*/
- context = DiscretisationContext_New( "context", 0, 0, CommWorld, dictionary );
+ context = DomainContext_New( "context", 0, 0, CommWorld, dictionary );
#if 0
componentDict = Dictionary_GetDictionary( dictionary, "components" );
@@ -136,6 +138,7 @@ int main( int argc, char* argv[] ) {
lucRenderingEngines_Finalise();
lucBase_Finalise();
+ StgDomain_Finalise();
StGermain_Finalise();
/* Close off MPI */
diff -r 01e617e68894 -r 5e802cd52184 WindowInteractions/src/ColourBarInteraction.c
--- a/WindowInteractions/src/ColourBarInteraction.c Fri Oct 05 01:23:19 2007 +0000
+++ b/WindowInteractions/src/ColourBarInteraction.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/Windowing/Windowing.h>
diff -r 01e617e68894 -r 5e802cd52184 WindowInteractions/src/FieldValueInteraction.c
--- a/WindowInteractions/src/FieldValueInteraction.c Fri Oct 05 01:23:19 2007 +0000
+++ b/WindowInteractions/src/FieldValueInteraction.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: FieldValueInteraction.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: FieldValueInteraction.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/Windowing/Windowing.h>
diff -r 01e617e68894 -r 5e802cd52184 WindowInteractions/src/Finalise.c
--- a/WindowInteractions/src/Finalise.c Fri Oct 05 01:23:19 2007 +0000
+++ b/WindowInteractions/src/Finalise.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Finalise.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Finalise.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "Finalise.h"
#include <stdio.h>
diff -r 01e617e68894 -r 5e802cd52184 WindowInteractions/src/Init.c
--- a/WindowInteractions/src/Init.c Fri Oct 05 01:23:19 2007 +0000
+++ b/WindowInteractions/src/Init.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,12 +39,13 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Init.c 657 2007-02-05 00:56:08Z CecileDuboz $
+** $Id: Init.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include "WindowInteractions.h"
diff -r 01e617e68894 -r 5e802cd52184 WindowInteractions/src/LightInteraction.c
--- a/WindowInteractions/src/LightInteraction.c Fri Oct 05 01:23:19 2007 +0000
+++ b/WindowInteractions/src/LightInteraction.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/Windowing/Windowing.h>
diff -r 01e617e68894 -r 5e802cd52184 WindowInteractions/src/MeshViewerInteraction.c
--- a/WindowInteractions/src/MeshViewerInteraction.c Fri Oct 05 01:23:19 2007 +0000
+++ b/WindowInteractions/src/MeshViewerInteraction.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/Windowing/Windowing.h>
diff -r 01e617e68894 -r 5e802cd52184 WindowInteractions/src/SwarmViewerInteraction.c
--- a/WindowInteractions/src/SwarmViewerInteraction.c Fri Oct 05 01:23:19 2007 +0000
+++ b/WindowInteractions/src/SwarmViewerInteraction.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include <glucifer/Windowing/Windowing.h>
diff -r 01e617e68894 -r 5e802cd52184 WindowInteractions/src/makefile
--- a/WindowInteractions/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/WindowInteractions/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -7,7 +7,7 @@ SRCS := $(wildcard *.c) $(wildcard *.cxx
SRCS := $(wildcard *.c) $(wildcard *.cxx)
HDRS := $(wildcard *.h)
-packages = PICELLERATOR STGFEM STGERMAIN PETSC MPI XML GL
+packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN PETSC MPI XML GL
ifdef HAVE_VTK
packages += VTK
diff -r 01e617e68894 -r 5e802cd52184 Windowing/src/CarbonWindow.c
--- a/Windowing/src/CarbonWindow.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Windowing/src/CarbonWindow.c Thu Oct 11 08:05:31 2007 +0000
@@ -46,6 +46,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <Carbon/Carbon.h>
#include <AGL/agl.h>
diff -r 01e617e68894 -r 5e802cd52184 Windowing/src/Finalise.c
--- a/Windowing/src/Finalise.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Windowing/src/Finalise.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Finalise.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Finalise.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "Finalise.h"
#include <stdio.h>
diff -r 01e617e68894 -r 5e802cd52184 Windowing/src/Init.c
--- a/Windowing/src/Init.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Windowing/src/Init.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Init.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Init.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -47,6 +47,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
#include "Windowing.h"
diff -r 01e617e68894 -r 5e802cd52184 Windowing/src/OSMesaWindow.c
--- a/Windowing/src/OSMesaWindow.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Windowing/src/OSMesaWindow.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OSMesaWindow.c 629 2006-10-13 00:36:46Z KathleenHumble $
+** $Id: OSMesaWindow.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -47,6 +47,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Windowing/src/SDLWindow.c
--- a/Windowing/src/SDLWindow.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Windowing/src/SDLWindow.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: SDLWindow.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: SDLWindow.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -47,6 +47,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Windowing/src/X11Window.c
--- a/Windowing/src/X11Window.c Fri Oct 05 01:23:19 2007 +0000
+++ b/Windowing/src/X11Window.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: X11Window.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: X11Window.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -47,6 +47,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/Base/Base.h>
diff -r 01e617e68894 -r 5e802cd52184 Windowing/src/makefile
--- a/Windowing/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/Windowing/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -7,7 +7,7 @@ SRCS := $(wildcard *.c) $(wildcard *.cxx
SRCS := $(wildcard *.c) $(wildcard *.cxx)
HDRS := $(wildcard *.h)
-packages = STGERMAIN
+packages = STGDOMAIN STGERMAIN
ifdef HAVE_OSMESA
packages += OSMESA
diff -r 01e617e68894 -r 5e802cd52184 libglucifer/src/Finalise.c
--- a/libglucifer/src/Finalise.c Fri Oct 05 01:23:19 2007 +0000
+++ b/libglucifer/src/Finalise.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Finalise.c 510 2006-02-17 04:33:32Z RobertTurnbull $
+** $Id: Finalise.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "glucifer.h"
diff -r 01e617e68894 -r 5e802cd52184 libglucifer/src/Init.c
--- a/libglucifer/src/Init.c Fri Oct 05 01:23:19 2007 +0000
+++ b/libglucifer/src/Init.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Init.c 728 2007-08-02 08:54:00Z SteveQuenette $
+** $Id: Init.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include "glucifer.h"
diff -r 01e617e68894 -r 5e802cd52184 libglucifer/src/makefile
--- a/libglucifer/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/libglucifer/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -40,7 +40,7 @@ EXTERNAL_LIBS = -L${LIB_DIR}
EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} -DLIB_DIR=\"${LIB_DIR}\"
-packages = PICELLERATOR STGFEM STGERMAIN
+packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN
ifdef HAVE_OSMESA
packages += OSMESA
diff -r 01e617e68894 -r 5e802cd52184 plugins/lucPlugin/lucPlugin.c
--- a/plugins/lucPlugin/lucPlugin.c Fri Oct 05 01:23:19 2007 +0000
+++ b/plugins/lucPlugin/lucPlugin.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,13 +39,14 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: lucPlugin.c 695 2007-05-22 04:28:39Z LukeHodkinson $
+** $Id: lucPlugin.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/glucifer.h>
@@ -54,7 +55,7 @@ const Type LucPlugin_Type = "LucPlugin";
/** Special run function which replaces the abstract context's normal one */
void lucPlugin_VisualOnlyRun( Context* _context ) {
- DiscretisationContext* context = (DiscretisationContext*)_context;
+ DomainContext* context = (DomainContext*)_context;
double dt = 0;
double dtLoadedFromFile = 0;
Index fieldVar_I;
diff -r 01e617e68894 -r 5e802cd52184 plugins/lucPlugin/makefile
--- a/plugins/lucPlugin/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/plugins/lucPlugin/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -10,8 +10,7 @@ HDRS := $(wildcard *.h)
# External Libraries and Headers
EXTERNAL_INCLUDES = -I${INC_DIR}
EXTERNAL_LIBS = -L${LIB_DIR} -lglucifer ${GLUCIFER_RPATH}
-
-packages = PICELLERATOR STGFEM STGERMAIN
+packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN
ifdef HAVE_OSMESA
packages += OSMESA
diff -r 01e617e68894 -r 5e802cd52184 project-config.sh
--- a/project-config.sh Fri Oct 05 01:23:19 2007 +0000
+++ b/project-config.sh Thu Oct 11 08:05:31 2007 +0000
@@ -16,7 +16,7 @@
## Role:
## Obtain the project configuration.
##
-## $Id: project-config.sh 631 2006-10-18 06:20:15Z SteveQuenette $
+## $Id: project-config.sh 740 2007-10-11 08:05:31Z SteveQuenette $
##
##
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -43,6 +43,7 @@ setValue PROJECT 'glucifer'
. ./VMake/Config/xml-config.sh
. ./VMake/Config/StGermain-config.sh
+. ./VMake/Config/StgDomain-config.sh
. ./VMake/Config/StgFEM-config.sh
. ./VMake/Config/vtk-config.sh
diff -r 01e617e68894 -r 5e802cd52184 src/main.c
--- a/src/main.c Fri Oct 05 01:23:19 2007 +0000
+++ b/src/main.c Thu Oct 11 08:05:31 2007 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: main.c 628 2006-10-12 08:23:07Z SteveQuenette $
+** $Id: main.c 740 2007-10-11 08:05:31Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -51,6 +51,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
+#include <StgDomain/StgDomain.h>
#include <glucifer/glucifer.h>
#include <stdio.h>
@@ -64,7 +65,7 @@ int main( int argc, char* argv[] ) {
int numProcessors;
Dictionary* dictionary;
XML_IO_Handler* ioHandler;
- DiscretisationContext* context = NULL;
+ DomainContext* context = NULL;
/* Initialise PETSc, get world info */
MPI_Init( &argc, &argv );
@@ -73,6 +74,7 @@ int main( int argc, char* argv[] ) {
MPI_Comm_rank( CommWorld, &rank );
StGermain_Init( &argc, &argv );
+ StgDomain_Init( &argc, &argv );
glucifer_Init();
#ifdef HAVE_PYTHON
Py_Initialize();
@@ -89,7 +91,7 @@ int main( int argc, char* argv[] ) {
Journal_ReadFromDictionary( dictionary );
/* Construction phase -----------------------------------------------------------------------------------------------*/
- context = DiscretisationContext_New( "context", 0, 0, CommWorld, dictionary );
+ context = DomainContext_New( "context", 0, 0, CommWorld, dictionary );
Stg_Component_Construct( context, 0 /* dummy */, &context, True );
if( rank == 0 )
@@ -118,6 +120,7 @@ int main( int argc, char* argv[] ) {
#endif
lucBase_Finalise();
+ StgDomain_Finalise();
StGermain_Finalise();
/* Close off MPI */
diff -r 01e617e68894 -r 5e802cd52184 src/makefile
--- a/src/makefile Fri Oct 05 01:23:19 2007 +0000
+++ b/src/makefile Thu Oct 11 08:05:31 2007 +0000
@@ -17,7 +17,7 @@ EXTERNAL_LIBS = -lglucifer ${EXPORT_DYN
EXTERNAL_LIBS = -lglucifer ${EXPORT_DYNAMIC_LFLAGS}
EXTERNAL_INCLUDES = -DMODULE_EXT=\"${MODULE_EXT}\" -I${GLUCIFER_INCDIR}
-packages = PICELLERATOR STGFEM STGERMAIN
+packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN
ifdef HAVE_OSMESA
packages += OSMESA
More information about the CIG-COMMITS
mailing list