Refactor Decomposition: use free functions

Author: ahojukka5

apps/aluminumNew/Aluminum.hpp

@@ -162,7 +162,8 @@ class Aluminum : public Model {
   }
 
   void prepare_operators(double dt) {
-    World w = get_world();
+    const Decomposition &decomp = get_decomposition();
+    World w = decomposition::get_world(decomp);
     auto spacing = get_spacing(w);
     auto size = get_size(w);
     auto dx = spacing[0];
@@ -172,9 +173,8 @@ class Aluminum : public Model {
     auto Ly = size[1];
     auto Lz = size[2];
 
-    const Decomposition &decomp = get_decomposition();
-    std::array<int, 3> low = decomp.get_outbox().low;
-    std::array<int, 3> high = decomp.get_outbox().high;
+    std::array<int, 3> low = get_outbox(decomp).low;
+    std::array<int, 3> high = get_outbox(decomp).high;
 
     int idx = 0;
     const double pi = std::atan(1.0) * 4.0;
@@ -243,8 +243,8 @@ class Aluminum : public Model {
     double x0 = get_origin(w, 0);
     int Lx = get_size(w, 0);
     const Decomposition &decomp = get_decomposition();
-    std::array<int, 3> low = decomp.get_inbox().low;
-    std::array<int, 3> high = decomp.get_inbox().high;
+    Int3 low = get_inbox(decomp).low;
+    Int3 high = get_inbox(decomp).high;
 
     // Calculate mean-field density n_mf
     fft.forward(psi, psi_F);

apps/aluminumNew/SeedGridFCC.hpp

@@ -64,8 +64,8 @@ class SeedGridFCC : public FieldModifier {
     const World &w = m.get_world();
     const Decomposition &decomp = m.get_decomposition();
     Field &field = m.get_real_field("psi");
-    Vec3<int> low = decomp.get_inbox().low;
-    Vec3<int> high = decomp.get_inbox().high;
+    Int3 low = get_inbox(decomp).low;
+    Int3 high = get_inbox(decomp).high;
 
     // Use the new World API to get size, spacing, and origin
     auto size = get_size(w);

apps/aluminumNew/SlabFCC.hpp

@@ -74,8 +74,8 @@ class SlabFCC : public FieldModifier {
     const World &w = m.get_world();
     const Decomposition &decomp = m.get_decomposition();
     Field &field = m.get_real_field("psi");
-    Vec3<int> low = decomp.get_inbox().low;
-    Vec3<int> high = decomp.get_inbox().high;
+    Int3 low = get_inbox(decomp).low;
+    Int3 high = get_inbox(decomp).high;
 
     // auto Lx = w.Lx;
     auto Ly = get_size(w, 1);

apps/tungsten.cpp

@@ -102,7 +102,8 @@ class Tungsten : public Model {
   }
 
   void prepare_operators(double dt) {
-    World w = get_world();
+    const Decomposition &decomp = get_decomposition();
+    World w = decomposition::get_world(decomp);
     auto spacing = get_spacing(w);
     auto size = get_size(w);
     auto dx = spacing[0];
@@ -112,9 +113,8 @@ class Tungsten : public Model {
     auto Ly = size[1];
     auto Lz = size[2];
 
-    const Decomposition &decomp = get_decomposition();
-    std::array<int, 3> low = decomp.get_outbox().low;
-    std::array<int, 3> high = decomp.get_outbox().high;
+    std::array<int, 3> low = get_outbox(decomp).low;
+    std::array<int, 3> high = get_outbox(decomp).high;
 
     int idx = 0;
     const double pi = std::atan(1.0) * 4.0;

examples/04_diffusion_model.cpp

@@ -83,9 +83,9 @@ class Diffusion : public Model {
     if (rank0) cout << "Allocate space" << endl;
 
     // Get references to world, fft and domain decomposition
-    const World &w = get_world();
-    FFT &fft = get_fft();
     const Decomposition &decomp = get_decomposition();
+    const World &w = decomposition::get_world(decomp);
+    FFT &fft = get_fft();
 
     // Allocate space for the main variable and it's fourier transform
     psi.resize(fft.size_inbox());
@@ -110,10 +110,10 @@ class Diffusion : public Model {
     Upper and lower limits for this particular MPI rank, in both inbox and
     outbox, are given by domain decomposition object
     */
-    Vec3<int> i_low = decomp.get_inbox().low;
-    Vec3<int> i_high = decomp.get_inbox().high;
-    Vec3<int> o_low = decomp.get_outbox().low;
-    Vec3<int> o_high = decomp.get_outbox().high;
+    Int3 i_low = get_inbox(decomp).low;
+    Int3 i_high = get_inbox(decomp).high;
+    Int3 o_low = get_outbox(decomp).low;
+    Int3 o_high = get_outbox(decomp).high;
 
     /*
     Typically initial conditions are constructed elsewhere. However, to keep

examples/05_simulator.cpp

@@ -52,8 +52,8 @@ class GaussianIC : public FieldModifier {
     const World &w = m.get_world();
     const Decomposition &decomp = m.get_decomposition();
     std::vector<double> &field = m.get_real_field("psi");
-    std::array<int, 3> low = decomp.get_inbox().low;
-    std::array<int, 3> high = decomp.get_inbox().high;
+    Int3 low = get_inbox(decomp).low;
+    Int3 high = get_inbox(decomp).high;
 
     if (m.is_rank0()) std::cout << "Create initial condition" << std::endl;
     size_t idx = 0;
@@ -98,10 +98,10 @@ class Diffusion : public Model {
   }
 
   void prepare_operators(double dt) {
-    const World &w = get_world();
     const Decomposition &decomp = get_decomposition();
-    std::array<int, 3> low = decomp.get_outbox().low;
-    std::array<int, 3> high = decomp.get_outbox().high;
+    const World &w = decomposition::get_world(decomp);
+    std::array<int, 3> low = get_outbox(decomp).low;
+    std::array<int, 3> high = get_outbox(decomp).high;
 
     if (is_rank0()) std::cout << "Prepare operators" << std::endl;
     size_t idx = 0;

examples/08_discrete_fields.cpp

@@ -52,23 +52,23 @@ int main() {
   Decomposition decomp4 = make_decomposition(world, 3, 4);
 
   std::cout << decomp1 << std::endl;
-  const std::array<int, 3> &inbox_size1 = decomp1.get_inbox_size();
-  const std::array<int, 3> &inbox_offset1 = decomp1.get_inbox_offset();
+  const std::array<int, 3> &inbox_size1 = get_inbox_size(decomp1);
+  const std::array<int, 3> &inbox_offset1 = get_inbox_offset(decomp1);
   DiscreteField<double, 3> field1(inbox_size1, inbox_offset1, get_origin(world),
                                   get_spacing(world));
 
-  const std::array<int, 3> &inbox_size2 = decomp2.get_inbox_size();
-  const std::array<int, 3> &inbox_offset2 = decomp2.get_inbox_offset();
+  const std::array<int, 3> &inbox_size2 = get_inbox_size(decomp2);
+  const std::array<int, 3> &inbox_offset2 = get_inbox_offset(decomp2);
   DiscreteField<double, 3> field2(inbox_size2, inbox_offset2, get_origin(world),
                                   get_spacing(world));
 
-  const std::array<int, 3> &inbox_size3 = decomp3.get_inbox_size();
-  const std::array<int, 3> &inbox_offset3 = decomp3.get_inbox_offset();
+  const std::array<int, 3> &inbox_size3 = get_inbox_size(decomp3);
+  const std::array<int, 3> &inbox_offset3 = get_inbox_offset(decomp3);
   DiscreteField<double, 3> field3(inbox_size3, inbox_offset3, get_origin(world),
                                   get_spacing(world));
 
-  const std::array<int, 3> &inbox_size4 = decomp4.get_inbox_size();
-  const std::array<int, 3> &inbox_offset4 = decomp4.get_inbox_offset();
+  const std::array<int, 3> &inbox_size4 = get_inbox_size(decomp4);
+  const std::array<int, 3> &inbox_offset4 = get_inbox_offset(decomp4);
   DiscreteField<double, 3> field4(inbox_size4, inbox_offset4, get_origin(world),
                                   get_spacing(world));
   std::cout << field1 << std::endl;

examples/09_parallel_fft_high_level.cpp

@@ -17,8 +17,8 @@ int main(int argc, char *argv[]) {
   // Create input field
   // DiscreteField<double, 3> input(decomp);
 
-  auto dimensions = decomp.get_inbox_size();
-  auto offsets = decomp.get_inbox_offset();
+  auto dimensions = get_inbox_size(decomp);
+  auto offsets = get_inbox_offset(decomp);
   auto origin = get_origin(world);
   auto discretization = get_spacing(world);
   DiscreteField<double, 3> input(dimensions, offsets, origin, discretization);

examples/11_write_results.cpp

@@ -16,8 +16,8 @@ int main(int argc, char **argv) {
   World world = world::create({4, 3, 2});
   Decomposition decomp = make_decomposition(world);
   // DiscreteField<double, 3> field(decomp);
-  auto dimensions = decomp.get_inbox_size();
-  auto offsets = decomp.get_inbox_offset();
+  auto dimensions = get_inbox_size(decomp);
+  auto offsets = get_inbox_offset(decomp);
   auto origin = get_origin(world);
   auto discretization = get_spacing(world);
   DiscreteField<double, 3> field(dimensions, offsets, origin, discretization);

examples/12_cahn_hilliard.cpp

@@ -43,8 +43,8 @@ class CahnHilliard : public Model {
 
     // prepare operators
     World w = get_world();
-    std::array<int, 3> o_low = decomp.get_outbox().low;
-    std::array<int, 3> o_high = decomp.get_outbox().high;
+    std::array<int, 3> o_low = get_outbox(decomp).low;
+    std::array<int, 3> o_high = get_outbox(decomp).high;
     size_t idx = 0;
     double pi = std::atan(1.0) * 4.0;
     auto spacing = get_spacing(w);
@@ -143,8 +143,8 @@ int main(int argc, char **argv) {
   // file_count
   writer.set_uri(sprintf("cahn_hilliard_%04i.vti", file_count));
   writer.set_field_name("concentration");
-  writer.set_domain(get_size(world), decomp.get_inbox_size(),
-                    decomp.get_inbox_offset());
+  writer.set_domain(get_size(world), get_inbox_size(decomp),
+                    get_inbox_offset(decomp));
   writer.set_origin(get_origin(world));
   writer.set_spacing(get_spacing(world));
   writer.initialize();