yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2044
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Fri 2010-02-19 21:26:09 +0100
message:
  - A few more comments and code cleaning.
modified:
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.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/TriaxialCompressionEngine.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp	2010-02-19 20:17:31 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp	2010-02-19 20:26:09 +0000
@@ -56,22 +56,17 @@
 	isotropicCompaction=false;
  	boxVolume=0;
 	maxStress =0;
-
-//	calculatedPorosity=1.1;	
-
 }
 
 TriaxialCompressionEngine::~TriaxialCompressionEngine()
 {	
 }
 
-
 void TriaxialCompressionEngine::postProcessAttributes(bool deserializing)
 {
 	if(deserializing) translationAxis.Normalize();
 }
 
-
 void TriaxialCompressionEngine::doStateTransition(Scene * body, stateNum nextState){
 
 	if ( /* currentState==STATE_UNINITIALIZED && */ nextState==STATE_ISO_COMPACTION){
@@ -158,26 +153,6 @@
 			Omega::instance().stopSimulationLoop();
 			return;
 		}
-
-#if 0
-		//This is a hack in order to allow subsequent run without activating compression - like for the YADE-COMSOL coupling
-		if ( !compressionActivated )
-		{
-			//   vector<shared_ptr<Engine> >::iterator itFirst = ncb->engines.begin();
-			//   vector<shared_ptr<Engine> >::iterator itLast = ncb->engines.end();
-			//   for (;itFirst!=itLast; ++itFirst) {
-			//    if ((*itFirst)->getClassName() == "CohesiveFrictionalRelationships")
-			//     (static_cast<CohesiveFrictionalRelationships*> ( (*itFirst).get()))->setCohesionNow = true;
-			//   }
-			internalCompaction = false;
-			Phase1 = true;
-			string fileName = "./" + Phase1End + "_" +
-							  lexical_cast<string> ( Omega::instance().getCurrentIteration() ) + ".xml";
-			cerr << "saving snapshot: " << fileName << " ...";
-			Omega::instance().saveSimulation ( fileName );
-			Omega::instance().stopSimulationLoop();
-		}
-#endif
 	}
 }
 
@@ -237,7 +212,6 @@
 		 
 		if (abs(epsilonMax) > abs(strain[1])) {
 			if ( currentStrainRate != strainRate ) currentStrainRate += ( strainRate-currentStrainRate ) *0.0003;
-			//else currentStrainRate = strainRate;
 			/* Move top and bottom wall according to strain rate */
 			State* p_bottom=Body::byId(wall_bottom_id,ncb)->state.get();
 			p_bottom->pos += 0.5*currentStrainRate*height*translationAxis*dt;
@@ -247,7 +221,6 @@
 			Omega::instance().stopSimulationLoop();
 		}
 	}
-
 	if ( currentState==STATE_FIXED_POROSITY_COMPACTION )
 	{
 		if ( Omega::instance().getCurrentIteration() % 100 == 0 )

=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.hpp'
--- pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.hpp	2010-02-19 20:17:31 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.hpp	2010-02-19 20:26:09 +0000
@@ -6,7 +6,6 @@
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
 
-
 #pragma once
 
 #include<yade/core/PartialEngine.hpp>
@@ -14,11 +13,6 @@
 #include<yade/pkg-dem/TriaxialStressController.hpp>
 #include<string>
 
-
-
-
-
-
 /** \brief Class for controlling optional initial isotropic compaction and subsequent triaxial test with constant lateral stress and constant axial strain rate.
  *
  * The engine is a state machine with the following states; transitions my be automatic, see below.