Merge pull request #520 from SCOREC/ac/fix-failing-tests

Fix Failing Adapt Tests

Author: Angelyr

mds/mds.c

@@ -579,7 +579,11 @@ static mds_id add_ent(struct mds* m, int t, mds_id* from)
 
 static void check_ent(struct mds* m, mds_id e)
 {
-#ifndef NDEBUG
+#ifdef NDEBUG // release build
+  /* good luck ! */
+  (void)m;
+  (void)e;
+#else //debug build
   int t;
   mds_id i;
   PCU_ALWAYS_ASSERT(e >= 0);
@@ -588,10 +592,6 @@ static void check_ent(struct mds* m, mds_id e)
   i = INDEX(e);
   PCU_ALWAYS_ASSERT(i < m->end[t]);
   PCU_ALWAYS_ASSERT(m->free[t][i] == MDS_LIVE);
-#else
-  /* good luck ! */
-  (void)m;
-  (void)e;
 #endif
 }
 

mds/mdsCGNS.cc

@@ -44,12 +44,12 @@
 
 namespace
 {
-#ifndef NDEBUG                 // debug settings, cmake double negative....
-const bool debugOutput = true; // probably will not get away with c++17
-//static constexpr bool debugOutput = true; // probably will not get away with c++17
-#else // optimised setting
+#ifdef NDEBUG // optimised build
 const bool debugOutput = false; // probably will not get away with c++17
                                 //static constexpr bool debugOutput = false; // probably will not get away with c++17
+#else // debug build
+const bool debugOutput = true; // probably will not get away with c++17
+                               //static constexpr bool debugOutput = true; // probably will not get away with c++17
 #endif
 
 static std::string SupportedCGNSElementTypeToString(const CGNS_ENUMT(ElementType_t) & elementType)

pumi-meshes

@@ -91,7 +91,7 @@ ma::Mesh* coarsenForced(ma::Mesh* m)
   double averageBefore = ma::getAverageEdgeLength(m);
   int edgesBefore = countEdges(m);
 
-  ma::coarsenMultiple(a);
+  ma::coarsen(a);
 
   measureQuality(m, avgQualAfter, minQualAfter);
 
@@ -123,7 +123,7 @@ ma::Mesh* coarsenRegular(ma::Mesh* m)
   double averageBefore = ma::getAverageEdgeLength(m);
   int edgesBefore = countEdges(m);
 
-  ma::coarsenMultiple(a);
+  ma::coarsen(a);
 
   measureQuality(m, avgQualAfter, minQualAfter);
 

test/aniso_adapt.h

@@ -192,10 +192,10 @@ std::string doit(apf::CGNSBCMap &cgnsBCMap, const std::string &argv1, const std:
 
   //std::cout << "FOUND " << found << " " << path.size() << " " << path << " " << index << std::endl;
 
-#ifndef NDEBUG // debug settings, cmake double negative....
-  const auto prefix = path.substr(index) + "_debug" + post;
-#else // optimised setting
+#ifdef NDEBUG //release build
   const auto prefix = path.substr(index) + "_release" + post;
+#else //debug build
+  const auto prefix = path.substr(index) + "_debug" + post;
 #endif
 
   const auto dim = m->getDimension();