lammps · akohlmey · Oct 14, 2021 · Oct 14, 2021 · Oct 14, 2021 · Oct 14, 2021
diff --git a/lib/poems/body23joint.cpp b/lib/poems/body23joint.cpp
@@ -30,8 +30,7 @@
 Body23Joint::Body23Joint(){
   DimQandU(4,2);
 }
-Body23Joint::~Body23Joint(){
-}
+Body23Joint::~Body23Joint() = default;
 
 JointType Body23Joint::GetType(){
   return BODY23JOINT;

diff --git a/lib/poems/fixedpoint.cpp b/lib/poems/fixedpoint.cpp
@@ -22,11 +22,6 @@
 
 using namespace std;
 
-FixedPoint::FixedPoint(){
-}
-FixedPoint::~FixedPoint(){
-}
-
 FixedPoint::FixedPoint(double x, double y, double z){
   position(1) = x;
   position(2) = y;

diff --git a/lib/poems/fixedpoint.h b/lib/poems/fixedpoint.h
@@ -24,8 +24,8 @@
 
 class FixedPoint : public Point  {
 public:
-  FixedPoint();
-  ~FixedPoint();
+  FixedPoint() = default;
+  ~FixedPoint() = default;
   FixedPoint(double x, double y, double z);
   FixedPoint(Vect3& v);
   PointType GetType();

diff --git a/lib/poems/freebodyjoint.cpp b/lib/poems/freebodyjoint.cpp
@@ -30,8 +30,7 @@ FreeBodyJoint::FreeBodyJoint(){
   DimQandU(7,6);
 }
 
-FreeBodyJoint::~FreeBodyJoint(){
-}
+FreeBodyJoint::~FreeBodyJoint() = default;
 
 JointType FreeBodyJoint::GetType(){
   return FREEBODYJOINT;

diff --git a/lib/poems/inertialframe.cpp b/lib/poems/inertialframe.cpp
@@ -33,8 +33,7 @@ InertialFrame::InertialFrame(){
   alpha.Zeros();
   alpha_t.Zeros();
 }
-InertialFrame::~InertialFrame(){
-}
+InertialFrame::~InertialFrame() = default;
 
 BodyType InertialFrame::GetType(){
   return INERTIALFRAME;

diff --git a/lib/poems/joint.cpp b/lib/poems/joint.cpp
@@ -33,8 +33,7 @@ Joint::Joint(){
   pk_C_k.Identity();
 }
 
-Joint::~Joint(){
-}
+Joint::~Joint() = default;
 
 void Joint::SetBodies(Body* b1, Body* b2){
   body1 = b1;

diff --git a/lib/poems/mat3x3.cpp b/lib/poems/mat3x3.cpp
@@ -24,8 +24,6 @@ using namespace std;
 Mat3x3::Mat3x3(){
   numrows = numcols = 3;
 }
-Mat3x3::~Mat3x3(){
-}
 
 Mat3x3::Mat3x3(const Mat3x3& A){
   numrows = numcols = 3;

diff --git a/lib/poems/mat3x3.h b/lib/poems/mat3x3.h
@@ -30,7 +30,7 @@ class Mat3x3 : public VirtualMatrix  {
   double elements[3][3];
 public:
   Mat3x3();
-  ~Mat3x3();
+  ~Mat3x3() = default;
   Mat3x3(const Mat3x3& A);  // copy constructor
   Mat3x3(const VirtualMatrix& A);  // copy constructor
 

diff --git a/lib/poems/mat4x4.cpp b/lib/poems/mat4x4.cpp
@@ -23,8 +23,6 @@ using namespace std;
 Mat4x4::Mat4x4(){
   numrows = numcols = 4;
 }
-Mat4x4::~Mat4x4(){
-}
 
 Mat4x4::Mat4x4(const Mat4x4& A){
   numrows = numcols = 4;

diff --git a/lib/poems/mat4x4.h b/lib/poems/mat4x4.h
@@ -28,7 +28,7 @@ class Mat4x4 : public VirtualMatrix  {
   double elements[4][4];
 public:
   Mat4x4();
-  ~Mat4x4();
+  ~Mat4x4() = default;
   Mat4x4(const Mat4x4& A);  // copy constructor
   Mat4x4(const VirtualMatrix& A);  // copy constructor
 

diff --git a/lib/poems/mat6x6.cpp b/lib/poems/mat6x6.cpp
@@ -23,8 +23,6 @@ using namespace std;
 Mat6x6::Mat6x6(){
   numrows = numcols = 6;
 }
-Mat6x6::~Mat6x6(){
-}
 
 Mat6x6::Mat6x6(const Mat6x6& A){
   numrows = numcols = 6;

diff --git a/lib/poems/mat6x6.h b/lib/poems/mat6x6.h
@@ -29,7 +29,7 @@ class Mat6x6 : public VirtualMatrix  {
   double elements[6][6];
 public:
   Mat6x6();
-  ~Mat6x6();
+  ~Mat6x6() = default;
   Mat6x6(const Mat6x6& A);  // copy constructor
   Mat6x6(const VirtualMatrix& A);  // copy constructor
 

diff --git a/lib/poems/mixedjoint.cpp b/lib/poems/mixedjoint.cpp
@@ -26,11 +26,9 @@
 
 
 
-MixedJoint::MixedJoint(){
-}
+MixedJoint::MixedJoint() = default;
 
-MixedJoint::~MixedJoint(){
-}
+MixedJoint::~MixedJoint() = default;
 
 JointType MixedJoint::GetType(){
   return MIXEDJOINT;

diff --git a/lib/poems/particle.cpp b/lib/poems/particle.cpp
@@ -19,11 +19,9 @@
 #include "particle.h"
 #include "fixedpoint.h"
 
-Particle::Particle(){
-}
+Particle::Particle() = default;
 
-Particle::~Particle(){
-}
+Particle::~Particle() = default;
 
 BodyType Particle::GetType(){
   return PARTICLE;

diff --git a/lib/poems/point.cpp b/lib/poems/point.cpp
@@ -21,8 +21,7 @@
 Point::Point(){
   position.Zeros();
 }
-Point::~Point(){
-}
+Point::~Point() = default;
 
 bool Point::ReadIn(std::istream& in){
   return ReadInPointData(in);

diff --git a/lib/poems/prismaticjoint.cpp b/lib/poems/prismaticjoint.cpp
@@ -27,8 +27,7 @@ PrismaticJoint::PrismaticJoint(){
   u.Dim(1);
   udot.Dim(1);
 }
-PrismaticJoint::~PrismaticJoint(){
-}
+PrismaticJoint::~PrismaticJoint() = default;
 
 JointType PrismaticJoint::GetType(){
   return PRISMATICJOINT;

diff --git a/lib/poems/revolutejoint.cpp b/lib/poems/revolutejoint.cpp
@@ -29,8 +29,7 @@ RevoluteJoint::RevoluteJoint(){
   SetAxisPK(axis);
 }
 
-RevoluteJoint::~RevoluteJoint(){
-}
+RevoluteJoint::~RevoluteJoint() = default;
 
 JointType RevoluteJoint::GetType(){
   return REVOLUTEJOINT;

diff --git a/lib/poems/rigidbody.cpp b/lib/poems/rigidbody.cpp
@@ -20,10 +20,8 @@
 
 using namespace std;
 
-RigidBody::RigidBody(){
-}
-RigidBody::~RigidBody(){
-}
+RigidBody::RigidBody() = default;
+RigidBody::~RigidBody() = default;
 
 BodyType RigidBody::GetType(){
   return RIGIDBODY;

diff --git a/lib/poems/solver.cpp b/lib/poems/solver.cpp
@@ -19,12 +19,9 @@
 #include "system.h"
 #include "matrices.h"
 
-Solver::Solver(){
+Solver::Solver() = default;
 
-}
-
-Solver::~Solver(){
-}
+Solver::~Solver() = default;
 
 void Solver::SetSystem(System* s){
   system = s;

diff --git a/lib/poems/sphericaljoint.cpp b/lib/poems/sphericaljoint.cpp
@@ -30,8 +30,7 @@
 SphericalJoint::SphericalJoint(){
   DimQandU(4,3);
 }
-SphericalJoint::~SphericalJoint(){
-}
+SphericalJoint::~SphericalJoint() = default;
 
 JointType SphericalJoint::GetType(){
   return SPHERICALJOINT;

diff --git a/lib/poems/vect3.cpp b/lib/poems/vect3.cpp
@@ -23,8 +23,6 @@ using namespace std;
 Vect3::Vect3(){
   numrows = 3; numcols = 1;
 }
-Vect3::~Vect3(){
-}
 
 Vect3::Vect3(const Vect3& A){  // copy constructor
   numrows = 3; numcols = 1;

diff --git a/lib/poems/vect3.h b/lib/poems/vect3.h
@@ -30,7 +30,7 @@ class Vect3 : public VirtualColMatrix  {
   double elements[3];
 public:
   Vect3();
-  ~Vect3();
+  ~Vect3() = default;
   Vect3(const Vect3& A);  // copy constructor
   Vect3(const VirtualMatrix& A);  // copy constructor
 

diff --git a/lib/poems/vect4.cpp b/lib/poems/vect4.cpp
@@ -23,8 +23,6 @@ using namespace std;
 Vect4::Vect4(){
   numrows = 4; numcols = 1;
 }
-Vect4::~Vect4(){
-}
 
 Vect4::Vect4(const Vect4& A){  // copy constructor
   numrows = 4; numcols = 1;

diff --git a/lib/poems/vect4.h b/lib/poems/vect4.h
@@ -28,7 +28,7 @@ class Vect4 : public VirtualColMatrix  {
   double elements[4];
 public:
   Vect4();
-  ~Vect4();
+  ~Vect4() = default;
   Vect4(const Vect4& A);  // copy constructor
   Vect4(const VirtualMatrix& A);  // copy constructor
 

diff --git a/lib/poems/vect6.cpp b/lib/poems/vect6.cpp
@@ -23,8 +23,6 @@ using namespace std;
 Vect6::Vect6(){
   numrows = 6; numcols = 1;
 }
-Vect6::~Vect6(){
-}
 
 Vect6::Vect6(const Vect6& A){  // copy constructor
   numrows = 6; numcols = 1;

diff --git a/lib/poems/vect6.h b/lib/poems/vect6.h
@@ -29,7 +29,7 @@ class Vect6 : public VirtualColMatrix  {
   double elements[6];
 public:
   Vect6();
-  ~Vect6();
+  ~Vect6() = default;
   Vect6(const Vect6& A);  // copy constructor
   Vect6(const VirtualMatrix& A);  // copy constructor
 

diff --git a/lib/poems/virtualcolmatrix.cpp b/lib/poems/virtualcolmatrix.cpp
@@ -25,9 +25,6 @@ VirtualColMatrix::VirtualColMatrix(){
   numcols = 1;
 }
 
-VirtualColMatrix::~VirtualColMatrix(){
-}
-
 double& VirtualColMatrix::operator_2int(int i, int j){
   if(j!=1){
     cerr << "matrix index invalid in operator ()" << endl;

diff --git a/lib/poems/virtualcolmatrix.h b/lib/poems/virtualcolmatrix.h
@@ -25,7 +25,7 @@
 class VirtualColMatrix : public VirtualMatrix  {
 public:
         VirtualColMatrix();
-        ~VirtualColMatrix();
+        ~VirtualColMatrix() = default;
         double& operator_2int (int i, int j); // array access
         double Get_2int (int i, int j) const;
         void Set_2int (int i, int j, double value);

diff --git a/lib/poems/virtualmatrix.cpp b/lib/poems/virtualmatrix.cpp
@@ -26,8 +26,7 @@ VirtualMatrix::VirtualMatrix(){
   numrows = numcols = 0;
 }
 
-VirtualMatrix::~VirtualMatrix(){
-}
+VirtualMatrix::~VirtualMatrix()= default;
 
 int VirtualMatrix::GetNumRows() const {
   return numrows;

diff --git a/lib/poems/virtualrowmatrix.cpp b/lib/poems/virtualrowmatrix.cpp
@@ -26,9 +26,6 @@ VirtualRowMatrix::VirtualRowMatrix(){
   numrows = 1;
 }
 
-VirtualRowMatrix::~VirtualRowMatrix(){
-}
-
 double& VirtualRowMatrix::operator_2int (int i, int j){
   if(i!=1){
     cerr << "matrix index invalid in operator ()" << endl;

diff --git a/lib/poems/virtualrowmatrix.h b/lib/poems/virtualrowmatrix.h
@@ -24,7 +24,7 @@
 class VirtualRowMatrix : public VirtualMatrix  {
 public:
   VirtualRowMatrix();
-  ~VirtualRowMatrix();
+  ~VirtualRowMatrix() = default;
   double& operator_2int (int i, int j); // array access
   double Get_2int(int i, int j) const;
   void Set_2int(int i, int j, double value);

diff --git a/src/BOCS/fix_bocs.cpp b/src/BOCS/fix_bocs.cpp
@@ -637,7 +637,7 @@ int FixBocs::read_F_table( char *filename, int p_basis_type )
     char line[MAX_F_TABLE_LINE_LENGTH];
     std::vector<std::string> inputLines;
     while (fgets(line, MAX_F_TABLE_LINE_LENGTH, fpi)) {
-      inputLines.push_back(std::string(line));
+      inputLines.emplace_back(line);
     }
     fclose(fpi);
 

diff --git a/src/CG-DNA/atom_vec_oxdna.cpp b/src/CG-DNA/atom_vec_oxdna.cpp
@@ -52,9 +52,6 @@ AtomVecOxdna::AtomVecOxdna(LAMMPS *lmp) : AtomVec(lmp)
     error->warning(FLERR, "Write_data command requires newton on to preserve 3'->5' bond polarity");
 }
 
-/* ---------------------------------------------------------------------- */
-AtomVecOxdna::~AtomVecOxdna() {}
-
 /* ----------------------------------------------------------------------
    set local copies of all grow ptrs used by this class, except defaults
    needed in replicate when 2 atom classes exist and it calls pack_restart()

diff --git a/src/CG-DNA/atom_vec_oxdna.h b/src/CG-DNA/atom_vec_oxdna.h
@@ -27,7 +27,7 @@ namespace LAMMPS_NS {
 class AtomVecOxdna : public AtomVec {
  public:
   AtomVecOxdna(class LAMMPS *);
-  ~AtomVecOxdna();
+  ~AtomVecOxdna() = default;
 
   void grow_pointers();
   void data_atom_post(int);

@@ -27,10 +27,6 @@ DumpAtomGZ::DumpAtomGZ(LAMMPS *lmp, int narg, char **arg) : DumpAtom(lmp, narg,
   if (!compressed) error->all(FLERR, "Dump atom/gz only writes compressed files");
 }
 
-/* ---------------------------------------------------------------------- */
-
-DumpAtomGZ::~DumpAtomGZ() {}
-
 /* ----------------------------------------------------------------------
    generic opening of a dump file
    ASCII or binary or compressed

@@ -28,7 +28,7 @@ namespace LAMMPS_NS {
 class DumpAtomGZ : public DumpAtom {
  public:
   DumpAtomGZ(class LAMMPS *, int, char **);
-  virtual ~DumpAtomGZ();
+  virtual ~DumpAtomGZ() = default;
 
  protected:
   GzFileWriter writer;

@@ -33,10 +33,6 @@ DumpAtomZstd::DumpAtomZstd(LAMMPS *lmp, int narg, char **arg) : DumpAtom(lmp, na
   if (!compressed) error->all(FLERR, "Dump atom/zstd only writes compressed files");
 }
 
-/* ---------------------------------------------------------------------- */
-
-DumpAtomZstd::~DumpAtomZstd() {}
-
 /* ----------------------------------------------------------------------
    generic opening of a dump file
    ASCII or binary or compressed

@@ -34,7 +34,7 @@ namespace LAMMPS_NS {
 class DumpAtomZstd : public DumpAtom {
  public:
   DumpAtomZstd(class LAMMPS *, int, char **);
-  virtual ~DumpAtomZstd();
+  virtual ~DumpAtomZstd() = default;
 
  protected:
   ZstdFileWriter writer;

@@ -29,10 +29,6 @@ DumpCFGGZ::DumpCFGGZ(LAMMPS *lmp, int narg, char **arg) : DumpCFG(lmp, narg, arg
   if (!compressed) error->all(FLERR, "Dump cfg/gz only writes compressed files");
 }
 
-/* ---------------------------------------------------------------------- */
-
-DumpCFGGZ::~DumpCFGGZ() {}
-
 /* ----------------------------------------------------------------------
    generic opening of a dump file
    ASCII or binary or compressed