From f6ca706b6529c6a9cbe922032c0792ab71b3c703 Mon Sep 17 00:00:00 2001 From: Carsten Burstedde Date: Mon, 18 Mar 2024 17:52:58 +0100 Subject: [PATCH 1/2] test_all6 (p6est): reduce refinement level by 1 --- test/test_all6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_all6.c b/test/test_all6.c index 0737b2551..7085f33ce 100644 --- a/test/test_all6.c +++ b/test/test_all6.c @@ -255,7 +255,7 @@ main (int argc, char **argv) sc_stats_set1 (&stats[TIMINGS_REFINE_LAYERS], snapshot.iwtime, "Refine layers"); - refine_level += 2; + refine_level += 1; sc_flops_snap (&fi, &snapshot); p6est_refine_columns (p6est, 1, refine_column_fn, init_fn); sc_flops_shot (&fi, &snapshot); From 5e5e382ea2d1fdc60215c5fdeea743d796bbcf0b Mon Sep 17 00:00:00 2001 From: Carsten Burstedde Date: Mon, 18 Mar 2024 17:59:24 +0100 Subject: [PATCH 2/2] test_all6 (p6est): use runtime check for zlib --- test/test_all6.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/test_all6.c b/test/test_all6.c index 7085f33ce..1ebd2e5c9 100644 --- a/test/test_all6.c +++ b/test/test_all6.c @@ -171,9 +171,8 @@ main (int argc, char **argv) double height[3] = { 0., 0., 0.1 }; int i; int vtk; -#ifdef P4EST_HAVE_ZLIB + int have_zlib; unsigned crc_computed = 0; -#endif sc_options_t *opt; int first_argc; const char *config_name; @@ -189,6 +188,7 @@ main (int argc, char **argv) sc_set_log_defaults (NULL, NULL, SC_LP_STATISTICS); #endif p4est_init (NULL, SC_LP_DEFAULT); + have_zlib = p4est_have_zlib (); opt = sc_options_new (argv[0]); @@ -379,11 +379,11 @@ main (int argc, char **argv) p6est_lnodes_destroy (lnodes); } -#ifdef P4EST_HAVE_ZLIB - crc_computed = p6est_checksum (p6est); - - P4EST_GLOBAL_PRODUCTIONF ("p6est checksum 0x%08x\n", crc_computed); -#endif + if (have_zlib) { + /* the parallel checksum aborts without zlib configured */ + crc_computed = p6est_checksum (p6est); + P4EST_GLOBAL_PRODUCTIONF ("p6est checksum 0x%08x\n", crc_computed); + } if (save_filename) { sc_flops_snap (&fi, &snapshot);