Merge branch 'master' into feature/GRIDEDIT-953_spline_to_curvilinear

Deltares · Jun 17, 2024 · fb837b3 · fb837b3
2 parents 087591e + 1a696ac
commit fb837b3
Show file tree

Hide file tree

Showing 48 changed files with 2,599 additions and 316 deletions.
diff --git a/.github/workflows/doxy-build.yml b/.github/workflows/doxy-build.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   check:
     runs-on: ubuntu-20.04
+    name: Doxygen Deploy
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.9

diff --git a/.github/workflows/doxy-check.yml b/.github/workflows/doxy-check.yml
@@ -8,6 +8,7 @@ on:
 jobs:
   check:
     runs-on: ubuntu-20.04
+    name: Doxygen Check
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.9

diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml
@@ -8,6 +8,7 @@ on:
 jobs:
   check:
     runs-on: ubuntu-20.04
+    name: Codespell Check
     steps:
       - uses: actions/checkout@v2
       - uses: codespell-project/actions-codespell@master

diff --git a/.github/workflows/style-check.yml b/.github/workflows/style-check.yml
@@ -8,6 +8,7 @@ on:
 jobs:
   check:
     runs-on: ubuntu-20.04
+    name: Clang Format Check
     steps:
       - uses: actions/checkout@v2
       - name: Download a recent, static build of clang-format

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,15 +1,10 @@
 cmake_minimum_required(VERSION 3.23)
 
-# get version from latest git tag (stored in VERSION_STRING_BASE)
-include(cmake/get_version_from_git.cmake)
-get_version_from_git(
-  LOG OFF
-  TIMESTAMP "%Y%m%d%H%M%S"
-)
+set(MESHKERNEL_VERSION 4.2.0)
 
 project(
   MeshKernel
-  VERSION ${VERSION_STRING_BASE}
+  VERSION ${MESHKERNEL_VERSION}
   DESCRIPTION "Library for creating and editing meshes."
   LANGUAGES CXX C
 )

diff --git a/cmake/get_version_from_git.cmake b/cmake/get_version_from_git.cmake
diff --git a/data/test/data/CasulliRefinement/casulli_deref_21_21.nc b/data/test/data/CasulliRefinement/casulli_deref_21_21.nc
diff --git a/data/test/data/CasulliRefinement/casulli_deref_21_22.nc b/data/test/data/CasulliRefinement/casulli_deref_21_22.nc
diff --git a/data/test/data/CasulliRefinement/casulli_deref_22_21.nc b/data/test/data/CasulliRefinement/casulli_deref_22_21.nc
diff --git a/data/test/data/CasulliRefinement/casulli_deref_22_22.nc b/data/test/data/CasulliRefinement/casulli_deref_22_22.nc
diff --git a/data/test/data/CasulliRefinement/casulli_derefine_polygon.nc b/data/test/data/CasulliRefinement/casulli_derefine_polygon.nc
diff --git a/data/test/data/CasulliRefinement/casulli_dref_two_polygon.nc b/data/test/data/CasulliRefinement/casulli_dref_two_polygon.nc
diff --git a/data/test/data/CasulliRefinement/casulli_polygon_then_all.nc b/data/test/data/CasulliRefinement/casulli_polygon_then_all.nc
diff --git a/libs/MeshKernel/CMakeLists.txt b/libs/MeshKernel/CMakeLists.txt
@@ -33,6 +33,7 @@ set(CURVILINEAR_UNDO_INC_DIR ${CURVILINEAR_GRID_INC_DIR}/UndoActions)
 set(
   SRC_LIST
   ${SRC_DIR}/AveragingInterpolation.cpp
+  ${SRC_DIR}/CasulliDeRefinement.cpp
   ${SRC_DIR}/CasulliRefinement.cpp
   ${SRC_DIR}/ConnectMeshes.cpp
   ${SRC_DIR}/Contacts.cpp
@@ -72,6 +73,7 @@ set(
   ${UNDO_SRC_DIR}/CompoundUndoAction.cpp
   ${UNDO_SRC_DIR}/DeleteEdgeAction.cpp
   ${UNDO_SRC_DIR}/DeleteNodeAction.cpp
+  ${UNDO_SRC_DIR}/FullUnstructuredGridUndo.cpp
   ${UNDO_SRC_DIR}/MeshConversionAction.cpp
   ${UNDO_SRC_DIR}/NodeTranslationAction.cpp
   ${UNDO_SRC_DIR}/ResetEdgeAction.cpp
@@ -136,6 +138,7 @@ set(
   ${DOMAIN_INC_DIR}/AveragingInterpolation.hpp
   ${DOMAIN_INC_DIR}/BilinearInterpolationOnGriddedSamples.hpp
   ${DOMAIN_INC_DIR}/BoundingBox.hpp
+  ${DOMAIN_INC_DIR}/CasulliDeRefinement.hpp
   ${DOMAIN_INC_DIR}/CasulliRefinement.hpp
   ${DOMAIN_INC_DIR}/ConnectMeshes.hpp
   ${DOMAIN_INC_DIR}/Constants.hpp
@@ -186,6 +189,7 @@ set(
   ${UNDO_INC_DIR}/BaseMeshUndoAction.hpp
   ${UNDO_INC_DIR}/DeleteEdgeAction.hpp
   ${UNDO_INC_DIR}/DeleteNodeAction.hpp
+  ${UNDO_INC_DIR}/FullUnstructuredGridUndo.hpp
   ${UNDO_INC_DIR}/MeshConversionAction.hpp
   ${UNDO_INC_DIR}/NodeTranslationAction.hpp
   ${UNDO_INC_DIR}/ResetEdgeAction.hpp