[cig-commits] r5331 - in long/3D/Gale/trunk: .
src/StGermain/Discretisation/Swarm/src src/StgFEM
src/StgFEM/Assembly src/StgFEM/libStG_FEM/src src/StgFEM/src
src/Underworld/plugins/Output
src/Underworld/plugins/Output/MaxVelocity
walter at geodynamics.org
walter at geodynamics.org
Mon Nov 20 11:21:48 PST 2006
Author: walter
Date: 2006-11-20 11:21:47 -0800 (Mon, 20 Nov 2006)
New Revision: 5331
Added:
long/3D/Gale/trunk/src/Underworld/plugins/Output/MaxVelocity/SConscript
Removed:
long/3D/Gale/trunk/src/Underworld/plugins/Output/MaxVelocity/makefile
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript
long/3D/Gale/trunk/src/StgFEM/Assembly/SConscript
long/3D/Gale/trunk/src/StgFEM/SConscript
long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript
long/3D/Gale/trunk/src/StgFEM/src/SConscript
long/3D/Gale/trunk/src/Underworld/plugins/Output/SConscript
Log:
r1106 at earth: boo | 2006-11-20 11:21:05 -0800
Sconscript fixes for tests
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1105
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1106
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript 2006-11-20 19:21:43 UTC (rev 5330)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript 2006-11-20 19:21:47 UTC (rev 5331)
@@ -29,6 +29,7 @@
"IntegrationPoint.h",
"LineParticleLayout.h",
"ManualParticleLayout.h",
+ "MeshParticleLayout.h",
"OperatorSwarmVariable.h",
"ParticleCommHandler.h",
"ParticleLayout.h",
@@ -63,6 +64,7 @@
"IntegrationPoint.c",
"LineParticleLayout.c",
"ManualParticleLayout.c",
+ "MeshParticleLayout.c",
"OperatorSwarmVariable.c",
"ParticleCommHandler.c",
"ParticleLayout.c",
@@ -91,6 +93,7 @@
GlobalParticleLayout.meta
LineParticleLayout.meta
ManualParticleLayout.meta
+MeshParticleLayout.meta
OperatorSwarmVariable.meta
ParticleCommHandler.meta
ParticleLayout.meta
Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/SConscript 2006-11-20 19:21:43 UTC (rev 5330)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/SConscript 2006-11-20 19:21:47 UTC (rev 5331)
@@ -15,5 +15,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-SConscript('src/SConscript')
+Import('make_test_deps')
+if not make_test_deps:
+ SConscript('src/SConscript')
+else:
+ SConscript('tests/SConscript')
+
Modified: long/3D/Gale/trunk/src/StgFEM/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SConscript 2006-11-20 19:21:43 UTC (rev 5330)
+++ long/3D/Gale/trunk/src/StgFEM/SConscript 2006-11-20 19:21:47 UTC (rev 5331)
@@ -18,9 +18,16 @@
# For now, comment out Apps since it only has tests
#SConscript('Apps/SConscript')
-StgFEM_static_objects=[]
-Export('StgFEM_static_objects')
+Import('make_test_deps')
+
+if not make_test_deps:
+ StgFEM_static_objects=[]
+ Export('StgFEM_static_objects')
+
+ StgFEM_static_library=[]
+ Export('StgFEM_static_library')
+
SConscript('Assembly/SConscript')
SConscript('Discretisation/SConscript')
SConscript('SLE/SConscript')
Modified: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript 2006-11-20 19:21:43 UTC (rev 5330)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript 2006-11-20 19:21:47 UTC (rev 5331)
@@ -28,6 +28,11 @@
Init.c""")
if with_shared:
- shared_lib_objects+=[local_env.SharedLibrary('StgFEM',c_files)]
-static_lib_objects=[local_env.StaticLibrary('StgFEM',[c_files]+StgFEM_static_objects)] + static_lib_objects
+ StgFEM_shared_library=local_env.SharedLibrary('StgFEM',c_files)
+ shared_lib_objects+=[StgFEM_shared_library]
+
+StgFEM_static_library=local_env.StaticLibrary('StgFEM',[c_files]+StgFEM_static_objects)
+
+static_lib_objects=[StgFEM_static_library] + static_lib_objects
Export('static_lib_objects')
+Export('StgFEM_static_library')
Modified: long/3D/Gale/trunk/src/StgFEM/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/src/SConscript 2006-11-20 19:21:43 UTC (rev 5330)
+++ long/3D/Gale/trunk/src/StgFEM/src/SConscript 2006-11-20 19:21:47 UTC (rev 5331)
@@ -19,6 +19,7 @@
local_env=env.Copy()
-bin_objects+=[local_env.Program('StgFEM',['main.c',libs(shared_lib_objects,
- static_lib_objects)])]
-
+StgFEM=local_env.Program('StgFEM',['main.c',libs(shared_lib_objects,
+ static_lib_objects)])
+bin_objects+=[StgFEM]
+Export('StgFEM')
Added: long/3D/Gale/trunk/src/Underworld/plugins/Output/MaxVelocity/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/MaxVelocity/SConscript 2006-11-20 19:21:43 UTC (rev 5330)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/MaxVelocity/SConscript 2006-11-20 19:21:47 UTC (rev 5331)
@@ -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','Underworld_static_objects','header_groups')
+
+local_env=env.Copy()
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"Underworld_MaxVelocity\\\""])
+
+c_files=Split("""MaxVelocity.c""")
+
+shared_lib_objects+=[local_env.SharedLibrary('Underworld_MaxVelocity',
+ c_files,SHLIBPREFIX='')]
+Underworld_static_objects+=[local_env.StaticObject(c_files)]
+
Deleted: long/3D/Gale/trunk/src/Underworld/plugins/Output/MaxVelocity/makefile
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/MaxVelocity/makefile 2006-11-20 19:21:43 UTC (rev 5330)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/MaxVelocity/makefile 2006-11-20 19:21:47 UTC (rev 5331)
@@ -1,24 +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 -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
-packages = PICELLERATOR STG_FEM STGERMAIN PETSC MPI XML PYTHON
-
-include ${PROJ_ROOT}/Makefile.vmake
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/SConscript 2006-11-20 19:21:43 UTC (rev 5330)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/SConscript 2006-11-20 19:21:47 UTC (rev 5331)
@@ -17,6 +17,7 @@
SConscript('AverageTemperature/SConscript')
SConscript('BoundaryLayers/SConscript')
+SConscript('MaxVelocity/SConscript')
SConscript('Nusselt/SConscript')
SConscript('Vrms/SConscript')
SConscript('DumpSwarm/SConscript')
More information about the cig-commits
mailing list