yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2275
committer: jduriez <jduriez@c1solimara-l>
branch nick: trunk
timestamp: Fri 2010-06-04 10:53:26 +0200
message:
  Fix of https://bugs.launchpad.net/yade/+bug/589516 (sorry, the compilation did not crash on my computer when I tried)
modified:
  pkg/dem/Engine/PartialEngine/KinemCNLEngine.cpp
  pkg/dem/Engine/PartialEngine/KinemCNLEngine.hpp
  pkg/dem/Engine/PartialEngine/KinemCNSEngine.cpp
  pkg/dem/Engine/PartialEngine/KinemCNSEngine.hpp


--
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/dem/Engine/PartialEngine/KinemCNLEngine.cpp'
--- pkg/dem/Engine/PartialEngine/KinemCNLEngine.cpp	2010-05-13 20:19:38 +0000
+++ pkg/dem/Engine/PartialEngine/KinemCNLEngine.cpp	2010-06-04 08:53:26 +0000
@@ -141,19 +141,19 @@
 	
 	if(firstRun)
 	{
-		if ( !myLdc )
+		if ( !myLdc )	// FIXME : reenable this feature since Law2 is a functor
 		{
-			vector<shared_ptr<Engine> >::iterator itFirst = scene->engines.begin();
-			vector<shared_ptr<Engine> >::iterator itLast = scene->engines.end();
-			for ( ;itFirst!=itLast; ++itFirst )
-			{
-				if ( ( *itFirst )->getClassName() == "Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity" ) 
-				{
-					if(LOG) cout << "Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity engine found" << endl;
-					myLdc =  YADE_PTR_CAST<Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity> ( *itFirst );
-					coeff_dech = myLdc ->coeff_dech;
-				}
-			}
+// 			vector<shared_ptr<Engine> >::iterator itFirst = scene->engines.begin();
+// 			vector<shared_ptr<Engine> >::iterator itLast = scene->engines.end();
+// 			for ( ;itFirst!=itLast; ++itFirst )
+// 			{
+// 				if ( ( *itFirst )->getClassName() == "Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity" ) 
+// 				{
+// 					myLdc =  YADE_PTR_CAST<Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity> ( *itFirst );
+// 					coeff_dech = myLdc ->coeff_dech;
+// 					if(LOG) cout << "Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity engine found, with coeff_dech = " << coeff_dech << endl;
+// 				}
+// 			}
 		}
 		
 		alpha=Mathr::PI/2.0;;

=== modified file 'pkg/dem/Engine/PartialEngine/KinemCNLEngine.hpp'
--- pkg/dem/Engine/PartialEngine/KinemCNLEngine.hpp	2010-04-13 21:09:57 +0000
+++ pkg/dem/Engine/PartialEngine/KinemCNLEngine.hpp	2010-06-04 08:53:26 +0000
@@ -67,7 +67,7 @@
 				 ((Real,wallDamping,0.2,"the vertical displacements done to maintain F equal to F_0 are in fact damped, through this wallDamping"))
 				 ((string,Key,"","string to add at the names of the saved files"))
 				 ((bool,LOG,false,"boolean controling the output of messages on the screen"))
-				 ((Real,coeff_dech,1.0,"in the case of the use of 'Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity' for ex, where kn(unload)#kn(load). The engine cares to find the value at the first run")),
+				 ((Real,coeff_dech,1.0,"in the case of the use of 'Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity' for ex, where kn(unload)#kn(load). The engine cares to find the value at the first run BROKEN actually")),
 				alpha=Mathr::PI/2.0;
 				temoin=0;
 				 );

=== modified file 'pkg/dem/Engine/PartialEngine/KinemCNSEngine.cpp'
--- pkg/dem/Engine/PartialEngine/KinemCNSEngine.cpp	2010-05-13 20:19:38 +0000
+++ pkg/dem/Engine/PartialEngine/KinemCNSEngine.cpp	2010-06-04 08:53:26 +0000
@@ -126,19 +126,19 @@
 	
 	if(firstRun)
 	{
-		if ( !myLdc )
+		if ( !myLdc )	// FIXME : reenable this feature since Law2 is a functor
 		{
-			vector<shared_ptr<Engine> >::iterator itFirst = scene->engines.begin();
-			vector<shared_ptr<Engine> >::iterator itLast = scene->engines.end();
-			for ( ;itFirst!=itLast; ++itFirst )
-			{
-				if ( ( *itFirst )->getClassName() == "Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity" ) 
-				{
-					myLdc =  YADE_PTR_CAST<Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity> ( *itFirst );
-					coeff_dech = myLdc ->coeff_dech;
-					if(LOG) cout << "Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity engine found, with coeff_dech = " << coeff_dech << endl;
-				}
-			}
+// 			vector<shared_ptr<Engine> >::iterator itFirst = scene->engines.begin();
+// 			vector<shared_ptr<Engine> >::iterator itLast = scene->engines.end();
+// 			for ( ;itFirst!=itLast; ++itFirst )
+// 			{
+// 				if ( ( *itFirst )->getClassName() == "Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity" ) 
+// 				{
+// 					myLdc =  YADE_PTR_CAST<Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity> ( *itFirst );
+// 					coeff_dech = myLdc ->coeff_dech;
+// 					if(LOG) cout << "Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity engine found, with coeff_dech = " << coeff_dech << endl;
+// 				}
+// 			}
 		}
 
 		alpha=Mathr::PI/2.0;;

=== modified file 'pkg/dem/Engine/PartialEngine/KinemCNSEngine.hpp'
--- pkg/dem/Engine/PartialEngine/KinemCNSEngine.hpp	2010-04-13 21:09:57 +0000
+++ pkg/dem/Engine/PartialEngine/KinemCNSEngine.hpp	2010-06-04 08:53:26 +0000
@@ -65,7 +65,7 @@
 		((Real,max_vel,1.0,"to limit the speed of the vertical displacements applied to control upper plate [m/s]"))
 		((string,Key,"","string to add at the names of the saved files"))
 		((bool,LOG,false,"boolean controling the output of messages on the screen"))
-		((Real,coeff_dech,1.0,"in the case of the use of 'Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity' for ex, where kn(unload)#kn(load). The engine cares to find the value at the first run"))
+		((Real,coeff_dech,1.0,"in the case of the use of 'Law2_ScGeom_NormalInelasticityPhys_NormalInelasticity' for ex, where kn(unload)#kn(load). The engine cares to find the value at the first run BROKEN actually"))
 		((Real,wallDamping,0.2,"the vertical displacements done to maintain F equal to F_0 are in fact damped, through this wallDamping")),
 		alpha=Mathr::PI/2.0;
 		temoin=0;