Simplify Finalize (#524)

ECP-WarpX · Feb 8, 2024 · 7259a22 · 7259a22
1 parent 5127908
commit 7259a22
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/ImpactX.cpp b/src/ImpactX.cpp
@@ -42,23 +42,24 @@ namespace impactx {
 
     ImpactX::~ImpactX()
     {
-        if (m_grids_initialized)
-        {
-            this->finalize();
-            m_grids_initialized = false;
-        }
-
+        this->finalize();
     }
 
     void ImpactX::finalize ()
     {
-        m_lattice.clear();
+        if (m_grids_initialized)
+        {
+            m_lattice.clear();
+
+            // this one last
+            amr_data.reset();
 
-        // this one last
-        amr_data.reset();
+            if (amrex::Initialized())
+                amrex::Finalize();
 
-        if (amrex::Initialized())
-            amrex::Finalize();
+            // only finalize once
+            m_grids_initialized = false;
+        }
     }
 
     void ImpactX::init_grids ()