Merge pull request #156 compile_warnings_clang

Edits to CHM to remove compiler warnings on Apple Clang 17.0.0 on Intel MacOSX Sequoia 15.7.2

Author: Chrismarsh

src/core.cpp

@@ -23,9 +23,6 @@
 
 #include "core.hpp"
 
-#include "mesh/vtk_writer.hpp"
-
-
 core::core()
 {
 
@@ -2216,11 +2213,16 @@ void core::_determine_module_dep()
     std::string font = "Helvetica";
     int fontsize = 11;
 
-    std::string edge_str = "E[edgetype == \"%s\"] {\n color=\"/paired12/%i\";\n fontsize=%i;\n     fontname=\"%s\"\n }";
     int idx = 1;
     for (const auto& itr : graphviz_vars)
     {
-        std::string edge = str_format(edge_str, itr.c_str(), idx, fontsize, font.c_str());
+        std::string edge = std::format(
+                "E[edgetype = \"{}\"] {{\n color=\"/paired12/{}\";\n fontsize={};\n     fontname=\"{}\"\n }}",
+                itr,
+                idx,
+                fontsize,
+                font
+                );
         idx++;
         gvpr << edge << std::endl;
     }
@@ -2421,7 +2423,8 @@ void core::run()
         ss << _global->posix_time();
 
         c.tic();
-        size_t chunks = 0;
+        // Commented to remove set but not used compiler warnings
+        // size_t chunks = 0;
         try
         {
             for (auto &itr : _chunked_modules)
@@ -2466,7 +2469,7 @@ void core::run()
                     }
                 }
 
-                chunks++;
+                // chunks++;
 
             }
         }

src/core.hpp

@@ -48,6 +48,7 @@
 #include <unistd.h> //for getpid
 #include <utility> // std::pair
 #include <vector>
+#include <format>
 
 //boost includes
 #include <boost/algorithm/cxx11/any_of.hpp>
@@ -93,13 +94,13 @@ namespace po = boost::program_options;
 #include "logger.hpp"
 #include "math/coordinates.hpp"
 #include "mesh/ugrid_writer.hpp"
+#include "mesh/vtk_writer.hpp"
 #include "metdata.hpp"
 #include "module_base.hpp"
 #include "chkpt_op.hpp"
 #include "output_info.hpp"
 #include "readjson.hpp"
 #include "station.hpp"
-#include "str_format.h"
 #include "timer.hpp"
 #include "timeseries/netcdf.hpp"
 #include "triangulation.hpp"

src/mesh/triangulation.hpp

@@ -569,7 +569,7 @@ class triangulation
     friend class vtk_writer;
 
     triangulation();
