yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3856
committer: Jerome Duriez <jerome.duriez@xxxxxxxxxxxxxxx>
timestamp: Thu 2014-03-27 15:52:07 +0100
message:
  Copy paste mistake in State and typo UniaxialStrainer doc
modified:
  core/State.hpp
  pkg/dem/UniaxialStrainer.hpp


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

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

=== modified file 'core/State.hpp'
--- core/State.hpp	2013-02-26 10:56:01 +0000
+++ core/State.hpp	2014-03-27 14:52:07 +0000
@@ -73,7 +73,7 @@
 		.add_property("pos",&State::pos_get,&State::pos_set,"Current position.")
 		.add_property("ori",&State::ori_get,&State::ori_set,"Current orientation.")
 		.def("displ",&State::displ,"Displacement from :yref:`reference position<State.refPos>` (:yref:`pos<State.pos>` - :yref:`refPos<State.refPos>`)")
-		.def("rot",&State::rot,"Rotation from :yref:`reference orientation<State.refPos>` (as rotation vector)")
+		.def("rot",&State::rot,"Rotation from :yref:`reference orientation<State.refOri>` (as rotation vector)")
 	);
 	REGISTER_INDEX_COUNTER(State);
 	DECLARE_LOGGER;

=== modified file 'pkg/dem/UniaxialStrainer.hpp'
--- pkg/dem/UniaxialStrainer.hpp	2010-11-07 11:46:20 +0000
+++ pkg/dem/UniaxialStrainer.hpp	2014-03-27 14:52:07 +0000
@@ -48,7 +48,7 @@
 			((Real,crossSectionArea,NaN,,"crossSection perpendicular to he strained axis; must be given explicitly [m²]"))
 			((Real,strain,0,,"Current strain value, elongation/originalLength |yupdate| [-]")) 
 			((Real,avgStress,0,,"Current average stress  |yupdate| [Pa]"))
-			((bool,blockDisplacements,false,,"Whether displacement of boundary bodies perpendicular to the strained axis are blocked of are free"))
+			((bool,blockDisplacements,false,,"Whether displacement of boundary bodies perpendicular to the strained axis are blocked or are free"))
 			((bool,blockRotations,false,,"Whether rotations of boundary bodies are blocked."))
 			((bool,setSpeeds,false,,"should we set speeds at the beginning directly, instead of increasing strain rate progressively?"))
 			((int,stressUpdateInterval,10,,"How often to recompute stress on supports.")),