Use Mpi class instead of MPI_Init and MPI_Finalize

examples/amgx/ex1p.cpp

@@ -38,10 +38,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -88,7 +87,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -321,7 +319,6 @@ int main(int argc, char *argv[])
    {
       delete fec;
    }
-   MPI_Finalize();
 
    return 0;
 }

examples/caliper/ex1p.cpp

@@ -59,10 +59,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
    // Define Caliper ConfigManager
    cali::ConfigManager mgr;
@@ -102,7 +101,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -294,7 +292,6 @@ int main(int argc, char *argv[])
    }
    // Flush output before MPI_finalize
    mgr.flush();
-   MPI_Finalize();
 
    return 0;
 }

examples/ex10p.cpp

@@ -163,10 +163,8 @@ void visualize(ostream &os, ParMesh *mesh,
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -224,7 +222,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -264,7 +261,6 @@ int main(int argc, char *argv[])
             cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
          }
          delete mesh;
-         MPI_Finalize();
          return 3;
    }
 
@@ -435,8 +431,6 @@ int main(int argc, char *argv[])
    delete ode_solver;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/ex11p.cpp

@@ -58,10 +58,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -124,7 +123,6 @@ int main(int argc, char *argv[])
          {
             args.PrintUsage(cout);
          }
-         MPI_Finalize();
          return 1;
       }
    }
@@ -387,7 +385,5 @@ int main(int argc, char *argv[])
    }
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }

examples/ex12p.cpp

@@ -49,10 +49,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -90,7 +89,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -110,7 +108,6 @@ int main(int argc, char *argv[])
          cerr << "\nInput mesh should have at least two materials!"
               << " (See schematic in ex12p.cpp)\n"
               << endl;
-      MPI_Finalize();
       return 3;
    }
 
@@ -366,7 +363,5 @@ int main(int argc, char *argv[])
    }
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }

examples/ex13p.cpp

@@ -43,10 +43,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -82,7 +81,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -271,7 +269,5 @@ int main(int argc, char *argv[])
    delete fec;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }

examples/ex14p.cpp

@@ -71,10 +71,9 @@ private:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -114,7 +113,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (kappa < 0)
@@ -283,7 +281,5 @@ int main(int argc, char *argv[])
    delete fec;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }

examples/ex15p.cpp

@@ -80,10 +80,9 @@ void UpdateAndRebalance(ParMesh &pmesh, ParFiniteElementSpace &fespace,
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -135,7 +134,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -391,7 +389,6 @@ int main(int argc, char *argv[])
    delete estimator;
 
    // 25. Exit
-   MPI_Finalize();
    return 0;
 }
 

examples/ex16p.cpp

@@ -94,10 +94,9 @@ double InitialTemperature(const Vector &x);
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -153,7 +152,6 @@ int main(int argc, char *argv[])
    if (!args.Good())
    {
       args.PrintUsage(cout);
-      MPI_Finalize();
       return 1;
    }
 
@@ -381,8 +379,6 @@ int main(int argc, char *argv[])
    delete ode_solver;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/ex1p.cpp

@@ -65,7 +65,6 @@ int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
    Mpi::Init();
-   int num_procs = Mpi::WorldSize();
    int myid = Mpi::WorldRank();
    Hypre::Init();
 

examples/ex20p.cpp

@@ -97,12 +97,11 @@ public:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Comm comm = MPI_COMM_WORLD;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(comm, &num_procs);
-   MPI_Comm_rank(comm, &myid);
+   Mpi::Init(argc, argv);
    Hypre::Init();
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
+   MPI_Comm comm = MPI_COMM_WORLD;
 
    // 2. Parse command-line options.
    int order  = 1;
@@ -141,7 +140,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -318,8 +316,6 @@ int main(int argc, char *argv[])
            << "window_title 'Energy in Phase Space'\n"
            << "keys\n maac\n" << "axis_labels 'q' 'p' 't'\n"<< flush;
    }
-
-   MPI_Finalize();
 }
 
 double hamiltonian(double q, double p, double t)

examples/ex21p.cpp

