Apply override to Region classes

This commit is contained in:
Richard Berger
2022-01-18 14:31:29 -05:00
parent 576f2266ae
commit d19f799585
9 changed files with 61 additions and 61 deletions

View File

@ -29,10 +29,10 @@ class RegBlock : public Region {
public:
RegBlock(class LAMMPS *, int, char **);
~RegBlock();
int inside(double, double, double);
int surface_interior(double *, double);
int surface_exterior(double *, double);
~RegBlock() override;
int inside(double, double, double) override;
int surface_interior(double *, double) override;
int surface_exterior(double *, double) override;
protected:
double xlo, xhi, ylo, yhi, zlo, zhi;

View File

@ -27,10 +27,10 @@ namespace LAMMPS_NS {
class RegCone : public Region {
public:
RegCone(class LAMMPS *, int, char **);
~RegCone();
int inside(double, double, double);
int surface_interior(double *, double);
int surface_exterior(double *, double);
~RegCone() override;
int inside(double, double, double) override;
int surface_interior(double *, double) override;
int surface_exterior(double *, double) override;
private:
char axis;

View File

@ -29,14 +29,14 @@ class RegCylinder : public Region {
public:
RegCylinder(class LAMMPS *, int, char **);
~RegCylinder();
void init();
int inside(double, double, double);
int surface_interior(double *, double);
int surface_exterior(double *, double);
void shape_update();
void set_velocity_shape();
void velocity_contact_shape(double *, double *);
~RegCylinder() override;
void init() override;
int inside(double, double, double) override;
int surface_interior(double *, double) override;
int surface_exterior(double *, double) override;
void shape_update() override;
void set_velocity_shape() override;
void velocity_contact_shape(double *, double *) override;
private:
char axis;

View File

@ -28,11 +28,11 @@ namespace LAMMPS_NS {
class RegionDeprecated : public Region {
public:
RegionDeprecated(class LAMMPS *, int, char **);
~RegionDeprecated() {}
virtual void init() {}
virtual int inside(double, double, double) { return 0; }
virtual int surface_interior(double *, double) { return 0; }
virtual int surface_exterior(double *, double) { return 0; }
~RegionDeprecated() override {}
void init() override {}
int inside(double, double, double) override { return 0; }
int surface_interior(double *, double) override { return 0; }
int surface_exterior(double *, double) override { return 0; }
};
} // namespace LAMMPS_NS

View File

@ -27,18 +27,18 @@ namespace LAMMPS_NS {
class RegIntersect : public Region {
public:
RegIntersect(class LAMMPS *, int, char **);
~RegIntersect();
void init();
int inside(double, double, double);
int surface_interior(double *, double);
int surface_exterior(double *, double);
void shape_update();
void pretransform();
void set_velocity();
void length_restart_string(int &);
void write_restart(FILE *);
int restart(char *, int &);
void reset_vel();
~RegIntersect() override;
void init() override;
int inside(double, double, double) override;
int surface_interior(double *, double) override;
int surface_exterior(double *, double) override;
void shape_update() override;
void pretransform() override;
void set_velocity() override;
void length_restart_string(int &) override;
void write_restart(FILE *) override;
int restart(char *, int &) override;
void reset_vel() override;
private:
char **idsub;

View File

@ -27,10 +27,10 @@ namespace LAMMPS_NS {
class RegPlane : public Region {
public:
RegPlane(class LAMMPS *, int, char **);
~RegPlane();
int inside(double, double, double);
int surface_interior(double *, double);
int surface_exterior(double *, double);
~RegPlane() override;
int inside(double, double, double) override;
int surface_interior(double *, double) override;
int surface_exterior(double *, double) override;
private:
double xp, yp, zp;

View File

@ -29,10 +29,10 @@ class RegPrism : public Region {
public:
RegPrism(class LAMMPS *, int, char **);
~RegPrism();
int inside(double, double, double);
int surface_interior(double *, double);
int surface_exterior(double *, double);
~RegPrism() override;
int inside(double, double, double) override;
int surface_interior(double *, double) override;
int surface_exterior(double *, double) override;
private:
double xlo, xhi, ylo, yhi, zlo, zhi;

View File

@ -27,14 +27,14 @@ namespace LAMMPS_NS {
class RegSphere : public Region {
public:
RegSphere(class LAMMPS *, int, char **);
~RegSphere();
void init();
int inside(double, double, double);
int surface_interior(double *, double);
int surface_exterior(double *, double);
void shape_update();
void set_velocity_shape();
void velocity_contact_shape(double *, double *);
~RegSphere() override;
void init() override;
int inside(double, double, double) override;
int surface_interior(double *, double) override;
int surface_exterior(double *, double) override;
void shape_update() override;
void set_velocity_shape() override;
void velocity_contact_shape(double *, double *) override;
private:
double xc, yc, zc;

View File

@ -27,18 +27,18 @@ namespace LAMMPS_NS {
class RegUnion : public Region {
public:
RegUnion(class LAMMPS *, int, char **);
~RegUnion();
void init();
int inside(double, double, double);
int surface_interior(double *, double);
int surface_exterior(double *, double);
void shape_update();
void pretransform();
void set_velocity();
void length_restart_string(int &);
void write_restart(FILE *);
int restart(char *, int &);
void reset_vel();
~RegUnion() override;
void init() override;
int inside(double, double, double) override;
int surface_interior(double *, double) override;
int surface_exterior(double *, double) override;
void shape_update() override;
void pretransform() override;
void set_velocity() override;
void length_restart_string(int &) override;
void write_restart(FILE *) override;
int restart(char *, int &) override;
void reset_vel() override;
private:
char **idsub;