Merge branch 'development' of https://github.com/GOMC-WSU/GOMC into b…

…uild-issues

lib/BasicTypes.h

@@ -104,44 +104,38 @@ inline void record_debug(uint *x, uint len, std::string filename,
 
 //******************************************************************************
 
-typedef unsigned int uint;
-typedef unsigned long int ulong;
-
-#define UNUSED(x) (void)(x)
-
-// single XYZ for use as a temporary and return type
-struct XYZ {
-  double x, y, z;
-
+// single XYZ coordinate for use as a temporary and return type
+class XYZ {
+public:
   XYZ() : x(0.0), y(0.0), z(0.0) {}
   XYZ(double xVal, double yVal, double zVal) : x(xVal), y(yVal), z(zVal) {}
+
+  friend inline std::ostream &operator<<(std::ostream &stream, const XYZ &p);
+
+  inline double getX() const { return x; }
+  inline double getY() const { return y; }
+  inline double getZ() const { return z; }
+
   void Reset() { x = y = z = 0.0; }
   XYZ &operator=(XYZ const &rhs) {
     x = rhs.x;
     y = rhs.y;
     z = rhs.z;
     return *this;
   }
-  bool operator==(XYZ const &rhs) {
-    if (x == rhs.x && y == rhs.y && z == rhs.z)
-      return true;
-    return false;
+  inline bool operator==(XYZ const &rhs) const {
+    return (x == rhs.x && y == rhs.y && z == rhs.z);
   }
-  bool operator!=(XYZ const &rhs) {
-    if (x != rhs.x || y != rhs.y || z != rhs.z)
-      return true;
-    return false;
+  inline bool operator!=(XYZ const &rhs) const {
+    return (x != rhs.x || y != rhs.y || z != rhs.z);
   }
-  bool operator<(XYZ const &rhs) {
-    if (x < rhs.x && y < rhs.y && z < rhs.z)
-      return true;
-    return false;
+  inline bool operator<(XYZ const &rhs) const {
+    return (x < rhs.x && y < rhs.y && z < rhs.z);
   }
-  bool operator>(XYZ const &rhs) {
-    if (x > rhs.x || y > rhs.y || z > rhs.z)
-      return true;
-    return false;
+  inline bool operator>(XYZ const &rhs) const {
+    return (x > rhs.x || y > rhs.y || z > rhs.z);
   }
+
   XYZ &operator+=(XYZ const &rhs) {
     x += rhs.x;
     y += rhs.y;
@@ -174,26 +168,26 @@ struct XYZ {
     return *this;
   }
 
-  XYZ operator+(XYZ const &rhs) const { return XYZ(*this) += rhs; }
-  XYZ operator-(XYZ const &rhs) const { return XYZ(*this) -= rhs; }
-  XYZ operator*(XYZ const &rhs) const { return XYZ(*this) *= rhs; }
-  XYZ operator/(XYZ const &rhs) const { return XYZ(*this) /= rhs; }
+  XYZ operator+(XYZ const &rhs) const { return XYZ(x+rhs.x, y+rhs.y, z+rhs.z); }
+  XYZ operator-(XYZ const &rhs) const { return XYZ(x-rhs.x, y-rhs.y, z-rhs.z); }
+  XYZ operator*(XYZ const &rhs) const { return XYZ(x*rhs.x, y*rhs.y, z*rhs.z); }
+  XYZ operator/(XYZ const &rhs) const { return XYZ(x/rhs.x, y/rhs.y, z/rhs.z); }
 
-  XYZ operator*(const double a) const { return XYZ(*this) *= a; }
+  XYZ operator*(const double a) const { return XYZ(x*a, y*a, z*a); }
 
-  XYZ operator-() const { return XYZ(*this) * -1.0; }
+  XYZ operator-() const { return XYZ(-x, -y, -z); }
 
   void Inverse() {
     x = 1.0 / x;
     y = 1.0 / y;
     z = 1.0 / z;
   }
 
-  double Length() const { return sqrt(LengthSq()); }
   double LengthSq() const { return x * x + y * y + z * z; }
+  double Length() const { return std::sqrt(LengthSq()); }
 
   XYZ &Normalize() {
-    *this *= (1 / Length());
+    *this *= (1.0 / Length());
     return *this;
   }
 
@@ -214,6 +208,9 @@ struct XYZ {
       m = z;
     return m;
   }
+
+public:
+  double x, y, z;
 };
 
 inline std::ostream &operator<<(std::ostream &stream, const XYZ &p) {

src/ConfigSetup.cpp

@@ -836,7 +836,7 @@ void ConfigSetup::Init(const char *fileName, MultiSim const *const &multisim) {
     } else if (CheckString(line[0], "IntraMEMC-1Freq")) {
       if (stringtod(line[1]) > 0.0) {
         sys.moves.intraMemc = stringtod(line[1]);
-        printf("%-40s %-4.4f \n", "Info: IntraMEMC-2 move frequency",
+        printf("%-40s %-4.4f \n", "Info: IntraMEMC-1 move frequency",
                sys.moves.intraMemc);
         sys.intraMemcVal.enable = true;
         sys.intraMemcVal.MEMC1 = true;