yade-dev team mailing list archive

[eudoxos at BerliOS <eudoxos@xxxxxxxxxxxxxxx>]

Author: eudoxos
Date: 2009-03-31 20:56:32 +0200 (Tue, 31 Mar 2009)
New Revision: 1740

Modified:
   trunk/core/BexContainer.hpp
   trunk/extra/Brefcom.cpp
   trunk/extra/Brefcom.hpp
   trunk/pkg/common/SConscript
Log:
1. Fix linking of ForceEngine with interpolation
2. Random rate-dependent things.
3. Typo in BexContainer docs


Modified: trunk/core/BexContainer.hpp
===================================================================
--- trunk/core/BexContainer.hpp	2009-03-31 16:42:01 UTC (rev 1739)
+++ trunk/core/BexContainer.hpp	2009-03-31 18:56:32 UTC (rev 1740)
@@ -107,14 +107,15 @@
 			_force.resize(newSize); _torque.resize(newSize);
 			size=newSize;
 		}
-		/*! Reset all data, also reset summay forces/torques and mark the container clean. */
+		/*! Reset all data, also reset summary forces/torques and mark the container clean. */
 		// perhaps should be private and friend MetaBody or whatever the only caller should be
 		void reset(){
 			for(int thread=0; thread<nThreads; thread++){
 				memset(_forceData [thread][0], 0,sizeof(Vector3r)*size);
 				memset(_torqueData[thread][0],0,sizeof(Vector3r)*size);
 			}
-			memset(_force [0], 0,sizeof(Vector3r)*size); memset(_torque[0], 0,sizeof(Vector3r)*size);
+			memset(_force [0], 0,sizeof(Vector3r)*size);
+			memset(_torque[0], 0,sizeof(Vector3r)*size);
 			synced=true;
 		}
 };

Modified: trunk/extra/Brefcom.cpp
===================================================================
--- trunk/extra/Brefcom.cpp	2009-03-31 16:42:01 UTC (rev 1739)
+++ trunk/extra/Brefcom.cpp	2009-03-31 18:56:32 UTC (rev 1740)
@@ -149,10 +149,11 @@
 	throw runtime_error("ef2_Spheres_Brefcom_BrefcomLaw::solveBeta failed to converge.");
 }
 
-Real BrefcomContact::computeDmgOverstress(Real epsN, Real dt){
-	if(dmgStrain>=dmgStrain*omega){ // unloading, no viscous stress
+Real BrefcomContact::computeDmgOverstress(Real dt){
+	if(dmgStrain>=epsN*omega){ // unloading, no viscous stress
+		dmgStrain=epsN*omega;
 		LOG_DEBUG("Unloading, no viscous overstress");
-		return 0.0;
+		return 0.;
 	}
 	Real c=epsCrackOnset*(1-omega)*pow(dmgTau/dt,dmgRateExp)*pow(epsN*omega-dmgStrain,dmgRateExp-1.);
 	Real beta=solveBeta(c,dmgRateExp);

Modified: trunk/extra/Brefcom.hpp
===================================================================
--- trunk/extra/Brefcom.hpp	2009-03-31 16:42:01 UTC (rev 1739)
+++ trunk/extra/Brefcom.hpp	2009-03-31 18:56:32 UTC (rev 1740)
@@ -96,7 +96,7 @@
 
 
 		static Real solveBeta(const Real c, const Real N);
-		Real computeDmgOverstress(Real epsN,Real dt);
+		Real computeDmgOverstress(Real dt);
 		Real computeViscoplScalingFactor(Real sigmaTNorm, Real sigmaTYield,Real dt);
 
 

Modified: trunk/pkg/common/SConscript
===================================================================
--- trunk/pkg/common/SConscript	2009-03-31 16:42:01 UTC (rev 1739)
+++ trunk/pkg/common/SConscript	2009-03-31 18:56:32 UTC (rev 1740)
@@ -28,7 +28,7 @@
 	env.SharedLibrary('MomentEngine',['Engine/DeusExMachina/MomentEngine.cpp'],
 		LIBS=env['LIBS']+['ParticleParameters']),
 	env.SharedLibrary('ForceEngine',['Engine/DeusExMachina/ForceEngine.cpp'],
-		LIBS=env['LIBS']+['ParticleParameters']),
+		LIBS=env['LIBS']+['ParticleParameters','Shop']),
 	env.SharedLibrary('DisplacementToForceEngine',['Engine/DeusExMachina/DisplacementToForceEngine.cpp'],
 		LIBS=env['LIBS']+['ParticleParameters']),
 	env.SharedLibrary('GravityEngines',['Engine/DeusExMachina/GravityEngines.cpp'],