@@ -38,10 +38,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 0. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 1. Parse command-line options.
@@ -71,7 +70,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -90,7 +88,6 @@ int main(int argc, char *argv[])
       cerr << "\nInput mesh should have at least two materials and "
            << "two boundary attributes! (See schematic in ex2.cpp)\n"
            << endl;
-      MPI_Finalize();
       return 3;
    }
 
@@ -362,6 +359,5 @@ int main(int argc, char *argv[])
       x.Save(x_out);
    }
 
-   MPI_Finalize();
    return 0;
 }

examples/ex22p.cpp

@@ -76,10 +76,9 @@ bool check_for_inline_mesh(const char * mesh_file);
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -138,7 +137,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -599,8 +597,6 @@ int main(int argc, char *argv[])
    delete fec;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/ex24p.cpp

@@ -56,10 +56,9 @@ double freq = 1.0, kappa;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -95,7 +94,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -440,8 +438,6 @@ int main(int argc, char *argv[])
    delete test_fec;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/ex25p.cpp

@@ -155,10 +155,9 @@ prob_type prob;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -258,7 +257,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -693,7 +691,6 @@ int main(int argc, char *argv[])
    delete fespace;
    delete fec;
    delete pmesh;
-   MPI_Finalize();
    return 0;
 }
 

examples/ex26p.cpp

@@ -126,10 +126,9 @@ private:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -158,7 +157,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -312,7 +310,5 @@ int main(int argc, char *argv[])
       delete collections[level];
    }
 
-   MPI_Finalize();
-
    return 0;
 }

examples/ex28p.cpp

@@ -88,10 +88,9 @@ int main(int argc, char *argv[])
 #endif
 
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -124,7 +123,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -368,7 +366,6 @@ int main(int argc, char *argv[])
    delete pmesh;
 
    // HYPRE_Finalize();
-   MPI_Finalize();
 
    return 0;
 }

examples/ex2p.cpp

@@ -49,10 +49,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -89,7 +88,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -114,7 +112,6 @@ int main(int argc, char *argv[])
          cerr << "\nInput mesh should have at least two materials and "
               << "two boundary attributes! (See schematic in ex2.cpp)\n"
               << endl;
-      MPI_Finalize();
       return 3;
    }
 
@@ -338,7 +335,5 @@ int main(int argc, char *argv[])
    }
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }

examples/ex30p.cpp

@@ -87,10 +87,9 @@ double singular_function(const Vector &p)
 int main(int argc, char *argv[])
 {
    // 0. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 1. Parse command-line options.
@@ -131,7 +130,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -245,6 +243,5 @@ int main(int argc, char *argv[])
       sol_sock << "mesh\n" << pmesh << flush;
    }
 
-   MPI_Finalize();
    return 0;
 }

examples/ex3p.cpp

@@ -60,10 +60,9 @@ int dim;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -106,8 +105,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      // HYPRE_Finalize();
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -299,8 +296,6 @@ int main(int argc, char *argv[])
    delete fec;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/ex4p.cpp

@@ -59,10 +59,9 @@ double freq = 1.0, kappa;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -102,7 +101,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -304,8 +302,6 @@ int main(int argc, char *argv[])
    delete fec;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/ex5p.cpp

@@ -56,10 +56,9 @@ int main(int argc, char *argv[])
    StopWatch chrono;
 
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
    bool verbose = (myid == 0);
 
@@ -100,7 +99,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (verbose)
@@ -489,8 +487,6 @@ int main(int argc, char *argv[])
    delete hdiv_coll;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/ex6p.cpp

@@ -53,10 +53,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -103,7 +102,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -395,6 +393,5 @@ int main(int argc, char *argv[])
    delete smooth_flux_fec;
    delete pmesh;
 
-   MPI_Finalize();
    return 0;
 }

examples/ex7p.cpp

@@ -35,10 +35,9 @@ void SnapNodes(Mesh &mesh);
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -76,7 +75,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -322,8 +320,6 @@ int main(int argc, char *argv[])
    delete fespace;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/ex8p.cpp

@@ -42,10 +42,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -68,7 +67,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -340,7 +338,5 @@ int main(int argc, char *argv[])
    delete x0_fec;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }

examples/hiop/ex9p.cpp

