Author: eudoxos
Date: 2008-10-25 21:03:17 +0200 (Sat, 25 Oct 2008)
New Revision: 1558
Modified:
trunk/pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp
trunk/pkg/dem/SConscript
Log:
1. Fix errors preventing compilation due to missing TesselationWrapper.
Modified: trunk/pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp 2008-10-25
17:40:16 UTC (rev 1557)
+++ trunk/pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp 2008-10-25
19:03:17 UTC (rev 1558)
@@ -22,14 +22,8 @@
#include "VolumicContactLaw.hpp"
-// <<<<<<< .mine
-// #include</home/jf/YADE/trunk/lib/miniWm3/Wm3Math.h>#include <cmath>
- #include
"/home/jf/YADE/trunk-clean/extra/triangulation/TesselationWrapper.h"
+#include<yade/extra/TesselationWrapper.h>
-// =======
-// #include "TesselationWrapper.h"
-// >>>>>>> .r1327
-
VolumicContactLaw::VolumicContactLaw() : InteractionSolver() , actionForce(new
Force) , actionMomentum(new Momentum)
Modified: trunk/pkg/dem/SConscript
===================================================================
--- trunk/pkg/dem/SConscript 2008-10-25 17:40:16 UTC (rev 1557)
+++ trunk/pkg/dem/SConscript 2008-10-25 19:03:17 UTC (rev 1558)
@@ -1,5 +1,32 @@
# vim: set filetype=python :
Import('*')
+
+import os.path,os
+# Dir('#') expands to the root of the source tree -- that is done by scons
+if
os.path.exists(Dir('#').abspath+'/extra/triangulation/libTesselationWrapper.a'):
+ print "Will build VolumetricContactLaw since libTesselationWrapper.a
was found."
+ env.Install('$PREFIX/lib/yade$SUFFIX/pkg-dem',[
+ env.SharedLibrary('VolumicContactLaw',
+ ['Engine/StandAloneEngine/VolumicContactLaw.cpp'],
+ LIBPATH=env['LIBPATH']+['../extra/triangulation'],
+ LIBS=env['LIBS']+['SDECLinkPhysics',
+ 'ElasticContactInteraction',
+ 'SDECLinkGeometry',
+ 'SpheresContactGeometry',
+ 'BodyMacroParameters',
+ 'yade-serialization',
+ 'yade-base',
+ 'GLDrawInteractingSphere',
+ 'yade-multimethods',
+ 'Force',
+ 'Momentum',
+ 'Sphere',
+ 'RigidBodyParameters',
+ 'InteractingSphere',
+ 'TesselationWrapper',
+ 'CGAL'])
+ ])
+
env.Install('$PREFIX/lib/yade$SUFFIX/pkg-dem',[
env.SharedLibrary('SQLiteRecorder',
@@ -188,28 +215,7 @@
'Momentum',
'Sphere',
'RigidBodyParameters']),
-
-
-
- env.SharedLibrary('VolumicContactLaw',
- ['Engine/StandAloneEngine/VolumicContactLaw.cpp'],
-
#LIBPATH=env['LIBPATH']+['/home/jf/YADE/trunk-clean/extra/triangulation'],
- LIBS=env['LIBS']+['SDECLinkPhysics',
- 'ElasticContactInteraction',
- 'SDECLinkGeometry',
- 'SpheresContactGeometry',
- 'BodyMacroParameters',
- 'yade-serialization',
- 'yade-base',
- 'GLDrawInteractingSphere',
- 'yade-multimethods',
- 'Force',
- 'Momentum',
- 'Sphere',
- 'RigidBodyParameters',
- 'InteractingSphere',
- 'TesselationWrapper',
- 'CGAL']),
+
env.SharedLibrary('CohesiveFrictionalContactLaw',
['Engine/StandAloneEngine/CohesiveFrictionalContactLaw.cpp'],
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
