------------------------------------------------------------ revno: 1746 committer: Anton Gladky <[email protected]> branch nick: trunk timestamp: Fri 2009-08-28 09:33:08 +0200 message: Press Engine and RockPM changes modified: pkg/common/Engine/DeusExMachina/PressTestEngine.cpp pkg/common/Engine/DeusExMachina/PressTestEngine.hpp pkg/dem/meta/RockPM.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/common/Engine/DeusExMachina/PressTestEngine.cpp' --- pkg/common/Engine/DeusExMachina/PressTestEngine.cpp 2009-08-06 07:40:14 +0000 +++ pkg/common/Engine/DeusExMachina/PressTestEngine.cpp 2009-08-28 07:33:08 +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/>* -**************************************************************************/ #include"PressTestEngine.hpp" #include<yade/pkg-common/ParticleParameters.hpp> === modified file 'pkg/common/Engine/DeusExMachina/PressTestEngine.hpp' --- pkg/common/Engine/DeusExMachina/PressTestEngine.hpp 2009-08-06 07:40:14 +0000 +++ pkg/common/Engine/DeusExMachina/PressTestEngine.hpp 2009-08-28 07:33:08 +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/>* -**************************************************************************/ #pragma once #include<yade/pkg-common/TranslationEngine.hpp> === modified file 'pkg/dem/meta/RockPM.cpp' --- pkg/dem/meta/RockPM.cpp 2009-08-28 07:22:29 +0000 +++ pkg/dem/meta/RockPM.cpp 2009-08-28 07:33:08 +0000 @@ -53,10 +53,11 @@ Fs=sigmaT*crossSection; phys->shearForce = Fs; + /**Normal Interaction*/ applyForceAtContactPoint(phys->normalForce + phys->shearForce, geom->contactPoint, contact->getId1(), geom->se31.position, contact->getId2(), geom->se32.position, rootBody); - /**Normal Interaction*/ + if ((phys->isCohesive)&&(displN<(-phys->lengthMaxCompression))) { - phys->isCohesive = false; + phys->isCohesive = false; ///Destruction } return; } else {
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
