Commit c9b91a74 authored by frey_m's avatar frey_m
Browse files

ArbitraryDomain: coding style

parent 26dbd6bb
...@@ -105,7 +105,7 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -105,7 +105,7 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
// Fill the map with true or false values for very fast isInside tests // Fill the map with true or false values for very fast isInside tests
// during the rest of the fieldsolve. // during the rest of the fieldsolve.
IsInsideMap[toCoordIdx(idx, idy, idz)] = true; isInsideMap_m[toCoordIdx(idx, idy, idz)] = true;
// Replace the old reference point with the new point (which we know is // Replace the old reference point with the new point (which we know is
// inside because we just tested for it. This makes the algorithm faster // inside because we just tested for it. This makes the algorithm faster
...@@ -176,7 +176,7 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -176,7 +176,7 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
#endif #endif
} }
} else { } else {
IsInsideMap[toCoordIdx(idx, idy, idz)] = false; isInsideMap_m[toCoordIdx(idx, idy, idz)] = false;
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "OUTSIDE" << " x,y,z= " << idx << "," << idy *gmsg << "OUTSIDE" << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl; << "," << idz << " P=" << P <<" I=" << I << endl;
...@@ -203,7 +203,7 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -203,7 +203,7 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
//xy points in z plane //xy points in z plane
int numtotal = 0; int numtotal = 0;
numXY.clear(); numXY_m.clear();
for(int idz = localId[2].first(); idz <= localId[2].last(); idz++) { for(int idz = localId[2].first(); idz <= localId[2].last(); idz++) {
int numxy = 0; int numxy = 0;
for(int idx = 0; idx < nr_m[0]; idx++) { for(int idx = 0; idx < nr_m[0]; idx++) {
...@@ -212,7 +212,7 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -212,7 +212,7 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
numxy++; numxy++;
} }
} }
numXY[idz-localId[2].first()] = numxy; numXY_m[idz-localId[2].first()] = numxy;
numtotal += numxy; numtotal += numxy;
} }
...@@ -254,7 +254,7 @@ int ArbitraryDomain::indexAccess(int x, int y, int z) { ...@@ -254,7 +254,7 @@ int ArbitraryDomain::indexAccess(int x, int y, int z) {
inline bool ArbitraryDomain::isInside(int idx, int idy, int idz) { inline bool ArbitraryDomain::isInside(int idx, int idy, int idz) {
return IsInsideMap[toCoordIdx(idx, idy, idz)]; return isInsideMap_m[toCoordIdx(idx, idy, idz)];
} }
void ArbitraryDomain::constantInterpolation(int idx, int idy, int idz, void ArbitraryDomain::constantInterpolation(int idx, int idy, int idz,
......
...@@ -74,10 +74,10 @@ private: ...@@ -74,10 +74,10 @@ private:
PointList_t intersectHiZ_m, intersectLoZ_m; PointList_t intersectHiZ_m, intersectLoZ_m;
// Here we store the number of nodes in a xy layer for a given z coordinate // Here we store the number of nodes in a xy layer for a given z coordinate
std::map<int, int> numXY; std::map<int, int> numXY_m;
// Mapping all cells that are inside the geometry // Mapping all cells that are inside the geometry
std::map<int, bool> IsInsideMap; std::map<int, bool> isInsideMap_m;
Vector_t globalInsideP0_m; Vector_t globalInsideP0_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