use '= default' when default functions should be used
This commit is contained in:
@ -30,8 +30,7 @@
|
|||||||
Body23Joint::Body23Joint(){
|
Body23Joint::Body23Joint(){
|
||||||
DimQandU(4,2);
|
DimQandU(4,2);
|
||||||
}
|
}
|
||||||
Body23Joint::~Body23Joint(){
|
Body23Joint::~Body23Joint() = default;
|
||||||
}
|
|
||||||
|
|
||||||
JointType Body23Joint::GetType(){
|
JointType Body23Joint::GetType(){
|
||||||
return BODY23JOINT;
|
return BODY23JOINT;
|
||||||
|
|||||||
@ -30,8 +30,7 @@ FreeBodyJoint::FreeBodyJoint(){
|
|||||||
DimQandU(7,6);
|
DimQandU(7,6);
|
||||||
}
|
}
|
||||||
|
|
||||||
FreeBodyJoint::~FreeBodyJoint(){
|
FreeBodyJoint::~FreeBodyJoint() = default;
|
||||||
}
|
|
||||||
|
|
||||||
JointType FreeBodyJoint::GetType(){
|
JointType FreeBodyJoint::GetType(){
|
||||||
return FREEBODYJOINT;
|
return FREEBODYJOINT;
|
||||||
|
|||||||
@ -33,8 +33,7 @@ InertialFrame::InertialFrame(){
|
|||||||
alpha.Zeros();
|
alpha.Zeros();
|
||||||
alpha_t.Zeros();
|
alpha_t.Zeros();
|
||||||
}
|
}
|
||||||
InertialFrame::~InertialFrame(){
|
InertialFrame::~InertialFrame() = default;
|
||||||
}
|
|
||||||
|
|
||||||
BodyType InertialFrame::GetType(){
|
BodyType InertialFrame::GetType(){
|
||||||
return INERTIALFRAME;
|
return INERTIALFRAME;
|
||||||
|
|||||||
@ -33,8 +33,7 @@ Joint::Joint(){
|
|||||||
pk_C_k.Identity();
|
pk_C_k.Identity();
|
||||||
}
|
}
|
||||||
|
|
||||||
Joint::~Joint(){
|
Joint::~Joint() = default;
|
||||||
}
|
|
||||||
|
|
||||||
void Joint::SetBodies(Body* b1, Body* b2){
|
void Joint::SetBodies(Body* b1, Body* b2){
|
||||||
body1 = b1;
|
body1 = b1;
|
||||||
|
|||||||
@ -26,11 +26,9 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
MixedJoint::MixedJoint(){
|
MixedJoint::MixedJoint() = default;
|
||||||
}
|
|
||||||
|
|
||||||
MixedJoint::~MixedJoint(){
|
MixedJoint::~MixedJoint() = default;
|
||||||
}
|
|
||||||
|
|
||||||
JointType MixedJoint::GetType(){
|
JointType MixedJoint::GetType(){
|
||||||
return MIXEDJOINT;
|
return MIXEDJOINT;
|
||||||
|
|||||||
@ -19,11 +19,9 @@
|
|||||||
#include "particle.h"
|
#include "particle.h"
|
||||||
#include "fixedpoint.h"
|
#include "fixedpoint.h"
|
||||||
|
|
||||||
Particle::Particle(){
|
Particle::Particle() = default;
|
||||||
}
|
|
||||||
|
|
||||||
Particle::~Particle(){
|
Particle::~Particle() = default;
|
||||||
}
|
|
||||||
|
|
||||||
BodyType Particle::GetType(){
|
BodyType Particle::GetType(){
|
||||||
return PARTICLE;
|
return PARTICLE;
|
||||||
|
|||||||
@ -21,8 +21,7 @@
|
|||||||
Point::Point(){
|
Point::Point(){
|
||||||
position.Zeros();
|
position.Zeros();
|
||||||
}
|
}
|
||||||
Point::~Point(){
|
Point::~Point() = default;
|
||||||
}
|
|
||||||
|
|
||||||
bool Point::ReadIn(std::istream& in){
|
bool Point::ReadIn(std::istream& in){
|
||||||
return ReadInPointData(in);
|
return ReadInPointData(in);
|
||||||
|
|||||||
@ -27,8 +27,7 @@ PrismaticJoint::PrismaticJoint(){
|
|||||||
u.Dim(1);
|
u.Dim(1);
|
||||||
udot.Dim(1);
|
udot.Dim(1);
|
||||||
}
|
}
|
||||||
PrismaticJoint::~PrismaticJoint(){
|
PrismaticJoint::~PrismaticJoint() = default;
|
||||||
}
|
|
||||||
|
|
||||||
JointType PrismaticJoint::GetType(){
|
JointType PrismaticJoint::GetType(){
|
||||||
return PRISMATICJOINT;
|
return PRISMATICJOINT;
|
||||||
|
|||||||
@ -29,8 +29,7 @@ RevoluteJoint::RevoluteJoint(){
|
|||||||
SetAxisPK(axis);
|
SetAxisPK(axis);
|
||||||
}
|
}
|
||||||
|
|
||||||
RevoluteJoint::~RevoluteJoint(){
|
RevoluteJoint::~RevoluteJoint() = default;
|
||||||
}
|
|
||||||
|
|
||||||
JointType RevoluteJoint::GetType(){
|
JointType RevoluteJoint::GetType(){
|
||||||
return REVOLUTEJOINT;
|
return REVOLUTEJOINT;
|
||||||
|
|||||||
@ -20,10 +20,8 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
RigidBody::RigidBody(){
|
RigidBody::RigidBody() = default;
|
||||||
}
|
RigidBody::~RigidBody() = default;
|
||||||
RigidBody::~RigidBody(){
|
|
||||||
}
|
|
||||||
|
|
||||||
BodyType RigidBody::GetType(){
|
BodyType RigidBody::GetType(){
|
||||||
return RIGIDBODY;
|
return RIGIDBODY;
|
||||||
|
|||||||
@ -19,12 +19,9 @@
|
|||||||
#include "system.h"
|
#include "system.h"
|
||||||
#include "matrices.h"
|
#include "matrices.h"
|
||||||
|
|
||||||
Solver::Solver(){
|
Solver::Solver() = default;
|
||||||
|
|
||||||
}
|
Solver::~Solver() = default;
|
||||||
|
|
||||||
Solver::~Solver(){
|
|
||||||
}
|
|
||||||
|
|
||||||
void Solver::SetSystem(System* s){
|
void Solver::SetSystem(System* s){
|
||||||
system = s;
|
system = s;
|
||||||
|
|||||||
@ -30,8 +30,7 @@
|
|||||||
SphericalJoint::SphericalJoint(){
|
SphericalJoint::SphericalJoint(){
|
||||||
DimQandU(4,3);
|
DimQandU(4,3);
|
||||||
}
|
}
|
||||||
SphericalJoint::~SphericalJoint(){
|
SphericalJoint::~SphericalJoint() = default;
|
||||||
}
|
|
||||||
|
|
||||||
JointType SphericalJoint::GetType(){
|
JointType SphericalJoint::GetType(){
|
||||||
return SPHERICALJOINT;
|
return SPHERICALJOINT;
|
||||||
|
|||||||
@ -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");
|
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
|
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()
|
needed in replicate when 2 atom classes exist and it calls pack_restart()
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace LAMMPS_NS {
|
|||||||
class AtomVecOxdna : public AtomVec {
|
class AtomVecOxdna : public AtomVec {
|
||||||
public:
|
public:
|
||||||
AtomVecOxdna(class LAMMPS *);
|
AtomVecOxdna(class LAMMPS *);
|
||||||
~AtomVecOxdna();
|
~AtomVecOxdna() = default;
|
||||||
|
|
||||||
void grow_pointers();
|
void grow_pointers();
|
||||||
void data_atom_post(int);
|
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");
|
if (!compressed) error->all(FLERR, "Dump atom/gz only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpAtomGZ::~DumpAtomGZ() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpAtomGZ : public DumpAtom {
|
class DumpAtomGZ : public DumpAtom {
|
||||||
public:
|
public:
|
||||||
DumpAtomGZ(class LAMMPS *, int, char **);
|
DumpAtomGZ(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpAtomGZ();
|
virtual ~DumpAtomGZ() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
GzFileWriter writer;
|
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");
|
if (!compressed) error->all(FLERR, "Dump atom/zstd only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpAtomZstd::~DumpAtomZstd() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -34,7 +34,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpAtomZstd : public DumpAtom {
|
class DumpAtomZstd : public DumpAtom {
|
||||||
public:
|
public:
|
||||||
DumpAtomZstd(class LAMMPS *, int, char **);
|
DumpAtomZstd(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpAtomZstd();
|
virtual ~DumpAtomZstd() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
ZstdFileWriter writer;
|
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");
|
if (!compressed) error->all(FLERR, "Dump cfg/gz only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpCFGGZ::~DumpCFGGZ() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpCFGGZ : public DumpCFG {
|
class DumpCFGGZ : public DumpCFG {
|
||||||
public:
|
public:
|
||||||
DumpCFGGZ(class LAMMPS *, int, char **);
|
DumpCFGGZ(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpCFGGZ();
|
virtual ~DumpCFGGZ() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
GzFileWriter writer;
|
GzFileWriter writer;
|
||||||
|
|||||||
@ -35,10 +35,6 @@ DumpCFGZstd::DumpCFGZstd(LAMMPS *lmp, int narg, char **arg) : DumpCFG(lmp, narg,
|
|||||||
if (!compressed) error->all(FLERR, "Dump cfg/zstd only writes compressed files");
|
if (!compressed) error->all(FLERR, "Dump cfg/zstd only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpCFGZstd::~DumpCFGZstd() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -33,7 +33,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpCFGZstd : public DumpCFG {
|
class DumpCFGZstd : public DumpCFG {
|
||||||
public:
|
public:
|
||||||
DumpCFGZstd(class LAMMPS *, int, char **);
|
DumpCFGZstd(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpCFGZstd();
|
virtual ~DumpCFGZstd() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
ZstdFileWriter writer;
|
ZstdFileWriter writer;
|
||||||
|
|||||||
@ -27,10 +27,6 @@ DumpCustomGZ::DumpCustomGZ(LAMMPS *lmp, int narg, char **arg) : DumpCustom(lmp,
|
|||||||
if (!compressed) error->all(FLERR, "Dump custom/gz only writes compressed files");
|
if (!compressed) error->all(FLERR, "Dump custom/gz only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpCustomGZ::~DumpCustomGZ() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpCustomGZ : public DumpCustom {
|
class DumpCustomGZ : public DumpCustom {
|
||||||
public:
|
public:
|
||||||
DumpCustomGZ(class LAMMPS *, int, char **);
|
DumpCustomGZ(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpCustomGZ();
|
virtual ~DumpCustomGZ() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
GzFileWriter writer;
|
GzFileWriter writer;
|
||||||
|
|||||||
@ -37,12 +37,6 @@ DumpCustomZstd::DumpCustomZstd(LAMMPS *lmp, int narg, char **arg) :
|
|||||||
error->all(FLERR,"Dump custom/zstd only writes compressed files");
|
error->all(FLERR,"Dump custom/zstd only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpCustomZstd::~DumpCustomZstd()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -34,7 +34,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpCustomZstd : public DumpCustom {
|
class DumpCustomZstd : public DumpCustom {
|
||||||
public:
|
public:
|
||||||
DumpCustomZstd(class LAMMPS *, int, char **);
|
DumpCustomZstd(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpCustomZstd();
|
virtual ~DumpCustomZstd() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
ZstdFileWriter writer;
|
ZstdFileWriter writer;
|
||||||
|
|||||||
@ -27,10 +27,6 @@ DumpLocalGZ::DumpLocalGZ(LAMMPS *lmp, int narg, char **arg) : DumpLocal(lmp, nar
|
|||||||
if (!compressed) error->all(FLERR, "Dump local/gz only writes compressed files");
|
if (!compressed) error->all(FLERR, "Dump local/gz only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpLocalGZ::~DumpLocalGZ() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpLocalGZ : public DumpLocal {
|
class DumpLocalGZ : public DumpLocal {
|
||||||
public:
|
public:
|
||||||
DumpLocalGZ(class LAMMPS *, int, char **);
|
DumpLocalGZ(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpLocalGZ();
|
virtual ~DumpLocalGZ() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
GzFileWriter writer;
|
GzFileWriter writer;
|
||||||
|
|||||||
@ -33,10 +33,6 @@ DumpLocalZstd::DumpLocalZstd(LAMMPS *lmp, int narg, char **arg) : DumpLocal(lmp,
|
|||||||
if (!compressed) error->all(FLERR, "Dump local/zstd only writes compressed files");
|
if (!compressed) error->all(FLERR, "Dump local/zstd only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpLocalZstd::~DumpLocalZstd() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -34,7 +34,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpLocalZstd : public DumpLocal {
|
class DumpLocalZstd : public DumpLocal {
|
||||||
public:
|
public:
|
||||||
DumpLocalZstd(class LAMMPS *, int, char **);
|
DumpLocalZstd(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpLocalZstd();
|
virtual ~DumpLocalZstd() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
ZstdFileWriter writer;
|
ZstdFileWriter writer;
|
||||||
|
|||||||
@ -26,10 +26,6 @@ DumpXYZGZ::DumpXYZGZ(LAMMPS *lmp, int narg, char **arg) : DumpXYZ(lmp, narg, arg
|
|||||||
if (!compressed) error->all(FLERR, "Dump xyz/gz only writes compressed files");
|
if (!compressed) error->all(FLERR, "Dump xyz/gz only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpXYZGZ::~DumpXYZGZ() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpXYZGZ : public DumpXYZ {
|
class DumpXYZGZ : public DumpXYZ {
|
||||||
public:
|
public:
|
||||||
DumpXYZGZ(class LAMMPS *, int, char **);
|
DumpXYZGZ(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpXYZGZ();
|
virtual ~DumpXYZGZ() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
GzFileWriter writer;
|
GzFileWriter writer;
|
||||||
|
|||||||
@ -32,10 +32,6 @@ DumpXYZZstd::DumpXYZZstd(LAMMPS *lmp, int narg, char **arg) : DumpXYZ(lmp, narg,
|
|||||||
if (!compressed) error->all(FLERR, "Dump xyz/zstd only writes compressed files");
|
if (!compressed) error->all(FLERR, "Dump xyz/zstd only writes compressed files");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
DumpXYZZstd::~DumpXYZZstd() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
generic opening of a dump file
|
generic opening of a dump file
|
||||||
ASCII or binary or compressed
|
ASCII or binary or compressed
|
||||||
|
|||||||
@ -34,7 +34,7 @@ namespace LAMMPS_NS {
|
|||||||
class DumpXYZZstd : public DumpXYZ {
|
class DumpXYZZstd : public DumpXYZ {
|
||||||
public:
|
public:
|
||||||
DumpXYZZstd(class LAMMPS *, int, char **);
|
DumpXYZZstd(class LAMMPS *, int, char **);
|
||||||
virtual ~DumpXYZZstd();
|
virtual ~DumpXYZZstd() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
ZstdFileWriter writer;
|
ZstdFileWriter writer;
|
||||||
|
|||||||
@ -93,10 +93,6 @@ FixPolarizeBEMICC::FixPolarizeBEMICC(LAMMPS *lmp, int narg, char **arg) : Fix(lm
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
||||||
FixPolarizeBEMICC::~FixPolarizeBEMICC() {}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
int FixPolarizeBEMICC::setmask()
|
int FixPolarizeBEMICC::setmask()
|
||||||
{
|
{
|
||||||
int mask = 0;
|
int mask = 0;
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace LAMMPS_NS {
|
|||||||
class FixPolarizeBEMICC : public Fix {
|
class FixPolarizeBEMICC : public Fix {
|
||||||
public:
|
public:
|
||||||
FixPolarizeBEMICC(class LAMMPS *, int, char **);
|
FixPolarizeBEMICC(class LAMMPS *, int, char **);
|
||||||
~FixPolarizeBEMICC();
|
~FixPolarizeBEMICC() = default;
|
||||||
virtual int setmask();
|
virtual int setmask();
|
||||||
virtual void init();
|
virtual void init();
|
||||||
virtual void setup(int);
|
virtual void setup(int);
|
||||||
|
|||||||
@ -61,12 +61,6 @@ FixEDPDSource::FixEDPDSource(LAMMPS *lmp, int narg, char **arg) :
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
||||||
FixEDPDSource::~FixEDPDSource()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
int FixEDPDSource::setmask()
|
int FixEDPDSource::setmask()
|
||||||
{
|
{
|
||||||
int mask = 0;
|
int mask = 0;
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace LAMMPS_NS {
|
|||||||
class FixEDPDSource : public Fix {
|
class FixEDPDSource : public Fix {
|
||||||
public:
|
public:
|
||||||
FixEDPDSource(class LAMMPS *, int, char **);
|
FixEDPDSource(class LAMMPS *, int, char **);
|
||||||
~FixEDPDSource();
|
~FixEDPDSource() = default;
|
||||||
int setmask();
|
int setmask();
|
||||||
void init();
|
void init();
|
||||||
void post_force(int);
|
void post_force(int);
|
||||||
|
|||||||
@ -62,12 +62,6 @@ FixTDPDSource::FixTDPDSource(LAMMPS *lmp, int narg, char **arg) :
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
||||||
FixTDPDSource::~FixTDPDSource()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
int FixTDPDSource::setmask()
|
int FixTDPDSource::setmask()
|
||||||
{
|
{
|
||||||
int mask = 0;
|
int mask = 0;
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace LAMMPS_NS {
|
|||||||
class FixTDPDSource : public Fix {
|
class FixTDPDSource : public Fix {
|
||||||
public:
|
public:
|
||||||
FixTDPDSource(class LAMMPS *, int, char **);
|
FixTDPDSource(class LAMMPS *, int, char **);
|
||||||
~FixTDPDSource();
|
~FixTDPDSource() = default;
|
||||||
int setmask();
|
int setmask();
|
||||||
void init();
|
void init();
|
||||||
void post_force(int);
|
void post_force(int);
|
||||||
|
|||||||
@ -34,10 +34,6 @@ NBinSSA::NBinSSA(LAMMPS *lmp) : NBinStandard(lmp)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NBinSSA::~NBinSSA()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
bin owned and ghost atoms for the Shardlow Splitting Algorithm (SSA)
|
bin owned and ghost atoms for the Shardlow Splitting Algorithm (SSA)
|
||||||
local atoms are in distinct bins (binhead[]) from the ghosts
|
local atoms are in distinct bins (binhead[]) from the ghosts
|
||||||
|
|||||||
@ -41,7 +41,7 @@ class NBinSSA : public NBinStandard {
|
|||||||
int lbinzhi; // highest local bin z-dim coordinate
|
int lbinzhi; // highest local bin z-dim coordinate
|
||||||
|
|
||||||
NBinSSA(class LAMMPS *);
|
NBinSSA(class LAMMPS *);
|
||||||
~NBinSSA();
|
virtual ~NBinSSA() = default;
|
||||||
|
|
||||||
void bin_atoms_setup(int);
|
void bin_atoms_setup(int);
|
||||||
void bin_atoms();
|
void bin_atoms();
|
||||||
|
|||||||
@ -51,12 +51,6 @@ EwaldDipoleSpin::EwaldDipoleSpin(LAMMPS *lmp) :
|
|||||||
mub2mu0hbinv = mub2mu0 / hbar; // in rad.THz
|
mub2mu0hbinv = mub2mu0 / hbar; // in rad.THz
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
|
||||||
free all memory
|
|
||||||
------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
EwaldDipoleSpin::~EwaldDipoleSpin() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
called once before run
|
called once before run
|
||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace LAMMPS_NS {
|
|||||||
class EwaldDipoleSpin : public EwaldDipole {
|
class EwaldDipoleSpin : public EwaldDipole {
|
||||||
public:
|
public:
|
||||||
EwaldDipoleSpin(class LAMMPS *);
|
EwaldDipoleSpin(class LAMMPS *);
|
||||||
virtual ~EwaldDipoleSpin();
|
virtual ~EwaldDipoleSpin() = default;
|
||||||
void init();
|
void init();
|
||||||
void setup();
|
void setup();
|
||||||
void compute(int, int);
|
void compute(int, int);
|
||||||
|
|||||||
@ -55,13 +55,6 @@ FixLbViscous::FixLbViscous(LAMMPS *lmp, int narg, char **arg) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
FixLbViscous::~FixLbViscous()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace LAMMPS_NS {
|
|||||||
class FixLbViscous : public Fix {
|
class FixLbViscous : public Fix {
|
||||||
public:
|
public:
|
||||||
FixLbViscous(class LAMMPS *, int, char **);
|
FixLbViscous(class LAMMPS *, int, char **);
|
||||||
~FixLbViscous();
|
virtual ~FixLbViscous() = default;
|
||||||
int setmask();
|
int setmask();
|
||||||
void init();
|
void init();
|
||||||
void setup(int);
|
void setup(int);
|
||||||
|
|||||||
@ -90,11 +90,6 @@ thyla_part::thyla_part( int type, double *args, double xlo, double ylo, double z
|
|||||||
z0 = (type == THYLA_TYPE_SPHERE) ? params[3] : params[5];
|
z0 = (type == THYLA_TYPE_SPHERE) ? params[3] : params[5];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
thyla_part::~thyla_part()
|
|
||||||
{}
|
|
||||||
|
|
||||||
double thyla_part::g(const double *x)
|
double thyla_part::g(const double *x)
|
||||||
{
|
{
|
||||||
switch(type) {
|
switch(type) {
|
||||||
|
|||||||
@ -33,7 +33,7 @@ namespace user_manifold {
|
|||||||
thyla_part(int type, double *args, double xlo, double ylo, double zlo, double xhi, double yhi,
|
thyla_part(int type, double *args, double xlo, double ylo, double zlo, double xhi, double yhi,
|
||||||
double zhi);
|
double zhi);
|
||||||
thyla_part() : type(-1), x0(-1337), y0(-1337), z0(-1337) {}
|
thyla_part() : type(-1), x0(-1337), y0(-1337), z0(-1337) {}
|
||||||
~thyla_part();
|
~thyla_part() = default;
|
||||||
|
|
||||||
double g(const double *x);
|
double g(const double *x);
|
||||||
void n(const double *x, double *n);
|
void n(const double *x, double *n);
|
||||||
|
|||||||
@ -38,7 +38,7 @@ using namespace LAMMPS_NS;
|
|||||||
class MESONTList {
|
class MESONTList {
|
||||||
public:
|
public:
|
||||||
MESONTList(const Atom* atom, const NeighList* nblist);
|
MESONTList(const Atom* atom, const NeighList* nblist);
|
||||||
~MESONTList() {};
|
~MESONTList() = default;;
|
||||||
//list of segments
|
//list of segments
|
||||||
const std::vector<std::array<int,2>>& get_segments() const;
|
const std::vector<std::array<int,2>>& get_segments() const;
|
||||||
//list of triplets
|
//list of triplets
|
||||||
|
|||||||
@ -31,10 +31,6 @@ MLIAPModelLinear::MLIAPModelLinear(LAMMPS* lmp, char* coefffilename) :
|
|||||||
if (nparams > 0) ndescriptors = nparams - 1;
|
if (nparams > 0) ndescriptors = nparams - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
MLIAPModelLinear::~MLIAPModelLinear() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
get number of parameters
|
get number of parameters
|
||||||
---------------------------------------------------------------------- */
|
---------------------------------------------------------------------- */
|
||||||
|
|||||||
@ -21,7 +21,7 @@ namespace LAMMPS_NS {
|
|||||||
class MLIAPModelLinear : public MLIAPModelSimple {
|
class MLIAPModelLinear : public MLIAPModelSimple {
|
||||||
public:
|
public:
|
||||||
MLIAPModelLinear(LAMMPS *, char * = nullptr);
|
MLIAPModelLinear(LAMMPS *, char * = nullptr);
|
||||||
~MLIAPModelLinear();
|
~MLIAPModelLinear() = default;
|
||||||
virtual int get_nparams();
|
virtual int get_nparams();
|
||||||
virtual int get_gamma_nnz(class MLIAPData *);
|
virtual int get_gamma_nnz(class MLIAPData *);
|
||||||
virtual void compute_gradients(class MLIAPData *);
|
virtual void compute_gradients(class MLIAPData *);
|
||||||
|
|||||||
@ -34,10 +34,6 @@ MLIAPModelQuadratic::MLIAPModelQuadratic(LAMMPS* lmp, char* coefffilename) :
|
|||||||
nonlinearflag = 1;
|
nonlinearflag = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
MLIAPModelQuadratic::~MLIAPModelQuadratic() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
get number of parameters
|
get number of parameters
|
||||||
---------------------------------------------------------------------- */
|
---------------------------------------------------------------------- */
|
||||||
|
|||||||
@ -21,7 +21,7 @@ namespace LAMMPS_NS {
|
|||||||
class MLIAPModelQuadratic : public MLIAPModelSimple {
|
class MLIAPModelQuadratic : public MLIAPModelSimple {
|
||||||
public:
|
public:
|
||||||
MLIAPModelQuadratic(LAMMPS *, char * = nullptr);
|
MLIAPModelQuadratic(LAMMPS *, char * = nullptr);
|
||||||
~MLIAPModelQuadratic();
|
~MLIAPModelQuadratic() = default;
|
||||||
virtual int get_nparams();
|
virtual int get_nparams();
|
||||||
virtual int get_gamma_nnz(class MLIAPData *);
|
virtual int get_gamma_nnz(class MLIAPData *);
|
||||||
virtual void compute_gradients(class MLIAPData *);
|
virtual void compute_gradients(class MLIAPData *);
|
||||||
|
|||||||
@ -41,10 +41,6 @@ PairLJCutCoulCutDielectricOMP::PairLJCutCoulCutDielectricOMP(LAMMPS *lmp) :
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
||||||
PairLJCutCoulCutDielectricOMP::~PairLJCutCoulCutDielectricOMP() {}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
void PairLJCutCoulCutDielectricOMP::compute(int eflag, int vflag)
|
void PairLJCutCoulCutDielectricOMP::compute(int eflag, int vflag)
|
||||||
{
|
{
|
||||||
ev_init(eflag, vflag);
|
ev_init(eflag, vflag);
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace LAMMPS_NS {
|
|||||||
class PairLJCutCoulCutDielectricOMP : public PairLJCutCoulCutDielectric, public ThrOMP {
|
class PairLJCutCoulCutDielectricOMP : public PairLJCutCoulCutDielectric, public ThrOMP {
|
||||||
public:
|
public:
|
||||||
PairLJCutCoulCutDielectricOMP(class LAMMPS *);
|
PairLJCutCoulCutDielectricOMP(class LAMMPS *);
|
||||||
virtual ~PairLJCutCoulCutDielectricOMP();
|
virtual ~PairLJCutCoulCutDielectricOMP() = default;
|
||||||
virtual void compute(int, int);
|
virtual void compute(int, int);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@ -47,10 +47,6 @@ PairLJCutCoulLongDielectricOMP::PairLJCutCoulLongDielectricOMP(LAMMPS *lmp) :
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
||||||
PairLJCutCoulLongDielectricOMP::~PairLJCutCoulLongDielectricOMP() {}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
void PairLJCutCoulLongDielectricOMP::compute(int eflag, int vflag)
|
void PairLJCutCoulLongDielectricOMP::compute(int eflag, int vflag)
|
||||||
{
|
{
|
||||||
ev_init(eflag, vflag);
|
ev_init(eflag, vflag);
|
||||||
|
|||||||
@ -29,7 +29,7 @@ class PairLJCutCoulLongDielectricOMP : public PairLJCutCoulLongDielectric, publi
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
PairLJCutCoulLongDielectricOMP(class LAMMPS *);
|
PairLJCutCoulLongDielectricOMP(class LAMMPS *);
|
||||||
virtual ~PairLJCutCoulLongDielectricOMP();
|
virtual ~PairLJCutCoulLongDielectricOMP() = default;
|
||||||
virtual void compute(int, int);
|
virtual void compute(int, int);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@ -47,11 +47,6 @@ PairLubricateOMP::PairLubricateOMP(LAMMPS *lmp) :
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
||||||
PairLubricateOMP::~PairLubricateOMP()
|
|
||||||
{}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
void PairLubricateOMP::compute(int eflag, int vflag)
|
void PairLubricateOMP::compute(int eflag, int vflag)
|
||||||
{
|
{
|
||||||
ev_init(eflag,vflag);
|
ev_init(eflag,vflag);
|
||||||
|
|||||||
@ -33,7 +33,7 @@ class PairLubricateOMP : public PairLubricate, public ThrOMP {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
PairLubricateOMP(class LAMMPS *);
|
PairLubricateOMP(class LAMMPS *);
|
||||||
virtual ~PairLubricateOMP();
|
virtual ~PairLubricateOMP() = default;
|
||||||
|
|
||||||
virtual void compute(int, int);
|
virtual void compute(int, int);
|
||||||
virtual double memory_usage();
|
virtual double memory_usage();
|
||||||
|
|||||||
@ -47,11 +47,6 @@ PairLubricatePolyOMP::PairLubricatePolyOMP(LAMMPS *lmp) :
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
||||||
PairLubricatePolyOMP::~PairLubricatePolyOMP()
|
|
||||||
{}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
void PairLubricatePolyOMP::compute(int eflag, int vflag)
|
void PairLubricatePolyOMP::compute(int eflag, int vflag)
|
||||||
{
|
{
|
||||||
ev_init(eflag,vflag);
|
ev_init(eflag,vflag);
|
||||||
|
|||||||
@ -33,7 +33,7 @@ class PairLubricatePolyOMP : public PairLubricatePoly, public ThrOMP {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
PairLubricatePolyOMP(class LAMMPS *);
|
PairLubricatePolyOMP(class LAMMPS *);
|
||||||
virtual ~PairLubricatePolyOMP();
|
virtual ~PairLubricatePolyOMP() = default;
|
||||||
|
|
||||||
virtual void compute(int, int);
|
virtual void compute(int, int);
|
||||||
virtual double memory_usage();
|
virtual double memory_usage();
|
||||||
|
|||||||
@ -53,10 +53,6 @@ PairSpin::PairSpin(LAMMPS *lmp) : Pair(lmp), emag(nullptr)
|
|||||||
lattice_flag = 0;
|
lattice_flag = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
PairSpin::~PairSpin() {}
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
global settings
|
global settings
|
||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
|
|||||||
@ -23,7 +23,7 @@ class PairSpin : public Pair {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
PairSpin(class LAMMPS *);
|
PairSpin(class LAMMPS *);
|
||||||
virtual ~PairSpin();
|
virtual ~PairSpin() = default;
|
||||||
virtual void settings(int, char **);
|
virtual void settings(int, char **);
|
||||||
virtual void coeff(int, char **) {}
|
virtual void coeff(int, char **) {}
|
||||||
virtual void init_style();
|
virtual void init_style();
|
||||||
|
|||||||
@ -38,10 +38,6 @@ Python::~Python()
|
|||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|
||||||
PythonInterface::~PythonInterface() {}
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
void Python::init()
|
void Python::init()
|
||||||
{
|
{
|
||||||
#if defined(LMP_PYTHON)
|
#if defined(LMP_PYTHON)
|
||||||
|
|||||||
@ -20,7 +20,7 @@ namespace LAMMPS_NS {
|
|||||||
|
|
||||||
class PythonInterface {
|
class PythonInterface {
|
||||||
public:
|
public:
|
||||||
virtual ~PythonInterface();
|
virtual ~PythonInterface() = default;
|
||||||
virtual void command(int, char **) = 0;
|
virtual void command(int, char **) = 0;
|
||||||
virtual void invoke_function(int, char *) = 0;
|
virtual void invoke_function(int, char *) = 0;
|
||||||
virtual int find(const char *) = 0;
|
virtual int find(const char *) = 0;
|
||||||
|
|||||||
@ -30,9 +30,6 @@ TableFileReader::TableFileReader(LAMMPS *lmp,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
TableFileReader::~TableFileReader() {
|
|
||||||
}
|
|
||||||
|
|
||||||
char *TableFileReader::find_section_start(const std::string &keyword) {
|
char *TableFileReader::find_section_start(const std::string &keyword) {
|
||||||
char *line = nullptr;
|
char *line = nullptr;
|
||||||
while ((line = reader->next_line())) {
|
while ((line = reader->next_line())) {
|
||||||
|
|||||||
@ -25,7 +25,7 @@ class TableFileReader : public PotentialFileReader {
|
|||||||
public:
|
public:
|
||||||
TableFileReader(class LAMMPS *lmp, const std::string &filename, const std::string &type,
|
TableFileReader(class LAMMPS *lmp, const std::string &filename, const std::string &type,
|
||||||
const int auto_convert = 0);
|
const int auto_convert = 0);
|
||||||
virtual ~TableFileReader();
|
virtual ~TableFileReader() = default;
|
||||||
|
|
||||||
char *find_section_start(const std::string &keyword);
|
char *find_section_start(const std::string &keyword);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -198,9 +198,6 @@ std::vector<std::string> Tokenizer::as_vector() {
|
|||||||
ValueTokenizer::ValueTokenizer(const std::string &str, const std::string &separators) : tokens(str, separators) {
|
ValueTokenizer::ValueTokenizer(const std::string &str, const std::string &separators) : tokens(str, separators) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ValueTokenizer::ValueTokenizer(const ValueTokenizer &rhs) : tokens(rhs.tokens) {
|
|
||||||
}
|
|
||||||
|
|
||||||
ValueTokenizer::ValueTokenizer(ValueTokenizer &&rhs) : tokens(std::move(rhs.tokens)) {
|
ValueTokenizer::ValueTokenizer(ValueTokenizer &&rhs) : tokens(std::move(rhs.tokens)) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -97,7 +97,7 @@ class ValueTokenizer {
|
|||||||
public:
|
public:
|
||||||
ValueTokenizer(const std::string &str,
|
ValueTokenizer(const std::string &str,
|
||||||
const std::string &separators = TOKENIZER_DEFAULT_SEPARATORS);
|
const std::string &separators = TOKENIZER_DEFAULT_SEPARATORS);
|
||||||
ValueTokenizer(const ValueTokenizer &);
|
ValueTokenizer(const ValueTokenizer &) = default;
|
||||||
ValueTokenizer(ValueTokenizer &&);
|
ValueTokenizer(ValueTokenizer &&);
|
||||||
ValueTokenizer &operator=(const ValueTokenizer &);
|
ValueTokenizer &operator=(const ValueTokenizer &);
|
||||||
ValueTokenizer &operator=(ValueTokenizer &&);
|
ValueTokenizer &operator=(ValueTokenizer &&);
|
||||||
|
|||||||
@ -19,8 +19,8 @@ const char *cont_input[] = {"create_atoms 1 single &", "0.2 0.1 0.1"};
|
|||||||
class LibraryCommands : public ::testing::Test {
|
class LibraryCommands : public ::testing::Test {
|
||||||
protected:
|
protected:
|
||||||
void *lmp;
|
void *lmp;
|
||||||
LibraryCommands(){};
|
LibraryCommands() = default;
|
||||||
~LibraryCommands() override{};
|
~LibraryCommands() override = default;
|
||||||
|
|
||||||
void SetUp() override
|
void SetUp() override
|
||||||
{
|
{
|
||||||
@ -31,7 +31,7 @@ protected:
|
|||||||
int argc = sizeof(args) / sizeof(char *);
|
int argc = sizeof(args) / sizeof(char *);
|
||||||
|
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
lmp = lammps_open_no_mpi(argc, argv, NULL);
|
lmp = lammps_open_no_mpi(argc, argv, nullptr);
|
||||||
std::string output = ::testing::internal::GetCapturedStdout();
|
std::string output = ::testing::internal::GetCapturedStdout();
|
||||||
if (verbose) std::cout << output;
|
if (verbose) std::cout << output;
|
||||||
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
||||||
|
|||||||
@ -22,8 +22,8 @@ protected:
|
|||||||
void *lmp;
|
void *lmp;
|
||||||
std::string INPUT_DIR = STRINGIFY(TEST_INPUT_FOLDER);
|
std::string INPUT_DIR = STRINGIFY(TEST_INPUT_FOLDER);
|
||||||
|
|
||||||
LibraryConfig(){};
|
LibraryConfig() = default;
|
||||||
~LibraryConfig() override{};
|
~LibraryConfig() override = default;
|
||||||
|
|
||||||
void SetUp() override
|
void SetUp() override
|
||||||
{
|
{
|
||||||
@ -35,7 +35,7 @@ protected:
|
|||||||
int argc = sizeof(args) / sizeof(char *);
|
int argc = sizeof(args) / sizeof(char *);
|
||||||
|
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
lmp = lammps_open_no_mpi(argc, argv, NULL);
|
lmp = lammps_open_no_mpi(argc, argv, nullptr);
|
||||||
lammps_command(lmp, "fix charge all property/atom q ghost yes");
|
lammps_command(lmp, "fix charge all property/atom q ghost yes");
|
||||||
lammps_command(lmp, "region box block 0 1 0 1 0 1");
|
lammps_command(lmp, "region box block 0 1 0 1 0 1");
|
||||||
lammps_command(lmp, "create_box 1 box");
|
lammps_command(lmp, "create_box 1 box");
|
||||||
|
|||||||
@ -69,7 +69,7 @@ TEST(lammps_external, callback)
|
|||||||
int argc = sizeof(args) / sizeof(char *);
|
int argc = sizeof(args) / sizeof(char *);
|
||||||
|
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
void *handle = lammps_open_no_mpi(argc, argv, NULL);
|
void *handle = lammps_open_no_mpi(argc, argv, nullptr);
|
||||||
std::string output = ::testing::internal::GetCapturedStdout();
|
std::string output = ::testing::internal::GetCapturedStdout();
|
||||||
if (verbose) std::cout << output;
|
if (verbose) std::cout << output;
|
||||||
|
|
||||||
@ -136,7 +136,7 @@ TEST(lammps_external, array)
|
|||||||
int argc = sizeof(args) / sizeof(char *);
|
int argc = sizeof(args) / sizeof(char *);
|
||||||
|
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
void *handle = lammps_open_no_mpi(argc, argv, NULL);
|
void *handle = lammps_open_no_mpi(argc, argv, nullptr);
|
||||||
std::string output = ::testing::internal::GetCapturedStdout();
|
std::string output = ::testing::internal::GetCapturedStdout();
|
||||||
if (verbose) std::cout << output;
|
if (verbose) std::cout << output;
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@ using ::testing::StartsWith;
|
|||||||
TEST(lammps_open, null_args)
|
TEST(lammps_open, null_args)
|
||||||
{
|
{
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
void *handle = lammps_open(0, NULL, MPI_COMM_WORLD, NULL);
|
void *handle = lammps_open(0, nullptr, MPI_COMM_WORLD, nullptr);
|
||||||
std::string output = ::testing::internal::GetCapturedStdout();
|
std::string output = ::testing::internal::GetCapturedStdout();
|
||||||
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
||||||
if (verbose) std::cout << output;
|
if (verbose) std::cout << output;
|
||||||
@ -175,7 +175,7 @@ TEST(lammps_open_fortran, no_args)
|
|||||||
MPI_Comm_split(MPI_COMM_WORLD, 0, 1, &mycomm);
|
MPI_Comm_split(MPI_COMM_WORLD, 0, 1, &mycomm);
|
||||||
int fcomm = MPI_Comm_c2f(mycomm);
|
int fcomm = MPI_Comm_c2f(mycomm);
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
void *handle = lammps_open_fortran(0, NULL, fcomm);
|
void *handle = lammps_open_fortran(0, nullptr, fcomm);
|
||||||
std::string output = ::testing::internal::GetCapturedStdout();
|
std::string output = ::testing::internal::GetCapturedStdout();
|
||||||
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
||||||
if (verbose) std::cout << output;
|
if (verbose) std::cout << output;
|
||||||
|
|||||||
@ -23,8 +23,8 @@ protected:
|
|||||||
void *lmp;
|
void *lmp;
|
||||||
std::string INPUT_DIR = STRINGIFY(TEST_INPUT_FOLDER);
|
std::string INPUT_DIR = STRINGIFY(TEST_INPUT_FOLDER);
|
||||||
|
|
||||||
LibraryProperties(){};
|
LibraryProperties() = default;
|
||||||
~LibraryProperties() override{};
|
~LibraryProperties() override = default;
|
||||||
|
|
||||||
void SetUp() override
|
void SetUp() override
|
||||||
{
|
{
|
||||||
@ -36,7 +36,7 @@ protected:
|
|||||||
int argc = sizeof(args) / sizeof(char *);
|
int argc = sizeof(args) / sizeof(char *);
|
||||||
|
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
lmp = lammps_open_no_mpi(argc, argv, NULL);
|
lmp = lammps_open_no_mpi(argc, argv, nullptr);
|
||||||
std::string output = ::testing::internal::GetCapturedStdout();
|
std::string output = ::testing::internal::GetCapturedStdout();
|
||||||
if (verbose) std::cout << output;
|
if (verbose) std::cout << output;
|
||||||
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
||||||
@ -436,8 +436,8 @@ class AtomProperties : public ::testing::Test {
|
|||||||
protected:
|
protected:
|
||||||
void *lmp;
|
void *lmp;
|
||||||
|
|
||||||
AtomProperties(){};
|
AtomProperties()= default;;
|
||||||
~AtomProperties() override{};
|
~AtomProperties() override= default;;
|
||||||
|
|
||||||
void SetUp() override
|
void SetUp() override
|
||||||
{
|
{
|
||||||
@ -447,7 +447,7 @@ protected:
|
|||||||
int argc = sizeof(args) / sizeof(char *);
|
int argc = sizeof(args) / sizeof(char *);
|
||||||
|
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
lmp = lammps_open_no_mpi(argc, argv, NULL);
|
lmp = lammps_open_no_mpi(argc, argv, nullptr);
|
||||||
std::string output = ::testing::internal::GetCapturedStdout();
|
std::string output = ::testing::internal::GetCapturedStdout();
|
||||||
if (verbose) std::cout << output;
|
if (verbose) std::cout << output;
|
||||||
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
||||||
|
|||||||
@ -23,8 +23,8 @@ protected:
|
|||||||
void *lmp;
|
void *lmp;
|
||||||
std::string INPUT_DIR = STRINGIFY(TEST_INPUT_FOLDER);
|
std::string INPUT_DIR = STRINGIFY(TEST_INPUT_FOLDER);
|
||||||
|
|
||||||
GatherProperties(){};
|
GatherProperties() = default;
|
||||||
~GatherProperties() override{};
|
~GatherProperties() override = default;
|
||||||
|
|
||||||
void SetUp() override
|
void SetUp() override
|
||||||
{
|
{
|
||||||
@ -36,7 +36,7 @@ protected:
|
|||||||
int argc = sizeof(args) / sizeof(char *);
|
int argc = sizeof(args) / sizeof(char *);
|
||||||
|
|
||||||
::testing::internal::CaptureStdout();
|
::testing::internal::CaptureStdout();
|
||||||
lmp = lammps_open_no_mpi(argc, argv, NULL);
|
lmp = lammps_open_no_mpi(argc, argv, nullptr);
|
||||||
std::string output = ::testing::internal::GetCapturedStdout();
|
std::string output = ::testing::internal::GetCapturedStdout();
|
||||||
if (verbose) std::cout << output;
|
if (verbose) std::cout << output;
|
||||||
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
EXPECT_THAT(output, StartsWith("LAMMPS ("));
|
||||||
|
|||||||
@ -29,7 +29,7 @@ protected:
|
|||||||
MPI_Initialized(&flag);
|
MPI_Initialized(&flag);
|
||||||
if (!flag) MPI_Init(&argc, &argv);
|
if (!flag) MPI_Init(&argc, &argv);
|
||||||
}
|
}
|
||||||
~Input_commands() override {}
|
~Input_commands() override = default;
|
||||||
|
|
||||||
void SetUp() override
|
void SetUp() override
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user