← Back to branch summary

~ubuntu-branches/ubuntu/wily/yade/wily

« back to all changes in this revision

Viewing changes to pkg/dem/ViscoelasticPM.cpp

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2014-11-14 12:54:52 UTC
  • mfrom: (20.1.23 sid)
  • Revision ID: package-import@ubuntu.com-20141114125452-t16anreumu4ybg2s
Tags: 1.12.0-2ubuntu1
Add allow-stderr restriction to autopkgtest, to silence a warning
printed by new matplotlib.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pkg/dem/ViscoelasticPM.cpp
1
1
// 2009 © Sergei Dorofeenko <sega@users.berlios.de>
2
2
#include"ViscoelasticPM.hpp"
3
 
#include<yade/core/State.hpp>
4
 
#include<yade/pkg/dem/ScGeom.hpp>
5
 
#include<yade/core/Omega.hpp>
6
 
#include<yade/core/Scene.hpp>
7
 
#include<yade/pkg/common/Sphere.hpp>
 
3
#include<core/State.hpp>
 
4
#include<pkg/dem/ScGeom.hpp>
 
5
#include<core/Omega.hpp>
 
6
#include<core/Scene.hpp>
 
7
#include<pkg/common/Sphere.hpp>
8
8
 
9
9
#ifdef YADE_SPH
10
 
#include<yade/pkg/common/SPHEngine.hpp>
 
10
#include<pkg/common/SPHEngine.hpp>
11
11
#endif
12
12
 
13
13
using std::isfinite;
255
255
#ifdef YADE_SPH
256
256
        if (mat1->SPHmode and mat2->SPHmode)  {
257
257
                phys->SPHmode=true;
258
 
                phys->mu=(mat1->mu+mat2->mu)/2.0;
 
258
                phys->mu=(mat1->mu+mat2->mu);
 
259
                phys->h=(mat1->h+mat2->h)/2.0;
259
260
        }
260
261
        
261
262
        phys->kernelFunctionCurrentPressure = returnKernelFunction (mat1->KernFunctionPressure, mat2->KernFunctionPressure, Grad);