Commit 5d9c07f1 authored by gsell's avatar gsell

Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into 611-fix-floating-point-comparisons-in-boundarygeometry
parents 192fd796 131ad823
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <iostream> #include <iostream>
#include <tuple> #include <tuple>
#include "Utilities/OpalException.h" #include "Utilities/OpalException.h"
#include "Index/NDIndex.h"
ArbitraryDomain::ArbitraryDomain( BoundaryGeometry * bgeom, ArbitraryDomain::ArbitraryDomain( BoundaryGeometry * bgeom,
IntVector_t nr, IntVector_t nr,
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
//FIXME: ORDER HOW TO TRAVERSE NODES IS FIXED, THIS SHOULD BE MORE GENERIC! (PLACES MARKED) //FIXME: ORDER HOW TO TRAVERSE NODES IS FIXED, THIS SHOULD BE MORE GENERIC! (PLACES MARKED)
BoxCornerDomain::BoxCornerDomain(double A, double B, double C, double length, BoxCornerDomain::BoxCornerDomain(double A, double B, double C,
double L1, double L2, IntVector_t nr, Vector_t hr, double L1, double L2, IntVector_t nr, Vector_t hr,
std::string interpl) std::string interpl)
: RegularDomain(nr, hr, interpl) : RegularDomain(nr, hr, interpl)
...@@ -41,7 +41,6 @@ BoxCornerDomain::BoxCornerDomain(double A, double B, double C, double length, ...@@ -41,7 +41,6 @@ BoxCornerDomain::BoxCornerDomain(double A, double B, double C, double length,
setRangeMin(Vector_t(-A, -B, L1)); setRangeMin(Vector_t(-A, -B, L1));
setRangeMax(Vector_t( A, B, L1 + L2)); setRangeMax(Vector_t( A, B, L1 + L2));
C_m = C; C_m = C;
length_m = length;
throw OpalException("BoxCornerDomain::BoxCornerDomain()", throw OpalException("BoxCornerDomain::BoxCornerDomain()",
"This domain is currently not supported!"); "This domain is currently not supported!");
......
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ public:
* \param L1 length of the first part of the structure * \param L1 length of the first part of the structure
* \param L2 length of the corner * \param L2 length of the corner
*/ */
BoxCornerDomain(double A, double B, double C, double length, BoxCornerDomain(double A, double B, double C,
double L1, double L2, IntVector_t nr, Vector_t hr, double L1, double L2, IntVector_t nr, Vector_t hr,
std::string interpl); std::string interpl);
~BoxCornerDomain(); ~BoxCornerDomain();
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <string> #include <string>
#include "Algorithms/Vektor.h" #include "Algorithms/Vektor.h"
#include "Algorithms/Quaternion.h" #include "Algorithms/Quaternion.h"
#include "Index/NDIndex.h"
/// enumeration corresponding to different interpolation methods at the boundary /// enumeration corresponding to different interpolation methods at the boundary
enum { enum {
......
...@@ -123,7 +123,6 @@ MGPoissonSolver::MGPoissonSolver ( PartBunch *beam, ...@@ -123,7 +123,6 @@ MGPoissonSolver::MGPoissonSolver ( PartBunch *beam,
new BoxCornerDomain(currentGeometry->getA(), new BoxCornerDomain(currentGeometry->getA(),
currentGeometry->getB(), currentGeometry->getB(),
currentGeometry->getC(), currentGeometry->getC(),
currentGeometry->getLength(),
currentGeometry->getL1(), currentGeometry->getL1(),
currentGeometry->getL2(), currentGeometry->getL2(),
orig_nr_m, hr_m, interpl)); orig_nr_m, hr_m, interpl));
......
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