------------------------------------------------------------ revno: 1745 committer: Anton Gladky <[email protected]> branch nick: trunk timestamp: Fri 2009-08-28 09:22:29 +0200 message: Small changes modified: pkg/dem/meta/RockPM.cpp pkg/dem/meta/RockPM.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/dem/meta/RockPM.cpp' --- pkg/dem/meta/RockPM.cpp 2009-08-27 14:03:05 +0000 +++ pkg/dem/meta/RockPM.cpp 2009-08-28 07:22:29 +0000 @@ -1,20 +1,3 @@ -/************************************************************************* -* Copyright (C) 2009 Anton Gladkyy [email protected] * -* * -* This program is free software: you can redistribute it and/or modify* -* it under the terms of the GNU General Public License as published by* -* the Free Software Foundation, either version 3 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program. If not, see <http://www.gnu.org/licenses/>* -**************************************************************************/ - #include"RockPM.hpp" #include<yade/core/MetaBody.hpp> #include<yade/pkg-dem/BodyMacroParameters.hpp> @@ -48,15 +31,6 @@ Real& Fn=phys->Fn; Vector3r& Fs=phys->Fs; - /* - *************Blocked for a while - const shared_ptr<Body>& body1=Body::byId(contact->getId1(),rootBody); - const shared_ptr<Body>& body2=Body::byId(contact->getId2(),rootBody); - assert(body1); - assert(body2); - const shared_ptr<RpmMat>& rbp1=YADE_PTR_CAST<RpmMat>(body1->physicalParameters); - const shared_ptr<RpmMat>& rbp2=YADE_PTR_CAST<RpmMat>(body2->physicalParameters); - */ if(displN<=0){ /**Normal Interaction*/ @@ -153,9 +127,6 @@ if ((rpm1->exampleNumber==rpm2->exampleNumber)&&(initDistance<(contPhys->lengthMaxTension))&&(initCohesive)&&(OO.getCurrentIteration()<=cohesiveThresholdIter)) { contPhys->isCohesive=true; - //LOG_WARN("InitDistance="<<initDistance<<" "<<rpm1->exampleNumber<<" "<<rpm2->exampleNumber<<" "<<OO.getCurrentIteration()); - //LOG_WARN("lengthMaxCompression="<<contPhys->lengthMaxCompression); - //LOG_WARN("lengthMaxTension="<<contPhys->lengthMaxTension); } === modified file 'pkg/dem/meta/RockPM.hpp' --- pkg/dem/meta/RockPM.hpp 2009-08-13 08:01:41 +0000 +++ pkg/dem/meta/RockPM.hpp 2009-08-28 07:22:29 +0000 @@ -1,19 +1,3 @@ -/************************************************************************* -* Copyright (C) 2009 Anton Gladkyy [email protected] * -* * -* This program is free software: you can redistribute it and/or modify* -* it under the terms of the GNU General Public License as published by* -* the Free Software Foundation, either version 3 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program. If not, see <http://www.gnu.org/licenses/>* -**************************************************************************/ /** === HIGH LEVEL OVERVIEW OF RockPM ===
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
