[cig-commits] r5037 - in long/3D/Gale/trunk: . src src/Gale
src/Gale/Utils src/Gale/Utils/src src/Gale/libGale
src/Gale/libGale/src src/Gale/plugins
src/Gale/plugins/SurfaceProcess src/Gale/src
src/PICellerator/PopulationControl/src
src/StGermain/Base/Context/src src/StGermain/Discretisation/Mesh/src
src/StgFEM/plugins/StandardConditionFunctions src/StgFEM/src
src/Underworld/Rheology/src
src/Underworld/plugins/Output/DumpSwarm src/Underworld/src
walter at geodynamics.org
walter at geodynamics.org
Sat Oct 14 15:01:33 PDT 2006
Author: walter
Date: 2006-10-14 15:01:29 -0700 (Sat, 14 Oct 2006)
New Revision: 5037
Added:
long/3D/Gale/trunk/src/Gale/Utils/SConscript
long/3D/Gale/trunk/src/Gale/Utils/src/SConscript
long/3D/Gale/trunk/src/Gale/libGale/SConscript
long/3D/Gale/trunk/src/Gale/libGale/src/SConscript
long/3D/Gale/trunk/src/Gale/plugins/SConscript
Removed:
long/3D/Gale/trunk/src/Gale/CollocationIntegration/
long/3D/Gale/trunk/src/Gale/EulerDeform/
long/3D/Gale/trunk/src/Gale/Isostasy/
long/3D/Gale/trunk/src/Gale/SurfaceProcess/
long/3D/Gale/trunk/src/Gale/doc/
long/3D/Gale/trunk/src/Gale/libGale/src/makefile
long/3D/Gale/trunk/src/Gale/plugins/SurfaceProcess/makefile
long/3D/Gale/trunk/src/Gale/plugins/makefile
long/3D/Gale/trunk/src/Gale/project-config.sh
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/SConstruct.in
long/3D/Gale/trunk/extension.xml
long/3D/Gale/trunk/shortening.xml
long/3D/Gale/trunk/src/Gale/SConscript
long/3D/Gale/trunk/src/Gale/libGale/src/Init.c
long/3D/Gale/trunk/src/Gale/src/SConscript
long/3D/Gale/trunk/src/Gale/src/main.c
long/3D/Gale/trunk/src/PICellerator/PopulationControl/src/SplittingRoutine.c
long/3D/Gale/trunk/src/SConscript
long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
long/3D/Gale/trunk/src/StgFEM/src/main.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.h
long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
long/3D/Gale/trunk/src/Underworld/src/main.c
Log:
r952 at earth: boo | 2006-10-14 14:47:23 -0700
merge in changes from Luke
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:919
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:952
Modified: long/3D/Gale/trunk/SConstruct.in
===================================================================
--- long/3D/Gale/trunk/SConstruct.in 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/SConstruct.in 2006-10-14 22:01:29 UTC (rev 5037)
@@ -211,6 +211,8 @@
source="PICellerator/libPICellerator/src/"
elif(partial_dir=='Underworld'):
source="Underworld/libUnderworld/src/"
+ elif(partial_dir=='Gale'):
+ source="Gale/libGale/src/"
else:
source=partial_dir + '/src/'
Modified: long/3D/Gale/trunk/extension.xml
===================================================================
--- long/3D/Gale/trunk/extension.xml 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/extension.xml 2006-10-14 22:01:29 UTC (rev 5037)
@@ -589,10 +589,10 @@
</struct>
</list>
</struct>
- <param name="StepFunctionOffset">1.0</param>
+ <param name="StepFunctionLowerOffset">0.8</param>
+ <param name="StepFunctionUpperOffset">1.2</param>
<param name="StepFunctionValue">1.0</param>
<param name="StepFunctionDim">0</param>
<param name="StepFunctionLessThan">False</param>
- <param name="interactive">t</param>
<param name="checkpointEvery">1</param>
</StGermainData>
Modified: long/3D/Gale/trunk/shortening.xml
===================================================================
--- long/3D/Gale/trunk/shortening.xml 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/shortening.xml 2006-10-14 22:01:29 UTC (rev 5037)
@@ -595,7 +595,7 @@
<struct>
<param name="name">vx</param>
<param name="type">double</param>
- <param name="value">1.0</param>
+ <param name="value">-1.0</param>
</struct>
</list>
</struct>
Modified: long/3D/Gale/trunk/src/Gale/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Gale/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -15,9 +15,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-SConscript('EulerDeform/SConscript')
-SConscript('Isostasy/SConscript')
-SConscript('SurfaceProcess/SConscript')
-SConscript('CollocationIntegration/SConscript')
-#SConscript('src/SConscript')
+Gale_static_objects=[]
+Export('Gale_static_objects')
+SConscript('Utils/SConscript')
+SConscript('plugins/SConscript')
+SConscript('libGale/SConscript')
+SConscript('src/SConscript')
+
Added: long/3D/Gale/trunk/src/Gale/Utils/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/Utils/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -0,0 +1,19 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+SConscript('src/SConscript')
+
Added: long/3D/Gale/trunk/src/Gale/Utils/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -0,0 +1,40 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','shared_lib_objects','Gale_static_objects','header_groups')
+
+local_env=env.Copy()
+
+header_groups['Gale/Utils']=Split("""GaleContext.h
+Finalise.h
+Init.h
+types.h
+Utils.h""")
+
+
+c_files=Split("""GaleContext.c
+Finalise.c
+Init.c""")
+
+
+meta_files=Split("""GaleContext.meta""")
+
+c_files+=[local_env.Meta(meta_files)]
+
+shared_lib_objects+=[local_env.SharedLibrary('GaleUtils',c_files)]
+Gale_static_objects+=[local_env.StaticObject(c_files)]
+
Added: long/3D/Gale/trunk/src/Gale/libGale/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Gale/libGale/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/libGale/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -0,0 +1,19 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+SConscript('src/SConscript')
+
Modified: long/3D/Gale/trunk/src/Gale/libGale/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/libGale/src/Init.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/libGale/src/Init.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -85,10 +85,10 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
- "Gale (Geodynamics framework) revision %s. Copyright (C) 2005 Monash Cluster Computing.\n", VERSION );
+ "Gale (Geodynamics framework) revision %s. Copyright (C) 2005-2006 California Institute of Technology.\n");
Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
Added: long/3D/Gale/trunk/src/Gale/libGale/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Gale/libGale/src/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/libGale/src/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -0,0 +1,35 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','shared_lib_objects','static_lib_objects',
+ 'Gale_static_objects','header_groups','with_shared')
+
+local_env=env.Copy()
+
+header_groups['Gale']=Split("""Finalise.h
+Init.h
+Gale.h""")
+
+
+c_files=Split("""Finalise.c
+Init.c""")
+
+if with_shared:
+ shared_lib_objects+=[local_env.SharedLibrary('Gale',c_files)]
+static_lib_objects=[local_env.StaticLibrary('Gale',c_files+Gale_static_objects)]+static_lib_objects
+Export('static_lib_objects')
+
Deleted: long/3D/Gale/trunk/src/Gale/libGale/src/makefile
===================================================================
--- long/3D/Gale/trunk/src/Gale/libGale/src/makefile 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/libGale/src/makefile 2006-10-14 22:01:29 UTC (rev 5037)
@@ -1,45 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
-##
-## Authors:
-## Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-## Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-## Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-## Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
-## Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-## Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##
-## This file may be distributed under the terms of the VPAC Public License
-## as defined by VPAC of Australia and appearing in the file
-## LICENSE.VPL included in the packaging of this file.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## $Id: Makefile.rules 2746 2005-03-06 00:29:00Z SteveQuenette $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-lib = ${PROJECT}
-libstatic = yes
-libdynamic = yes
-includes = ${PROJECT}
-
-SRCS = $(wildcard *.c)
-
-HDRS = $(wildcard *.h)
-
-PROJ_OBJLISTS = GaleUtils
-EXTERNAL_LIBS = -L${LIB_DIR}
-
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} -I${PICELLERATOR_INCDIR}
-
-packages = STGERMAIN STG_FEM MPI XML MATH
-
-include ${PROJ_ROOT}/Makefile.vmake
Added: long/3D/Gale/trunk/src/Gale/plugins/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Gale/plugins/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/plugins/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -0,0 +1,19 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+SConscript('SurfaceProcess/SConscript')
+
Deleted: long/3D/Gale/trunk/src/Gale/plugins/SurfaceProcess/makefile
===================================================================
--- long/3D/Gale/trunk/src/Gale/plugins/SurfaceProcess/makefile 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/plugins/SurfaceProcess/makefile 2006-10-14 22:01:29 UTC (rev 5037)
@@ -1,17 +0,0 @@
-SHELL := $(shell which bash)
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-
-include ${PROJ_ROOT}/Makefile.system
-
-modName := $(shell basename `pwd` )
-modName := $(shell echo ${modName} | cut -c 1 | tr '[:lower:]' '[:upper:]' )$(shell echo ${modName} | cut -c 2- )
-
-mod = ${PROJECT}_${modName}
-includes = ${PROJECT}/${modName}
-
-SRCS = $(wildcard *.c)
-HDRS = $(wildcard *.h)
-
-packages = UNDERWORLD PICELLERATOR STG_FEM STGERMAIN PETSC MPI XML
-
-include ${PROJ_ROOT}/Makefile.vmake
Deleted: long/3D/Gale/trunk/src/Gale/plugins/makefile
===================================================================
--- long/3D/Gale/trunk/src/Gale/plugins/makefile 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/plugins/makefile 2006-10-14 22:01:29 UTC (rev 5037)
@@ -1,9 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := $(shell find * -type d -follow -prune ! -name .svn )
-
-include ${PROJ_ROOT}/Makefile.vmake
Deleted: long/3D/Gale/trunk/src/Gale/project-config.sh
===================================================================
--- long/3D/Gale/trunk/src/Gale/project-config.sh 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/project-config.sh 2006-10-14 22:01:29 UTC (rev 5037)
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
-fi
-
-. './build-functions.sh'
-
-setValue PROJECT 'Gale'
-
-# Setup Makefile shortcuts
-. ./VMake/Config/makefile-shortcuts.sh
-
-# Do configurations
-. ./VMake/Config/compiler-config.sh
-. ./VMake/Config/PETSc-config.sh
-. ./VMake/Config/mpi-config.sh
-. ./VMake/Config/xml-config.sh
-
-. ./VMake/Config/StGermain-config.sh
-. ./VMake/Config/StG_FEM-config.sh
-. ./VMake/Config/PICellerator-config.sh
-. ./VMake/Config/gLucifer-config.sh
-. ./VMake/Config/Underworld-config.sh
-. ./VMake/Config/sdl-config.sh
-
-# . ./VMake/Config/tetgen-config.sh
Modified: long/3D/Gale/trunk/src/Gale/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Gale/src/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/src/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -15,9 +15,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-Import('env','bin_objects','shared_lib_objects')
+Import('env','bin_objects','libs','shared_lib_objects','static_lib_objects')
local_env=env.Copy()
-bin_objects+=[local_env.Program('Gale',['main.c',shared_lib_objects])]
+bin_objects+=[local_env.Program('Gale',
+ ['main.c',libs(shared_lib_objects,
+ static_lib_objects)])]
Modified: long/3D/Gale/trunk/src/Gale/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/src/main.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Gale/src/main.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -61,6 +61,35 @@
#include <Underworld/Underworld.h>
#include <Gale/Gale.h>
+/* BEGIN STATIC PLUGINS */
+Index StG_FEM_FrequentOutput_Register( PluginsManager* pluginsManager );
+Index StG_FEM_StandardConditionFunctions_Register( PluginsManager* pluginsManager );
+Index StG_FEM_CPUTime_Register( PluginsManager* pluginsManager );
+Index Underworld_MovingMesh_Register( PluginsManager* pluginsManager );
+Index Underworld_Vrms_Register( PluginsManager* pluginsManager );
+Index _Underworld_EulerDeform_Register( PluginsManager* pluginsManager );
+Index StG_FEM_PrintFeVariableDiscreteValues_Register( PluginsManager* pluginsManager );
+Index Underworld_DumpSwarm_Register( PluginsManager* pluginsManager );
+
+int nPlugins = 8;
+char* pluginNames[] = {"StG_FEM_FrequentOutput",
+ "StG_FEM_StandardConditionFunctions",
+ "StG_FEM_CPUTime",
+ "Underworld_MovingMesh",
+ "Underworld_Vrms",
+ "Underworld_EulerDeform",
+ "StG_FEM_PrintFeVariableDiscreteValues",
+ "Underworld_DumpSwarm"};
+StaticPluginEntry pluginLst[] = {{StG_FEM_FrequentOutput_Register, NULL, NULL, NULL},
+ {StG_FEM_StandardConditionFunctions_Register, NULL, NULL, NULL},
+ {StG_FEM_CPUTime_Register, NULL, NULL, NULL},
+ {Underworld_MovingMesh_Register, NULL, NULL, NULL},
+ {Underworld_Vrms_Register, NULL, NULL, NULL},
+ {_Underworld_EulerDeform_Register},
+ {StG_FEM_PrintFeVariableDiscreteValues_Register},
+ {Underworld_DumpSwarm_Register}};
+/* END STATIC PLUGINS */
+
int main( int argc, char* argv[] ) {
MPI_Comm CommWorld;
int rank;
@@ -95,6 +124,7 @@
/* Read input */
ioHandler = XML_IO_Handler_New();
IO_Handler_ReadAllFromCommandLine( ioHandler, argc, argv, dictionary );
+ Journal_Enable_TypedStream("info",False);
Journal_ReadFromDictionary( dictionary );
/* Construction phase -----------------------------------------------------------------------------------------------*/
@@ -109,7 +139,7 @@
CheckDictionaryKeys(componentDict, errMessage);
LiveComponentRegister_Add( context->CF->LCRegister, (Stg_Component*) context );
- PluginsManager_Load( context->plugins, context, dictionary );
+ PluginsManager_Load( context->plugins, context, dictionary, nPlugins, pluginNames, pluginLst );
Stg_ComponentFactory_CreateComponents( context->CF );
Stg_ComponentFactory_ConstructComponents( context->CF, NULL );
Modified: long/3D/Gale/trunk/src/PICellerator/PopulationControl/src/SplittingRoutine.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/PopulationControl/src/SplittingRoutine.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/PICellerator/PopulationControl/src/SplittingRoutine.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -163,7 +163,7 @@
idealParticleCount = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "idealParticleCount", 0 );
minParticlesPerCell = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "minParticlesPerCell", idealParticleCount );
- originalParticleShape = Stg_ComponentFactory_ConstructByKey( cf, self->name, "originalParticleShape", Stg_Shape, False ) ;
+ originalParticleShape = Stg_ComponentFactory_ConstructByKey( cf, self->name, "originalParticleShape", Stg_Shape, False, data ) ;
_SplittingRoutine_Init( self, dim, idealParticleCount, minParticlesPerCell, originalParticleShape );
}
Modified: long/3D/Gale/trunk/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -19,5 +19,4 @@
SConscript('StgFEM/SConscript')
SConscript('PICellerator/SConscript')
SConscript('Underworld/SConscript')
-#SConscript('gLucifer/SConscript')
-#SConscript('Gale/SConscript')
+SConscript('Gale/SConscript')
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -777,26 +777,11 @@
self->CF = Stg_ComponentFactory_New( self->dictionary, componentDict, self->register_Register );
}
LiveComponentRegister_Add( self->CF->LCRegister, (Stg_Component*)self );
-
+
/* Obtain the applications info from the global dictionary. Boot them up. */
if( (apps = Dictionary_Get( self->dictionary, AbstractContext_Dict_Applications )) != NULL ) {
int index; /* needs to be signed */
- /* Go through the list of entries, and attempt to load each plugin. NOTE: this will call the "Init" of the
- application module. */
- for( index = 0; index < Dictionary_Entry_Value_GetCount( apps ); index++ ) {
- Dictionary_Entry_Value* application;
-
- application = Dictionary_Entry_Value_GetElement( apps, index );
-
- Journal_Firewall(
- PluginsManager_LoadPlugin( self->plugins, application->as.typeString, self ),
- Journal_Register( Error_Type, AbstractContext_Type ),
- "Error: Application Plugin %s not found. Ensure it is"
- " a valid plugin, and has been built.\n",
- application->as.typeString );
- }
-
/* Now that the plugins are loaded (i.e. ALL application environments enabled), now RE-construct the context in the
reverse order. Ensuring that only the first (i.e. largest context) plugin builds a new context.
NOTE: This mechanism completely sucks! The way Contexts are replaced is crap but works for now. It shows that
@@ -824,9 +809,6 @@
}
}
}
-
- /* Load the plugins ?? */
- PluginsManager_Load( self->plugins, context, self->dictionary );
Stg_ComponentFactory_CreateComponents( self->CF );
Stg_ComponentFactory_ConstructComponents( self->CF, ptrToSelf );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript 2006-10-14 22:01:29 UTC (rev 5037)
@@ -28,6 +28,7 @@
Decomp_Sync.h
Decomp_Sync_Claim.h
Decomp_Sync_Negotiate.h
+DecompTransfer.h
DummyMD.h
ElementLayout.h
Finalise.h
@@ -61,6 +62,7 @@
Decomp_Sync.c
Decomp_Sync_Claim.c
Decomp_Sync_Negotiate.c
+DecompTransfer.c
DummyMD.c
ElementLayout.c
Finalise.c
@@ -89,6 +91,7 @@
Decomp_Sync.meta
Decomp_Sync_Claim.meta
Decomp_Sync_Negotiate.meta
+DecompTransfer.meta
DummyMD.meta
ElementLayout.meta
Grid.meta
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -691,47 +691,38 @@
Dictionary* dictionary = context->dictionary;
double* result = (double*) _result;
double* coord;
- double offset;
+ double lower_offset, upper_offset;
double value;
unsigned dim;
Bool less;
- double grad;
- Bool useGrad;
feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "VelocityField" );
mesh = feVariable->feMesh;
coord = Mesh_CoordAt( mesh, node_lI );
- offset = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionOffset", 0.0 );
+ lower_offset = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionLowerOffset", 0.0 );
+ upper_offset = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionUpperOffset", lower_offset );
value = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionValue", 0.0 );
dim = Dictionary_GetUnsignedInt_WithDefault( dictionary, "StepFunctionDim", 0 );
less = Dictionary_GetBool_WithDefault( dictionary, "StepFunctionLessThan", True );
- grad = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionGradient", 0.0 );
- useGrad = Dictionary_GetBool_WithDefault( dictionary, "StepFunctionUseGradient", False );
if( less ) {
- if( coord[dim] < offset ) {
- if( useGrad )
- *result = (offset - coord[dim])*grad;
- else
- *result = value;
- if(fabs(*result)>fabs(value))
- *result=value;
- }
- else
- *result = 0;
+ if(coord[dim] > upper_offset) {
+ *result=0;
+ } else if(coord[dim] > lower_offset) {
+ *result=value*(upper_offset - coord[dim])/(upper_offset-lower_offset);
+ } else {
+ *result=value;
+ }
}
else {
- if( coord[dim] > offset ) {
- if( useGrad )
- *result = (coord[dim] - offset)*grad;
- else
- *result = value;
- if(fabs(*result)>fabs(value))
- *result=value;
- }
- else
- *result = 0;
+ if(coord[dim] < lower_offset) {
+ *result=0;
+ } else if(coord[dim] < upper_offset) {
+ *result=value*(coord[dim] - lower_offset)/(upper_offset-lower_offset);
+ } else {
+ *result=value;
+ }
}
}
Modified: long/3D/Gale/trunk/src/StgFEM/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/src/main.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/StgFEM/src/main.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -111,30 +111,6 @@
context = FiniteElementContext_New( "context", 0, 0, CommWorld, dictionary );
Stg_Component_Construct( context, 0 /* dummy */, &context, True );
- if ( componentDict == NULL ) {
- componentDict = Dictionary_New();
- }
- context->CF = Stg_ComponentFactory_New( dictionary, componentDict, context->register_Register );
-
- /*check components dictionary for double entries */
- CheckDictionaryKeys(componentDict, errMessage);
-
- LiveComponentRegister_Add( context->CF->LCRegister, (Stg_Component*) context );
- PluginsManager_Load( context->plugins, context, dictionary, 0, NULL, NULL );
-
- Stg_ComponentFactory_CreateComponents( context->CF );
- Stg_ComponentFactory_ConstructComponents( context->CF );
- PluginsManager_ConstructPlugins( context->plugins, context->CF );
-
- KeyCall( context, context->constructExtensionsK, EntryPoint_VoidPtr_CallCast* )( KeyHandle(context,context->constructExtensionsK), context );
-
- if( rank == 0 )
- Context_PrintConcise( context, context->verbose );
-
- if ( True == Dictionary_GetBool_WithDefault( dictionary, "showJournalStatus", False ) ) {
- Journal_PrintConcise();
- }
-
/* Building phase ---------------------------------------------------------------------------------------------------*/
Stg_Component_Build( context, 0 /* dummy */, False );
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -159,14 +159,15 @@
name );
}
-void _MohrCoulomb_Construct( void* rheology, Stg_ComponentFactory* cf ){
+void _MohrCoulomb_Construct( void* rheology, Stg_ComponentFactory* cf,
+ void *data ){
MohrCoulomb* self = (MohrCoulomb*)rheology;
FeVariable* pressureField;
MaterialPointsSwarm* materialPointsSwarm;
FeVariable* velocityGradientsField;
/* Construct Parent */
- _YieldRheology_Construct( self, cf );
+ _YieldRheology_Construct( self, cf, data );
/* Make sure that there is strain weakening */
Journal_Firewall(
@@ -176,11 +177,11 @@
__func__, self->type, self->name );
materialPointsSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name,
- "MaterialPointsSwarm", MaterialPointsSwarm, True );
+ "MaterialPointsSwarm", MaterialPointsSwarm, True, data );
pressureField = Stg_ComponentFactory_ConstructByKey( cf, self->name,
- "PressureField", FeVariable, True );
+ "PressureField", FeVariable, True, data );
velocityGradientsField = Stg_ComponentFactory_ConstructByKey( cf, self->name,
- "VelocityGradientsField", FeVariable, True );
+ "VelocityGradientsField", FeVariable, True, data );
_MohrCoulomb_Init(
self,
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.h
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.h 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.h 2006-10-14 22:01:29 UTC (rev 5037)
@@ -98,7 +98,8 @@
/* 'Stg_Component' implementations */
void* _MohrCoulomb_DefaultNew( Name name ) ;
- void _MohrCoulomb_Construct( void* rheology, Stg_ComponentFactory* cf );
+ void _MohrCoulomb_Construct( void* rheology, Stg_ComponentFactory* cf,
+ void *data );
void _MohrCoulomb_Build( void* rheology, void* data );
void _MohrCoulomb_Initialise( void* rheology, void* data ) ;
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -51,10 +51,10 @@
const Type Underworld_DumpSwarm_Type = "Underworld_DumpSwarm";
-void _Underworld_DumpSwarm_Construct( void* component, Stg_ComponentFactory* cf ) {
+void _Underworld_DumpSwarm_Construct( void* component, Stg_ComponentFactory* cf, void *data ) {
FiniteElementContext* context;
- context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True );
+ context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True, data );
ContextEP_Append( context, AbstractContext_EP_Dump,
DumpSwarm );
Modified: long/3D/Gale/trunk/src/Underworld/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/src/main.c 2006-10-14 21:33:20 UTC (rev 5036)
+++ long/3D/Gale/trunk/src/Underworld/src/main.c 2006-10-14 22:01:29 UTC (rev 5037)
@@ -61,36 +61,7 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-/* BEGIN STATIC PLUGINS */
-Index StG_FEM_FrequentOutput_Register( PluginsManager* pluginsManager );
-Index StG_FEM_StandardConditionFunctions_Register( PluginsManager* pluginsManager );
-Index StG_FEM_CPUTime_Register( PluginsManager* pluginsManager );
-Index Underworld_MovingMesh_Register( PluginsManager* pluginsManager );
-Index Underworld_Vrms_Register( PluginsManager* pluginsManager );
-Index _Underworld_EulerDeform_Register( PluginsManager* pluginsManager );
-Index StG_FEM_PrintFeVariableDiscreteValues_Register( PluginsManager* pluginsManager );
-Index Underworld_DumpSwarm_Register( PluginsManager* pluginsManager );
-int nPlugins = 8;
-char* pluginNames[] = {"StG_FEM_FrequentOutput",
- "StG_FEM_StandardConditionFunctions",
- "StG_FEM_CPUTime",
- "Underworld_MovingMesh",
- "Underworld_Vrms",
- "Underworld_EulerDeform",
- "StG_FEM_PrintFeVariableDiscreteValues",
- "Underworld_DumpSwarm"};
-StaticPluginEntry pluginLst[] = {{StG_FEM_FrequentOutput_Register, NULL, NULL, NULL},
- {StG_FEM_StandardConditionFunctions_Register, NULL, NULL, NULL},
- {StG_FEM_CPUTime_Register, NULL, NULL, NULL},
- {Underworld_MovingMesh_Register, NULL, NULL, NULL},
- {Underworld_Vrms_Register, NULL, NULL, NULL},
- {_Underworld_EulerDeform_Register},
- {StG_FEM_PrintFeVariableDiscreteValues_Register},
- {Underworld_DumpSwarm_Register}};
-/* END STATIC PLUGINS */
-
-
int main( int argc, char* argv[] ) {
MPI_Comm CommWorld;
int rank;
More information about the cig-commits
mailing list