[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
From: |
Markus Bürg |
Subject: |
[Getfem-commits] (no subject) |
Date: |
Fri, 15 Sep 2017 04:29:44 -0400 (EDT) |
branch: mb_race_condition_convex_of_reference
commit d744bfd7477474180a7d6d617e9c3901663ea2ec
Author: mb <address@hidden>
Date: Fri Sep 15 10:29:11 2017 +0200
Revert moving the assert.
---
src/bgeot_convex_ref.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bgeot_convex_ref.cc b/src/bgeot_convex_ref.cc
index 36e1219..5e805a6 100644
--- a/src/bgeot_convex_ref.cc
+++ b/src/bgeot_convex_ref.cc
@@ -97,10 +97,6 @@ namespace bgeot {
psimplexified_convex = std::make_shared<mesh_structure>();
// dal::singleton<cleanup_simplexified_convexes>::instance()
// .push_back(psimplexified_convex);
- GMM_ASSERT1(auto_basic,
- "always use simplexified_convex on the basic_convex_ref() "
- "[this=" << nb_points() << ", basic="
- << basic_convex_ref_->nb_points());
simplexify_convex(structure(), *psimplexified_convex);
}
@@ -110,6 +106,10 @@ namespace bgeot {
/* should be called on the basic_convex_ref */
const mesh_structure* convex_of_reference::simplexified_convex() const {
+ GMM_ASSERT1(auto_basic,
+ "always use simplexified_convex on the basic_convex_ref() "
+ "[this=" << nb_points() << ", basic="
+ << basic_convex_ref_->nb_points());
return psimplexified_convex.get();
}