From 1f4df0c2011a877a9ec5bccc29a9d2fe3272e66e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 26 Oct 2015 19:31:20 +0000
Subject: [PATCH] fix init order
---
Numeric/FuncSpaceData.cpp | 30 ++++++++++++++----------------
Numeric/FuncSpaceData.h | 5 +++--
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/Numeric/FuncSpaceData.cpp b/Numeric/FuncSpaceData.cpp
index 586213617e..f635dc5cfb 100644
--- a/Numeric/FuncSpaceData.cpp
+++ b/Numeric/FuncSpaceData.cpp
@@ -8,21 +8,21 @@
FuncSpaceData::FuncSpaceData(const MElement *el, const bool *serendip) :
_tag(el->getTypeForMSH()), _spaceOrder(el->getPolynomialOrder()),
- _nij(0), _nk(_spaceOrder), _pyramidalSpace(el->getType() == TYPE_PYR),
- _serendipity(serendip ? *serendip : el->getIsOnlySerendipity())
+ _serendipity(serendip ? *serendip : el->getIsOnlySerendipity()),
+ _nij(0), _nk(_spaceOrder), _pyramidalSpace(el->getType() == TYPE_PYR)
{}
FuncSpaceData::FuncSpaceData(const MElement *el, int order, const bool *serendip) :
_tag(el->getTypeForMSH()), _spaceOrder(order),
- _nij(0), _nk(_spaceOrder), _pyramidalSpace(el->getType() == TYPE_PYR),
- _serendipity(serendip ? *serendip : el->getIsOnlySerendipity())
+ _serendipity(serendip ? *serendip : el->getIsOnlySerendipity()),
+ _nij(0), _nk(_spaceOrder), _pyramidalSpace(el->getType() == TYPE_PYR)
{}
FuncSpaceData::FuncSpaceData(const MElement *el, bool pyr, int nij, int nk,
const bool *serendip) :
_tag(el->getTypeForMSH()), _spaceOrder(pyr ? nij+nk : std::max(nij, nk)),
- _nij(nij), _nk(nk), _pyramidalSpace(pyr),
- _serendipity(serendip ? *serendip : el->getIsOnlySerendipity())
+ _serendipity(serendip ? *serendip : el->getIsOnlySerendipity()),
+ _nij(nij), _nk(nk), _pyramidalSpace(pyr)
{
if (el->getType() != TYPE_PYR)
Msg::Error("Creation of pyramidal space data for a non-pyramid element !");
@@ -30,21 +30,20 @@ FuncSpaceData::FuncSpaceData(const MElement *el, bool pyr, int nij, int nk,
FuncSpaceData::FuncSpaceData(int tag, const bool *serendip) :
_tag(tag), _spaceOrder(ElementType::OrderFromTag(tag)),
+ _serendipity(serendip ? *serendip : ElementType::SerendipityFromTag(_tag) > 1),
_nij(0), _nk(_spaceOrder),
- _pyramidalSpace(ElementType::ParentTypeFromTag(tag) == TYPE_PYR),
- _serendipity(serendip ? *serendip :
- ElementType::SerendipityFromTag(_tag) > 1)
+ _pyramidalSpace(ElementType::ParentTypeFromTag(tag) == TYPE_PYR)
{}
FuncSpaceData::FuncSpaceData(bool isTag, int tagOrType, int order,
const bool *serendip, bool elemIsSerendip) :
_tag(isTag ? tagOrType : ElementType::getTag(tagOrType, order, elemIsSerendip)),
- _spaceOrder(order), _nij(0), _nk(_spaceOrder),
+ _spaceOrder(order),
+ _serendipity(serendip ? *serendip : ElementType::SerendipityFromTag(_tag) > 1),
+ _nij(0), _nk(_spaceOrder),
_pyramidalSpace(isTag ?
ElementType::ParentTypeFromTag(tagOrType) == TYPE_PYR :
- tagOrType == TYPE_PYR),
- _serendipity(serendip ? *serendip :
- ElementType::SerendipityFromTag(_tag) > 1)
+ tagOrType == TYPE_PYR)
{}
FuncSpaceData::FuncSpaceData(bool isTag, int tagOrType, bool pyr, int nij,
@@ -52,9 +51,8 @@ FuncSpaceData::FuncSpaceData(bool isTag, int tagOrType, bool pyr, int nij,
_tag(isTag ? tagOrType :
ElementType::getTag(tagOrType, pyr ? nij+nk : std::max(nij, nk), elemIsSerendip)),
_spaceOrder(pyr ? nij+nk : std::max(nij, nk)),
- _nij(nij), _nk(nk), _pyramidalSpace(pyr),
- _serendipity(serendip ? *serendip :
- ElementType::SerendipityFromTag(_tag) > 1)
+ _serendipity(serendip ? *serendip : ElementType::SerendipityFromTag(_tag) > 1),
+ _nij(nij), _nk(nk), _pyramidalSpace(pyr)
{
if (ElementType::ParentTypeFromTag(_tag) != TYPE_PYR)
Msg::Error("Creation of pyramidal space data for a non-pyramid element!");
diff --git a/Numeric/FuncSpaceData.h b/Numeric/FuncSpaceData.h
index 946ea1233d..eda5db87f5 100644
--- a/Numeric/FuncSpaceData.h
+++ b/Numeric/FuncSpaceData.h
@@ -39,8 +39,9 @@ private:
public:
- FuncSpaceData() : _tag(-1), _spaceOrder(-1), _nij(-1), _nk(-1),
- _pyramidalSpace(false), _serendipity(false) {}
+ FuncSpaceData()
+ : _tag(-1), _spaceOrder(-1), _serendipity(false), _nij(-1), _nk(-1),
+ _pyramidalSpace(false) {}
// Constructors using MElement*
FuncSpaceData(const MElement *el, const bool *serendip = NULL);
--
GitLab