yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #03733
[Branch ~yade-dev/yade/trunk] Rev 2115: -Register and code cleaning.
------------------------------------------------------------
revno: 2115
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Mon 2010-03-29 17:48:00 +0200
message:
-Register and code cleaning.
modified:
pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp
pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.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/TriaxialStateRecorder.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp 2010-03-20 12:40:44 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp 2010-03-29 15:48:00 +0000
@@ -9,29 +9,16 @@
*************************************************************************/
#include "TriaxialStateRecorder.hpp"
-//#include <yade/pkg-dem/ElasticContactLaw.hpp>
-//#include <yade/pkg-dem/TriaxialStressController.hpp>
#include <yade/pkg-dem/TriaxialCompressionEngine.hpp>
#include<yade/pkg-common/Sphere.hpp>
-
-//#include <yade/pkg-dem/ScGeom.hpp>
-//#include <yade/pkg-dem/FrictPhys.hpp>
-
#include <yade/core/Omega.hpp>
#include <yade/core/Scene.hpp>
#include <boost/lexical_cast.hpp>
-
#include <yade/pkg-dem/ScGeom.hpp>
#include <yade/pkg-dem/FrictPhys.hpp>
-
-
CREATE_LOGGER(TriaxialStateRecorder);
-
-TriaxialStateRecorder::TriaxialStateRecorder () : Recorder(){
- iterPeriod=1;
- porosity = 1.;
-}
+TriaxialStateRecorder::~TriaxialStateRecorder() {};
void TriaxialStateRecorder::action ()
{
@@ -39,8 +26,6 @@
if(out.tellp()==0){
out<<"iteration s11 s22 s33 e11 e22 e33 unb_force porosity kineticE"<<endl;
}
-
-
if ( !triaxialCompressionEngine )
{
vector<shared_ptr<Engine> >::iterator itFirst = scene->engines.begin();
@@ -59,8 +44,6 @@
if ( ! ( Omega::instance().getCurrentIteration() % triaxialCompressionEngine->computeStressStrainInterval == 0 ) )
triaxialCompressionEngine->computeStressStrain ();
-
-
/// Compute kinetic energy and porosity :
Real Vs=0, kinematicE = 0;
@@ -70,33 +53,18 @@
BodyContainer::iterator biEnd = scene->bodies->end();
for ( ; bi!=biEnd; ++bi )
-
{
const shared_ptr<Body>& b = *bi;
-
- if ( b->isDynamic )
- {
+ if ( b->isDynamic ){
const Vector3r& v = b->state->vel;
kinematicE +=
0.5* ( b->state->mass ) * ( v[0]*v[0]+v[1]*v[1]+v[2]*v[2] );
- Vs += 1.3333333*Mathr::PI*pow ( YADE_PTR_CAST<Sphere>( b->shape)->radius, 3 );
-
- }
+ Vs += 1.3333333*Mathr::PI*pow ( YADE_PTR_CAST<Sphere>( b->shape)->radius, 3 );}
}
porosity = ( V - Vs ) /V;
-
-
-
-
-
-
-
-
-
-// ========================================================================
-
- out << lexical_cast<string> ( Omega::instance().getCurrentIteration() ) << " "
+
+ out << lexical_cast<string> ( Omega::instance().getCurrentIteration() ) << " "
<< lexical_cast<string> ( triaxialCompressionEngine->stress[triaxialCompressionEngine->wall_right][0] ) << " "
<< lexical_cast<string> ( triaxialCompressionEngine->stress[triaxialCompressionEngine->wall_top][1] ) << " "
<< lexical_cast<string> ( triaxialCompressionEngine->stress[triaxialCompressionEngine->wall_front][2] ) << " "
@@ -107,167 +75,7 @@
<< lexical_cast<string> ( porosity ) << " "
<< lexical_cast<string> ( kinematicE )
<< endl;
-
-
-/*
-// ========================================================================
- if ( Omega::instance().getCurrentIteration() % 500 == 0 || Omega::instance().getCurrentIteration() == 0 )
- {
-
- out << lexical_cast<string> ( Omega::instance().getCurrentIteration() ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->stress[triaxialCompressionEngine->wall_right][0] ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->stress[triaxialCompressionEngine->wall_top][1] ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->stress[triaxialCompressionEngine->wall_front][2] ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->strain[0] ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->strain[1] ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->strain[2] ) << " "
- << lexical_cast<string> ( triaxialCompressionEngine->force[triaxialCompressionEngine->wall_right][0] ) << " "
- << lexical_cast<string> ( triaxialCompressionEngine->force[triaxialCompressionEngine->wall_top][1] ) << " "
- << lexical_cast<string> ( triaxialCompressionEngine->force[triaxialCompressionEngine->wall_front][2] ) << " "
- << lexical_cast<string> ( triaxialCompressionEngine->force[triaxialCompressionEngine->wall_left][0] ) << " "
- << lexical_cast<string> ( triaxialCompressionEngine->force[triaxialCompressionEngine->wall_bottom][1] ) << " "
- << lexical_cast<string> ( triaxialCompressionEngine->force[triaxialCompressionEngine->wall_back][2] ) << " "
- << lexical_cast<string> ( triaxialCompressionEngine->position_right ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->position_top ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->position_front ) << " "
-
- << lexical_cast<string> ( triaxialCompressionEngine->ComputeUnbalancedForce ( ncb ) ) << " "
- << lexical_cast<string> ( porosity ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->position_left ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->position_bottom ) << " "
-// << lexical_cast<string> ( triaxialCompressionEngine->position_back ) << " "
- << lexical_cast<string> ( kinematicE ) << " " << endl;
-// << lexical_cast<string> ( force_sphere ) << " " << endl;
- }
-//=======
-*/
-
-
-
-
-
}
-/*
-TriaxialStressController::ComputeLoveStress ( Scene * ncb )
-{
- shared_ptr<BodyContainer>& bodies = ncb->bodies;
-
- Real f1_el_x=0, f1_el_y=0, f1_el_z=0, x1=0, y1=0, z1=0, x2=0, y2=0, z2=0;
-
- Real sig11_el=0, sig22_el=0, sig33_el=0, sig12_el=0, sig13_el=0,
- sig23_el=0;
- //, Vwater = 0,
- Real kinematicE = 0;
-
- InteractionContainer::iterator ii = ncb->interactions->begin();
- InteractionContainer::iterator iiEnd = ncb->interactions->end();
-
- Real j = 0;
- Real FT[3][3] = {{0,0,0},{0,0,0},{0,0,0}};
-
- for ( ; ii!=iiEnd ; ++ii )
- {
- if ( ( *ii )->isReal() )
- {
- const shared_ptr<Interaction>& interaction = *ii;
-
- unsigned int id1 = interaction -> getId1();
- unsigned int id2 = interaction -> getId2();
-
- ScGeom* currentContactGeometry =
- static_cast<ScGeom*> ( interaction->interactionGeometry.
- get() );
-
- FrictPhys* currentContactPhysics =
- static_cast<FrictPhys*>
- ( interaction->interactionPhysics.get() );
-
- Real fn = currentContactPhysics->normalForce.Length();
-
- if ( fn!=0 )
-
- //if (currentContactGeometry->penetrationDepth >= 0)
-
- {
- j=j+1;
-
- Vector3r fel =
- currentContactPhysics->normalForce + currentContactPhysics->shearForce;
-
- f1_el_x=fel[0];
- f1_el_y=fel[1];
- f1_el_z=fel[2];
-
- int geometryIndex1 =
- ( *bodies ) [id1]->geometricalModel->getClassIndex();
- int geometryIndex2 =
- ( *bodies ) [id2]->geometricalModel->getClassIndex();
-
- if ( geometryIndex1 == geometryIndex2 )
-
- {
- BodyMacroParameters* de1 =
- static_cast<BodyMacroParameters*> ( ( *bodies ) [id1]->physicalParameters.get() );
- x1 = de1->se3.position[0];
- y1 = de1->se3.position[1];
- z1 = de1->se3.position[2];
-
-
- BodyMacroParameters* de2 =
- static_cast<BodyMacroParameters*> ( ( *bodies ) [id2]->physicalParameters.get() );
- x2 = de2->se3.position[0];
- y2 = de2->se3.position[1];
- z2 = de2->se3.position[2];
-
- ///Calcul des contraintes elastiques spheres/spheres
-
- sig11_el = sig11_el + f1_el_x* ( x2 - x1 );
- sig22_el = sig22_el + f1_el_y* ( y2 - y1 );
- sig33_el = sig33_el + f1_el_z* ( z2 - z1 );
- sig12_el = sig12_el + f1_el_x* ( y2 - y1 );
- sig13_el = sig13_el + f1_el_x* ( z2 - z1 );
- sig23_el = sig23_el + f1_el_y* ( z2 - z1 );
-
- }
-
- else
-
- {
- Vector3r l =
- std::min ( currentContactGeometry->radius2,
- currentContactGeometry->radius1 )
- *currentContactGeometry->normal;
-
- /// Calcul des contraintes elastiques spheres/parois
-
- sig11_el = sig11_el + f1_el_x*l[0];
- sig22_el = sig22_el + f1_el_y*l[1];
- sig33_el = sig33_el + f1_el_z*l[2];
- sig12_el = sig12_el + f1_el_x*l[1];
- sig13_el = sig13_el + f1_el_x*l[2];
- sig23_el = sig23_el + f1_el_y*l[2];
-
- }
-
- /// fabric tensor
-
- Vector3r normal = currentContactGeometry->normal;
-
- for ( int i=0; i<3; ++i )
- {
- for ( int n=0; n<3; ++n )
- {
- //fabricTensor[i][n]
- FT[i][n]
- += normal[i]*normal[n];
- }
- }
-
- }
- }
- }
-}*/
-
YADE_PLUGIN((TriaxialStateRecorder));
=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.hpp'
--- pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.hpp 2010-03-20 12:40:44 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.hpp 2010-03-29 15:48:00 +0000
@@ -29,21 +29,10 @@
shared_ptr<TriaxialCompressionEngine> triaxialCompressionEngine;
bool changed;
public :
- Real porosity;
-
- //Real height, width, depth;
- //Real thickness; // FIXME should retrieve "extents" of a Box
-
- //int wall_bottom_id, wall_top_id, wall_left_id, wall_right_id, wall_front_id, wall_back_id;
-
- TriaxialStateRecorder ();
+ virtual ~TriaxialStateRecorder ();
virtual void action();
+ YADE_CLASS_BASE_DOC_ATTRS(TriaxialStateRecorder,Recorder,"Engine recording triaxial variables (needs :yref:TriaxialCompressionEngine present in the simulation).",
+ ((Real,porosity,1,"porosity of the packing [-]")));
DECLARE_LOGGER;
- REGISTER_ATTRIBUTES(Recorder,(porosity));
-
- protected :
- REGISTER_CLASS_AND_BASE(TriaxialStateRecorder,Recorder);
};
REGISTER_SERIALIZABLE(TriaxialStateRecorder);
-
-
