4 files changed, 41 insertions, 31 deletions
diff --git a/Source/Initialization/WarpXAMReXInit.H b/Source/Initialization/WarpXAMReXInit.H
index a34072f22..06c31e358 100644
--- a/Source/Initialization/WarpXAMReXInit.H
+++ b/Source/Initialization/WarpXAMReXInit.H
@@ -11,24 +11,28 @@
 
 #include <AMReX_BaseFwd.H>
 
-/** Call amrex::Initialize
- *
- * This function calls amrex::Initialize and overwrites AMReX' defaults.
- * Note: AMReX defines a placeholder/"mock-up" for MPI_Comm and
- * MPI_COMM_WORLD in serial builds
- *
- * @param[in] argc number of arguments from main()
- * @param[in] argv argument strings from main()
- * @param[in] build_parm_parse build the input file parser (AMReX' default: true)
- * @param[in] mpi_comm the MPI communicator to use (AMReX' default: MPI_COMM_WORLD)
- * @returns pointer to an AMReX* object, forwarded from amrex::Initialize
- */
-amrex::AMReX*
-warpx_amrex_init(
-    int& argc,
-    char**& argv,
-    bool const build_parm_parse = true,
-    MPI_Comm const mpi_comm = MPI_COMM_WORLD
-);
+namespace warpx::initialization
+{
+
+    /** Call amrex::Initialize
+     *
+     * This function calls amrex::Initialize and overwrites AMReX' defaults.
+     * Note: AMReX defines a placeholder/"mock-up" for MPI_Comm and
+     * MPI_COMM_WORLD in serial builds
+     *
+     * @param[in] argc number of arguments from main()
+     * @param[in] argv argument strings from main()
+     * @param[in] build_parm_parse build the input file parser (AMReX' default: true)
+     * @param[in] mpi_comm the MPI communicator to use (AMReX' default: MPI_COMM_WORLD)
+     * @returns pointer to an AMReX* object, forwarded from amrex::Initialize
+     */
+    amrex::AMReX*
+    amrex_init(
+        int& argc,
+        char**& argv,
+        bool const build_parm_parse = true,
+        MPI_Comm const mpi_comm = MPI_COMM_WORLD
+    );
 
+}
 #endif
diff --git a/Source/Initialization/WarpXAMReXInit.cpp b/Source/Initialization/WarpXAMReXInit.cpp
index 7f8af142f..33bc1a789 100644
--- a/Source/Initialization/WarpXAMReXInit.cpp
+++ b/Source/Initialization/WarpXAMReXInit.cpp
@@ -56,14 +56,20 @@ namespace {
     }
 }
 
-amrex::AMReX*
-warpx_amrex_init (int& argc, char**& argv, bool const build_parm_parse, MPI_Comm const mpi_comm)
+
+namespace warpx::initialization
 {
-    return amrex::Initialize(
-        argc,
-        argv,
-        build_parm_parse,
-        mpi_comm,
-        overwrite_amrex_parser_defaults
-    );
+
+    amrex::AMReX*
+    amrex_init (int& argc, char**& argv, bool const build_parm_parse, MPI_Comm const mpi_comm)
+    {
+        return amrex::Initialize(
+            argc,
+            argv,
+            build_parm_parse,
+            mpi_comm,
+            ::overwrite_amrex_parser_defaults
+        );
+    }
+
 }
diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp
index afc4caa5b..cbee65b61 100644
--- a/Source/Python/WarpXWrappers.cpp
+++ b/Source/Python/WarpXWrappers.cpp
@@ -150,12 +150,12 @@ namespace
 
     void amrex_init (int argc, char* argv[])
     {
-        warpx_amrex_init(argc, argv);
+        warpx::initialization::amrex_init(argc, argv);
     }
 
     void amrex_init_with_inited_mpi (int argc, char* argv[], MPI_Comm mpicomm)
     {
-        warpx_amrex_init(argc, argv, true, mpicomm);
+        warpx::initialization::amrex_init(argc, argv, true, mpicomm);
     }
 
     void amrex_finalize (int /*finalize_mpi*/)
diff --git a/Source/main.cpp b/Source/main.cpp
index 54638fc14..b889bb24a 100644
--- a/Source/main.cpp
+++ b/Source/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char* argv[])
 {
     ablastr::parallelization::mpi_init(argc, argv);
 
-    warpx_amrex_init(argc, argv);
+    warpx::initialization::amrex_init(argc, argv);
 
     utils::rocfft::setup();