yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2664
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
branch nick: yade
timestamp: Wed 2011-01-19 19:47:05 +0100
message:
  - Fix some temporary stuff left behind (safe but useless) + get back one line of comment removed by mistake.
modified:
  core/Cell.cpp
  core/Cell.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 'core/Cell.cpp'
--- core/Cell.cpp	2011-01-19 18:22:56 +0000
+++ core/Cell.cpp	2011-01-19 18:47:05 +0000
@@ -1,7 +1,7 @@
 
 #include<yade/core/Cell.hpp>
 
-void Cell::integrateAndUpdate(Real dt, bool initH){
+void Cell::integrateAndUpdate(Real dt){
 	//incremental displacement gradient
 	_trsfInc=dt*velGrad;
 	// total transformation; M = (Id+G).M = F.M
@@ -15,6 +15,7 @@
 		Vector3r base(Hsize.col(i));
 		_size[i]=base.norm(); base/=_size[i]; //base is normalized now
 		Hnorm(0,i)=base[0]; Hnorm(1,i)=base[1]; Hnorm(2,i)=base[2];};
+	// skew cosines
 	for(int i=0; i<3; i++){
 		int i1=(i+1)%3, i2=(i+2)%3;
 		// sin between axes is cos of skew

=== modified file 'core/Cell.hpp'
--- core/Cell.hpp	2011-01-19 18:22:56 +0000
+++ core/Cell.hpp	2011-01-19 18:47:05 +0000
@@ -58,8 +58,8 @@
 		void fillGlShearTrsfMatrix(double m[16]);
 	public:
 
-	//! "integrate" velGrad, update cached values used by public getter. If initH, Hsize is defined on the basis of refSize and trsf (only used if refSize is modified); else it is incremented the same way as for trsf.
-	void integrateAndUpdate(Real dt, bool initH=false);
+	//! "integrate" velGrad, update cached values used by public getter.
+	void integrateAndUpdate(Real dt);
 	/*! Return point inside periodic cell, even if shear is applied */
 	Vector3r wrapShearedPt(const Vector3r& pt) const { return shearPt(wrapPt(unshearPt(pt))); }
 	/*! Return point inside periodic cell, even if shear is applied; store cell coordinates in period. */