Merge pull request #5849 from MFraters/fix_gwb_clang_warnings

Backport fix gwb clang flags.

contrib/world_builder/include/world_builder/bounding_box.h

@@ -93,7 +93,7 @@ namespace WorldBuilder
    *
    * @note The majority of this class is copied from the deal.II library.
    */
-  template <int spacedim>
+  template <unsigned int spacedim>
   class BoundingBox
   {
     public:
@@ -270,7 +270,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline BoundingBox<spacedim>::BoundingBox(
     const std::pair<Point<spacedim>, Point<spacedim>>
     &boundary_points_)
@@ -286,7 +286,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   template <class Container>
   inline BoundingBox<spacedim>::BoundingBox(const Container &points)
   {
@@ -314,23 +314,23 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline std::pair<Point<spacedim>, Point<spacedim>> &BoundingBox<spacedim>::get_boundary_points()
   {
     return this->boundary_points;
   }
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline const std::pair<Point<spacedim>, Point<spacedim>> &BoundingBox<spacedim>::get_boundary_points() const
   {
     return this->boundary_points;
   }
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline bool
   BoundingBox<spacedim>::
   operator==(const BoundingBox<spacedim> &box) const
@@ -340,7 +340,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline bool
   BoundingBox<spacedim>::
   operator!=(const BoundingBox<spacedim> &box) const
@@ -350,7 +350,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline void
   BoundingBox<spacedim>::extend(const double amount)
   {
@@ -365,7 +365,7 @@ namespace WorldBuilder
   }
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline
   bool
   BoundingBox<spacedim>::point_inside(const Point<spacedim> &point,
@@ -397,7 +397,7 @@ namespace WorldBuilder
 
   }
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline
   bool
   BoundingBox<spacedim>::point_inside_implementation(const Point<spacedim> &p,
@@ -426,7 +426,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline
   void
   BoundingBox<spacedim>::merge_with(
@@ -445,7 +445,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   double
   BoundingBox<spacedim>::volume() const
   {
@@ -457,7 +457,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline
   double
   BoundingBox<spacedim>::lower_bound(const unsigned int direction) const
@@ -469,7 +469,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline
   double
   BoundingBox<spacedim>::upper_bound(const unsigned int direction) const
@@ -481,7 +481,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   Point<spacedim>
   BoundingBox<spacedim>::center() const
   {
@@ -494,7 +494,7 @@ namespace WorldBuilder
 
 
 
-  template <int spacedim>
+  template <unsigned int spacedim>
   inline
   double
   BoundingBox<spacedim>::side_length(const unsigned int direction) const

contrib/world_builder/include/world_builder/features/continental_plate_models/grains/interface.h

@@ -30,7 +30,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/continental_plate_models/temperature/interface.h

@@ -29,7 +29,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/fault_models/composition/interface.h

@@ -32,7 +32,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/fault_models/grains/interface.h

@@ -32,7 +32,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/fault_models/temperature/interface.h

@@ -32,7 +32,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/mantle_layer_models/composition/interface.h

@@ -29,7 +29,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/mantle_layer_models/grains/interface.h

@@ -30,7 +30,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/mantle_layer_models/temperature/interface.h

@@ -29,7 +29,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/oceanic_plate_models/composition/interface.h

@@ -29,7 +29,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/oceanic_plate_models/temperature/interface.h

@@ -29,7 +29,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/plume_models/grains/interface.h

@@ -30,7 +30,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/plume_models/temperature/interface.h

@@ -29,7 +29,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/subducting_plate_models/composition/interface.h

@@ -32,7 +32,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/subducting_plate_models/grains/interface.h

@@ -32,7 +32,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/subducting_plate_models/temperature/interface.h

@@ -32,7 +32,7 @@ namespace WorldBuilder
 {
   class World;
   class Parameters;
-  template <int dim> class Point;
+  template <unsigned int dim> class Point;
 
   /**
    * This class is an interface for the specific plate tectonic feature classes,

contrib/world_builder/include/world_builder/features/subducting_plate_models/temperature/mass_conserving.h

@@ -133,7 +133,7 @@ namespace WorldBuilder
             ReferenceModelName reference_model_name;
             const int plate_model_summation_number = 100; // for the plate model
             bool apply_spline;
-            int spline_n_points;
+            unsigned int spline_n_points;
         };
       } // namespace Temperature
     } // namespace SubductingPlateModels

contrib/world_builder/include/world_builder/kd_tree.h

@@ -78,7 +78,8 @@ namespace WorldBuilder
       const double &operator[](const bool y_axis) const
       {
         WBAssert(std::fabs((y_axis ? y : x) - *(&x+y_axis)) < std::numeric_limits<double>::epsilon(),
-                 "Internal error: y_axis=" << y_axis << ", x=" << x << ", y=" << y <<", *(&x+y_axis)=" << *(&x+y_axis) << ", ((bool)y_axis ? x : y) - *(&x+y_axis)=" << abs(((bool)y_axis ? x : y) - *(&x+y_axis)));
+                 "Internal error: y_axis=" << y_axis << ", x=" << x << ", y=" << y <<", *(&x+y_axis)=" << *(&x+y_axis)
+                 << ", ((bool)y_axis ? x : y) - *(&x+y_axis)=" << fabs((y_axis ? x : y) - *(&x+y_axis)));
         return *(&x+y_axis);
       }
     };

contrib/world_builder/include/world_builder/parameters.h

@@ -33,7 +33,7 @@ namespace WorldBuilder
   namespace Types
   {
     class Interface;
-    template<int dim>
+    template<unsigned int dim>
     class Point;
     class Double;
     class String;

contrib/world_builder/include/world_builder/point.h

@@ -107,7 +107,7 @@ namespace WorldBuilder
    * implements several operations such as the computation of the l2 norm and the
    * dot product.
    */
-  template<int dim>
+  template<unsigned int dim>
   class Point
   {
     public:
@@ -463,7 +463,7 @@ namespace WorldBuilder
     return (point[0] * point[0]) + (point[1] * point[1]) + (point[2] * point[2]);
   }
 
-  template<int dim>
+  template<unsigned int dim>
   inline
   Point<dim> operator*(const double scalar, const Point<dim> &point)
   {

contrib/world_builder/include/world_builder/types/int.h

@@ -60,8 +60,8 @@ namespace WorldBuilder
                           const std::string &name,
                           const std::string &documentation) const override final;
 
-        unsigned int value {0};
-        unsigned int default_value;
+        int value {0};
+        int default_value;
 
       protected:
         /**

contrib/world_builder/include/world_builder/types/point.h

@@ -38,7 +38,7 @@ namespace WorldBuilder
      * the returned temperature or composition of the temperature and composition
      * functions of this class will be.
      */
-    template <int dim>
+    template <unsigned int dim>
     class Point final: public Interface
     {
       public:
@@ -124,7 +124,7 @@ namespace WorldBuilder
 
     };
 
-    template<int dim>
+    template<unsigned int dim>
     WorldBuilder::Point<dim> operator*(const double scalar, const Point<dim> &point);
   } // namespace Types
 } // namespace WorldBuilder