From 72d29459ef916f9c6cce27219b019bad0e17226b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 7 Oct 2020 11:52:49 +0200 Subject: [PATCH] compile issues fixed to the changes in class BoxCornerDomain length_m has been removed but was still used in a constructor --- src/Solvers/BoxCornerDomain.cpp | 3 +-- src/Solvers/BoxCornerDomain.h | 2 +- src/Solvers/MGPoissonSolver.cpp | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Solvers/BoxCornerDomain.cpp b/src/Solvers/BoxCornerDomain.cpp index 01adb96e3..665aaec12 100644 --- a/src/Solvers/BoxCornerDomain.cpp +++ b/src/Solvers/BoxCornerDomain.cpp @@ -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!"); diff --git a/src/Solvers/BoxCornerDomain.h b/src/Solvers/BoxCornerDomain.h index 0c20ccbc0..07b73236b 100644 --- a/src/Solvers/BoxCornerDomain.h +++ b/src/Solvers/BoxCornerDomain.h @@ -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(); diff --git a/src/Solvers/MGPoissonSolver.cpp b/src/Solvers/MGPoissonSolver.cpp index 934b7c8c9..6fd450b05 100644 --- a/src/Solvers/MGPoissonSolver.cpp +++ b/src/Solvers/MGPoissonSolver.cpp @@ -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)); -- GitLab