yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Chareyre (bruno-chareyre)
------------------------------------------------------------
revno: 2941 [merge]
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Fri 2011-10-21 20:41:40 +0200
message:
  Fix compilation error during debug-mode
modified:
  pkg/dem/WirePM.cpp


--
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/dem/WirePM.cpp'
--- pkg/dem/WirePM.cpp	2011-07-29 02:38:16 +0000
+++ pkg/dem/WirePM.cpp	2011-10-21 18:41:40 +0000
@@ -182,7 +182,7 @@
 	if ( contactPhysics->isDoubleTwist ) {
 		Real alpha = atan( l0 / (3.*Mathr::PI*mat1->diameter) );
 		Real kh = k * ( l0*mat1->diameter/crossSection ) / ( 48.*cos(alpha) * ( 41./9.*(1.+mat1->poisson) + 17./4.*pow(tan(alpha),2) ) );
-		TRVAR2( kn, kh );
+		//TRVAR2( kn, kh ); //Commented due to an error during debug-build: "yade/pkg/dem/WirePM.cpp:185:3: error: 'kn' was not declared in this scope"
 		k = 2. * ( mat1->lambdak*kh + (1-mat1->lambdak)*k );
 		Real F = k * DFValues[0](0);
 		Real mappingF = F/DFValues[0](1);