yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3920
committer: bchareyre <bruno.chareyre@xxxxxxxxxxxxxxx>
timestamp: Mon 2016-07-25 21:26:13 +0200
message:
  fix invalid pointer, thanks Jerome (https://lists.launchpad.net/yade-dev/msg12791.html)
modified:
  pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
  pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity1.cpp


--
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/Law2_ScGeom_CapillaryPhys_Capillarity.cpp'
--- pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp	2015-07-14 22:25:36 +0000
+++ pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp	2016-07-25 19:26:13 +0000
@@ -135,6 +135,14 @@
 				//If P=0, we use null solution
 				MeniscusParameters
 				solution(Pinterpol? capillary->interpolate(R1,R2,Dinterpol, Pinterpol, currentIndexes) : MeniscusParameters());
+				/// If no bridge, delete the interaction if necessary and escape
+				if (!solution.V) {
+					if ((fusionDetection) || (hertzOn ? mindlinContactPhysics->isBroken : cundallContactPhysics->isBroken)) bodiesMenisciiList.remove(interaction);
+					if (D>0) {scene->interactions->requestErase(interaction); continue;}
+					else if ((Pinterpol > 0) && (showError)) {
+						LOG_ERROR("No meniscus found at a contact. capillaryPressure may be too large wrt. the loaded data files."); // V=0 at a contact reveals a problem if and only if uc* > 0
+						showError = false;}//show error message once / avoid console spam	
+				}
 				/// capillary adhesion force
 				Real Finterpol = solution.F;
 				Vector3r fCap = - Finterpol*(2*Mathr::PI*(R2/alpha)*liquidTension)*currentContactGeometry->normal;
@@ -151,14 +159,7 @@
 					if (Vinterpol != 0) mindlinContactPhysics->meniscus = true;
 					else mindlinContactPhysics->meniscus = false;
 				}
-				if (!Vinterpol) {
-					if ((fusionDetection) || (hertzOn ? mindlinContactPhysics->isBroken : cundallContactPhysics->isBroken)) bodiesMenisciiList.remove(interaction);
-					if (D>0) scene->interactions->requestErase(interaction);
-					else if ((Pinterpol > 0) && (showError)) {
-						LOG_ERROR("No meniscus found at a contact. capillaryPressure may be too large wrt. the loaded data files."); // V=0 at a contact reveals a problem if and only if uc* > 0
-						showError = false;//show error message once / avoid console spam
-					}
-				}
+				
 				/// wetting angles
 				if (!hertzOn) {
 					cundallContactPhysics->Delta1 = max(solution.delta1,solution.delta2);

=== modified file 'pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity1.cpp'
--- pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity1.cpp	2015-07-23 17:26:21 +0000
+++ pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity1.cpp	2016-07-25 19:26:13 +0000
@@ -11,7 +11,7 @@
 //FIXME : in triaxialStressController, change test about null force in updateStiffnessccc
 //keep this #ifdef as long as you don't really want to realize a final version publicly, it will save compilation time for everyone else
 //when you want it compiled, you can just uncomment the following line
-// #define LAW2_SCGEOM_CAPILLARYPHYS_Capillarity1
+#define LAW2_SCGEOM_CAPILLARYPHYS_Capillarity1
 #ifdef LAW2_SCGEOM_CAPILLARYPHYS_Capillarity1
 
 #include <pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity1.hpp>
@@ -462,7 +462,7 @@
 	      if (!hertzOn) cundallContactPhysics->capillaryPressure = suction;
 	      else mindlinContactPhysics->capillaryPressure = suction;
 	      /// Capillary solution finder:
-	      if ((Pinterpol>=0) && (hertzOn? mindlinContactPhysics->meniscus : cundallContactPhysics->meniscus)) {
+	      if ((Pinterpol>=0) && (hertzOn? mindlinContactPhysics->meniscus : cundallContactPhysics->meniscus)) {//FIXME: need an "else {delete}"
 		MeniscusPhysicalData solution = interpolate1(dtPbased,K::Point_3(R2/R1, Pinterpol, Dinterpol), cundallContactPhysics->m, solutions, reset);
 /// capillary adhesion force
 		Real Finterpol = solution.force;
@@ -486,6 +486,7 @@
                 if (cundallContactPhysics->meniscus== false) cundallContactPhysics->SInterface=4*3.141592653589793238462643383279502884*(pow(R1,2))+4*3.141592653589793238462643383279502884*(pow(R2,2));
                 if (!Vinterpol) {
                     if ((fusionDetection) || (hertzOn ? mindlinContactPhysics->isBroken : cundallContactPhysics->isBroken)) bodiesMenisciiList.remove((*ii));
+/// FIXME: the following D>(...) test is wrong, should be based on penetrationDepth, and should "continue" after erasing
 		    if (D>((interactionDetectionFactor-1)*(currentContactGeometry->radius2+currentContactGeometry->radius1))) scene->interactions->requestErase(interaction);
                 }
 /// wetting angles
@@ -500,7 +501,7 @@
 	      
 	    }
 	    else{
-	      if (cundallContactPhysics->vMeniscus==0 and cundallContactPhysics->capillaryPressure!=0){
+	      if (cundallContactPhysics->vMeniscus==0 and cundallContactPhysics->capillaryPressure!=0){//FIXME: test capillaryPressure consistently (!0 or >0 or >=0?!)
 		Real Pinterpol = 0;
 	        if (!hertzOn) Pinterpol = cundallContactPhysics->isBroken ? 0 : cundallContactPhysics->capillaryPressure*R1/liquidTension;
 	        else Pinterpol = mindlinContactPhysics->isBroken ? 0 : cundallContactPhysics->capillaryPressure*R1/liquidTension;