Merge pull request #31 from nextsimhub/issue29_update-catch2

Update catch2 and fix Mac CI
nextsimhub · Aug 21, 2024 · 12b1d60 · 12b1d60
2 parents 369fec2 + 88040cc
commit 12b1d60
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -1,19 +1,19 @@
-name: 'Domain Decomposition Toolkit CI'
+name: Domain Decomposition Toolkit CI
 on:
   push:
     branches: [main]
   pull_request:
     branches: [main]
 jobs:
   build-on-ubuntu:
-    runs-on: ubuntu-latest   
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
         shell: bash
         run: |
           sudo apt-get install -y cmake libboost-program-options-dev libhdf5-mpi-dev libcurl4-nss-dev
-          git clone -b v2.x https://github.com/catchorg/Catch2.git
+          git clone https://github.com/catchorg/Catch2.git
           cd Catch2
           cmake -DBUILD_TESTING=OFF -Bbuild -S.
           sudo cmake --build build --config Release --target install
@@ -71,8 +71,7 @@ jobs:
       - name: Install dependencies
         run: |
           brew install cmake
-          brew extract --version=2.13.9 catch2 homebrew/cask-versions
-          brew install [email protected]
+          brew install catch2
           brew install boost
           brew install hdf5-mpi
           brew install pnetcdf

diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ The project installs a shared library that can be imported by other CMake projec
 ### How to run
 The binary `decomp` can be used to partition a 2D grid with an optional land mask represented as a netCDF file. By default, the name of the dimensions in the netCDF file are `x` and `y` with the `y` dimension increasing the fastest, and the name of the variable representing the land mask is `mask`. For netCDF files using the enhanced model, we assume the group that contains the information of interest is named `data`. These can be overridden using command-line options. For example:
 ```
-mpirun -n 2 ./decomp grid.nc --dim0 y --dim1 x --mask land_mask
+mpirun -n 2 ./decomp --grid grid.nc --dim0 y --dim1 x --mask land_mask
 ```
 
 The `decomp` tool produces two netCDF-4 files (using the classic data model) named `partition_mask_<num_mpi_processes>.nc` and `partition_metadata_<num_mpi_processes>.nc` with the following layout:

diff --git a/test/main.cpp b/test/main.cpp
@@ -5,7 +5,7 @@
  */
 
 #define CATCH_CONFIG_RUNNER
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mpi.h>
 
 // Global options

diff --git a/test/test_grid_0.cpp b/test/test_grid_0.cpp
@@ -6,7 +6,7 @@
 
 #include "Grid.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mpi.h>
 
 TEST_CASE("Grid: all land", "[grid]")

diff --git a/test/test_grid_1.cpp b/test/test_grid_1.cpp
@@ -6,7 +6,7 @@
 
 #include "Grid.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mpi.h>
 
 TEST_CASE("Grid: no land", "[grid]")

diff --git a/test/test_grid_2.cpp b/test/test_grid_2.cpp
@@ -6,7 +6,7 @@
 
 #include "Grid.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mpi.h>
 
 TEST_CASE("Grid: non-default dimension naming", "[grid]")

diff --git a/test/test_zoltan_partitioner_0.cpp b/test/test_zoltan_partitioner_0.cpp
@@ -7,7 +7,7 @@
 #include "Grid.hpp"
 #include "Partitioner.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mpi.h>
 
 extern int global_argc;

diff --git a/test/test_zoltan_partitioner_1.cpp b/test/test_zoltan_partitioner_1.cpp
@@ -7,7 +7,7 @@
 #include "Grid.hpp"
 #include "Partitioner.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mpi.h>
 
 extern int global_argc;

diff --git a/test/test_zoltan_partitioner_2.cpp b/test/test_zoltan_partitioner_2.cpp
@@ -7,7 +7,7 @@
 #include "Grid.hpp"
 #include "Partitioner.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mpi.h>
 
 extern int global_argc;