From 71c14c47c5aaaf6287fad263678438228c02f7de Mon Sep 17 00:00:00 2001 From: Angelyr Date: Thu, 13 Nov 2025 14:13:55 -0500 Subject: [PATCH 1/2] fix failing tests --- mds/mds.c | 10 +++++----- mds/mdsCGNS.cc | 8 ++++---- test/aniso_adapt.h | 4 ++-- test/cgns.cc | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mds/mds.c b/mds/mds.c index a896da704..f1087ccdd 100644 --- a/mds/mds.c +++ b/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 } diff --git a/mds/mdsCGNS.cc b/mds/mdsCGNS.cc index 54f483607..6062eb4b9 100644 --- a/mds/mdsCGNS.cc +++ b/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) diff --git a/test/aniso_adapt.h b/test/aniso_adapt.h index 8eb85ee1f..160a88165 100644 --- a/test/aniso_adapt.h +++ b/test/aniso_adapt.h @@ -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); diff --git a/test/cgns.cc b/test/cgns.cc index 66ea7d439..11e89cc8b 100644 --- a/test/cgns.cc +++ b/test/cgns.cc @@ -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(); From 18505f474474d34b0c27b56184da56cb567a0773 Mon Sep 17 00:00:00 2001 From: Angelyr Date: Thu, 13 Nov 2025 14:40:25 -0500 Subject: [PATCH 2/2] point to pumi-meshes master --- pumi-meshes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pumi-meshes b/pumi-meshes index 93d3dadf4..684e48051 160000 --- a/pumi-meshes +++ b/pumi-meshes @@ -1 +1 @@ -Subproject commit 93d3dadf4ecf73f6ec50bdf6f91a4d3ffd0f6f10 +Subproject commit 684e48051ee75b666bc3c162babf6836cc2c9b07