yade-dev team mailing list archive

[eudoxos at BerliOS <eudoxos@xxxxxxxxxxxxxxx>]

Author: eudoxos
Date: 2009-03-01 14:46:00 +0100 (Sun, 01 Mar 2009)
New Revision: 1705

Modified:
   trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp
Log:
1. Fix for the compile error in snow for OrthogonalPlaneFit3. It still misses pkg/snow/Engine/ElawSnowLayersDeformation.cpp in the repo. Compile with exclude=...,snow as workaround.


Modified: trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp
===================================================================
--- trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp	2009-03-01 13:35:18 UTC (rev 1704)
+++ trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp	2009-03-01 13:46:00 UTC (rev 1705)
@@ -196,6 +196,9 @@
 	int id1 = c->getId1();
 	int id2 = c->getId2();
 
+	#ifdef MINIWM3
+		throw runtime_error(__FILE__ ": Your build uses miniWm3, which doesn't have OrthogonalPlaneFit3 function. Aborting.");
+	#else
 	if(!cross_section.empty())
 	{
 		// find the contact plane with least squre fitting from wm3 library
@@ -345,6 +348,7 @@
 
 		//return true;
 	}
+	#endif
 	if(! m1->depths[id2].empty()) m1->depths[id2].clear();
 	if(! m2->depths[id1].empty()) m2->depths[id1].clear();
 	return false;