@@ -240,10 +240,9 @@ public:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -300,7 +299,6 @@ int main(int argc, char *argv[])
    if (!args.Good())
    {
       if (myid == 0) { args.PrintUsage(cout); }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0) { args.PrintOptions(cout); }
@@ -326,7 +324,6 @@ int main(int argc, char *argv[])
             cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
          }
          delete mesh;
-         MPI_Finalize();
          return 3;
    }
 
@@ -571,7 +568,6 @@ int main(int argc, char *argv[])
    delete ode_solver;
    delete dc;
 
-   MPI_Finalize();
    return 0;
 }
 

examples/petsc/ex10p.cpp

@@ -186,10 +186,9 @@ void visualize(ostream &os, ParMesh *mesh, ParGridFunction *deformed_nodes,
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -252,7 +251,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -296,7 +294,6 @@ int main(int argc, char *argv[])
          {
             cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
          }
-         MPI_Finalize();
          return 3;
    }
 
@@ -473,8 +470,6 @@ int main(int argc, char *argv[])
    // We finalize PETSc
    if (use_petsc) { MFEMFinalizePetsc(); }
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/petsc/ex11p.cpp

@@ -42,10 +42,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -112,7 +111,6 @@ int main(int argc, char *argv[])
          {
             args.PrintUsage(cout);
          }
-         MPI_Finalize();
          return 1;
       }
    }
@@ -437,7 +435,6 @@ int main(int argc, char *argv[])
 
    // We finalize SLEPc
    MFEMFinalizeSlepc();
-   MPI_Finalize();
 
    return 0;
 }

examples/petsc/ex1p.cpp

@@ -76,10 +76,9 @@ public:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -131,7 +130,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -381,7 +379,5 @@ int main(int argc, char *argv[])
    // We finalize PETSc
    MFEMFinalizePetsc();
 
-   MPI_Finalize();
-
    return 0;
 }

examples/petsc/ex2p.cpp

@@ -51,10 +51,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -102,7 +101,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -125,7 +123,6 @@ int main(int argc, char *argv[])
          cerr << "\nInput mesh should have at least two materials and "
               << "two boundary attributes! (See schematic in ex2.cpp)\n"
               << endl;
-      MPI_Finalize();
       return 3;
    }
 
@@ -394,7 +391,5 @@ int main(int argc, char *argv[])
    // We finalize PETSc
    if (use_petsc) { MFEMFinalizePetsc(); }
 
-   MPI_Finalize();
-
    return 0;
 }

examples/petsc/ex3p.cpp

@@ -46,10 +46,9 @@ int dim;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -89,7 +88,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -309,8 +307,6 @@ int main(int argc, char *argv[])
    // We finalize PETSc
    if (use_petsc) { MFEMFinalizePetsc(); }
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/petsc/ex4p.cpp

@@ -41,10 +41,9 @@ double freq = 1.0, kappa;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -90,7 +89,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -330,8 +328,6 @@ int main(int argc, char *argv[])
    // We finalize PETSc
    if (use_petsc) { MFEMFinalizePetsc(); }
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/petsc/ex5p.cpp

@@ -51,10 +51,9 @@ int main(int argc, char *argv[])
    StopWatch chrono;
 
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
    bool verbose = (myid == 0);
 
@@ -98,7 +97,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (verbose)
@@ -547,8 +545,6 @@ int main(int argc, char *argv[])
    // We finalize PETSc
    if (use_petsc) { MFEMFinalizePetsc(); }
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/petsc/ex6p.cpp

@@ -40,10 +40,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -81,7 +80,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -318,6 +316,5 @@ int main(int argc, char *argv[])
    // We finalize PETSc
    if (use_petsc) { MFEMFinalizePetsc(); }
 
-   MPI_Finalize();
    return 0;
 }

examples/petsc/ex9p.cpp

@@ -137,10 +137,9 @@ public:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -223,7 +222,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -258,7 +256,6 @@ int main(int argc, char *argv[])
             {
                cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
             }
-            MPI_Finalize();
             return 3;
       }
    }
@@ -516,7 +513,6 @@ int main(int argc, char *argv[])
    // We finalize PETSc
    if (use_petsc) { MFEMFinalizePetsc(); }
 
