[cig-commits] r3973 - in long/3D/Gale/trunk: .
src/PICellerator/MaterialPoints/src
src/StGermain/Discretisation/Geometry/src
src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D
walter at geodynamics.org
walter at geodynamics.org
Thu Jul 6 10:31:41 PDT 2006
Author: walter
Date: 2006-07-06 10:31:41 -0700 (Thu, 06 Jul 2006)
New Revision: 3973
Removed:
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/makefile
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
Log:
r425 at earth: boo | 2006-07-06 10:28:30 -0700
Update build system
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:374
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:425
Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/SConscript 2006-07-06 09:12:00 UTC (rev 3972)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/SConscript 2006-07-06 17:31:41 UTC (rev 3973)
@@ -40,6 +40,7 @@
ParticleFeVariable.h
PeriodicBoundariesManager.h
SwarmAdvectorD.h
+SwarmAdvectorW.h
SwarmAdvector.h
types.h""")
@@ -63,7 +64,8 @@
ParticleFeVariable.c
PeriodicBoundariesManager.c
SwarmAdvector.c
-SwarmAdvectorD.c""")
+SwarmAdvectorD.c
+SwarmAdvectorW.c""")
meta_files=Split("""BackgroundParticleLayout.meta
@@ -84,6 +86,7 @@
PeriodicBoundariesManager.meta
SingleMaterialMapper.meta
SwarmAdvectorD.meta
+SwarmAdvectorW.meta
SwarmAdvector.meta""")
c_files+=[local_env.Meta(meta_files)]
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript 2006-07-06 09:12:00 UTC (rev 3972)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript 2006-07-06 17:31:41 UTC (rev 3973)
@@ -24,6 +24,7 @@
"types.h",
"isinf.h",
"Dimension.h",
+ "ParallelDelaunay.h",
"Delaunay.h",
"VectorMath.h",
"TensorMath.h",
@@ -50,6 +51,7 @@
c_files=["Dimension.c",
+ "ParallelDelaunay.c",
"Delaunay.c",
"VectorMath.c",
"TensorMath.c",
Deleted: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/makefile
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/makefile 2006-07-06 09:12:00 UTC (rev 3972)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/makefile 2006-07-06 17:31:41 UTC (rev 3973)
@@ -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
More information about the cig-commits
mailing list