From df17ab55382b92f56fcdca5b682b9d5e533183d8 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 15 Dec 2016 12:25:45 +0100 Subject: [PATCH] fixed: missed updating the lagrangian ASM drivers in 383390ebbacb10ce57fd446a44e96f4cda8b2079 oh override how i miss you --- src/ASM/ASMs2DLag.C | 2 +- src/ASM/ASMs2DLag.h | 4 +++- src/ASM/ASMs3DLag.C | 4 ++-- src/ASM/ASMs3DLag.h | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ASM/ASMs2DLag.C b/src/ASM/ASMs2DLag.C index a67e437e..16d915c9 100644 --- a/src/ASM/ASMs2DLag.C +++ b/src/ASM/ASMs2DLag.C @@ -742,7 +742,7 @@ bool ASMs2DLag::evalSolution (Matrix& sField, const IntegrandBase& integrand, } -void ASMs2DLag::generateThreadGroups (const Integrand&, bool) +void ASMs2DLag::generateThreadGroups (const Integrand&, bool, bool) { const int p1 = surf->order_u(); const int p2 = surf->order_v(); diff --git a/src/ASM/ASMs2DLag.h b/src/ASM/ASMs2DLag.h index 0a52dd1e..8bd51c88 100644 --- a/src/ASM/ASMs2DLag.h +++ b/src/ASM/ASMs2DLag.h @@ -156,7 +156,9 @@ public: //! \brief Generates element groups for multi-threading of interior integrals. //! \param[in] silence If \e true, suppress threading group outprint - virtual void generateThreadGroups(const Integrand&, bool silence); + //! \param[in] ignoreGlobalLM If \e true ignore global multipliers in sanity check + virtual void generateThreadGroups(const Integrand&, bool silence, + bool ignoreGlobalLM); //! \brief Returns the number of elements on a boundary. virtual size_t getNoBoundaryElms(char lIndex, char ldim) const; diff --git a/src/ASM/ASMs3DLag.C b/src/ASM/ASMs3DLag.C index 793843af..01a9cc95 100644 --- a/src/ASM/ASMs3DLag.C +++ b/src/ASM/ASMs3DLag.C @@ -989,7 +989,7 @@ bool ASMs3DLag::evalSolution (Matrix& sField, const IntegrandBase& integrand, } -void ASMs3DLag::generateThreadGroups (const Integrand&, bool) +void ASMs3DLag::generateThreadGroups (const Integrand&, bool, bool) { const int p1 = svol->order(0); const int p2 = svol->order(1); @@ -1003,7 +1003,7 @@ void ASMs3DLag::generateThreadGroups (const Integrand&, bool) } -void ASMs3DLag::generateThreadGroups (char lIndex, bool) +void ASMs3DLag::generateThreadGroups (char lIndex, bool, bool) { if (threadGroupsFace.find(lIndex) != threadGroupsFace.end()) return; diff --git a/src/ASM/ASMs3DLag.h b/src/ASM/ASMs3DLag.h index bf991715..cc5e97ff 100644 --- a/src/ASM/ASMs3DLag.h +++ b/src/ASM/ASMs3DLag.h @@ -165,11 +165,13 @@ public: //! \brief Generates element groups for multi-threading of interior integrals. //! \param[in] silence If \e true, suppress threading group outprint - virtual void generateThreadGroups(const Integrand&, bool silence); + //! \param[in] ignoreGlobalLM If \e true ignore global multipliers in sanity check + virtual void generateThreadGroups(const Integrand&, bool silence, + bool ignoreGlobalLM); //! \brief Generates element groups for multi-threading of boundary integrals. //! \param[in] lIndex Local index [1,6] of the boundary face //! \param[in] silence If \e true, suppress threading group outprint - virtual void generateThreadGroups(char lIndex, bool silence); + virtual void generateThreadGroups(char lIndex, bool silence, bool); //! \brief Returns the number of elements on a boundary. virtual size_t getNoBoundaryElms(char lIndex, char ldim) const;