Refactor Decomposition

Simplify it a lot by making the actual domain decomposition outside of
class constructor. Implement make_decomposition taking id and number of
processes and perform domain decomposition based on that. Do not save
any additional information to Decompositoin what we don't use at the
moment, we will extend this later on.

Author: ahojukka5

apps/aluminumNew/Aluminum.hpp

@@ -171,8 +171,8 @@ class Aluminum : public Model {
     auto Lz = size[2];
 
     const Decomposition &decomp = get_decomposition();
-    std::array<int, 3> low = decomp.outbox.low;
-    std::array<int, 3> high = decomp.outbox.high;
+    std::array<int, 3> low = decomp.get_outbox().low;
+    std::array<int, 3> high = decomp.get_outbox().high;
 
     int idx = 0;
     const double pi = std::atan(1.0) * 4.0;
@@ -240,8 +240,8 @@ class Aluminum : public Model {
     double x0 = w.origin()[0];
     int Lx = w.size()[0];
     const Decomposition &decomp = get_decomposition();
-    std::array<int, 3> low = decomp.inbox.low;
-    std::array<int, 3> high = decomp.inbox.high;
+    std::array<int, 3> low = decomp.get_inbox().low;
+    std::array<int, 3> high = decomp.get_inbox().high;
 
     // Calculate mean-field density n_mf
     fft.forward(psi, psi_F);

apps/aluminumNew/SeedGridFCC.hpp

@@ -61,8 +61,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.inbox.low;
-    Vec3<int> high = decomp.inbox.high;
+    Vec3<int> low = decomp.get_inbox().low;
+    Vec3<int> high = decomp.get_inbox().high;
 
     // Use the new World API to get size, spacing, and origin
     auto size = w.size();

apps/aluminumNew/SlabFCC.hpp

@@ -67,8 +67,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.inbox.low;
-    Vec3<int> high = decomp.inbox.high;
+    Vec3<int> low = decomp.get_inbox().low;
+    Vec3<int> high = decomp.get_inbox().high;
 
     // auto Lx = w.Lx;
     auto Ly = w.get_size()[1];

apps/tungsten.cpp

@@ -113,8 +113,8 @@ class Tungsten : public Model {
     auto Lz = size[2];
 
     const Decomposition &decomp = get_decomposition();
-    std::array<int, 3> low = decomp.outbox.low;
-    std::array<int, 3> high = decomp.outbox.high;
+    std::array<int, 3> low = decomp.get_outbox().low;
+    std::array<int, 3> high = decomp.get_outbox().high;
 
     int idx = 0;
     const double pi = std::atan(1.0) * 4.0;

examples/02_domain_decomposition.cpp

@@ -32,10 +32,10 @@ int main(int argc, char *argv[]) {
   // size of the calculation domain, id number and total number of subdomains:
   int comm_rank = 0, comm_size = 2;
   World world1({32, 4, 4});
-  Decomposition decomp1(world1, comm_rank, comm_size);
+  Decomposition decomp1 = make_decomposition(world1, comm_rank, comm_size);
   cout << decomp1 << endl;
 
-  // In practive, we let MPI communicator to decide the number of subdomains.
+  // In practice, we let MPI communicator to decide the number of subdomains.
   MPI_Init(&argc, &argv);
   MPI_Comm comm = MPI_COMM_WORLD;
   MPI_Comm_rank(comm, &comm_rank);

examples/04_diffusion_model.cpp

@@ -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.inbox.low;
-    Vec3<int> i_high = decomp.inbox.high;
-    Vec3<int> o_low = decomp.outbox.low;
-    Vec3<int> o_high = decomp.outbox.high;
+    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;
 
     /*
     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.inbox.low;
-    std::array<int, 3> high = decomp.inbox.high;
+    std::array<int, 3> low = decomp.get_inbox().low;
+    std::array<int, 3> high = decomp.get_inbox().high;
 
     if (m.is_rank0()) std::cout << "Create initial condition" << std::endl;
     size_t idx = 0;
@@ -100,8 +100,8 @@ 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.outbox.low;
-    std::array<int, 3> high = decomp.outbox.high;
+    std::array<int, 3> low = decomp.get_outbox().low;
+    std::array<int, 3> high = decomp.get_outbox().high;
 
     if (is_rank0()) std::cout << "Prepare operators" << std::endl;
     size_t idx = 0;

examples/08_discrete_fields.cpp

@@ -5,6 +5,7 @@
 #include <openpfc/core/decomposition.hpp>
 #include <openpfc/core/world.hpp>
 #include <openpfc/discrete_field.hpp>
+#include <openpfc/factory/decomposition_factory.hpp>
 #include <openpfc/utils.hpp>
 
 using namespace pfc;
@@ -43,10 +44,11 @@ class Modifier {
 int main() {
   World world({16, 8, 1});
   std::cout << world << std::endl;
-  Decomposition decomp1(world, 0, 4);
-  Decomposition decomp2(world, 1, 4);
-  Decomposition decomp3(world, 2, 4);
-  Decomposition decomp4(world, 3, 4);
+  Decomposition decomp1 = make_decomposition(world, 0, 4);
+  Decomposition decomp2 = make_decomposition(world, 1, 4);
+  Decomposition decomp3 = make_decomposition(world, 2, 4);
+  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();

examples/12_cahn_hilliard.cpp

@@ -42,8 +42,8 @@ class CahnHilliard : public Model {
 
     // prepare operators
     World w = get_world();
-    std::array<int, 3> o_low = decomp.outbox.low;
-    std::array<int, 3> o_high = decomp.outbox.high;
+    std::array<int, 3> o_low = decomp.get_outbox().low;
+    std::array<int, 3> o_high = decomp.get_outbox().high;
     size_t idx = 0;
     double pi = std::atan(1.0) * 4.0;
     auto spacing = w.spacing();

examples/diffusion_model.hpp

@@ -28,10 +28,10 @@ class Diffusion : public Model {
     psi_F.resize(fft.size_outbox());
     opL.resize(fft.size_outbox());
 
-    Vec3<int> i_low = decomp.inbox.low;
-    Vec3<int> i_high = decomp.inbox.high;
-    Vec3<int> o_low = decomp.outbox.low;
-    Vec3<int> o_high = decomp.outbox.high;
+    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;
 
     auto origin = w.origin();
     auto spacing = w.spacing();