Commit 131ad823 authored by gsell's avatar gsell

Merge branch '612-master-does-not-compile-any-more' into 'master'

Resolve "master does not compile any more"

Closes #612

See merge request !448
parents 5ff2f5ae 72d29459
......@@ -35,6 +35,7 @@
#include <iostream>
#include <tuple>
#include "Utilities/OpalException.h"
#include "Index/NDIndex.h"
ArbitraryDomain::ArbitraryDomain( BoundaryGeometry * bgeom,
IntVector_t nr,
......
......@@ -33,7 +33,7 @@
//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,
std::string interpl)
: RegularDomain(nr, hr, interpl)
......@@ -41,7 +41,6 @@ BoxCornerDomain::BoxCornerDomain(double A, double B, double C, double length,
setRangeMin(Vector_t(-A, -B, L1));
setRangeMax(Vector_t( A, B, L1 + L2));
C_m = C;
length_m = length;
throw OpalException("BoxCornerDomain::BoxCornerDomain()",
"This domain is currently not supported!");
......
......@@ -79,7 +79,7 @@ public:
* \param L1 length of the first part of the structure
* \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,
std::string interpl);
~BoxCornerDomain();
......
......@@ -30,6 +30,7 @@
#include <string>
#include "Algorithms/Vektor.h"
#include "Algorithms/Quaternion.h"
#include "Index/NDIndex.h"
/// enumeration corresponding to different interpolation methods at the boundary
enum {
......
......@@ -123,7 +123,6 @@ MGPoissonSolver::MGPoissonSolver ( PartBunch *beam,
new BoxCornerDomain(currentGeometry->getA(),
currentGeometry->getB(),
currentGeometry->getC(),
currentGeometry->getLength(),
currentGeometry->getL1(),
currentGeometry->getL2(),
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