Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: virtual_sites: Removed default argument from virtual function and non-functional virtual COM feature #3250

Merged
merged 4 commits into from
Oct 15, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,10 @@ set(EspressoCore_SRC
observables/LBVelocityProfile.cpp
virtual_sites/lb_inertialess_tracers.cpp
virtual_sites/lb_inertialess_tracers_cuda_interface.cpp
virtual_sites/virtual_sites_com.cpp
virtual_sites/VirtualSitesInertialessTracers.cpp
virtual_sites/VirtualSitesRelative.cpp
accumulators/TimeSeries.cpp
observables/PidObservable.cpp)
observables/PidObservable.cpp)

if(CUDA)
set(EspressoCuda_SRC
Expand Down
2 changes: 1 addition & 1 deletion src/core/event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ void on_ghost_flags_change() {

void update_dependent_particles() {
#ifdef VIRTUAL_SITES
virtual_sites()->update();
virtual_sites()->update(true);
#endif
cells_update_ghosts();

Expand Down
4 changes: 2 additions & 2 deletions src/core/integrate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ void integrate_vv(int n_steps, int reuse_forces) {
lb_lbcoupling_deactivate();

#ifdef VIRTUAL_SITES
virtual_sites()->update();
virtual_sites()->update(true);
#endif

// Communication step: distribute ghost positions
Expand Down Expand Up @@ -248,7 +248,7 @@ void integrate_vv(int n_steps, int reuse_forces) {

// VIRTUAL_SITES pos (and vel for DPD) update for security reason !!!
#ifdef VIRTUAL_SITES
virtual_sites()->update();
virtual_sites()->update(true);
#endif

// Communication step: distribute ghost positions
Expand Down
2 changes: 1 addition & 1 deletion src/core/virtual_sites/VirtualSites.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class VirtualSites {
* Velocities are only updated if get_have_velocity() returns true.
* @param recalc_positions Skip the recalculation of positions if false.
*/
virtual void update(bool recalc_positions = true) const = 0;
virtual void update(bool recalc_positions) const = 0;
/** Back-transfer forces (and torques) to non-virtual particles. */
virtual void back_transfer_forces_and_torques() const = 0;
/** @brief Called after force calculation (and before rattle/shake) */
Expand Down
147 changes: 0 additions & 147 deletions src/core/virtual_sites/virtual_sites_com.cpp

This file was deleted.

46 changes: 0 additions & 46 deletions src/core/virtual_sites/virtual_sites_com.hpp

This file was deleted.