From 2fd1e731a90fc134c201f1c6c160aa23b4009ad5 Mon Sep 17 00:00:00 2001 From: davefavismortlock Date: Fri, 14 Nov 2025 12:30:54 +0000 Subject: [PATCH] Removed compiler warnings --- src/calc_waves.cpp | 6 +++--- src/coast.cpp | 4 ++-- src/coast.h | 2 +- src/gis_vector.cpp | 4 ++-- src/run_cmake.sh | 2 +- src/spatial_interpolation.cpp | 15 ++++++++------- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/calc_waves.cpp b/src/calc_waves.cpp index 5fda8deed..9b41771ef 100644 --- a/src/calc_waves.cpp +++ b/src/calc_waves.cpp @@ -165,8 +165,8 @@ void CSimulation::GenerateSyntheticTransects(vector const* pVR TransectWaveData const& transect = (*pVRealTransects)[i]; if (!transect.VdX.empty()) { - VdTransectExtX[i] = dGridCentroidXToExtCRSX(transect.VdX[0]); - VdTransectExtY[i] = dGridCentroidYToExtCRSY(transect.VdY[0]); + VdTransectExtX[i] = dGridCentroidXToExtCRSX(static_cast(transect.VdX[0])); + VdTransectExtY[i] = dGridCentroidYToExtCRSY(static_cast(transect.VdY[0])); } else { @@ -228,7 +228,7 @@ void CSimulation::GenerateSyntheticTransects(vector const* pVR // Second pass: generate the synthetic transects // Using OpenMP to parallelize - each thread handles one pair - int nCurrentIndex = 0; + // int nCurrentIndex = 0; #pragma omp parallel for schedule(dynamic) for (int nPair = 0; nPair < nNumRealTransects - 1; nPair++) diff --git a/src/coast.cpp b/src/coast.cpp index ac31a6713..82743dba3 100644 --- a/src/coast.cpp +++ b/src/coast.cpp @@ -504,9 +504,9 @@ CGeomCoastPolygon* CRWCoast::pPolyCreateAndAppendPolygon(int const nCoastID, int } //! Returns the number of coast polygons -std::size_t CRWCoast::nGetNumPolygons(void) const +int CRWCoast::nGetNumPolygons(void) const { - return m_pVCoastPolygon.size(); + return static_cast(m_pVCoastPolygon.size()); } //! Returns a pointer to a coast polygon, specified by down-coast (i.e. along the coast in the direction of increasing coastline point numbers) sequence diff --git a/src/coast.h b/src/coast.h index e018c8ecd..ae0a3a006 100644 --- a/src/coast.h +++ b/src/coast.h @@ -223,7 +223,7 @@ class CRWCoast CGeomProfile* pGetProfileWithUpCoastSeq(int const) const; CGeomCoastPolygon* pPolyCreateAndAppendPolygon(int const, int const, CGeom2DIPoint const*, CGeom2DIPoint const*, int const, int const, vector const*, int const, int const, bool const, bool const); - std::size_t nGetNumPolygons(void) const; + int nGetNumPolygons(void) const; CGeomCoastPolygon* pGetPolygon(int const); void SetPolygonNode(int const, int const); diff --git a/src/gis_vector.cpp b/src/gis_vector.cpp index f4e724123..50de1f182 100644 --- a/src/gis_vector.cpp +++ b/src/gis_vector.cpp @@ -1565,8 +1565,8 @@ bool CSimulation::bWriteVectorGISFile(int const nDataItem, string const* strPlot OGRFeature* pOGRFeature = OGRFeature::CreateFeature(pOGRLayer->GetLayerDefn()); // Set the feature's geometry (convert from grid CRS to external CRS) - OGRPt.setX(dGridCentroidXToExtCRSX(transect.VdX[nPoint])); - OGRPt.setY(dGridCentroidYToExtCRSY(transect.VdY[nPoint])); + OGRPt.setX(dGridCentroidXToExtCRSX(static_cast(transect.VdX[nPoint]))); + OGRPt.setY(dGridCentroidYToExtCRSY(static_cast(transect.VdY[nPoint]))); pOGRFeature->SetGeometry(&OGRPt); // Calculate wave height and angle from components diff --git a/src/run_cmake.sh b/src/run_cmake.sh index e3f1e30cd..1c2c8dc08 100755 --- a/src/run_cmake.sh +++ b/src/run_cmake.sh @@ -76,7 +76,7 @@ if [ "$cflag" = "true" ]; then fi # CMAKE_COMPILER_ARGS="PKG_CPPFLAGS='-Xclang -fopenmp' PKG_LIBS=-lomp" # cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$buildtype -DCOMPILER=$compiler -DCSHORE_LIBRARY=$cshorelibrary -DCSHORE_INOUT=$cshoreinout $CMAKE_COMPILER_ARGS . -cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$buildtype -DCOMPILER=$compiler -DCSHORE_LIBRARY=$cshorelibrary -DCSHORE_INOUT=$cshoreinout -DCMAKE_VERBOSE_MAKEFILE=ON $CMAKE_COMPILER_ARGS . +cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$buildtype -DCOMPILER=$compiler -DCSHORE_LIBRARY=$cshorelibrary -DCSHORE_INOUT=$cshoreinout -DCMAKE_VERBOSE_MAKEFILE=OFF $CMAKE_COMPILER_ARGS . #cmake -DCMAKE_BUILD_TYPE=$buildtype -DCOMPILER=$compiler -DCSHORE_LIBRARY=$cshorelibrary -DCSHORE_INOUT=$cshoreinout $CMAKE_COMPILER_ARGS . -G"CodeBlocks - Unix Makefiles" # Or Ninja? #cmake -G Ninja -DCMAKE_BUILD_TYPE=$buildtype -DCOMPILER=$compiler -DCSHORE_LIBRARY=$cshorelibrary -DCSHORE_INOUT=$cshoreinout $CMAKE_COMPILER_ARGS . diff --git a/src/spatial_interpolation.cpp b/src/spatial_interpolation.cpp index f2b08e1a2..a8bb16bbc 100644 --- a/src/spatial_interpolation.cpp +++ b/src/spatial_interpolation.cpp @@ -39,9 +39,10 @@ //! double result = interp.Interpolate(5.0, 5.0); // Interpolate at (5,5) //! //=============================================================================================================================== +#include #include "spatial_interpolation.h" -#include +#include "cme.h" #ifdef _OPENMP #include @@ -117,7 +118,7 @@ double SpatialInterpolator::Interpolate(double x, double y) const std::vector indices(k); std::vector sq_dists(k); // Squared distances (faster than actual distances) - unsigned int num_found = m_kdtree->knnSearch(query_pt, k, + long unsigned int num_found = m_kdtree->knnSearch(query_pt, k, indices.data(), sq_dists.data()); @@ -134,7 +135,7 @@ double SpatialInterpolator::Interpolate(double x, double y) const double sum_weights = 0.0; double sum_weighted_values = 0.0; - if (m_power == 2.0) + if (bFPIsEqual(m_power, 2.0, TOLERANCE)) { // *** OPTIMIZED PATH for power=2.0 *** // Since weight = 1/dist^2 and we have sq_dist = dist^2, @@ -181,7 +182,7 @@ void SpatialInterpolator::Interpolate(std::vector const& query_points, { double const query_pt[2] = {query_points[i].x, query_points[i].y}; - unsigned int num_found = m_kdtree->knnSearch(query_pt, k, + long unsigned int num_found = m_kdtree->knnSearch(query_pt, k, indices.data(), sq_dists.data()); @@ -202,7 +203,7 @@ void SpatialInterpolator::Interpolate(std::vector const& query_points, double sum_weights = 0.0; double sum_weighted_values = 0.0; - if (m_power == 2.0) + if (bFPIsEqual(m_power, 2.0, TOLERANCE)) { for (size_t j = 0; j < num_found; j++) { @@ -297,7 +298,7 @@ void DualSpatialInterpolator::InterpolatePoint(double x, double y, double const query_pt[2] = {x, y}; size_t const k = std::min((size_t) m_k_neighbors, m_cloud.pts.size()); - unsigned int num_found = m_kdtree->knnSearch(query_pt, k, + long unsigned int num_found = m_kdtree->knnSearch(query_pt, k, indices.data(), sq_dists.data()); @@ -320,7 +321,7 @@ void DualSpatialInterpolator::InterpolatePoint(double x, double y, double sum_weighted_x = 0.0; double sum_weighted_y = 0.0; - if (m_power == 2.0) + if (bFPIsEqual(m_power, 2.0, TOLERANCE)) { for (size_t i = 0; i < num_found; i++) {