-   MPI_Finalize();
    return 0;
 }
 

examples/pumi/ex1.cpp

@@ -65,10 +65,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI (required by PUMI) and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -105,7 +104,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -269,6 +267,5 @@ int main(int argc, char *argv[])
    Sim_unregisterAllKeys();
 #endif
 
-   MPI_Finalize();
    return 0;
 }

examples/pumi/ex1p.cpp

@@ -70,10 +70,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -110,7 +109,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -299,7 +297,5 @@ int main(int argc, char *argv[])
    Sim_unregisterAllKeys();
 #endif
 
-   MPI_Finalize();
-
    return 0;
 }

examples/pumi/ex2.cpp

@@ -79,10 +79,10 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI (required by PUMI) and HYPRE.
-   int num_proc, myId;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_proc);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myId);
+   Mpi::Init(argc, argv);
+   Hypre::Init();
+   int num_proc = Mpi::WorldSize();
+   int myId = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -420,7 +420,5 @@ int main(int argc, char *argv[])
    Sim_unregisterAllKeys();
 #endif
 
-   MPI_Finalize();
-
    return 0;
 }

examples/pumi/ex6p.cpp

@@ -52,10 +52,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -100,7 +99,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -390,7 +388,5 @@ int main(int argc, char *argv[])
    Sim_unregisterAllKeys();
 #endif
 
-   MPI_Finalize();
-
    return 0;
 }

examples/sundials/ex10p.cpp

@@ -216,10 +216,9 @@ void visualize(ostream &os, ParMesh *mesh, ParGridFunction *deformed_nodes,
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -299,7 +298,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -314,7 +312,6 @@ int main(int argc, char *argv[])
       {
          cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
       }
-      MPI_Finalize();
       return 1;
    }
 
@@ -335,7 +332,6 @@ int main(int argc, char *argv[])
          cout << "Unknown type of nonlinear solver: " << nls << endl;
       }
       delete mesh;
-      MPI_Finalize();
       return 4;
    }
 
@@ -580,8 +576,6 @@ int main(int argc, char *argv[])
    delete ode_solver;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/sundials/ex16p.cpp

@@ -102,10 +102,9 @@ double InitialTemperature(const Vector &x);
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -171,7 +170,6 @@ int main(int argc, char *argv[])
    if (!args.Good())
    {
       args.PrintUsage(cout);
-      MPI_Finalize();
       return 1;
    }
 
@@ -187,7 +185,6 @@ int main(int argc, char *argv[])
       {
          cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
       }
-      MPI_Finalize();
       return 1;
    }
 
@@ -416,8 +413,6 @@ int main(int argc, char *argv[])
    delete ode_solver;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

examples/sundials/ex9p.cpp

@@ -153,10 +153,9 @@ public:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -242,7 +241,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -257,7 +255,6 @@ int main(int argc, char *argv[])
       {
          cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
       }
-      MPI_Finalize();
       return 3;
    }
 
@@ -583,7 +580,6 @@ int main(int argc, char *argv[])
 #endif
    delete dc;
 
-   MPI_Finalize();
    return 0;
 }
 

examples/superlu/ex1p.cpp

@@ -54,10 +54,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -97,7 +96,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -324,7 +322,6 @@ int main(int argc, char *argv[])
    {
       delete fec;
    }
-   MPI_Finalize();
 
    return 0;
 }

miniapps/adjoint/adjoint_advection_diffusion.cpp

@@ -202,10 +202,9 @@ double u_init(const Vector &x)
 int main(int argc, char *argv[])
 {
    // Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // Parse command-line options.
@@ -238,7 +237,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -410,7 +408,6 @@ int main(int argc, char *argv[])
    delete V;
    delete cvodes;
 
-   MPI_Finalize();
    return 0;
 }
 

miniapps/autodiff/par_example.cpp

@@ -286,10 +286,9 @@ private:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myrank;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myrank = Mpi::WorldRank();
    Hypre::Init();
    // Define Caliper ConfigManager
 #ifdef MFEM_USE_CALIPER
@@ -369,7 +368,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(std::cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myrank == 0)
@@ -548,7 +546,6 @@ int main(int argc, char *argv[])
 #ifdef MFEM_USE_CALIPER
    mgr.flush();
 #endif
