From 54fa103f8b3c20aef33df4a7e84dfab8709062fd Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Tue, 10 Aug 2010 08:40:54 +0000
Subject: [PATCH] box: disable partial reassembly by default
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@4042 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/common/boxproperties.hh | 2 +-
dumux/boxmodels/common/pdelabboxassembler.hh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dumux/boxmodels/common/boxproperties.hh b/dumux/boxmodels/common/boxproperties.hh
index f8a6fca422..4be1b7b52c 100644
--- a/dumux/boxmodels/common/boxproperties.hh
+++ b/dumux/boxmodels/common/boxproperties.hh
@@ -371,7 +371,7 @@ SET_PROP(BoxModel, LocalOperator)
// enable jacobian matrix recycling by default
SET_BOOL_PROP(BoxModel, EnableJacobianRecycling, true);
// enable partial reassembling by default
-SET_BOOL_PROP(BoxModel, EnablePartialReassemble, true);
+SET_BOOL_PROP(BoxModel, EnablePartialReassemble, false);
// \}
diff --git a/dumux/boxmodels/common/pdelabboxassembler.hh b/dumux/boxmodels/common/pdelabboxassembler.hh
index 3bec66b0e4..79671d5f5f 100644
--- a/dumux/boxmodels/common/pdelabboxassembler.hh
+++ b/dumux/boxmodels/common/pdelabboxassembler.hh
@@ -283,7 +283,7 @@ public:
}
- EntityColor vertexColor(const Element &element, int vertIdx) const
+ int vertexColor(const Element &element, int vertIdx) const
{
if (!enablePartialReassemble)
return Red; // reassemble unconditionally!
@@ -292,14 +292,14 @@ public:
return vertexColor_[globalIdx];
}
- EntityColor vertexColor(int globalVertIdx) const
+ int vertexColor(int globalVertIdx) const
{
if (!enablePartialReassemble)
return Red; // reassemble unconditionally!
return vertexColor_[globalVertIdx];
}
- EntityColor elementColor(const Element &element) const
+ int elementColor(const Element &element) const
{
if (!enablePartialReassemble)
return Red; // reassemble unconditionally!
@@ -308,7 +308,7 @@ public:
return elementColor_[globalIdx];
}
- EntityColor elementColor(int globalElementIdx) const
+ int elementColor(int globalElementIdx) const
{
if (!enablePartialReassemble)
return Red; // reassemble unconditionally!
--
GitLab