Author: gladky_anton
Date: 2009-08-05 11:02:32 +0200 (Wed, 05 Aug 2009)
New Revision: 1921
Modified:
trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.cpp
trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.hpp
trunk/pkg/dem/meta/RockPM.cpp
Log:
1. Some small changes
Modified: trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.cpp 2009-08-05
08:32:18 UTC (rev 1920)
+++ trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.cpp 2009-08-05
09:02:32 UTC (rev 1921)
@@ -42,7 +42,7 @@
*/
curentDirection=backward;
TranslationEngine::velocity *=
-pressVelocityForw2Back;
-
currentIterationAfterDestruction =
(Omega::instance().getCurrentIteration())/pressVelocityForw2Back;
+
currentIterationAfterDestruction =
(Omega::instance().getCurrentIteration())/pressVelocityForw2Back*riseUpPressHigher;
}
} else if
(((currentIterationAfterDestruction!=0)&&(maxVerticalForce !=0))) {
/*
@@ -66,4 +66,4 @@
}
CREATE_LOGGER(PressTestEngine);
-YADE_PLUGIN((PressTestEngine));
\ No newline at end of file
+YADE_PLUGIN((PressTestEngine));
Modified: trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.hpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.hpp 2009-08-05
08:32:18 UTC (rev 1920)
+++ trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.hpp 2009-08-05
09:02:32 UTC (rev 1921)
@@ -29,14 +29,14 @@
public:
enum motionDirection {forward, backward, stop};
motionDirection curentDirection;
- Real currentVerticalForce, maxVerticalForce, minimalForce,
predictedForce, minimalPredictedForce;
+ Real currentVerticalForce, maxVerticalForce, minimalForce,
predictedForce, minimalPredictedForce, riseUpPressHigher;
long int numberIterationAfterDestruction,
currentIterationAfterDestruction;
int pressVelocityForw2Back;
- PressTestEngine(): curentDirection(forward),
currentVerticalForce(0), maxVerticalForce(0),
currentIterationAfterDestruction(0), pressVelocityForw2Back(25) {};
+ PressTestEngine(): curentDirection(forward),
currentVerticalForce(0), maxVerticalForce(0),
currentIterationAfterDestruction(0), pressVelocityForw2Back(25),
riseUpPressHigher(1){};
virtual ~PressTestEngine(){};
virtual void applyCondition(MetaBody*);
REGISTER_CLASS_AND_BASE(PressTestEngine,TranslationEngine);
- REGISTER_ATTRIBUTES(TranslationEngine,
(numberIterationAfterDestruction) (predictedForce));
+ REGISTER_ATTRIBUTES(TranslationEngine,
(numberIterationAfterDestruction) (predictedForce) (riseUpPressHigher));
DECLARE_LOGGER;
};
REGISTER_SERIALIZABLE(PressTestEngine);
Modified: trunk/pkg/dem/meta/RockPM.cpp
===================================================================
--- trunk/pkg/dem/meta/RockPM.cpp 2009-08-05 08:32:18 UTC (rev 1920)
+++ trunk/pkg/dem/meta/RockPM.cpp 2009-08-05 09:02:32 UTC (rev 1921)
@@ -32,7 +32,8 @@
void Law2_Dem3DofGeom_RockPMPhys_Rpm::go(shared_ptr<InteractionGeometry>& ig,
shared_ptr<InteractionPhysics>& ip, Interaction* contact, MetaBody* rootBody){
Dem3DofGeom* geom=static_cast<Dem3DofGeom*>(ig.get());
RpmPhys* phys=static_cast<RpmPhys*>(ip.get());
-
+ //geom->distanceFactor=1.1;
+
Real displN=geom->displacementN();
const Real& crossSection=phys->crossSection;
@@ -126,7 +127,7 @@
const shared_ptr<BodyMacroParameters>&
elast1=static_pointer_cast<BodyMacroParameters>(pp1);
const shared_ptr<BodyMacroParameters>&
elast2=static_pointer_cast<BodyMacroParameters>(pp2);
- long cohesiveThresholdIter=1000;
+ long cohesiveThresholdIter=10;
bool initCohesive = rpm1->initCohesive*rpm2->initCohesive;
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-...@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
_______________________________________________
yade-dev mailing list
yade-dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/yade-dev