-    ~triangulation();
+    virtual ~triangulation();
 
 
     /**

src/mesh/ugrid_writer.cpp

@@ -17,10 +17,10 @@
 #include "ugrid_writer.hpp"
 
 ugrid_writer::ugrid_writer(mesh m, std::shared_ptr<global> g, bool write_parameters, std::string fname, bool use_zarr):
-    _mesh(m),
     _fname(""),
     _store_path(std::move(fname)),
     _use_zarr(use_zarr),
+    _mesh(m),
     _global(g),
     _write_parameters(write_parameters)
 {
@@ -435,7 +435,8 @@ void ugrid_writer::init_ugrid(const std::vector<std::string>& output_variables)
     if (status != NC_NOERR)
     {
         SPDLOG_ERROR("nc_create_par={}", status);
-        CHM_THROW_EXCEPTION(file_write_error, "Failed to create ugrid output file, error="+status);
+        std::string err = std::format("Failed to create ugrid output file, error = {}",status);
+        CHM_THROW_EXCEPTION(file_write_error, err);
     }
 
     // We also only have per-rank vertex IDs (they aren't global)

src/mesh/ugrid_writer.hpp

@@ -24,6 +24,7 @@
 #include <string>
 #include <utility>
 #include <cstdint>
+#include <format>
 
 #include <boost/mpi.hpp>
 #include <boost/optional.hpp>

src/modules/snow_slide.cpp

@@ -100,7 +100,8 @@ void snow_slide::run(mesh& domain)
     do
     {
 
-        int this_iter_moved_snow = false;
+        // Commented to remove set but not used compiler warning (as well as any uses)
+        // int this_iter_moved_snow = false;
         // Make a vector of pairs (elevation + snowdepth, pointer to face)
         tbb::concurrent_vector<std::pair<double, mesh_elem>> sorted_z(domain->size_local_faces());
 
@@ -197,7 +198,7 @@ void snow_slide::run(mesh& domain)
             if ( snowdepthavg > maxDepth)
             {
                 done = 0;
-                this_iter_moved_snow = true;
+                // this_iter_moved_snow = true;
 
                 double del_depth = snowdepthavg - maxDepth;           // Amount to be removed (positive) [m]
                 double del_swe = swe * (1 - maxDepth / snowdepthavg); // Amount of swe to be removed (positive) [m]
@@ -371,7 +372,7 @@ void snow_slide::run(mesh& domain)
 
         // only do another iteration if we have incoming mass transport from the ghosts or if we have moved mass this itr
         // this algorithm tends to need a couple passes to make sure there are no straglers
-        if(ghost_transport > 0) // || this_iter_moved_snow)
+        if(ghost_transport > 0) // || this_iter_moved_snow) 
             done = 0;
         else
             done = 1;

src/output_info.hpp

@@ -45,11 +45,12 @@ class output_info
 {
 public:
     output_info():
+    type{output_type::output_type_none},
+    mesh_output_formats{mesh_outputs::mesh_outputs_none},
     name{""},
     fname{""},
     latitude{0}, longitude{0},
-    x{0}, y{0}, type{output_type::output_type_none},
-    mesh_output_formats{mesh_outputs::mesh_outputs_none},
+    x{0}, y{0}, 
     only_last_n{SIZE_MAX},
     write_ghost_neighbors{false}
     {
@@ -142,8 +143,8 @@ class output_info
     }
 
     output_type type; // the type of output, timeseries or mesh
-    std::string name;
     mesh_outputs mesh_output_formats;
+    std::string name;
     std::string fname;
     std::string base_name; // base file name for vtu or ugrid outputs
 

src/preprocessing/partition/main.cpp

@@ -141,11 +141,12 @@ class preprocessingTriangulation : public triangulation
         }
         // each processor only knows its own start and end indices
         size_t face_start_idx = 0;
-        size_t face_end_idx = _num_faces_in_partition.at(0) - 1;
+        // Commented to avoid set but not used compiler warning
+        // size_t face_end_idx = _num_faces_in_partition.at(0) - 1;
         for (int i = 1; i <= _comm_world.rank(); ++i)
         {
             face_start_idx += _num_faces_in_partition.at(i - 1);
-            face_end_idx += _num_faces_in_partition.at(i);
+            // face_end_idx += _num_faces_in_partition.at(i);
         }
 
 #pragma omp parallel for

src/utility/gis.cpp

@@ -98,13 +98,21 @@ namespace gis
 
         OGRFieldDefn oFieldX("X", OFTReal);
         oFieldX.SetWidth(32);
-        poLayer->CreateField(&oFieldX);
-
+        OGRErr err = poLayer->CreateField(&oFieldX);
+        if (err)
+        {
+            std::string msg = std::format("GDAL CreateField error of type {}. See ogr_core.h for meaning.",err);
+            CHM_THROW_EXCEPTION(chm_error,msg);
+        }
 
         OGRFieldDefn oFieldY("Y", OFTReal);
         oFieldY.SetWidth(32);
-        poLayer->CreateField(&oFieldY);
-
+        err = poLayer->CreateField(&oFieldY);
+        if (err)
+        {
+            std::string msg = std::format("GDAL CreateField error of type {}. See ogr_core.h for meaning.",err);
+            CHM_THROW_EXCEPTION(chm_error,msg);
+        }
 //        double xCoordinates[] = {10.0, 20.0, 30.0}; // Example x coordinates
 //        double yCoordinates[] = {40.0, 50.0, 60.0}; // Example y coordinates
         int numPoints = xy.size();
@@ -135,4 +143,4 @@ namespace gis
         GDALClose(poDS);
     }
 
-}
+}

src/utility/gis.hpp

@@ -26,6 +26,7 @@
 #include <vector>
 #include <tuple>
 #include <string>
+#include <format>
 
 #include "exception.hpp"