Skip to content

Fix Failing Adapt Tests #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Angelyr merged 2 commits into from
Nov 13, 2025
Merged

Fix Failing Adapt Tests #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71c14c4
fix failing tests
Angelyr Nov 13, 2025
18505f4
point to pumi-meshes master
Angelyr Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions mds/mds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ! */
Copy link
Contributor

@cwsmith cwsmith Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol

(void)m;
(void)e;
#else //debug build
int t;
mds_id i;
PCU_ALWAYS_ASSERT(e >= 0);
Expand All @@ -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
}

Expand Down
8 changes: 4 additions & 4 deletions mds/mdsCGNS.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pumi-meshes
Open in desktop
Submodule pumi-meshes updated 0 files
4 changes: 2 additions & 2 deletions test/aniso_adapt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions test/cgns.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down