clang-tidy llvm-*

GeodynamicWorldBuilder · Jun 27, 2021 · c7bdab7 · c7bdab7
1 parent ca0e0d9
commit c7bdab7
Show file tree

Hide file tree

Showing 78 changed files with 556 additions and 593 deletions.
diff --git a/app/main.cc b/app/main.cc
@@ -23,8 +23,8 @@
 
 #include <algorithm>
 #include <exception>
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <memory>
 
 #include <world_builder/assert.h>

diff --git a/include/visualization/main.h b/include/visualization/main.h
@@ -20,6 +20,9 @@
 #ifndef WORLD_BUILDER_VISUALIZATION_MAIN_H_
 #define WORLD_BUILDER_VISUALIZATION_MAIN_H_
 
+#include <vector>
+#include <string>
+
 void project_on_sphere(double, double &, double &, double &);
 
 void lay_points(double x1, double y1, double z1,

diff --git a/include/world_builder/nan.h b/include/world_builder/nan.h
@@ -20,7 +20,7 @@
 #ifndef _world_nan_h
 #define _world_nan_h
 
-#include <cmath>
+#include <limits>
 
 namespace WorldBuilder
 {

diff --git a/source/coordinate_systems/cartesian.cc b/source/coordinate_systems/cartesian.cc
@@ -17,9 +17,10 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/assert.h>
 #include <world_builder/coordinate_systems/cartesian.h>
 
+#include <world_builder/assert.h>
+
 namespace WorldBuilder
 {
   namespace CoordinateSystems
@@ -87,6 +88,6 @@ namespace WorldBuilder
      * Register plugin
      */
     WB_REGISTER_COORDINATE_SYSTEM(Cartesian, cartesian)
-  }
-}
+  } // namespace CoordinateSystems
+} // namespace WorldBuilder
 
diff --git a/source/coordinate_systems/interface.cc b/source/coordinate_systems/interface.cc
@@ -18,11 +18,10 @@
 */
 
 #include <world_builder/coordinate_systems/interface.h>
-#include <world_builder/coordinate_systems/cartesian.h>
-#include <world_builder/coordinate_systems/spherical.h>
-#include <world_builder/assert.h>
 
+#include <world_builder/assert.h>
 #include <world_builder/types/object.h>
+
 #include <algorithm>
 
 
@@ -97,6 +96,6 @@ namespace WorldBuilder
       // thrown when the name is not present.
       return get_factory_map().at(lower_case_name)->create(world);
     }
-  }
-}
+  } // namespace CoordinateSystems
+} // namespace WorldBuilder
 
diff --git a/source/coordinate_systems/spherical.cc b/source/coordinate_systems/spherical.cc
@@ -17,10 +17,11 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/assert.h>
 #include <world_builder/coordinate_systems/spherical.h>
-#include <world_builder/types/string.h>
+
+#include <world_builder/assert.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/string.h>
 
 namespace WorldBuilder
 {
@@ -132,6 +133,6 @@ namespace WorldBuilder
      * Register plugin
      */
     WB_REGISTER_COORDINATE_SYSTEM(Spherical, spherical)
-  }
-}
+  } // namespace CoordinateSystems
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate.cc b/source/features/continental_plate.cc
@@ -18,20 +18,17 @@
 */
 
 #include <world_builder/features/continental_plate.h>
-#include <world_builder/features/continental_plate_models/temperature/interface.h>
-#include <world_builder/features/continental_plate_models/composition/interface.h>
 
-#include <world_builder/utilities.h>
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -237,5 +234,5 @@ namespace WorldBuilder
 
     WB_REGISTER_FEATURE(ContinentalPlate, continental plate)
 
-  }
-}
+  } // namespace Features
+} // namespace WorldBuilder
diff --git a/source/features/continental_plate_models/composition/interface.cc b/source/features/continental_plate_models/composition/interface.cc
@@ -17,13 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/continental_plate_models/composition/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/composition/interface.h>
+#include <world_builder/types/string.h>
+
+#include <algorithm>
 
 
 namespace WorldBuilder
@@ -78,8 +78,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate_models/composition/uniform.cc b/source/features/continental_plate_models/composition/uniform.cc
@@ -17,17 +17,17 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/composition/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/features/continental_plate_models/composition/uniform.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -114,9 +114,9 @@ namespace WorldBuilder
           return composition;
         }
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_COMPOSITION_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/continental_plate_models/grains/interface.cc b/source/features/continental_plate_models/grains/interface.cc
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/continental_plate_models/grains/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/grains/interface.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -78,8 +77,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate_models/grains/random_uniform_distribution.cc b/source/features/continental_plate_models/grains/random_uniform_distribution.cc
@@ -17,19 +17,19 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/grains/random_uniform_distribution.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/continental_plate_models/grains/random_uniform_distribution.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 #include <algorithm>
 
@@ -208,9 +208,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_GRAINS_MODEL(RandomUniformDistribution, random uniform distribution)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/continental_plate_models/grains/uniform.cc b/source/features/continental_plate_models/grains/uniform.cc
@@ -17,18 +17,18 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/grains/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/continental_plate_models/grains/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 #include <algorithm>
 
@@ -160,9 +160,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_GRAINS_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/continental_plate_models/temperature/adiabatic.cc b/source/features/continental_plate_models/temperature/adiabatic.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/temperature/adiabatic.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/temperature/adiabatic.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -156,8 +156,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_TEMPERATURE_MODEL(Adiabatic, adiabatic)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate_models/temperature/interface.cc b/source/features/continental_plate_models/temperature/interface.cc
@@ -17,16 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/continental_plate_models/temperature/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/temperature/interface.h>
-#include <world_builder/features/continental_plate_models/temperature/adiabatic.h>
-#include <world_builder/features/continental_plate_models/temperature/linear.h>
-#include <world_builder/features/continental_plate_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -92,8 +89,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder