Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit c4fda3de authored by frey_m's avatar frey_m
Browse files

ArbitraryDomain: break long lines

parent 80e1a9fe
No related branches found
No related tags found
1 merge request!396Resolve "Code duplication in Domains"
Hide whitespace changes
Inline Side-by-side
src/Solvers/ArbitraryDomain.cpp
+ 49
− 24
View file @ c4fda3de
...@@ -119,7 +119,8 @@ void ArbitraryDomain::compute(Vector_t hr){ ...@@ -119,7 +119,8 @@ void ArbitraryDomain::compute(Vector_t hr){
IntersectHiZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2])); IntersectHiZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "zdir=+1 " << dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "zdir=+1 " << dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -129,7 +130,8 @@ void ArbitraryDomain::compute(Vector_t hr){ ...@@ -129,7 +130,8 @@ void ArbitraryDomain::compute(Vector_t hr){
IntersectLoZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2])); IntersectLoZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "zdir=-1 " << -dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "zdir=-1 " << -dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -140,7 +142,8 @@ void ArbitraryDomain::compute(Vector_t hr){ ...@@ -140,7 +142,8 @@ void ArbitraryDomain::compute(Vector_t hr){
IntersectHiY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1])); IntersectHiY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "ydir=+1 " << dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "ydir=+1 " << dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -150,7 +153,8 @@ void ArbitraryDomain::compute(Vector_t hr){ ...@@ -150,7 +153,8 @@ void ArbitraryDomain::compute(Vector_t hr){
IntersectLoY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1])); IntersectLoY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "ydir=-1" << -dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "ydir=-1" << -dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -161,7 +165,8 @@ void ArbitraryDomain::compute(Vector_t hr){ ...@@ -161,7 +165,8 @@ void ArbitraryDomain::compute(Vector_t hr){
IntersectHiX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0])); IntersectHiX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "xdir=+1 " << dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "xdir=+1 " << dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -171,12 +176,14 @@ void ArbitraryDomain::compute(Vector_t hr){ ...@@ -171,12 +176,14 @@ void ArbitraryDomain::compute(Vector_t hr){
IntersectLoX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0])); IntersectLoX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "xdir=-1 " << -dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "xdir=-1 " << -dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "OUTSIDE" << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "OUTSIDE" << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
} }
...@@ -285,7 +292,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -285,7 +292,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
IntersectHiZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2])); IntersectHiZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "zdir=+1 " << dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "zdir=+1 " << dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -296,7 +304,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -296,7 +304,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
IntersectLoZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2])); IntersectLoZ.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[2]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "zdir=-1 " << -dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "zdir=-1 " << -dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -310,7 +319,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -310,7 +319,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
IntersectHiY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1])); IntersectHiY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "ydir=+1 " << dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "ydir=+1 " << dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -321,7 +331,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -321,7 +331,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
IntersectLoY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1])); IntersectLoY.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[1]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "ydir=-1" << -dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "ydir=-1" << -dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -335,7 +346,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -335,7 +346,8 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
IntersectHiX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0])); IntersectHiX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "xdir=+1 " << dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "xdir=+1 " << dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
...@@ -346,13 +358,15 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){ ...@@ -346,13 +358,15 @@ void ArbitraryDomain::compute(Vector_t hr, NDIndex<3> localId){
IntersectLoX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0])); IntersectLoX.insert(std::pair< std::tuple<int, int, int>, double >(pos, I[0]));
} else { } else {
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "xdir=-1 " << -dir << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "xdir=-1 " << -dir << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
} else { } else {
IsInsideMap[toCoordIdx(idx, idy, idz)] = false; IsInsideMap[toCoordIdx(idx, idy, idz)] = false;
#ifdef DEBUG_INTERSECT_RAY_BOUNDARY #ifdef DEBUG_INTERSECT_RAY_BOUNDARY
*gmsg << "OUTSIDE" << " x,y,z= " << idx << "," << idy << "," << idz << " P=" << P <<" I=" << I << endl; *gmsg << "OUTSIDE" << " x,y,z= " << idx << "," << idy
<< "," << idz << " P=" << P <<" I=" << I << endl;
#endif #endif
} }
} }
...@@ -505,15 +519,20 @@ int ArbitraryDomain::getNumXY(int z) { ...@@ -505,15 +519,20 @@ int ArbitraryDomain::getNumXY(int z) {
return numXY[z]; return numXY[z];
} }
void ArbitraryDomain::getBoundaryStencil(int idxyz, double &W, double &E, double &S, double &N, double &F, double &B, double &C, double &scaleFactor) { void ArbitraryDomain::getBoundaryStencil(int idxyz, double &W, double &E, double &S,
double &N, double &F, double &B, double &C,
double &scaleFactor)
{
int idx = 0, idy = 0, idz = 0; int idx = 0, idy = 0, idz = 0;
getCoord(idxyz, idx, idy, idz); getCoord(idxyz, idx, idy, idz);
getBoundaryStencil(idx, idy, idz, W, E, S, N, F, B, C, scaleFactor); getBoundaryStencil(idx, idy, idz, W, E, S, N, F, B, C, scaleFactor);
} }
void ArbitraryDomain::getBoundaryStencil(int idx, int idy, int idz, double &W, double &E, double &S, double &N, double &F, double &B, double &C, double &scaleFactor) { void ArbitraryDomain::getBoundaryStencil(int idx, int idy, int idz, double &W,
double &E, double &S, double &N, double &F,
double &B, double &C, double &scaleFactor)
{
scaleFactor = 1.0; scaleFactor = 1.0;
// determine which interpolation method we use for points near the boundary // determine which interpolation method we use for points near the boundary
switch(interpolationMethod){ switch(interpolationMethod){
...@@ -532,8 +551,10 @@ void ArbitraryDomain::getBoundaryStencil(int idx, int idy, int idz, double &W, d ...@@ -532,8 +551,10 @@ void ArbitraryDomain::getBoundaryStencil(int idx, int idy, int idz, double &W, d
assert(C > 0); assert(C > 0);
} }
void ArbitraryDomain::constantInterpolation(int idx, int idy, int idz, double& W, double& E, double& S, double& N, double& F, double& B, double& C, double& /*scaleFactor*/) { void ArbitraryDomain::constantInterpolation(int idx, int idy, int idz, double& W,
double& E, double& S, double& N, double& F,
double& B, double& C, double& /*scaleFactor*/)
{
W = -1/(hr[0]*hr[0]); W = -1/(hr[0]*hr[0]);
E = -1/(hr[0]*hr[0]); E = -1/(hr[0]*hr[0]);
N = -1/(hr[1]*hr[1]); N = -1/(hr[1]*hr[1]);
...@@ -558,7 +579,9 @@ void ArbitraryDomain::constantInterpolation(int idx, int idy, int idz, double& W ...@@ -558,7 +579,9 @@ void ArbitraryDomain::constantInterpolation(int idx, int idy, int idz, double& W
B = 0.0; B = 0.0;
} }
void ArbitraryDomain::linearInterpolation(int idx, int idy, int idz, double& W, double& E, double& S, double& N, double& F, double& B, double& C, double &scaleFactor) void ArbitraryDomain::linearInterpolation(int idx, int idy, int idz, double& W,
double& E, double& S, double& N, double& F,
double& B, double& C, double &scaleFactor)
{ {
scaleFactor = 1; scaleFactor = 1;
...@@ -648,16 +671,18 @@ void ArbitraryDomain::linearInterpolation(int idx, int idy, int idz, double& W, ...@@ -648,16 +671,18 @@ void ArbitraryDomain::linearInterpolation(int idx, int idy, int idz, double& W,
C += (dz_f + dz_b) * (dx_w + dx_e) * (dy_n + dy_s) / m2; C += (dz_f + dz_b) * (dx_w + dx_e) * (dy_n + dy_s) / m2;
} }
void ArbitraryDomain::getNeighbours(int id, int &W, int &E, int &S, int &N, int &F, int &B) { void ArbitraryDomain::getNeighbours(int id, int &W, int &E, int &S,
int &N, int &F, int &B)
{
int idx = 0, idy = 0, idz = 0; int idx = 0, idy = 0, idz = 0;
getCoord(id, idx, idy, idz); getCoord(id, idx, idy, idz);
getNeighbours(idx, idy, idz, W, E, S, N, F, B); getNeighbours(idx, idy, idz, W, E, S, N, F, B);
} }
void ArbitraryDomain::getNeighbours(int idx, int idy, int idz, int &W, int &E, int &S, int &N, int &F, int &B) { void ArbitraryDomain::getNeighbours(int idx, int idy, int idz, int &W,
int &E, int &S, int &N, int &F, int &B)
{
W = getIdx(idx - 1, idy, idz); W = getIdx(idx - 1, idy, idz);
E = getIdx(idx + 1, idy, idz); E = getIdx(idx + 1, idy, idz);
N = getIdx(idx, idy + 1, idz); N = getIdx(idx, idy + 1, idz);
......
src/Solvers/ArbitraryDomain.h
+ 37
− 11
View file @ c4fda3de
...@@ -44,19 +44,32 @@ class ArbitraryDomain : public IrregularDomain { ...@@ -44,19 +44,32 @@ class ArbitraryDomain : public IrregularDomain {
public: public:
ArbitraryDomain(BoundaryGeometry *bgeom, Vector_t nr, Vector_t hr, std::string interpl); ArbitraryDomain(BoundaryGeometry *bgeom, Vector_t nr, Vector_t hr,
ArbitraryDomain(BoundaryGeometry *bgeom, Vector_t nr, Vector_t hr, Vector_t globalMeanR, Quaternion_t globalToLocalQuaternion, std::string interpl); std::string interpl);
ArbitraryDomain(BoundaryGeometry *bgeom, Vector_t nr, Vector_t hr,
Vector_t globalMeanR, Quaternion_t globalToLocalQuaternion,
std::string interpl);
~ArbitraryDomain(); ~ArbitraryDomain();
/// returns discretization at (x,y,z) /// returns discretization at (x,y,z)
void getBoundaryStencil(int idx, int idy, int idz, double &W, double &E, double &S, double &N, double &F, double &B, double &C, double &scaleFactor); void getBoundaryStencil(int idx, int idy, int idz, double &W, double &E,
double &S, double &N, double &F, double &B, double &C,
double &scaleFactor);
/// returns discretization at 3D index /// returns discretization at 3D index
void getBoundaryStencil(int idxyz, double &W, double &E, double &S, double &N, double &F, double &B, double &C, double &scaleFactor); void getBoundaryStencil(int idxyz, double &W, double &E, double &S, double &N,
double &F, double &B, double &C, double &scaleFactor);
/// returns index of neighbours at (x,y,z) /// returns index of neighbours at (x,y,z)
void getNeighbours(int idx, int idy, int idz, int &W, int &E, int &S, int &N, int &F, int &B); void getNeighbours(int idx, int idy, int idz, int &W,
int &E, int &S, int &N, int &F, int &B);
/// returns index of neighbours at 3D index /// returns index of neighbours at 3D index
void getNeighbours(int idxyz, int &W, int &E, int &S, int &N, int &F, int &B); void getNeighbours(int idxyz, int &W, int &E,
int &S, int &N, int &F, int &B);
/// returns type of boundary condition /// returns type of boundary condition
std::string getType() {return "Geometric";} std::string getType() {return "Geometric";}
/// queries if a given (x,y,z) coordinate lies inside the domain /// queries if a given (x,y,z) coordinate lies inside the domain
...@@ -92,7 +105,9 @@ public: ...@@ -92,7 +105,9 @@ public:
private: private:
BoundaryGeometry *bgeom_m; BoundaryGeometry *bgeom_m;
/// PointList maps from an (x,z) resp. (y,z) pair to double values (=intersections with boundary) /** PointList maps from an (x,z) resp. (y,z) pair to double values
* (=intersections with boundary)
*/
typedef std::multimap< std::tuple<int, int, int>, double > PointList; typedef std::multimap< std::tuple<int, int, int>, double > PointList;
/// all intersection points with gridlines in X direction /// all intersection points with gridlines in X direction
...@@ -147,12 +162,23 @@ private: ...@@ -147,12 +162,23 @@ private:
inline void getCoord(int idxyz, int &x, int &y, int &z); inline void getCoord(int idxyz, int &x, int &y, int &z);
inline void crossProduct(double A[], double B[], double C[]); inline void crossProduct(double A[], double B[], double C[]);
inline double dotProduct(double v1[], double v2[]) { return (v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2]); }
inline double dotProduct(double v1[], double v2[]) {
return (v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2]);
}
// Different interpolation methods for boundary points // Different interpolation methods for boundary points
void constantInterpolation(int idx, int idy, int idz, double &W, double &E, double &S, double &N, double &F, double &B, double &C, double &scaleFactor); void constantInterpolation(int idx, int idy, int idz, double &W, double &E,
void linearInterpolation(int idx, int idy, int idz, double &W, double &E, double &S, double &N, double &F, double &B, double &C, double &scaleFactor); double &S, double &N, double &F, double &B,
void quadraticInterpolation(int idx, int idy, int idz, double &W, double &E, double &S, double &N, double &F, double &B, double &C, double &scaleFactor); double &C, double &scaleFactor);
void linearInterpolation(int idx, int idy, int idz, double &W, double &E,
double &S, double &N, double &F, double &B,
double &C, double &scaleFactor);
void quadraticInterpolation(int idx, int idy, int idz, double &W, double &E,
double &S, double &N, double &F, double &B,
double &C, double &scaleFactor);
// Rotate positive axes with quaternion -DW // Rotate positive axes with quaternion -DW
inline void rotateWithQuaternion(Vector_t &v, Quaternion_t const quaternion); inline void rotateWithQuaternion(Vector_t &v, Quaternion_t const quaternion);
......
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