yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #05578
[Branch ~yade-dev/yade/trunk] Rev 2414: - Solved compilation errors
------------------------------------------------------------
revno: 2414
committer: ecatalano <ecatalano@dt-rv019>
branch nick: trunk
timestamp: Thu 2010-08-26 10:20:56 +0200
message:
- Solved compilation errors
modified:
pkg/dem/Engine/PartialEngine/FlowEngine.cpp
pkg/dem/Engine/PartialEngine/FlowEngine.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/FlowEngine.cpp'
--- pkg/dem/Engine/PartialEngine/FlowEngine.cpp 2010-08-25 15:38:59 +0000
+++ pkg/dem/Engine/PartialEngine/FlowEngine.cpp 2010-08-26 08:20:56 +0000
@@ -60,7 +60,7 @@
if (!first) flow->GaussSeidel ( );
timingDeltas->checkpoint("Gauss-Seidel");
- if (save_mplot){int j = Omega::instance().getCurrentIteration();
+ if (save_mplot){int j = scene->iter;
char plotfile [50];
mkdir("./mplot", S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
string visu_consol = "./mplot/"+flow->key+"%d_Visu_Consol";
@@ -90,9 +90,9 @@
timingDeltas->checkpoint("Applying Forces");
- Real time = Omega::instance().getSimulationTime();
+ Real time = scene->time;
- int j = Omega::instance().getCurrentIteration();
+ int j = scene->iter;
char file [50];
mkdir("./Consol", S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
string consol = "./Consol/"+flow->key+"%d_Consol";
@@ -220,7 +220,7 @@
if ( b->shape->getClassIndex() == Sph_Index )
{
Sphere* s=YADE_CAST<Sphere*> ( b->shape.get() );
- const body_id_t& id = b->getId();
+ //const Body::id_t& id = b->getId();
Real rad = s->radius;
Real x = b->state->pos[0];
Real y = b->state->pos[1];
@@ -248,7 +248,7 @@
if ( b->shape->getClassIndex() == Bx_Index )
{
Box* w = YADE_CAST<Box*> ( b->shape.get() );
-// const body_id_t& id = b->getId();
+// const Body::id_t& id = b->getId();
Real center [3], Extent[3];
for ( int h=0;h<3;h++ ) {center[h] = b->state->pos[h]; Extent[h] = w->extents[h];}
wall_thickness = min(min(Extent[0],Extent[1]),Extent[2]);
@@ -282,7 +282,7 @@
if ( b->shape->getClassIndex() == Sph_Index )
{
Sphere* s=YADE_CAST<Sphere*> ( b->shape.get() );
- const body_id_t& id = b->getId();
+ const Body::id_t& id = b->getId();
Real rad = s->radius;
Real x = b->state->pos[0];
Real y = b->state->pos[1];
=== modified file 'pkg/dem/Engine/PartialEngine/FlowEngine.hpp'
--- pkg/dem/Engine/PartialEngine/FlowEngine.hpp 2010-08-25 15:38:59 +0000
+++ pkg/dem/Engine/PartialEngine/FlowEngine.hpp 2010-08-26 08:20:56 +0000
@@ -48,41 +48,41 @@
virtual void action();
YADE_CLASS_BASE_DOC_ATTRS_CTOR(FlowEngine,PartialEngine,"An engine to solve flow problem in saturated granular media",
- ((bool,isActivated,true,"Activates Flow Engine"))
- ((bool,first,true,"Controls the initialization/update phases"))
- ((bool,save_vtk,false,"Enable/disable vtk files creation for visualization"))
- ((bool,save_mplot,false,"Enable/disable mplot files creation"))
- ((bool, slip_boundary, true, "Controls friction condition on lateral walls"))
- ((bool,WaveAction, false, "Allow sinusoidal pressure condition to simulate ocean waves"))
+ ((bool,isActivated,true,,"Activates Flow Engine"))
+ ((bool,first,true,,"Controls the initialization/update phases"))
+ ((bool,save_vtk,false,,"Enable/disable vtk files creation for visualization"))
+ ((bool,save_mplot,false,,"Enable/disable mplot files creation"))
+ ((bool, slip_boundary, true,, "Controls friction condition on lateral walls"))
+ ((bool,WaveAction, false,, "Allow sinusoidal pressure condition to simulate ocean waves"))
// ((bool,currentTes,false,"Identifies the current triangulation/tesselation of pore space"))
- ((double,P_zero,0,"Initial internal pressure for oedometer test"))
- ((double,Tolerance,1e-06,"Gauss-Seidel Tolerance"))
- ((double,Relax,1.9,"Gauss-Seidel relaxation"))
- ((int,PermuteInterval,100000,"Pore space re-triangulation period"))
- ((bool,compute_K,true,"Activates permeability measure within a granular sample"))
- ((bool,meanK_correction,true,"Local permeabilities' correction through meanK threshold"))
- ((bool,meanK_opt,false,"Local permeabilities' correction through an optimized threshold"))
- ((double,permeability_factor,1.0,"a permability multiplicator"))
- ((Real,loadFactor,1.1,"Load multiplicator for oedometer test"))
- ((double, K, 0, "Permeability of the sample"))
- ((double, MaxPressure, 0, "Maximal value of water pressure within the sample"))
- ((double, currentStress, 0, "Current value of axial stress"))
- ((double, currentStrain, 0, "Current value of axial strain"))
- ((int, intervals, 30, "Number of layers for pressure measurements"))
- ((bool, Flow_imposed_TOP_Boundary, true, "if false involve pressure imposed condition"))
- ((bool, Flow_imposed_BOTTOM_Boundary, true, "if false involve pressure imposed condition"))
- ((bool, Flow_imposed_FRONT_Boundary, true, "if false involve pressure imposed condition"))
- ((bool, Flow_imposed_BACK_Boundary, true, "if false involve pressure imposed condition"))
- ((bool, Flow_imposed_LEFT_Boundary, true, "if false involve pressure imposed condition"))
- ((bool, Flow_imposed_RIGHT_Boundary, true, "if false involve pressure imposed condition"))
- ((double, Pressure_TOP_Boundary, 0, "Pressure imposed on top boundary"))
- ((double, Pressure_BOTTOM_Boundary, 0, "Pressure imposed on bottom boundary"))
- ((double, Pressure_FRONT_Boundary, 0, "Pressure imposed on front boundary"))
- ((double, Pressure_BACK_Boundary, 0, "Pressure imposed on back boundary"))
- ((double, Pressure_LEFT_Boundary, 0, "Pressure imposed on left boundary"))
- ((double, Pressure_RIGHT_Boundary, 0, "Pressure imposed on right boundary"))
- ((double, Sinus_Pressure, 0, "Pressure value (amplitude) when sinusoidal pressure is applied"))
- ((int, id_sphere, 0, "Average velocity will be computed for all cells incident to that sphere"))
+ ((double,P_zero,0,,"Initial internal pressure for oedometer test"))
+ ((double,Tolerance,1e-06,,"Gauss-Seidel Tolerance"))
+ ((double,Relax,1.9,,"Gauss-Seidel relaxation"))
+ ((int,PermuteInterval,100000,,"Pore space re-triangulation period"))
+ ((bool,compute_K,true,,"Activates permeability measure within a granular sample"))
+ ((bool,meanK_correction,true,,"Local permeabilities' correction through meanK threshold"))
+ ((bool,meanK_opt,false,,"Local permeabilities' correction through an optimized threshold"))
+ ((double,permeability_factor,1.0,,"a permability multiplicator"))
+ ((Real,loadFactor,1.1,,"Load multiplicator for oedometer test"))
+ ((double, K, 0,, "Permeability of the sample"))
+ ((double, MaxPressure, 0,, "Maximal value of water pressure within the sample"))
+ ((double, currentStress, 0,, "Current value of axial stress"))
+ ((double, currentStrain, 0,, "Current value of axial strain"))
+ ((int, intervals, 30, ,"Number of layers for pressure measurements"))
+ ((bool, Flow_imposed_TOP_Boundary, true,, "if false involve pressure imposed condition"))
+ ((bool, Flow_imposed_BOTTOM_Boundary, true,, "if false involve pressure imposed condition"))
+ ((bool, Flow_imposed_FRONT_Boundary, true,, "if false involve pressure imposed condition"))
+ ((bool, Flow_imposed_BACK_Boundary, true,, "if false involve pressure imposed condition"))
+ ((bool, Flow_imposed_LEFT_Boundary, true,, "if false involve pressure imposed condition"))
+ ((bool, Flow_imposed_RIGHT_Boundary, true,, "if false involve pressure imposed condition"))
+ ((double, Pressure_TOP_Boundary, 0,, "Pressure imposed on top boundary"))
+ ((double, Pressure_BOTTOM_Boundary, 0,, "Pressure imposed on bottom boundary"))
+ ((double, Pressure_FRONT_Boundary, 0,, "Pressure imposed on front boundary"))
+ ((double, Pressure_BACK_Boundary, 0,, "Pressure imposed on back boundary"))
+ ((double, Pressure_LEFT_Boundary, 0,, "Pressure imposed on left boundary"))
+ ((double, Pressure_RIGHT_Boundary, 0,, "Pressure imposed on right boundary"))
+ ((double, Sinus_Pressure, 0,, "Pressure value (amplitude) when sinusoidal pressure is applied"))
+ ((int, id_sphere, 0, ,"Average velocity will be computed for all cells incident to that sphere"))
,timingDeltas=shared_ptr<TimingDeltas>(new TimingDeltas));
DECLARE_LOGGER;
};