-   MPI_Finalize();
 
    return 0;
 }

miniapps/gslib/pfindpts.cpp

@@ -61,10 +61,9 @@ void F_exact(const Vector &p, Vector &F)
 int main (int argc, char *argv[])
 {
    // Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // Set the method's default parameters.
@@ -313,6 +312,5 @@ int main (int argc, char *argv[])
 
    delete fec;
 
-   MPI_Finalize();
    return 0;
 }

miniapps/gslib/schwarz_ex1p.cpp

@@ -74,10 +74,9 @@ void GetInterdomainBoundaryPoints(OversetFindPointsGSLIB &finder,
 int main(int argc, char *argv[])
 {
    // Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // Parse command-line options.
@@ -430,7 +429,5 @@ int main(int argc, char *argv[])
    delete comml;
 
 
-   MPI_Finalize();
-
    return 0;
 }

miniapps/meshing/pmesh-optimizer.cpp

@@ -114,10 +114,8 @@ using namespace std;
 int main (int argc, char *argv[])
 {
    // 0. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 1. Set the method's default parameters.
@@ -1249,6 +1247,5 @@ int main (int argc, char *argv[])
    delete fec;
    delete pmesh;
 
-   MPI_Finalize();
    return 0;
 }

miniapps/meshing/pminimal-surface.cpp

@@ -1289,9 +1289,9 @@ static int Problem1(Opt &opt)
 int main(int argc, char *argv[])
 {
    Opt opt;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_rank(MPI_COMM_WORLD, &opt.id);
-   MPI_Comm_size(MPI_COMM_WORLD, &opt.sz);
+   Mpi::Init(argc, argv);
+   opt.id = Mpi::WorldRank();
+   opt.sz = Mpi::WorldSize();
    Hypre::Init();
 
    // Parse command-line options.
@@ -1329,7 +1329,7 @@ int main(int argc, char *argv[])
    args.AddOption(&opt.snapshot, "-ss", "--snapshot", "-no-ss", "--no-snapshot",
                   "Enable or disable GLVis snapshot.");
    args.Parse();
-   if (!args.Good()) { args.PrintUsage(mfem::out); MPI_Finalize(); return 1; }
+   if (!args.Good()) { args.PrintUsage(mfem::out); return 1; }
    MFEM_VERIFY(opt.lambda >= 0.0 && opt.lambda <= 1.0,"");
    if (!opt.id) { args.PrintOptions(mfem::out); }
 
@@ -1341,6 +1341,5 @@ int main(int argc, char *argv[])
 
    if (opt.pb == 1) { Problem1(opt); }
 
-   MPI_Finalize();
    return 0;
 }

miniapps/mtop/parheat.cpp

@@ -50,10 +50,9 @@
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int nprocs, myrank;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
+   Mpi::Init(argc, argv);
+   int nprocs = Mpi::WorldSize();
+   int myrank = Mpi::WorldRank();
    mfem::Hypre::Init();
 
    // Parse command-line options.
@@ -109,7 +108,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(std::cout);
       }
-      MPI_Finalize();
       return 1;
    }
 
@@ -351,6 +349,5 @@ int main(int argc, char *argv[])
    delete loadco;
    delete diffco;
 
-   MPI_Finalize();
    return 0;
 }

miniapps/navier/navier_cht.cpp

@@ -133,10 +133,9 @@ void VisualizeField(socketstream &sock, const char *vishost, int visport,
 int main(int argc, char *argv[])
 {
    // Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // Parse command-line options.
@@ -405,8 +404,6 @@ int main(int argc, char *argv[])
    delete pmesh;
    delete comml;
 
-   MPI_Finalize();
-
    return 0;
 }
 

miniapps/nurbs/nurbs_ex11p.cpp

@@ -48,10 +48,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -110,7 +109,6 @@ int main(int argc, char *argv[])
          {
             args.PrintUsage(cout);
          }
-         MPI_Finalize();
          return 1;
       }
    }
@@ -397,7 +395,5 @@ int main(int argc, char *argv[])
    }
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }

miniapps/nurbs/nurbs_ex1p.cpp

