From c2c6f8dff710a812f8d94873e72bb91074e18446 Mon Sep 17 00:00:00 2001 From: BillSenior Date: Wed, 17 Sep 2025 13:41:19 +0200 Subject: [PATCH 01/18] GRIDEDIT-1958 Fixed crash when refining mesh with hole with gridded samples --- .../BilinearInterpolationOnGriddedSamples.hpp | 17 +++++- .../tests/src/Mesh2DRefinmentTests.cpp | 55 +++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/libs/MeshKernel/include/MeshKernel/BilinearInterpolationOnGriddedSamples.hpp b/libs/MeshKernel/include/MeshKernel/BilinearInterpolationOnGriddedSamples.hpp index 82a3ec27b..8924f66da 100644 --- a/libs/MeshKernel/include/MeshKernel/BilinearInterpolationOnGriddedSamples.hpp +++ b/libs/MeshKernel/include/MeshKernel/BilinearInterpolationOnGriddedSamples.hpp @@ -151,7 +151,11 @@ namespace meshkernel for (UInt n = 0; n < numNodes; ++n) { const auto node = m_mesh.Node(n); - m_nodeResults[n] = Interpolation(node); + + if (node.IsValid()) + { + m_nodeResults[n] = Interpolation(node); + } } m_edgeResults.resize(numEdges); @@ -159,14 +163,21 @@ namespace meshkernel for (UInt e = 0; e < numEdges; ++e) { const auto& [first, second] = m_mesh.GetEdge(e); - m_edgeResults[e] = 0.5 * (m_nodeResults[first] + m_nodeResults[second]); + + if (first != constants::missing::uintValue && second != constants::missing::uintValue) + { + m_edgeResults[e] = 0.5 * (m_nodeResults[first] + m_nodeResults[second]); + } } m_faceResults.resize(numFaces, constants::missing::doubleValue); std::ranges::fill(m_faceResults, constants::missing::doubleValue); for (UInt f = 0; f < numFaces; ++f) { - m_faceResults[f] = Interpolation(m_mesh.m_facesMassCenters[f]); + if (m_mesh.m_facesMassCenters[f].IsValid()) + { + m_faceResults[f] = Interpolation(m_mesh.m_facesMassCenters[f]); + } } } diff --git a/libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp b/libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp index ad145f84f..2423bb051 100644 --- a/libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp +++ b/libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp @@ -1324,3 +1324,58 @@ TEST(MeshRefinement, SplitAlongRow_FailureTests) errorCode = meshkernelapi::mkernel_mesh2d_split_row(meshKernelId, node1, node2); ASSERT_EQ(meshkernel::ExitCode::ConstraintErrorCode, errorCode); } + +TEST(MeshRefinement, Mesh2DWithHoleRefineBasedOnGriddedSamplesWaveCourant_WithGriddedSamples_ShouldRefineMesh) +{ + int meshKernelId = -1; + int errorCode = -1; + + constexpr int isSpherical = 1; + + meshkernelapi::mkernel_allocate_state(isSpherical, meshKernelId); + + meshkernel::MakeGridParameters gridParameters; + gridParameters.origin_x = 99.0; + gridParameters.origin_y = -7.0; + gridParameters.block_size_x = 0.2; + gridParameters.block_size_y = 0.2; + gridParameters.upper_right_x = 114.0; + gridParameters.upper_right_y = 13.5; + + errorCode = meshkernelapi::mkernel_curvilinear_compute_rectangular_grid_on_extension(meshKernelId, gridParameters); + ASSERT_EQ(meshkernel::ExitCode::Success, errorCode); + errorCode = meshkernelapi::mkernel_curvilinear_convert_to_mesh2d(meshKernelId); + ASSERT_EQ(meshkernel::ExitCode::Success, errorCode); + + std::vector pxs{98.0, 107.5, 98.0, 98}; + std::vector pys{2.5, -7.5, -7.5, 2.5}; + meshkernelapi::GeometryList polygon{}; + polygon.coordinates_x = pxs.data(); + polygon.coordinates_y = pys.data(); + polygon.num_coordinates = static_cast(pxs.size()); + errorCode = mkernel_mesh2d_delete(meshKernelId, polygon, 0, 0); + ASSERT_EQ(meshkernel::ExitCode::Success, errorCode); + + std::vector sampleDataXs{99.0, 114.0}; + std::vector sampleDataYs{-7.0, 13.5}; + std::vector sampleDataValues{-9999.0, -9999.0, -9999.0, -9999.0}; + + meshkernelapi::GriddedSamples sampleData; + + sampleData.num_x = static_cast(sampleDataXs.size()); + sampleData.num_y = static_cast(sampleDataYs.size()); + + sampleData.x_coordinates = sampleDataXs.data(); + sampleData.y_coordinates = sampleDataYs.data(); + sampleData.values = sampleDataValues.data(); + + meshkernel::MeshRefinementParameters meshRefinementParameters; + meshRefinementParameters.min_edge_size = 1250.0; + meshRefinementParameters.refinement_type = 1; // WAVE_COURANT? + meshRefinementParameters.smoothing_iterations = 2; + + meshkernelapi::GeometryList refPolygon{}; + + errorCode = mkernel_mesh2d_refine_based_on_gridded_samples(meshKernelId, refPolygon, sampleData, meshRefinementParameters, true); + ASSERT_EQ(meshkernel::ExitCode::Success, errorCode); +} From 7239bd2ea68d666cd93c65ccd339a9753cfa20cb Mon Sep 17 00:00:00 2001 From: BillSenior Date: Wed, 17 Sep 2025 15:43:37 +0200 Subject: [PATCH 02/18] GRIDEDIT-1958 Reduced run time of unit test --- libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp b/libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp index 2423bb051..f805ef977 100644 --- a/libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp +++ b/libs/MeshKernelApi/tests/src/Mesh2DRefinmentTests.cpp @@ -1337,8 +1337,8 @@ TEST(MeshRefinement, Mesh2DWithHoleRefineBasedOnGriddedSamplesWaveCourant_WithGr meshkernel::MakeGridParameters gridParameters; gridParameters.origin_x = 99.0; gridParameters.origin_y = -7.0; - gridParameters.block_size_x = 0.2; - gridParameters.block_size_y = 0.2; + gridParameters.block_size_x = 0.4; + gridParameters.block_size_y = 0.4; gridParameters.upper_right_x = 114.0; gridParameters.upper_right_y = 13.5; From 025d99060640281f78f0a44628e14d28b80494ff Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 09:25:48 +0200 Subject: [PATCH 03/18] GRIDEDIT-1958 Removed macos13 from build --- .github/workflows/build-and-test-feature-master.yml | 1 - .github/workflows/build-and-test-release.yml | 2 -- .github/workflows/build-and-test-workflow.yml | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test-feature-master.yml b/.github/workflows/build-and-test-feature-master.yml index 1402b8eab..12388ec28 100644 --- a/.github/workflows/build-and-test-feature-master.yml +++ b/.github/workflows/build-and-test-feature-master.yml @@ -20,7 +20,6 @@ jobs: fail-fast: false matrix: platform: - - macos-13 # x86_64 (free) - macos-14 # arm64 (free) build_type: - Release diff --git a/.github/workflows/build-and-test-release.yml b/.github/workflows/build-and-test-release.yml index 0fa9b172c..edf9ae089 100644 --- a/.github/workflows/build-and-test-release.yml +++ b/.github/workflows/build-and-test-release.yml @@ -19,8 +19,6 @@ jobs: fail-fast: false matrix: platform: - - macos-13 # x86_64 (free) - - macos-13-xlarge # arm64 (billable) - macos-14 # arm64 (free) build_type: - Release diff --git a/.github/workflows/build-and-test-workflow.yml b/.github/workflows/build-and-test-workflow.yml index 3c8ede412..6195b3891 100644 --- a/.github/workflows/build-and-test-workflow.yml +++ b/.github/workflows/build-and-test-workflow.yml @@ -23,8 +23,8 @@ jobs: # It seems like gcc and g++ are symbolic links to the default clang and clang++ compilers, respectively. # CMAKE_CXX_COMPILER_ID will evaluate to AppleClang rather than GNU on macos. env: - CC: gcc-12 - CXX: g++-12 + CC: gcc-13 + CXX: g++-13 # Build steps steps: From f0b1c66a60b083742bdfc835c6a6a561b7173fae Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 09:50:37 +0200 Subject: [PATCH 04/18] GRIDEDIT-1958 Added zlib dependency --- CMakeLists.txt | 3 +++ cmake/find_packages.cmake | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 cmake/find_packages.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index c9a1dce3d..12b39ad92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,9 @@ include(cmake/options.cmake) # configure the compiler include(cmake/compiler_config.cmake) +# fetch dependencies, must appear after options.cmake +include(cmake/fetch_contents.cmake) + # fetch dependencies, must appear after options.cmake include(cmake/fetch_content.cmake) diff --git a/cmake/find_packages.cmake b/cmake/find_packages.cmake new file mode 100644 index 000000000..7e05238d0 --- /dev/null +++ b/cmake/find_packages.cmake @@ -0,0 +1,36 @@ +# zlib +if(WIN32) + # Set the path to the shared library + if(DEFINED ENV{ZLIB_ROOT}) + message(VERBOSE "ZLIB_ROOT is an env var") + set(ZLIB_LIBRARY_PATH "$ENV{ZLIB_ROOT}") + elseif(DEFINED ZLIB_ROOT) + message(VERBOSE "ZLIB_ROOT is a config option") + set(ZLIB_LIBRARY_PATH "${ZLIB_ROOT}") + else() + message(FATAL_ERROR "ZLIB_ROOT is undefined") + endif() + set(ZLIB_LIBRARY "${ZLIB_LIBRARY_PATH}/bin/zlib.dll") +endif() +find_package(ZLIB REQUIRED) +if (ZLIB_FOUND) + message(STATUS "Found ZLIB ${ZLIB_VERSION}") +else() + message(FATAL_ERROR "Could not find ZLIB") +endif() + +check_runtime_dependency(ZLIB::ZLIB UNKNOWN_LIBRARY) + +set( + THIRD_PARTY_RUNTIME_DEPS + $ # not an element of TARGET_RUNTIME_DLLS, helaas speculaas + CACHE STRING "Third-party runtime dependencies" FORCE +) + +# cache all runtime dependencies +set( + ALL_RUNTIME_DEPS + ${THIRD_PARTY_RUNTIME_DEPS} + $ + CACHE STRING "All runtime dependencies" FORCE +) From 7726d3434f57c39c2497c82659934de7f4369609 Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 09:53:19 +0200 Subject: [PATCH 05/18] GRIDEDIT-1958 Renamed file --- cmake/{fetch_content.cmake => fetch_contents.cmake} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cmake/{fetch_content.cmake => fetch_contents.cmake} (100%) diff --git a/cmake/fetch_content.cmake b/cmake/fetch_contents.cmake similarity index 100% rename from cmake/fetch_content.cmake rename to cmake/fetch_contents.cmake From a85785de3210dfba3ce9f27db4f3bd4e35625b9e Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 09:55:31 +0200 Subject: [PATCH 06/18] GRIDEDIT-1958 Renamed file --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12b39ad92..210bfb3da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,8 +18,8 @@ include(cmake/compiler_config.cmake) # fetch dependencies, must appear after options.cmake include(cmake/fetch_contents.cmake) -# fetch dependencies, must appear after options.cmake -include(cmake/fetch_content.cmake) +# find required packages +include(cmake/find_packages.cmake) # organize targets into folders, can be remove in version > 3.26 (ON by default) set_property(GLOBAL PROPERTY USE_FOLDERS ON) From aede9cf7cce786bb8fe913bb8c7f3a9b6660fdb0 Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 09:59:08 +0200 Subject: [PATCH 07/18] GRIDEDIT-1958 Removed cmake file --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 210bfb3da..4a028992c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,6 @@ include(cmake/compiler_config.cmake) # fetch dependencies, must appear after options.cmake include(cmake/fetch_contents.cmake) -# find required packages -include(cmake/find_packages.cmake) - # organize targets into folders, can be remove in version > 3.26 (ON by default) set_property(GLOBAL PROPERTY USE_FOLDERS ON) From c5f2ffecfa80276985d07c20b97bca0961e2c0e2 Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 10:14:51 +0200 Subject: [PATCH 08/18] GRIDEDIT-1958 Added macos 15 to test --- .github/workflows/build-and-test-feature-master.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test-feature-master.yml b/.github/workflows/build-and-test-feature-master.yml index 12388ec28..b8eaf1389 100644 --- a/.github/workflows/build-and-test-feature-master.yml +++ b/.github/workflows/build-and-test-feature-master.yml @@ -21,6 +21,7 @@ jobs: matrix: platform: - macos-14 # arm64 (free) + - macos-15 # arm64 (free) build_type: - Release From 259bbff84a2abbe035b7246aa7ec9446d85183f9 Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 10:22:46 +0200 Subject: [PATCH 09/18] GRIDEDIT-1958 Removed macos 15 --- .github/workflows/build-and-test-feature-master.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-and-test-feature-master.yml b/.github/workflows/build-and-test-feature-master.yml index b8eaf1389..12388ec28 100644 --- a/.github/workflows/build-and-test-feature-master.yml +++ b/.github/workflows/build-and-test-feature-master.yml @@ -21,7 +21,6 @@ jobs: matrix: platform: - macos-14 # arm64 (free) - - macos-15 # arm64 (free) build_type: - Release From 074aa7c898076b07a09c6d9e5c3220cf0d443455 Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 15:55:04 +0200 Subject: [PATCH 10/18] GRIDEDIT-1958 COMmented out the cmake miniumu --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a028992c..f5d7db48d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.23) +#cmake_minimum_required(VERSION 3.23) set(MESHKERNEL_VERSION 8.1.3) From b48b8d0793e3044b12dd76e3cfd180b373297fb1 Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 16:01:12 +0200 Subject: [PATCH 11/18] GRIDEDIT-1958 Added back cmake minimum version requirements --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5d7db48d..4a028992c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -#cmake_minimum_required(VERSION 3.23) +cmake_minimum_required(VERSION 3.23) set(MESHKERNEL_VERSION 8.1.3) From 546da4408f215e725367f956646fb7ed74da3705 Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 16:04:45 +0200 Subject: [PATCH 12/18] GRIDEDIT-1958 CHange to gcc-12 --- .github/workflows/build-and-test-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-workflow.yml b/.github/workflows/build-and-test-workflow.yml index 6195b3891..3c8ede412 100644 --- a/.github/workflows/build-and-test-workflow.yml +++ b/.github/workflows/build-and-test-workflow.yml @@ -23,8 +23,8 @@ jobs: # It seems like gcc and g++ are symbolic links to the default clang and clang++ compilers, respectively. # CMAKE_CXX_COMPILER_ID will evaluate to AppleClang rather than GNU on macos. env: - CC: gcc-13 - CXX: g++-13 + CC: gcc-12 + CXX: g++-12 # Build steps steps: From 81ea8ca26f3ae9be72fda381744383cd77b191bf Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 16:30:59 +0200 Subject: [PATCH 13/18] GRIDEDIT-1958 Updated cache save/restore version --- .github/workflows/build-and-test-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-workflow.yml b/.github/workflows/build-and-test-workflow.yml index 3c8ede412..f5b3b8744 100644 --- a/.github/workflows/build-and-test-workflow.yml +++ b/.github/workflows/build-and-test-workflow.yml @@ -57,7 +57,7 @@ jobs: # Step: Restore cached user-provided dependencies - name: Restore cached user-provided dependencies - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 id: restore-cached-external-dependencies with: key: ${{ inputs.platform }}-${{ inputs.build_type }}-cache-key @@ -77,7 +77,7 @@ jobs: # Step: Cache user-provided dependencies, executes only if no cache restored - name: Cache user-provided dependencies - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: steps.restore-cached-external-dependencies.outputs.cache-hit != 'true' with: key: ${{ inputs.platform }}-${{ inputs.build_type }}-cache-key From 3a3b2d4a7f53a883c0d9ce0fb2617bb4a1f9c90a Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 16:45:35 +0200 Subject: [PATCH 14/18] GRIDEDIT-1958 Updated zlib version to 1.3.1 --- scripts/install_netcdf_static.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_netcdf_static.ps1 b/scripts/install_netcdf_static.ps1 index 87d39dd64..82576947c 100644 --- a/scripts/install_netcdf_static.ps1 +++ b/scripts/install_netcdf_static.ps1 @@ -35,7 +35,7 @@ Param( [Parameter(Mandatory = $true)] [string] $InstallDir, [Parameter(Mandatory = $false)] [ValidateSet('Release', 'Debug', 'RelWithDebInfo')] [string] $BuildType = 'Release', [Parameter(Mandatory = $false)] [hashtable]$GitTags = @{ ` - zlib = 'v1.2.13'; ` + zlib = 'v1.3.1'; ` curl = 'curl-7_88_1'; ` hdf5 = 'hdf5-1_14_0'; ` netcdf_c = 'v4.9.1' From e91fdcb361dbd3c8b460e9a1c31bef982c78ebbe Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 17:25:31 +0200 Subject: [PATCH 15/18] GRIDEDIT-1958 Updated netcdf version to 4.9.1 (from 4.9.1) --- scripts/install_netcdf_static.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_netcdf_static.ps1 b/scripts/install_netcdf_static.ps1 index 82576947c..983a81ed0 100644 --- a/scripts/install_netcdf_static.ps1 +++ b/scripts/install_netcdf_static.ps1 @@ -35,10 +35,10 @@ Param( [Parameter(Mandatory = $true)] [string] $InstallDir, [Parameter(Mandatory = $false)] [ValidateSet('Release', 'Debug', 'RelWithDebInfo')] [string] $BuildType = 'Release', [Parameter(Mandatory = $false)] [hashtable]$GitTags = @{ ` - zlib = 'v1.3.1'; ` + zlib = 'v1.2.13'; ` curl = 'curl-7_88_1'; ` hdf5 = 'hdf5-1_14_0'; ` - netcdf_c = 'v4.9.1' + netcdf_c = 'v4.9.3' }, [Parameter(Mandatory = $false)] [ValidateRange(1, [int]::MaxValue)] [int] $ParallelJobs = 6, [Parameter(Mandatory = $false)] [Switch] $Clean = $False From 0bf17ec70cafb5ff9940596885d39fe13df42f50 Mon Sep 17 00:00:00 2001 From: Bill Senior Date: Tue, 23 Sep 2025 17:31:30 +0200 Subject: [PATCH 16/18] GRIDEDIT-1958 Reverting netcdf version back to 4.9.1 --- scripts/install_netcdf_static.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_netcdf_static.ps1 b/scripts/install_netcdf_static.ps1 index 983a81ed0..87d39dd64 100644 --- a/scripts/install_netcdf_static.ps1 +++ b/scripts/install_netcdf_static.ps1 @@ -38,7 +38,7 @@ Param( zlib = 'v1.2.13'; ` curl = 'curl-7_88_1'; ` hdf5 = 'hdf5-1_14_0'; ` - netcdf_c = 'v4.9.3' + netcdf_c = 'v4.9.1' }, [Parameter(Mandatory = $false)] [ValidateRange(1, [int]::MaxValue)] [int] $ParallelJobs = 6, [Parameter(Mandatory = $false)] [Switch] $Clean = $False From 0e552774de09d43c759d4ee1f19e62c5d749cc94 Mon Sep 17 00:00:00 2001 From: BillSenior Date: Wed, 24 Sep 2025 10:19:40 +0200 Subject: [PATCH 17/18] GRIDEDIT-1958 Set netcdf dir env var --- tools/test_utils/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/test_utils/CMakeLists.txt b/tools/test_utils/CMakeLists.txt index f65297e6b..478a2dafb 100644 --- a/tools/test_utils/CMakeLists.txt +++ b/tools/test_utils/CMakeLists.txt @@ -64,6 +64,10 @@ target_sources( ${INC_LIST} ) +if (APPLE) + set (netCDF_DIR "/Users/runner/work/MeshKernel/MeshKernel/external_dependencies/netcdf-c/install") +endif () + # NetCDF find_package(netCDF REQUIRED COMPONENTS C) message(STATUS "Found NetCDF: in ${netCDF_INSTALL_PREFIX} (found version \"${NetCDFVersion}\")") From 0eff2b0a462c469117b8ff1b74808bd28d3e8e7e Mon Sep 17 00:00:00 2001 From: BillSenior Date: Wed, 24 Sep 2025 10:44:27 +0200 Subject: [PATCH 18/18] GRIDEDIT-1958 Removed setting of netcdf dir env var --- tools/test_utils/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/test_utils/CMakeLists.txt b/tools/test_utils/CMakeLists.txt index 478a2dafb..f65297e6b 100644 --- a/tools/test_utils/CMakeLists.txt +++ b/tools/test_utils/CMakeLists.txt @@ -64,10 +64,6 @@ target_sources( ${INC_LIST} ) -if (APPLE) - set (netCDF_DIR "/Users/runner/work/MeshKernel/MeshKernel/external_dependencies/netcdf-c/install") -endif () - # NetCDF find_package(netCDF REQUIRED COMPONENTS C) message(STATUS "Found NetCDF: in ${netCDF_INSTALL_PREFIX} (found version \"${NetCDFVersion}\")")