← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pkg/dem/Ig2_Sphere_Sphere_ScGeom.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/Ig2_Sphere_Sphere_ScGeom.cpp
3
3
// © 2008 Václav Šmilauer <eudoxos@arcig.cz>
4
4
 
5
5
#include"Ig2_Sphere_Sphere_ScGeom.hpp"
6
 
#include<yade/pkg/dem/ScGeom.hpp>
7
 
#include<yade/pkg/common/Sphere.hpp>
8
 
#include<yade/core/Scene.hpp>
9
 
#include<yade/lib/base/Math.hpp>
10
 
#include<yade/core/Omega.hpp>
11
 
#include<yade/pkg/common/InteractionLoop.hpp>
 
6
#include<pkg/dem/ScGeom.hpp>
 
7
#include<pkg/common/Sphere.hpp>
 
8
#include<core/Scene.hpp>
 
9
#include<lib/base/Math.hpp>
 
10
#include<core/Omega.hpp>
 
11
#include<pkg/common/InteractionLoop.hpp>
12
12
 
13
13
bool Ig2_Sphere_Sphere_ScGeom::go(      const shared_ptr<Shape>& cm1, const shared_ptr<Shape>& cm2, const State& state1, const State& state2, const Vector3r& shift2, const bool& force, const shared_ptr<Interaction>& c)
14
14
{