Commit 176f5c9d authored by frey_m's avatar frey_m
Browse files

remove duplicated hasGeometryChanged function + variable

parent c098ae20
...@@ -86,9 +86,6 @@ public: ...@@ -86,9 +86,6 @@ public:
void setYRangeMax(double ymax){ maxCoords_m(1) = ymax; } void setYRangeMax(double ymax){ maxCoords_m(1) = ymax; }
void setZRangeMax(double zmax){ maxCoords_m(2) = zmax; } void setZRangeMax(double zmax){ maxCoords_m(2) = zmax; }
bool hasGeometryChanged() { return hasGeometryChanged_m; }
private: private:
BoundaryGeometry *bgeom_m; BoundaryGeometry *bgeom_m;
...@@ -131,9 +128,6 @@ private: ...@@ -131,9 +128,6 @@ private:
// Interpolation type // Interpolation type
int interpolationMethod; int interpolationMethod;
// Flag indicating if geometry has changed for the current time-step
bool hasGeometryChanged_m;
Vector_t Geo_nr_m; Vector_t Geo_nr_m;
Vector_t Geo_hr_m; Vector_t Geo_hr_m;
Vector_t geomCentroid_m; Vector_t geomCentroid_m;
......
...@@ -122,8 +122,6 @@ public: ...@@ -122,8 +122,6 @@ public:
//TODO: ? //TODO: ?
int getStartIdx() {return 0;} int getStartIdx() {return 0;}
bool hasGeometryChanged() { return hasGeometryChanged_m; }
private: private:
//XXX: since the Y coorindate is dependent on the Z value we need (int, //XXX: since the Y coorindate is dependent on the Z value we need (int,
...@@ -178,8 +176,6 @@ private: ...@@ -178,8 +176,6 @@ private:
/// interpolation type /// interpolation type
int interpolationMethod; int interpolationMethod;
/// flag indicating if geometry has changed for the current time-step
bool hasGeometryChanged_m;
/// for debug reasons /// for debug reasons
std::ofstream os_m; std::ofstream os_m;
......
...@@ -85,9 +85,6 @@ public: ...@@ -85,9 +85,6 @@ public:
double getZRangeMin() { return zMin_m; } double getZRangeMin() { return zMin_m; }
double getZRangeMax() { return zMax_m; } double getZRangeMax() { return zMax_m; }
bool hasGeometryChanged() { return hasGeometryChanged_m; }
void resizeMesh(Vector_t& origin, Vector_t& hr, const Vector_t& rmin, void resizeMesh(Vector_t& origin, Vector_t& hr, const Vector_t& rmin,
const Vector_t& rmax, double dh); const Vector_t& rmax, double dh);
...@@ -121,9 +118,6 @@ private: ...@@ -121,9 +118,6 @@ private:
/// interpolation type /// interpolation type
int interpolationMethod_m; int interpolationMethod_m;
/// flag indicating if geometry has changed for the current time-step
bool hasGeometryChanged_m;
/// conversion from (x,y) to index in xy plane /// conversion from (x,y) to index in xy plane
inline int toCoordIdx(int x, int y) { return y * nr[0] + x; } inline int toCoordIdx(int x, int y) { return y * nr[0] + x; }
......
...@@ -133,7 +133,9 @@ public: ...@@ -133,7 +133,9 @@ public:
virtual double getZRangeMax() = 0; virtual double getZRangeMax() = 0;
virtual int getIdx(int x, int y, int z) = 0; virtual int getIdx(int x, int y, int z) = 0;
virtual bool hasGeometryChanged() = 0;
bool hasGeometryChanged();
virtual ~IrregularDomain() {}; virtual ~IrregularDomain() {};
virtual void resizeMesh(Vector_t& origin, Vector_t& hr, virtual void resizeMesh(Vector_t& origin, Vector_t& hr,
...@@ -169,10 +171,20 @@ protected: ...@@ -169,10 +171,20 @@ protected:
/// mean position of bunch (m) /// mean position of bunch (m)
Vector_t rMean_m; Vector_t rMean_m;
Quaternion_t globalToLocalQuaternion_m; Quaternion_t globalToLocalQuaternion_m;
/// flag indicating if geometry has changed for the current time-step
bool hasGeometryChanged_m;
}; };
inline bool IrregularDomain::hasGeometryChanged() {
return hasGeometryChanged_m;
}
#endif #endif
// vi: set et ts=4 sw=4 sts=4: // vi: set et ts=4 sw=4 sts=4:
// Local Variables: // Local Variables:
// mode:c // mode:c
......
...@@ -150,8 +150,6 @@ private: ...@@ -150,8 +150,6 @@ private:
/// container for multiple geometries /// container for multiple geometries
std::vector<BoundaryGeometry *> geometries_m; std::vector<BoundaryGeometry *> geometries_m;
/// flag notifying us that the geometry (discretization) has changed
bool hasGeometryChanged_m;
int repartFreq_m; int repartFreq_m;
/// flag specifying if we are verbose /// flag specifying if we are verbose
bool verbose_m; bool verbose_m;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment