From a26c81d73bb21d9e5fea12d623b4cf7b5ad04344 Mon Sep 17 00:00:00 2001 From: Stan Moore Date: Thu, 3 Oct 2024 15:59:27 -0600 Subject: [PATCH] Revert changes to pair lubricate base class --- src/COLLOID/pair_brownian.cpp | 2 +- src/COLLOID/pair_lubricate.cpp | 2 -- src/COLLOID/pair_lubricate.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/COLLOID/pair_brownian.cpp b/src/COLLOID/pair_brownian.cpp index db58bc7bfe..6773900e44 100644 --- a/src/COLLOID/pair_brownian.cpp +++ b/src/COLLOID/pair_brownian.cpp @@ -54,7 +54,7 @@ PairBrownian::PairBrownian(LAMMPS *lmp) : Pair(lmp) PairBrownian::~PairBrownian() { - if(copymode) return; + if (copymode) return; if (allocated) { memory->destroy(setflag); diff --git a/src/COLLOID/pair_lubricate.cpp b/src/COLLOID/pair_lubricate.cpp index d758ac8840..14e587e5f8 100644 --- a/src/COLLOID/pair_lubricate.cpp +++ b/src/COLLOID/pair_lubricate.cpp @@ -56,8 +56,6 @@ PairLubricate::PairLubricate(LAMMPS *lmp) : Pair(lmp) PairLubricate::~PairLubricate() { - if (copymode) return; - if (allocated) { memory->destroy(setflag); memory->destroy(cutsq); diff --git a/src/COLLOID/pair_lubricate.h b/src/COLLOID/pair_lubricate.h index 6956293dbc..8097eb76dd 100644 --- a/src/COLLOID/pair_lubricate.h +++ b/src/COLLOID/pair_lubricate.h @@ -56,7 +56,7 @@ class PairLubricate : public Pair { double R0, RT0, RS0; double **cut_inner, **cut; - virtual void allocate(); + void allocate(); }; } // namespace LAMMPS_NS