← Back to branch summary

~ubuntu-branches/debian/jessie/yade/jessie

« back to all changes in this revision

Viewing changes to pkg/dem/TriaxialCompressionEngine.cpp

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2014-08-04 19:34:58 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20140804193458-cw8qhnujxe9wzi15
Tags: 1.11.0-1
* [a0600ae] Imported Upstream version 1.11.0
* [a3055e0] Do not use parallel build on kfreebsd-amd64 and s390x.
* [f86b405] Remove applied patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pkg/dem/TriaxialCompressionEngine.cpp
10
10
#include<yade/core/Scene.hpp>
11
11
#include<yade/core/Omega.hpp>
12
12
#include<yade/lib/base/Math.hpp>
13
 
#include<boost/lexical_cast.hpp>
14
13
#include<boost/lambda/lambda.hpp>
15
14
#include<yade/pkg/dem/Shop.hpp>
16
15
#include<yade/core/Interaction.hpp>
84
83
 
85
84
        if (  (currentState!=STATE_TRIAX_LOADING && currentState==STATE_ISO_COMPACTION) || currentState==STATE_ISO_UNLOADING || currentState==STATE_FIXED_POROSITY_COMPACTION || autoCompressionActivation)
86
85
        {
87
 
                if (UnbalancedForce<=StabilityCriterion && abs ( ( meanStress-sigma_iso ) /sigma_iso ) <0.005 && fixedPoroCompaction==false )
 
86
                if (UnbalancedForce<=StabilityCriterion && std::abs ( ( meanStress-sigma_iso ) /sigma_iso ) <0.005 && fixedPoroCompaction==false )
88
87
                {
89
88
                        // only go to UNLOADING if it is needed
90
89
                        if ( currentState==STATE_ISO_COMPACTION && autoUnload && sigmaLateralConfinement!=sigmaIsoCompaction ) {
123
122
        {
124
123
                updateParameters ();
125
124
                maxStress = max(maxStress,stress[wall_top][1]);
126
 
                LOG_INFO("UnbalancedForce="<< UnbalancedForce<<", rel stress "<< abs ( ( meanStress-sigma_iso ) /sigma_iso ));
 
125
                LOG_INFO("UnbalancedForce="<< UnbalancedForce<<", rel stress "<< std::abs ( ( meanStress-sigma_iso ) /sigma_iso ));
127
126
        }
128
127
        if ( saveSimulation )
129
128
        {
163
162
                if (scene->iter % 100 == 0) LOG_DEBUG("Compression active.");
164
163
                const Real& dt = scene->dt;
165
164
 
166
 
                if (abs(epsilonMax) > abs(strain[1])) {
 
165
                if (std::abs(epsilonMax) > std::abs(strain[1])) {
167
166
                        if ( currentStrainRate != strainRate ) currentStrainRate += ( strainRate-currentStrainRate ) *0.0003;
168
167
                        /* Move top and bottom wall according to strain rate */
169
168
                        State* p_bottom=Body::byId(wall_bottom_id,scene)->state.get();