diff --git a/include/dem/particle_particle_contact_info.h b/include/dem/particle_particle_contact_info.h index 1991f80744..31f4beb50e 100644 --- a/include/dem/particle_particle_contact_info.h +++ b/include/dem/particle_particle_contact_info.h @@ -30,36 +30,11 @@ using namespace dealii; * namely everything related to tangential overlaps */ template -class particle_particle_contact_info +struct particle_particle_contact_info { -public: - /** @brief Constructor for cases where the two particle iterators are known. - * This constructor is used everywhere in the regular DEM and unresolved - * CFD-DEM code - * - * @param particle_one The iterator of particle one - * @param particle_two The iterator of particle two - */ - - inline particle_particle_contact_info( - Particles::ParticleIterator &particle_one, - Particles::ParticleIterator &particle_two) - : particle_one(particle_one) - , particle_two(particle_two) - {} - - /** @brief Dummy constructor for cases where the two particle iterators are unknown. - * This constructor is only used in the resolved CFD-DEM and should be - * deprecated eventually. - */ - - inline particle_particle_contact_info() - {} - - - Tensor<1, 3> tangential_overlap; Particles::ParticleIterator particle_one; Particles::ParticleIterator particle_two; + Tensor<1, 3> tangential_overlap; }; -#endif /* particle_particle_contact_info_struct_h */ +#endif diff --git a/source/dem/particle_particle_fine_search.cc b/source/dem/particle_particle_fine_search.cc index f4351aa7d5..60ad06da5d 100644 --- a/source/dem/particle_particle_fine_search.cc +++ b/source/dem/particle_particle_fine_search.cc @@ -88,8 +88,9 @@ particle_particle_fine_search( particle_one_contact_list.emplace( particle_two_id, - particle_particle_contact_info(particle_one, - particle_two)); + particle_particle_contact_info{particle_one, + particle_two, + Tensor<1, 3>()}); } } }