Refactoring: instantiate WarpX class via MakeWarpX function (#4104)

* move functions from main to WarpX class and make WarpX constructible only using factory method

* instantiate WarpX via MakeWarpX static member function

* test adding MakeWarpX to warpx_init in python wrapper

* revert to the use of a simple pointer for the WarpX instance

* fix issue

* use finalize in python wrapper

* change finalize order

* move finalize

* fix bug

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/Initialization/PlasmaInjector.cpp b/Source/Initialization/PlasmaInjector.cpp
index 4149ca4bc..115fbfca1 100644
--- a/Source/Initialization/PlasmaInjector.cpp
+++ b/Source/Initialization/PlasmaInjector.cpp
@@ -54,8 +54,9 @@ namespace {
     }
 }
 
-PlasmaInjector::PlasmaInjector (int ispecies, const std::string& name)
-    : species_id{ispecies}, species_name{name}
+PlasmaInjector::PlasmaInjector (int ispecies, const std::string& name,
+    const amrex::Geometry& geom):
+    species_id{ispecies}, species_name{name}
 {
     using namespace amrex::literals;
 
@@ -83,7 +84,6 @@ PlasmaInjector::PlasmaInjector (int ispecies, const std::string& name)
     zmax = std::numeric_limits<amrex::Real>::max();
 
     // NOTE: When periodic boundaries are used, default injection range is set to mother grid dimensions.
-    const amrex::Geometry& geom = WarpX::GetInstance().Geom(0);
     if( geom.isPeriodic(0) ) {
 #       ifndef WARPX_DIM_1D_Z
         xmin = geom.ProbLo(0);