yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #01277
[svn] r1785 - trunk/pkg/snow/Engine
Author: cosurgi
Date: 2009-05-29 14:14:18 +0200 (Fri, 29 May 2009)
New Revision: 1785
Modified:
trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp
Log:
after isNew and isReal are removed I'll update the code to use new contact logic.
Modified: trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp
===================================================================
--- trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp 2009-05-29 08:42:46 UTC (rev 1784)
+++ trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp 2009-05-29 12:14:18 UTC (rev 1785)
@@ -224,11 +224,11 @@
// FIXME: SpheresContactGeometry (components that are not from IstSnowLayersContact itself) are calculated by "parent" class
// the penetration depth, contact point and normal. I couldn't make stimulation to be stable without this.
- bool old_n = c->isNew;
- c->isNew=false;
+//FIXME// bool old_n = c->isNew;
+//FIXME// c->isNew=false;
//ggg.assist=true;
bool res = ggg.go(cm1,cm2,se31,se32,c);
- c->isNew=old_n;
+//FIXME// c->isNew=old_n;
return res;
//return true;
@@ -429,11 +429,11 @@
// FIXME: SpheresContactGeometry (components that are not from IstSnowLayersContact itself) are calculated by "parent" class
// the penetration depth, contact point and normal. I couldn't make stimulation to be stable without this.
- bool old_n = c->isNew;
- c->isNew=false;
+//FIXME// bool old_n = c->isNew;
+//FIXME// c->isNew=false;
//ggg.assist=true;
bool res = ggg.goReverse(cm1,cm2,se31,se32,c);
- c->isNew=old_n;
+//FIXME// c->isNew=old_n;
return res;
//return true;