Skip to content
Snippets Groups Projects
Commit bca130fd authored by Sebastian Eibl's avatar Sebastian Eibl
Browse files

[API] extended dem collision model with dt

parent 557c3602
Branches
Tags
No related merge requests found
//======================================================================================================================
//
// This file is part of waLBerla. waLBerla is free software: you can
// redistribute it and/or modify it under the terms of the GNU General Public
// License as published by the Free Software Foundation, either version 3 of
// the License, or (at your option) any later version.
//
// waLBerla is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// for more details.
//
// You should have received a copy of the GNU General Public License along
// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \file ContactResolvers.h
//! \author Klaus Iglberger
//! \author Sebastian Eibl <sebastian.eibl@fau.de>
//! \brief Header file for DEM contact models
//
//======================================================================================================================
#pragma once #pragma once
#include "pe/Types.h" #include "pe/Types.h"
...@@ -11,7 +33,7 @@ namespace cr { ...@@ -11,7 +33,7 @@ namespace cr {
class ResolveContactSpringDashpotHaffWerner { class ResolveContactSpringDashpotHaffWerner {
public: public:
void operator()( ContactID c ) const void operator()( ContactID c, const real_t /*dt*/ ) const
{ {
WALBERLA_LOG_DETAIL( "resolving contact: " << c->getID() ); WALBERLA_LOG_DETAIL( "resolving contact: " << c->getID() );
BodyID b1( c->getBody1()->getTopSuperBody() ); BodyID b1( c->getBody1()->getTopSuperBody() );
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along // You should have received a copy of the GNU General Public License along
// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
// //
//! \file DEM.cpp //! \file DEM.impl.h
//! \author Klaus Iglberger //! \author Klaus Iglberger
//! \author Sebastian Eibl <sebastian.eibl@fau.de> //! \author Sebastian Eibl <sebastian.eibl@fau.de>
//! \brief Source file for the DEM solver //! \brief Source file for the DEM solver
...@@ -88,7 +88,7 @@ void DEMSolver<Integrator,ContactResolver>::timestep( real_t dt ) ...@@ -88,7 +88,7 @@ void DEMSolver<Integrator,ContactResolver>::timestep( real_t dt )
if (shouldContactBeTreated( &(*cIt), currentBlock.getAABB() )) if (shouldContactBeTreated( &(*cIt), currentBlock.getAABB() ))
{ {
++numberOfContactsTreated_; ++numberOfContactsTreated_;
resolveContact_( &(*cIt) ); resolveContact_( &(*cIt), dt);
} }
} }
......
//======================================================================================================================
//
// This file is part of waLBerla. waLBerla is free software: you can
// redistribute it and/or modify it under the terms of the GNU General Public
// License as published by the Free Software Foundation, either version 3 of
// the License, or (at your option) any later version.
//
// waLBerla is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
// for more details.
//
// You should have received a copy of the GNU General Public License along
// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \file Integrators.h
//! \author Klaus Iglberger
//! \author Sebastian Eibl <sebastian.eibl@fau.de>
//! \brief Integrators for the DEM collision resolver
//
//======================================================================================================================
#pragma once #pragma once
#include "pe/Types.h" #include "pe/Types.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment