[cig-commits] r4188 - in long/3D/Gale/trunk: .
src/PICellerator/plugins
src/PICellerator/plugins/CalculateParticleDisplacement
src/StgFEM/plugins src/StgFEM/plugins/FeVariableImportExporters
src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS
walter at geodynamics.org
walter at geodynamics.org
Tue Aug 1 11:05:53 PDT 2006
Author: walter
Date: 2006-08-01 11:05:51 -0700 (Tue, 01 Aug 2006)
New Revision: 4188
Added:
long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/SConscript
Removed:
long/3D/Gale/trunk/src/PICellerator/plugins/CalculateParticleDisplacement/makefile
long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/makefile
long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/makefile
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/PICellerator/plugins/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/SConscript
Log:
r557 at earth: boo | 2006-08-01 02:37:54 -0700
Makefile/SConscript stuff
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:447
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:557
Deleted: long/3D/Gale/trunk/src/PICellerator/plugins/CalculateParticleDisplacement/makefile
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/plugins/CalculateParticleDisplacement/makefile 2006-08-01 16:48:21 UTC (rev 4187)
+++ long/3D/Gale/trunk/src/PICellerator/plugins/CalculateParticleDisplacement/makefile 2006-08-01 18:05:51 UTC (rev 4188)
@@ -1,78 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-## Melbourne, 3053, Australia.
-## Copyright (c) 2005-2006, Monash Cluster Computing, Building 28, Monash University Clayton Campus,
-## Victoria, 3800, Australia
-##
-## Primary Contributing Organisations:
-## Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-## Australian Computational Earth Systems Simulator - http://www.access.edu.au
-## Monash Cluster Computing - http://www.mcc.monash.edu.au
-##
-## Contributors:
-## Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-## Patrick D. Sunter, Software Engineer, VPAC. (patrick at vpac.org)
-## Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-## Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-## David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-## Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-## Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-## Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-## Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-## Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-## David Stegman, Postdoctoral Fellow, Monash University. (david.stegman at sci.monash.edu.au)
-## Wendy Sharples, PhD Student, Monash University (wendy.sharples at sci.monash.edu.au)
-##
-## This library 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 library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-## $Id: makefile 277 2006-04-11 11:28:01Z PatrickSunter $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#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 -prune ! -name .svn )
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-# What to call the plugin
-modName := $(shell basename `pwd`)
-mod = ${PROJECT}_${modName}
-
-# Where to put header files
-includes = ${PROJECT}/${modName}
-
-# External Libraries and Headers
-EXTERNAL_INCLUDES = ${STG_FEM_INCLUDES} ${STGERMAIN_INCLUDES} ${PETSC_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = \
- ${STG_FEM_RPATH} ${STG_FEM_LIBS} \
- ${STG_FEM_RPATH} ${STGERMAIN_LIBS} \
- ${PETSC_RPATH} ${PETSC_LIBS} \
- ${MPI_RPATH} ${MPI_LIBS} \
- ${XML_LIBS}
-
-ifdef HAVE_PYTHON
- packages += PYTHON
-endif
-
-
-include ${PROJ_ROOT}/Makefile.vmake
Modified: long/3D/Gale/trunk/src/PICellerator/plugins/SConscript
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/plugins/SConscript 2006-08-01 16:48:21 UTC (rev 4187)
+++ long/3D/Gale/trunk/src/PICellerator/plugins/SConscript 2006-08-01 18:05:51 UTC (rev 4188)
@@ -16,4 +16,5 @@
# USA
SConscript('Output/SConscript')
+SConscript('CalculateParticleDisplacement/SConscript')
Added: long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/SConscript 2006-08-01 16:48:21 UTC (rev 4187)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/SConscript 2006-08-01 18:05:51 UTC (rev 4188)
@@ -0,0 +1,28 @@
+# 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','StgFEM_static_objects','header_groups')
+
+local_env=env.Copy()
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_FeVariable_ImportExport_ABAQUS\\\""])
+
+c_files=Split("""FeVariable_ImportExport_ABAQUS.c""")
+
+shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_FeVariable_ImportExport_ABAQUS',
+ c_files,SHLIBPREFIX='')]
+StgFEM_static_objects+=[local_env.StaticObject(c_files)]
+
Deleted: long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/makefile
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/makefile 2006-08-01 16:48:21 UTC (rev 4187)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/makefile 2006-08-01 18:05:51 UTC (rev 4188)
@@ -1,59 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-## Melbourne, 3053, Australia.
-##
-## Primary Contributing Organisations:
-## Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-## Australian Computational Earth Systems Simulator - http://www.access.edu.au
-## Monash Cluster Computing - http://www.mcc.monash.edu.au
-## Computational Infrastructure for Geodynamics - http://www.geodynamics.org
-##
-## Contributors:
-## Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-## Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-## Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-## David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-## Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-## Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-## Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-## Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-## Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-## Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-##
-## This library 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 library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-## $Id: makefile 535 2006-04-11 13:07:34Z PatrickSunter $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-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 = STGERMAIN PETSC MPI XML
-EXTERNAL_LIBS = -lStG_FEM
-
-include ${PROJ_ROOT}/Makefile.vmake
Added: long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/SConscript 2006-08-01 16:48:21 UTC (rev 4187)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/SConscript 2006-08-01 18:05:51 UTC (rev 4188)
@@ -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('FeVariable_ImportExport_ABAQUS/SConscript')
+
Deleted: long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/makefile
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/makefile 2006-08-01 16:48:21 UTC (rev 4187)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/makefile 2006-08-01 18:05:51 UTC (rev 4188)
@@ -1,49 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-## Melbourne, 3053, Australia.
-##
-## Primary Contributing Organisations:
-## Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-## Australian Computational Earth Systems Simulator - http://www.access.edu.au
-## Monash Cluster Computing - http://www.mcc.monash.edu.au
-## Computational Infrastructure for Geodynamics - http://www.geodynamics.org
-##
-## Contributors:
-## Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-## Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-## Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-## David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-## Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-## Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-## Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-## Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-## Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-## Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-##
-## This library 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 library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-## $Id: makefile 588 2006-06-20 02:02:24Z AlanLo $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-subdirs = FeVariable_ImportExport_ABAQUS
-
-# obtain defaults for required variables according to system and project location, and then run the build.
-SHELL := $(shell which bash)
-PROJ_ROOT:= $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-
-include ${PROJ_ROOT}/Makefile.system
-include ${PROJ_ROOT}/Makefile.vmake
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/SConscript 2006-08-01 16:48:21 UTC (rev 4187)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/SConscript 2006-08-01 18:05:51 UTC (rev 4188)
@@ -17,6 +17,7 @@
SConscript('CompareFeVariableAgainstReferenceSolution/SConscript')
SConscript('Document/SConscript')
+SConscript('FeVariableImportExporters/SConscript')
SConscript('LevelSetPlugin/SConscript')
SConscript('MultiGrid/SConscript')
SConscript('Output/SConscript')
More information about the cig-commits
mailing list