ran clang format again

Author: jtramm

include/openmc/tensor.h

@@ -79,10 +79,16 @@ struct Range {
 };
 
 //! Create a Range [start, end)
-inline Range range(size_t start, size_t end) { return {start, end}; }
+inline Range range(size_t start, size_t end)
+{
+  return {start, end};
+}
 
 //! Create a Range [start, <end of axis>)
-inline Range range(size_t start) { return {start, SIZE_MAX}; }
+inline Range range(size_t start)
+{
+  return {start, SIZE_MAX};
+}
 
 namespace detail {
 
@@ -93,13 +99,20 @@ struct SliceArg {
   size_t end;
 };
 
-inline SliceArg to_slice_arg(All) { return {SliceArg::ALL, 0, 0}; }
-inline SliceArg to_slice_arg(Range r) { return {SliceArg::RANGE, r.start, r.end}; }
+inline SliceArg to_slice_arg(All)
+{
+  return {SliceArg::ALL, 0, 0};
+}
+inline SliceArg to_slice_arg(Range r)
+{
+  return {SliceArg::RANGE, r.start, r.end};
+}
 
 template<typename I>
-inline typename std::enable_if<
-  std::is_integral<I>::value || std::is_enum<I>::value, SliceArg>::type
-to_slice_arg(I i)
+inline
+  typename std::enable_if<std::is_integral<I>::value || std::is_enum<I>::value,
+    SliceArg>::type
+  to_slice_arg(I i)
 {
   return {SliceArg::INDEX, static_cast<size_t>(i), 0};
 }
@@ -113,9 +126,8 @@ struct SliceResult {
 
 //! Compute the result of applying slice arguments to shape/strides
 template<typename First, typename... Rest>
-SliceResult compute_slice(
-  const vector<size_t>& shape, const vector<size_t>& strides,
-  First first, Rest... rest)
+SliceResult compute_slice(const vector<size_t>& shape,
+  const vector<size_t>& strides, First first, Rest... rest)
 {
   const size_t n = 1 + sizeof...(Rest);
   SliceArg args[1 + sizeof...(Rest)] = {
@@ -618,17 +630,17 @@ class Tensor {
   {
     auto strides = compute_strides();
     auto r = detail::compute_slice(shape_, strides, first, rest...);
-    return {data_.data() + r.ptr_offset, std::move(r.shape),
-      std::move(r.strides)};
+    return {
+      data_.data() + r.ptr_offset, std::move(r.shape), std::move(r.strides)};
   }
 
   template<typename First, typename... Rest>
   View<const stored_type> slice(First first, Rest... rest) const
   {
     auto strides = compute_strides();
     auto r = detail::compute_slice(shape_, strides, first, rest...);
-    return {data_.data() + r.ptr_offset, std::move(r.shape),
-      std::move(r.strides)};
+    return {
+      data_.data() + r.ptr_offset, std::move(r.shape), std::move(r.strides)};
   }
 
   //! Flat 1D view of all elements

src/photon.cpp

@@ -168,8 +168,8 @@ PhotonInteraction::PhotonInteraction(hid_t group)
     close_dataset(dset);
     read_dataset(tgroup, "xs", xs);
 
-    auto cross_section =
-      cross_sections_.slice(tensor::range(static_cast<size_t>(shell.threshold)), i);
+    auto cross_section = cross_sections_.slice(
+      tensor::range(static_cast<size_t>(shell.threshold)), i);
     cross_section = tensor::where(xs > 0, tensor::log(xs), 0);
 
     if (object_exists(tgroup, "transitions")) {
@@ -184,7 +184,8 @@ PhotonInteraction::PhotonInteraction(hid_t group)
         read_dataset(tgroup, "transitions", matrix);
 
         // Transition probability normalization
-        double norm = tensor::Tensor<double>(matrix.slice(tensor::all, 3)).sum();
+        double norm =
+          tensor::Tensor<double>(matrix.slice(tensor::all, 3)).sum();
 
         shell.transitions.resize(n_transition);
         for (int j = 0; j < n_transition; ++j) {
@@ -314,7 +315,8 @@ PhotonInteraction::PhotonInteraction(hid_t group)
 
       tensor::Tensor<double> frst({static_cast<size_t>(1)});
       frst(0) = cutoff;
-      tensor::Tensor<double> rest(electron_energy.slice(tensor::range(i_grid + 1)));
+      tensor::Tensor<double> rest(
+        electron_energy.slice(tensor::range(i_grid + 1)));
       electron_energy = tensor::concatenate(frst, rest);
     }
 

src/physics.cpp

@@ -375,8 +375,7 @@ void sample_photon_reaction(Particle& p)
     // cross sections
     int i_grid = micro.index_grid;
     double f = micro.interp_factor;
-    tensor::View<const double> xs_lower =
-      element.cross_sections_.slice(i_grid);
+    tensor::View<const double> xs_lower = element.cross_sections_.slice(i_grid);
     tensor::View<const double> xs_upper =
       element.cross_sections_.slice(i_grid + 1);
 

src/secondary_correlated.cpp

@@ -132,9 +132,12 @@ CorrelatedAngleEnergy::CorrelatedAngleEnergy(hid_t group)
         interp_mu = 1;
 
       auto interp = int2interp(interp_mu);
-      tensor::View<double> xs = mu.slice(0, tensor::range(offset_mu, offset_mu + m));
-      tensor::View<double> ps = mu.slice(1, tensor::range(offset_mu, offset_mu + m));
-      tensor::View<double> cs = mu.slice(2, tensor::range(offset_mu, offset_mu + m));
+      tensor::View<double> xs =
+        mu.slice(0, tensor::range(offset_mu, offset_mu + m));
+      tensor::View<double> ps =
+        mu.slice(1, tensor::range(offset_mu, offset_mu + m));
+      tensor::View<double> cs =
+        mu.slice(2, tensor::range(offset_mu, offset_mu + m));
 
       vector<double> x {xs.begin(), xs.end()};
       vector<double> p {ps.begin(), ps.end()};

src/tallies/tally.cpp

@@ -1007,7 +1007,8 @@ void reduce_tally_results()
       // Extract 2D view of the VALUE column from the 3D results tensor,
       // then copy into a contiguous array for MPI reduction
       const int val_idx = static_cast<int>(TallyResult::VALUE);
-      tensor::View<double> val_view = tally->results_.slice(tensor::all, tensor::all, val_idx);
+      tensor::View<double> val_view =
+        tally->results_.slice(tensor::all, tensor::all, val_idx);
       tensor::Tensor<double> values(val_view);
 
       tensor::Tensor<double> values_reduced(values.shape());

src/xsdata.cpp

@@ -148,8 +148,7 @@ void XsData::fission_vector_beta_from_hdf5(
   for (size_t a = 0; a < n_ang; a++)
     for (size_t d = 0; d < n_dg_; d++)
       for (size_t gin = 0; gin < n_g_; gin++)
-        chi_delayed.slice(a, d, gin) =
-          temp_chi.slice(a);
+        chi_delayed.slice(a, d, gin) = temp_chi.slice(a);
 
   // Get nu-fission
   tensor::Tensor<double> temp_nufiss({n_ang, n_g_}, 0.);
@@ -233,8 +232,7 @@ void XsData::fission_vector_no_beta_from_hdf5(hid_t xsdata_grp, size_t n_ang)
   for (size_t a = 0; a < n_ang; a++)
     for (size_t d = 0; d < n_dg_; d++)
       for (size_t gin = 0; gin < n_g_; gin++)
-        chi_delayed.slice(a, d, gin) =
-          temp_chi_d.slice(a, d);
+        chi_delayed.slice(a, d, gin) = temp_chi_d.slice(a, d);
 
   // Get prompt and delayed nu-fission directly
   read_nd_tensor(xsdata_grp, "prompt-nu-fission", prompt_nu_fission, true);
@@ -366,8 +364,7 @@ void XsData::fission_matrix_beta_from_hdf5(
   for (size_t a = 0; a < n_ang; a++)
     for (size_t d = 0; d < n_dg_; d++)
       for (size_t gin = 0; gin < n_g_; gin++) {
-        tensor::View<double> row =
-          chi_delayed.slice(a, d, gin);
+        tensor::View<double> row = chi_delayed.slice(a, d, gin);
         row /= row.sum();
       }
 }
@@ -650,8 +647,7 @@ void XsData::combine(
     for (size_t a = 0; a < n_ang; a++)
       for (size_t d = 0; d < n_dg; d++)
         for (size_t gin = 0; gin < n_g; gin++) {
-          tensor::View<double> row =
-            chi_delayed.slice(a, d, gin);
+          tensor::View<double> row = chi_delayed.slice(a, d, gin);
           row /= row.sum();
         }
   }

tests/cpp_unit_tests/test_tensor.cpp

@@ -626,8 +626,8 @@ TEST_CASE("Tensor multi-axis slice")
   REQUIRE(s3.ndim() == 2);
   REQUIRE(s3.shape(0) == 2);
   REQUIRE(s3.shape(1) == 4);
-  REQUIRE(s3(0, 0) == 0);  // t(0,0,0)
-  REQUIRE(s3(1, 3) == 7);  // t(0,1,3)
+  REQUIRE(s3(0, 0) == 0); // t(0,0,0)
+  REQUIRE(s3(1, 3) == 7); // t(0,1,3)
 }
 
 // ============================================================================
@@ -733,8 +733,8 @@ TEST_CASE("View sub-slice")
   Tensor<int> t({6}, 0);
   t = {10, 20, 30, 40, 50, 60};
 
-  auto s = t.slice(range(1, 5));   // [20, 30, 40, 50]
-  auto ss = s.slice(range(1, 3));  // [30, 40]
+  auto s = t.slice(range(1, 5));  // [20, 30, 40, 50]
+  auto ss = s.slice(range(1, 3)); // [30, 40]
   REQUIRE(ss.size() == 2);
   REQUIRE(ss[0] == 30);
   REQUIRE(ss[1] == 40);
@@ -819,9 +819,12 @@ TEST_CASE("StaticTensor2D iteration")
 TEST_CASE("StaticTensor2D slice")
 {
   StaticTensor2D<int, 3, 2> t;
-  t(0, 0) = 1; t(0, 1) = 2;
-  t(1, 0) = 3; t(1, 1) = 4;
-  t(2, 0) = 5; t(2, 1) = 6;
+  t(0, 0) = 1;
+  t(0, 1) = 2;
+  t(1, 0) = 3;
+  t(1, 1) = 4;
+  t(2, 0) = 5;
+  t(2, 1) = 6;
 
   // slice(1) = row 1 (fix axis 0 at 1)
   auto r1 = t.slice(1);