ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make utility functions local and static. remove from class.

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-10-04 10:33:27 -04:00
parent 8af3aef734
commit c0f1fe4d31
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/region_ellipsoid.cpp
View File

@ -25,6 +25,14 @@ using namespace LAMMPS_NS;
enum { CONSTANT, VARIABLE }; enum { CONSTANT, VARIABLE };
static double GetRoot2D(double r0, double z0, double z1, double g);
static double GetRoot3D(double r0, double r1, double z0, double z1, double z2, double g);
static double DistancePointEllipse(double e0, double e1, double y0, double y1, double &x0,
double &x1);
static double DistancePointEllipsoid(double e0, double e1, double e2, double y0, double y1,
double y2, double &x0, double &x1, double &x2);
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
RegEllipsoid::RegEllipsoid(LAMMPS *lmp, int narg, char **arg) : RegEllipsoid::RegEllipsoid(LAMMPS *lmp, int narg, char **arg) :
@ -439,7 +447,7 @@ void RegEllipsoid::variable_check()
functions for the 2D case functions for the 2D case
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
double RegEllipsoid::GetRoot2D(double r0, double z0, double z1, double g) double GetRoot2D(double r0, double z0, double z1, double g)
{ {
int maxIterations = int maxIterations =
std::numeric_limits<double>::digits - std::numeric_limits<double>::min_exponent; std::numeric_limits<double>::digits - std::numeric_limits<double>::min_exponent;
@ -464,8 +472,7 @@ double RegEllipsoid::GetRoot2D(double r0, double z0, double z1, double g)
return s; return s;
} }
double RegEllipsoid::DistancePointEllipse(double e0, double e1, double y0, double y1, double &x0, double DistancePointEllipse(double e0, double e1, double y0, double y1, double &x0, double &x1)
double &x1)
{ {
double distance; double distance;
if (y1 > 0) { if (y1 > 0) {
@ -510,7 +517,7 @@ double RegEllipsoid::DistancePointEllipse(double e0, double e1, double y0, doubl
functions for the 3D case functions for the 3D case
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
double RegEllipsoid::GetRoot3D(double r0, double r1, double z0, double z1, double z2, double g) double GetRoot3D(double r0, double r1, double z0, double z1, double z2, double g)
{ {
int maxIterations = int maxIterations =
std::numeric_limits<double>::digits - std::numeric_limits<double>::min_exponent; std::numeric_limits<double>::digits - std::numeric_limits<double>::min_exponent;
@ -537,8 +544,8 @@ double RegEllipsoid::GetRoot3D(double r0, double r1, double z0, double z1, doubl
return s; return s;
} }
double RegEllipsoid::DistancePointEllipsoid(double e0, double e1, double e2, double y0, double y1, double DistancePointEllipsoid(double e0, double e1, double e2, double y0, double y1, double y2,
double y2, double &x0, double &x1, double &x2) double &x0, double &x1, double &x2)
{ {
double distance; double distance;
if (y2 > 0) { if (y2 > 0) {

6
src/region_ellipsoid.h
View File

@ -47,12 +47,6 @@ class RegEllipsoid : public Region {
char *astr, *bstr, *cstr; char *astr, *bstr, *cstr;
void variable_check(); void variable_check();
double GetRoot2D(double r0, double z0, double z1, double g);
double GetRoot3D(double r0, double r1, double z0, double z1, double z2, double g);
double DistancePointEllipse(double e0, double e1, double y0, double y1, double &x0, double &x1);
double DistancePointEllipsoid(double e0, double e1, double e2, double y0, double y1, double y2,
double &x0, double &x1, double &x2);
}; };
} // namespace LAMMPS_NS } // namespace LAMMPS_NS