Apply clang-format changes

boutproject · Oct 12, 2023 · 1c1d834 · 1c1d834
1 parent 3597663
commit 1c1d834
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/include/bout/options.hxx b/include/bout/options.hxx
@@ -194,9 +194,9 @@ public:
   static void cleanup();
 
   /// The type used to store values
-  using ValueType =
-      bout::utils::variant<bool, int, BoutReal, std::string, Field2D, Field3D, FieldPerp,
-                           Array<BoutReal>, Array<int>, Matrix<BoutReal>, Tensor<BoutReal>>;
+  using ValueType = bout::utils::variant<bool, int, BoutReal, std::string, Field2D,
+                                         Field3D, FieldPerp, Array<BoutReal>, Array<int>,
+                                         Matrix<BoutReal>, Tensor<BoutReal>>;
 
   /// The type used to store attributes
   /// Extends the variant class so that cast operator can be implemented

diff --git a/src/mesh/data/gridfromfile.cxx b/src/mesh/data/gridfromfile.cxx
@@ -138,8 +138,10 @@ struct GetDimensions {
   std::vector<int> operator()(MAYBE_UNUSED(int value)) { return {1}; }
   std::vector<int> operator()(MAYBE_UNUSED(BoutReal value)) { return {1}; }
   std::vector<int> operator()(MAYBE_UNUSED(const std::string& value)) { return {1}; }
-  template<typename T>
-  std::vector<int> operator()(const Array<T>& array) { return {array.size()}; }
+  template <typename T>
+  std::vector<int> operator()(const Array<T>& array) {
+    return {array.size()};
+  }
   std::vector<int> operator()(const Matrix<BoutReal>& array) {
     const auto shape = array.shape();
     return {std::get<0>(shape), std::get<1>(shape)};
@@ -484,8 +486,8 @@ bool GridFile::get(Mesh* UNUSED(m), std::vector<int>& var, const std::string& na
 
   // Check size
   if (full_var.size() < len + offset) {
-    throw BoutException("{} has length {}. Expected {} elements + {} offset",
-                        name, full_var.size(), len, offset);
+    throw BoutException("{} has length {}. Expected {} elements + {} offset", name,
+                        full_var.size(), len, offset);
   }
 
   // Ensure that output variable has the correct size

diff --git a/src/mesh/impls/bout/boutmesh.cxx b/src/mesh/impls/bout/boutmesh.cxx
@@ -2080,21 +2080,24 @@ void BoutMesh::topology() {
   if (limiter_count > 0) {
     std::vector<int> limiter_yinds, limiter_xstarts, limiter_xends;
     if (!source->get(this, limiter_yinds, "limiter_yinds", limiter_count)) {
-      throw BoutException("Couldn't read limiter_yinds vector of length {} from mesh", limiter_count);
+      throw BoutException("Couldn't read limiter_yinds vector of length {} from mesh",
+                          limiter_count);
     }
     if (!source->get(this, limiter_xstarts, "limiter_xstarts", limiter_count)) {
-      throw BoutException("Couldn't read limiter_xstarts vector of length {} from mesh", limiter_count);
+      throw BoutException("Couldn't read limiter_xstarts vector of length {} from mesh",
+                          limiter_count);
     }
     if (!source->get(this, limiter_xends, "limiter_xends", limiter_count)) {
-      throw BoutException("Couldn't read limiter_xend vector of length {} from mesh", limiter_count);
+      throw BoutException("Couldn't read limiter_xend vector of length {} from mesh",
+                          limiter_count);
     }
 
     for (int i = 0; i < limiter_count; ++i) {
       int yind = limiter_yinds[i];
       int xstart = limiter_xstarts[i];
       int xend = limiter_xends[i];
       output_info.write("Adding a limiter between y={} and {}. X indices {} to {}\n",
-                        yind, yind+1, xstart, xend);
+                        yind, yind + 1, xstart, xend);
       add_target(yind, xstart, xend);
     }
   }

diff --git a/src/sys/options.cxx b/src/sys/options.cxx
@@ -735,9 +735,8 @@ Array<int> Options::as<Array<int>>(const Array<int>& similar_to) const {
 
   Array<int> result = bout::utils::visit(
       ConvertContainer<Array<int>>{
-          fmt::format(
-              _("Value for option {:s} cannot be converted to an Array<int>"),
-              full_name),
+          fmt::format(_("Value for option {:s} cannot be converted to an Array<int>"),
+                      full_name),
           similar_to},
       value);