@@ -136,10 +136,9 @@ public:
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -182,7 +181,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (!strongBC & (kappa < 0))
@@ -435,7 +433,5 @@ int main(int argc, char *argv[])
    if (own_fec) { delete fec; }
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }

miniapps/performance/ex1p.cpp

@@ -88,10 +88,9 @@ struct ex1_t
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -143,7 +142,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (static_cond && perf && matrix_free)
@@ -153,7 +151,6 @@ int main(int argc, char *argv[])
          cout << "\nStatic condensation can not be used with matrix-free"
               " evaluation!\n" << endl;
       }
-      MPI_Finalize();
       return 2;
    }
    MFEM_VERIFY(perf || !matrix_free,
@@ -237,7 +234,6 @@ int ex1_t<dim>::run(Mesh *mesh, int ser_ref_levels, int par_ref_levels,
                  << "Recompile with suitable 'geom' value." << endl;
          }
          delete mesh;
-         MPI_Finalize();
          return 4;
       }
       else if (!mesh_t::MatchesNodes(*mesh))
@@ -342,7 +338,6 @@ int ex1_t<dim>::run(Mesh *mesh, int ser_ref_levels, int par_ref_levels,
       delete fespace;
       delete fec;
       delete mesh;
-      MPI_Finalize();
       return 5;
    }
 
@@ -572,7 +567,5 @@ int ex1_t<dim>::run(Mesh *mesh, int ser_ref_levels, int par_ref_levels,
    delete pmesh;
    delete pcg;
 
-   MPI_Finalize();
-
    return 0;
 }

miniapps/shifted/diffusion.cpp

@@ -90,10 +90,8 @@ int main(int argc, char *argv[])
 #endif
 
    // Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // Parse command-line options.
@@ -140,7 +138,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0) { args.PrintOptions(cout); }
@@ -656,7 +653,5 @@ int main(int argc, char *argv[])
    delete dirichlet_dist_coef;
    delete dirichlet_dist_coef_2;
 
-   MPI_Finalize();
-
    return 0;
 }

miniapps/shifted/distance.cpp

@@ -173,10 +173,8 @@ void DGyroid(const mfem::Vector &xx, mfem::Vector &vals)
 int main(int argc, char *argv[])
 {
    // Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // Parse command-line options.
@@ -222,7 +220,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0) { args.PrintOptions(cout); }
@@ -358,6 +355,5 @@ int main(int argc, char *argv[])
 
    delete dist_solver;
 
-   MPI_Finalize();
    return 0;
 }

tests/convergence/prates.cpp

@@ -70,10 +70,9 @@ int prob=0;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -115,7 +114,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (prob >3 || prob <0) { prob = 0; } // default problem = H1
@@ -339,8 +337,6 @@ int main(int argc, char *argv[])
    delete fec;
    delete pmesh;
 
-   MPI_Finalize();
-
    return 0;
 }
 

tests/par-mesh-format/ex1p.cpp

@@ -39,10 +39,9 @@ using namespace mfem;
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI and HYPRE.
-   int num_procs, myid;
-   MPI_Init(&argc, &argv);
-   MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
-   MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+   Mpi::Init(argc, argv);
+   int num_procs = Mpi::WorldSize();
+   int myid = Mpi::WorldRank();
    Hypre::Init();
 
    // 2. Parse command-line options.
@@ -79,7 +78,6 @@ int main(int argc, char *argv[])
       {
          args.PrintUsage(cout);
       }
-      MPI_Finalize();
       return 1;
    }
    if (myid == 0)
@@ -264,7 +262,5 @@ int main(int argc, char *argv[])
    if (order > 0) { delete fec; }
    if (serial_mode) { delete pmesh; }
 
-   MPI_Finalize();
-
    return 0;
 }

tests/unit/miniapps/test_sedov.cpp

@@ -39,7 +39,6 @@
 #define ParFiniteElementSpace FiniteElementSpace
 #define PFesGetParMeshGetComm(...)
 #define PFesGetParMeshGetComm0(...) 0
-#define MPI_Finalize()
 #define MPI_Allreduce(src,dst,...) *dst = *src
 #define MPI_Reduce(src, dst, n, T,...) *dst = *src
 #endif