------------------------------------------------------------ revno: 3776 committer: Anton Gladky <[email protected]> timestamp: Mon 2016-01-18 10:32:24 +0100 message: Fix some compilation warnings. modified: pkg/dem/deformablecohesive/Lin4NodeTetra.cpp pkg/dem/deformablecohesive/Lin4NodeTetra.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 'pkg/dem/deformablecohesive/Lin4NodeTetra.cpp' --- pkg/dem/deformablecohesive/Lin4NodeTetra.cpp 2016-01-07 17:49:32 +0000 +++ pkg/dem/deformablecohesive/Lin4NodeTetra.cpp 2016-01-18 09:32:24 +0000 @@ -73,15 +73,15 @@ Real x12=pos01(0), x13=pos02(0), x14=pos03(0), x23= pos12(0), x24=pos13(0), x34= pos23(0); - Real x21=-x12, x31=-x13, x41=-x14, x32=-x23, x42=-x24, x43=-x34; + Real x21=-x12, x31=-x13, /*x41=-x14,*/ x32=-x23, x42=-x24, x43=-x34; Real y12=pos01(1), y13=pos02(1), y14=pos03(1), y23= pos12(1), y24=pos13(1), y34= pos23(1); - Real y21=-y12, y31=-y13, y41=-y14, y32=-y23, y42=-y24, y43=-y34; + Real y21=-y12, y31=-y13, /*y41=-y14,*/ y32=-y23, y42=-y24, y43=-y34; Real z12=pos01(2), z13=pos02(2), z14=pos03(2), z23= pos12(2), z24=pos13(2), z34= pos23(2); - Real z21=-z12, z31=-z13, z41=-z14, z32=-z23, z42=-z24, z43=-z34; + Real z21=-z12, z31=-z13, /*z41=-z14,*/ z32=-z23, z42=-z24, z43=-z34; Real V=fabs(((0.166666667)*J.determinant())); === modified file 'pkg/dem/deformablecohesive/Lin4NodeTetra.hpp' --- pkg/dem/deformablecohesive/Lin4NodeTetra.hpp 2016-01-07 17:49:32 +0000 +++ pkg/dem/deformablecohesive/Lin4NodeTetra.hpp 2016-01-18 09:32:24 +0000 @@ -49,12 +49,14 @@ Vector3r pos2=i2->second.position-i0->second.position; Vector3r pos3=i3->second.position-i0->second.position; + /* Vector3r pos01=-pos1; Vector3r pos02=-pos2; Vector3r pos03=-pos3; Vector3r pos12= pos1-pos2; Vector3r pos13= pos1-pos3; Vector3r pos23= pos2-pos3; + */ J.col(0)<<1,pos0; @@ -62,7 +64,7 @@ J.col(2)<<1,pos2; J.col(3)<<1,pos3; - + /* Real x12=pos01(0), x13=pos02(0), x14=pos03(0), x23= pos12(0), x24=pos13(0), x34= pos23(0); Real x21=-x12, x31=-x13, x41=-x14, x32=-x23, x42=-x24, x43=-x34; @@ -74,7 +76,7 @@ Real z12=pos01(2), z13=pos02(2), z14=pos03(2), z23= pos12(2), z24=pos13(2), z34= pos23(2); Real z21=-z12, z31=-z13, z41=-z14, z32=-z23, z42=-z24, z43=-z34; - + */ Real V=fabs(((0.166666667)*J.determinant())); return V;
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
