Commit 397773a6 authored by frey_m's avatar frey_m

SAAMG: remove unused variables geomCentroid_m and globalMeanR_m

parent 2a402c6d
......@@ -48,8 +48,6 @@ ArbitraryDomain::ArbitraryDomain( BoundaryGeometry * bgeom,
setRangeMin(bgeom->getmincoords());
setRangeMax(bgeom->getmaxcoords());
geomCentroid_m = (min_m + max_m)/2.0;
bool have_inside_pt = bgeom->getInsidePoint(globalInsideP0_m);
if (have_inside_pt == false) {
throw OpalException(
......@@ -70,8 +68,6 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
setHr(hr);
globalMeanR_m = getGlobalMeanR();
globalToLocalQuaternion_m = getGlobalToLocalQuaternion();
localToGlobalQuaternion_m[0] = globalToLocalQuaternion_m[0];
for (int i=1; i<4; i++)
......@@ -121,8 +117,6 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
//P = saveP;
//rotateWithQuaternion(P, localToGlobalQuaternion_m);
//P += geomCentroid_m; //sorry, this doesn't make sense. -DW
//P += globalMeanR_m;
if (bgeom_m->fastIsInside(P0, P) % 2 == 0) {
......@@ -143,8 +137,6 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
dir = Vector_t(0, 0, 1);
if (bgeom_m->intersectRayBoundary(P, dir, I)) {
//I -= geomCentroid_m;
//I -= globalMeanR_m;
//rotateWithQuaternion(I, globalToLocalQuaternion_m);
IntersectHiZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2]));
} else {
......@@ -155,8 +147,6 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
}
if (bgeom_m->intersectRayBoundary(P, -dir, I)) {
//I -= geomCentroid_m;
//I -= globalMeanR_m;
//rotateWithQuaternion(I, globalToLocalQuaternion_m);
IntersectLoZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2]));
} else {
......@@ -170,8 +160,6 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
dir = Vector_t(0, 1, 0);
if (bgeom_m->intersectRayBoundary(P, dir, I)) {
//I -= geomCentroid_m;
//I -= globalMeanR_m;
//rotateWithQuaternion(I, globalToLocalQuaternion_m);
IntersectHiY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1]));
} else {
......@@ -182,8 +170,6 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
}
if (bgeom_m->intersectRayBoundary(P, -dir, I)) {
//I -= geomCentroid_m;
//I -= globalMeanR_m;
//rotateWithQuaternion(I, globalToLocalQuaternion_m);
IntersectLoY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1]));
} else {
......@@ -197,8 +183,6 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
dir = Vector_t(1, 0, 0);
if (bgeom_m->intersectRayBoundary(P, dir, I)) {
//I -= geomCentroid_m;
//I -= globalMeanR_m;
//rotateWithQuaternion(I, globalToLocalQuaternion_m);
IntersectHiX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0]));
} else {
......@@ -209,8 +193,6 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
}
if (bgeom_m->intersectRayBoundary(P, -dir, I)){
//I -= geomCentroid_m;
//I -= globalMeanR_m;
//rotateWithQuaternion(I, globalToLocalQuaternion_m);
IntersectLoX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0]));
} else {
......
......@@ -81,8 +81,6 @@ private:
/// all intersection points with gridlines in Z direction
PointList IntersectHiZ, IntersectLoZ;
// meanR to shift from global to local frame
Vector_t globalMeanR_m;
// Quaternion_t globalToLocalQuaternion_m; because defined in parent class
Quaternion_t localToGlobalQuaternion_m;
......@@ -94,7 +92,6 @@ private:
// Mapping all cells that are inside the geometry
std::map<int, bool> IsInsideMap;
Vector_t geomCentroid_m;
Vector_t globalInsideP0_m;
// Conversion from (x,y,z) to index in xyz plane
......
......@@ -118,9 +118,6 @@ public:
double getMinZ() { return zMin_m; }
double getMaxZ() { return zMax_m; }
void setGlobalMeanR(Vector_t rmean) { rMean_m = rmean;}
Vector_t getGlobalMeanR() { return rMean_m; }
void setGlobalToLocalQuaternion(Quaternion_t globalToLocalQuaternion){
globalToLocalQuaternion_m = globalToLocalQuaternion;}
......
......@@ -300,7 +300,6 @@ void MGPoissonSolver::computePotential(Field_t &rho, Vector_t hr) {
nr_m[1] = orig_nr_m[1];
nr_m[2] = orig_nr_m[2];
bp_m->setGlobalMeanR(itsBunch_m->getGlobalMeanR());
bp_m->setGlobalToLocalQuaternion(itsBunch_m->getGlobalToLocalQuaternion());
bp_m->setNr(nr_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