Change export to save as layout-right. Verified the recorded moments change is only transposed

Author: ProExpertProg

cpp/lib/Exporter.cpp

@@ -21,14 +21,12 @@ void Exporter::exportTo(fs::path const &filename, Grid::View::C_XY cView) {
 }
 
 void Exporter::exportTo(fs::path const &filename, Grid::View::R_XY rView) {
-  // TODO Copy the data to a layout-right buffer
-  //  stdex::mdarray<Real, stdex::dextents<size_t, 2u>> rArray{rView.extents()};
-  //  grid.for_each_xy([&](Dim x, Dim y) { rArray(x, y) = rView(x, y); });
-  //  cnpy::npy_save(prefix_dir / filename, rArray.data(), {grid.X, grid.Y}, "w");
+  // Copy the data to a layout-right buffer
+  stdex::mdarray<Real, stdex::dextents<size_t, 2u>> rArray{rView.extents()};
+  grid.for_each_xy([&](Dim x, Dim y) { rArray(x, y) = rView(x, y); });
 
-  // Dimensions are switched because we use layout_left
   auto const path = filename.is_absolute() ? filename : prefix_dir / filename;
-  cnpy::npy_save(path, rView.data_handle(), {grid.Y, grid.X}, "w");
+  cnpy::npy_save(path, rArray.data(), {grid.X, grid.Y}, "w");
 }
 
 NpyMdspan

cpp/lib/NpyMdspan.hpp

@@ -19,14 +19,9 @@ class NpyMdspan {
   using ViewXY = stdex::mdspan<Real, stdex::dextents<size_t, 2u>>;
 
   // TODO(luka) const view
-  Grid::View::R_XY view() {
-    // Reverse the dimensions
-    auto shape = array_.shape;
-    std::reverse(shape.begin(), shape.end());
-    std::span<size_t, 2> const extents{shape.data(), 2};
-
-    // Return a layout_left view
-    return Grid::View::R_XY{array_.data<Real>(), extents};
+  ViewXY view() {
+    std::span<size_t, 2> const extents{array_.shape.data(), 2};
+    return ViewXY{array_.data<Real>(), extents};
   }
 
   [[nodiscard]] bool valid() const { return array_.word_size == sizeof(Real); }

cpp/lib/Transformer.hpp

@@ -15,7 +15,7 @@ class Transformer {
   /// Forward FFT
   void fft(Grid::View::R_XY in, Grid::View::C_XY out) const;
 
-  /// Backwards FFT (unnormalized)
+  /// Backwards FFT (unnormalized, destructive)
   void bfft(Grid::View::C_XY in, Grid::View::R_XY out) const;
 
   /// Normalize a complex buffer (can be in-place)