yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2820
committer: Klaus Thoeni <klaus.thoeni@xxxxxxxxx>
branch nick: yade
timestamp: Mon 2011-04-18 18:00:23 +1000
message:
  1. move value which indicates how far interactions are from normal failing to WirePhys since only WirePM is using it
modified:
  pkg/common/NormShearPhys.hpp
  pkg/dem/VTKRecorder.cpp
  pkg/dem/WirePM.hpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'pkg/common/NormShearPhys.hpp'
--- pkg/common/NormShearPhys.hpp	2011-04-18 03:39:47 +0000
+++ pkg/common/NormShearPhys.hpp	2011-04-18 08:00:23 +0000
@@ -9,8 +9,7 @@
 		virtual ~NormPhys();
 	YADE_CLASS_BASE_DOC_ATTRS_CTOR(NormPhys,IPhys,"Abstract class for interactions that have normal stiffness.",
 		((Real,kn,NaN,,"Normal stiffness"))
-		((Vector3r,normalForce,Vector3r::Zero(),,"Normal force after previous step (in global coordinates)."))
-		((Real,limitNormalFactor,NaN,,"This value indicates on how far from failing the normal interaction is if failure is considered, e.g. actual normal displacement divided by admissible normal displacement multiplied by actual normal force divided by admissible normal force (currently just used in the :yref:`wire particle model<Law2_ScGeom_WirePhys_WirePM>`).")),
+		((Vector3r,normalForce,Vector3r::Zero(),,"Normal force after previous step (in global coordinates).")),
 		createIndex();
 	);
 	REGISTER_CLASS_INDEX(NormPhys,IPhys);

=== modified file 'pkg/dem/VTKRecorder.cpp'
--- pkg/dem/VTKRecorder.cpp	2011-04-18 03:39:47 +0000
+++ pkg/dem/VTKRecorder.cpp	2011-04-18 08:00:23 +0000
@@ -28,6 +28,7 @@
 #include<yade/pkg/common/Facet.hpp>
 #include<yade/pkg/dem/ConcretePM.hpp>
 #include<yade/pkg/dem/RockPM.hpp>
+#include<yade/pkg/dem/WirePM.hpp>
 #include<yade/pkg/dem/Shop.hpp>
 
 
@@ -257,7 +258,8 @@
 				intrForceN->InsertNextValue(fn);
 				intrAbsForceT->InsertNextTupleValue(fs);
 				if(recActive[REC_WPM]) {
-					wpmLimitNormalFactor->InsertNextValue(phys->limitNormalFactor);
+					const WirePhys* wirephys = YADE_CAST<WirePhys*>(I->phys.get());
+					wpmLimitNormalFactor->InsertNextValue(wirephys->limitNormalFactor);
 				}
 			}
 		}

=== modified file 'pkg/dem/WirePM.hpp'
--- pkg/dem/WirePM.hpp	2011-04-18 03:39:47 +0000
+++ pkg/dem/WirePM.hpp	2011-04-18 08:00:23 +0000
@@ -68,6 +68,7 @@
 			((vector<Vector2r>,displForceValues,,(Attr::readonly|Attr::noSave),"Defines the values for force-displacement curve."))
 			((vector<Real>,stiffnessValues,,(Attr::readonly|Attr::noSave),"Defines the values for the different stiffness (first value corresponds to elastic stiffness kn)."))
 			((Real,plastD,0,Attr::readonly,"Plastic part of the inter-particular distance of the previous step. \n\n.. note::\n\t Only elastic displacements are reversible (the elastic stiffness is used for unloading) and compressive forces are inadmissible. The compressive stiffness is assumed to be equal to zero (see [Bertrand2005]_).\n\n.."))
+			((Real,limitNormalFactor,0.,,"This value indicates on how far from failing the wire is, e.g. actual normal displacement divided by admissible normal displacement multiplied by actual normal force divided by admissible normal force."))
 			,
 			createIndex();
 			,