From 86a668b0e02702a1a35948ea8a0cfdb012ac4f1c Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 7 Dec 2017 13:13:00 +0100 Subject: [PATCH] remove unused LR multipatch code --- src/ASM/ASMunstruct.h | 8 -------- src/ASM/LR/ASMu2D.C | 35 ----------------------------------- src/ASM/LR/ASMu2D.h | 8 -------- src/ASM/LR/ASMu3D.C | 41 ----------------------------------------- src/ASM/LR/ASMu3D.h | 8 -------- 5 files changed, 100 deletions(-) diff --git a/src/ASM/ASMunstruct.h b/src/ASM/ASMunstruct.h index c8b01aa7..c57b330c 100644 --- a/src/ASM/ASMunstruct.h +++ b/src/ASM/ASMunstruct.h @@ -172,14 +172,6 @@ public: virtual void remapErrors(RealArray& errors, const RealArray& orig, bool elemErrors = false) const = 0; - //! \brief Match neighbours after refinement in multipatch models. - //! \param neigh Neigbouring patch - //! \param[in] midx Index of face/edge on this patch - //! \param[in] sidx Index of face/edge on neighbour - //! \param[in] orient Orientation flag for connection - virtual bool matchNeighbour(ASMunstruct* neigh, - int midx, int sidx, int orient) = 0; - protected: LR::LRSpline* geo; //!< Pointer to the actual spline geometry object diff --git a/src/ASM/LR/ASMu2D.C b/src/ASM/LR/ASMu2D.C index 412fbc44..5ff5b74f 100644 --- a/src/ASM/LR/ASMu2D.C +++ b/src/ASM/LR/ASMu2D.C @@ -2145,41 +2145,6 @@ void ASMu2D::generateThreadGroups (const Integrand& integrand, bool silence, } -bool ASMu2D::matchNeighbour (ASMunstruct* neigh, int midx, int sidx, int orient) -{ - ASMu2D* slave = dynamic_cast(neigh); - if (!slave) - return false; - - LR::parameterEdge sedge; - switch (sidx) { - case 1: sedge = LR::WEST; break; - case 2: sedge = LR::EAST; break; - default: - case 3: sedge = LR::SOUTH; break; - case 4: sedge = LR::NORTH; break; - } - LR::parameterEdge medge; - switch (midx) { - case 1: medge = LR::WEST; break; - case 2: medge = LR::EAST; break; - default: - case 3: medge = LR::SOUTH; break; - case 4: medge = LR::NORTH; break; - } - - bool result = false; - for (size_t i = 1; i <= this->getNoBasis(); ++i) { - result |= this->getBasis(i)->matchParametricEdge(medge, slave->getBasis(i), - sedge, orient); - this->getBasis(i)->enforceIsotropic(); - slave->getBasis(i)->enforceIsotropic(); - } - - return result; -} - - void ASMu2D::remapErrors (RealArray& errors, const RealArray& origErr, bool elemErrors) const { diff --git a/src/ASM/LR/ASMu2D.h b/src/ASM/LR/ASMu2D.h index 2ef1fb1d..6ee780df 100644 --- a/src/ASM/LR/ASMu2D.h +++ b/src/ASM/LR/ASMu2D.h @@ -454,14 +454,6 @@ public: bool transferCntrlPtVars(const LR::LRSplineSurface* oldBasis, RealArray& newVars, int nGauss) const; - //! \brief Match neighbours after refinement in multipatch models. - //! \param neigh Neigbouring patch - //! \param[in] midx Index of face/edge on this patch - //! \param[in] sidx Index of face/edge on neighbour - //! \param[in] orient Orientation flag for connection - virtual bool matchNeighbour(ASMunstruct* neigh, - int midx, int sidx, int orient); - protected: // Internal utility methods diff --git a/src/ASM/LR/ASMu3D.C b/src/ASM/LR/ASMu3D.C index 5975e06f..e35eab73 100644 --- a/src/ASM/LR/ASMu3D.C +++ b/src/ASM/LR/ASMu3D.C @@ -2209,47 +2209,6 @@ bool ASMu3D::updateDirichlet (const std::map& func, } -bool ASMu3D::matchNeighbour(ASMunstruct* neigh, int midx, int sidx, int orient) -{ - ASMu3D* slave = dynamic_cast(neigh); - if (!slave) - return false; - - LR::parameterEdge sedge; - switch (sidx) - { - case 1: sedge = LR::WEST; break; - default: - case 2: sedge = LR::EAST; break; - case 3: sedge = LR::SOUTH; break; - case 4: sedge = LR::NORTH; break; - case 5: sedge = LR::BOTTOM; break; - case 6: sedge = LR::TOP; break; - } - LR::parameterEdge medge; - switch (midx) - { - case 1: medge = LR::WEST; break; - default: - case 2: medge = LR::EAST; break; - case 3: medge = LR::SOUTH; break; - case 4: medge = LR::NORTH; break; - case 5: medge = LR::BOTTOM; break; - case 6: medge = LR::TOP; break; - } - - bool result = this->getBasis(1)->matchParametricEdge(medge, slave->getBasis(1), - sedge, orient & 2, - orient & 1, orient & 4); - this->getBasis(1)->enforceIsotropic(); - slave->getBasis(1)->enforceIsotropic(); - this->getBasis(1)->generateIDs(); - slave->getBasis(1)->generateIDs(); - - return result; -} - - void ASMu3D::remapErrors (RealArray& errors, const RealArray& origErr, bool elemErrors) const { diff --git a/src/ASM/LR/ASMu3D.h b/src/ASM/LR/ASMu3D.h index 59cb6d03..b404394c 100644 --- a/src/ASM/LR/ASMu3D.h +++ b/src/ASM/LR/ASMu3D.h @@ -403,14 +403,6 @@ public: Real2DMat& result, double time) const; - //! \brief Match neighbours after refinement in multipatch models. - //! \param neigh Neigbouring patch - //! \param[in] midx Index of face/edge on this patch - //! \param[in] sidx Index of face/edge on neighbour - //! \param[in] orient Orientation flag for connection - virtual bool matchNeighbour(ASMunstruct* neigh, - int midx, int sidx, int orient); - protected: // Internal utility methods