cleaning up comments and some reorganizing

AMReX-Codes · Jun 27, 2023 · cf37d78 · cf37d78
1 parent d29b951
commit cf37d78
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 59 deletions.
diff --git a/Src/Base/AMReX_Arena.cpp b/Src/Base/AMReX_Arena.cpp
@@ -279,6 +279,7 @@ Arena::Initialize ()
     BL_ASSERT(the_managed_arena == nullptr || the_managed_arena == The_BArena());
     BL_ASSERT(the_pinned_arena == nullptr);
     BL_ASSERT(the_cpu_arena == nullptr || the_cpu_arena == The_BArena());
+    BL_ASSERT(the_comms_arena == nullptr || the_comms_arena == The_BArena());
 
 #ifdef AMREX_USE_GPU
 #ifdef AMREX_USE_SYCL
@@ -366,15 +367,6 @@ Arena::Initialize ()
                                   (the_pinned_arena_release_threshold));
     the_pinned_arena->registerForProfiling("Pinned Memory");
 
-    /*
-    if (!(the_arena->isDevice())) {
-        the_comms_arena = the_device_arena;
-    } else {
-        the_comms_arena = new CArena(0, ArenaInfo{}.SetDeviceMemory().SetReleaseThreshold
-                                      (the_comms_arena_release_threshold));
-        the_comms_arena->registerForProfiling("Comms Memory");
-    } */
-
 #ifdef AMREX_USE_GPU
     if (ParallelDescriptor::UseGpuAwareMpi()) {
         if (!(the_arena->isDevice())) {
@@ -471,19 +463,19 @@ Arena::PrintUsage ()
             p->PrintUsage("The Managed Arena");
         }
     }
-    if (The_Comms_Arena() && The_Comms_Arena() != The_Device_Arena()
-         && The_Comms_Arena() != The_Pinned_Arena()) {
-        auto* p = dynamic_cast<CArena*>(The_Comms_Arena());
-        if (p) {
-            p->PrintUsage("The Comms Arena");
-        }
-    }
     if (The_Pinned_Arena()) {
         auto* p = dynamic_cast<CArena*>(The_Pinned_Arena());
         if (p) {
             p->PrintUsage("The  Pinned Arena");
         }
     }
+    if (The_Comms_Arena() && The_Comms_Arena() != The_Device_Arena()
+         && The_Comms_Arena() != The_Pinned_Arena()) {
+        auto* p = dynamic_cast<CArena*>(The_Comms_Arena());
+        if (p) {
+            p->PrintUsage("The   Comms Arena");
+        }
+    }
 }
 
 void
@@ -523,19 +515,19 @@ Arena::PrintUsageToFiles (const std::string& filename, const std::string& messag
             p->PrintUsage(ofs, "The Managed Arena", "    ");
         }
     }
-    if (The_Comms_Arena() && The_Comms_Arena() != The_Device_Arena()
-        && The_Comms_Arena() != The_Pinned_Arena()) {
-        auto* p = dynamic_cast<CArena*>(The_Comms_Arena());
-        if (p) {
-            p->PrintUsage(ofs, "The Comms Arena", "    ");
-        }
-    }
     if (The_Pinned_Arena()) {
         auto* p = dynamic_cast<CArena*>(The_Pinned_Arena());
         if (p) {
             p->PrintUsage(ofs, "The  Pinned Arena", "    ");
         }
     }
+    if (The_Comms_Arena() && The_Comms_Arena() != The_Device_Arena()
+        && The_Comms_Arena() != The_Pinned_Arena()) {
+        auto* p = dynamic_cast<CArena*>(The_Comms_Arena());
+        if (p) {
+            p->PrintUsage(ofs, "The   Comms Arena", "    ");
+        }
+    }
 
     ofs << "\n";
 }
@@ -638,16 +630,6 @@ The_Managed_Arena ()
     }
 }
 
-Arena*
-The_Comms_Arena ()
-{
-    if        (the_comms_arena) {
-        return the_comms_arena;
-    } else {
-        return The_Null_Arena();
-    }
-}
-
 Arena*
 The_Pinned_Arena ()
 {
@@ -668,4 +650,14 @@ The_Cpu_Arena ()
     }
 }
 
+Arena*
+The_Comms_Arena ()
+{
+    if        (the_comms_arena) {
+        return the_comms_arena;
+    } else {
+        return The_Null_Arena();
+    }
 }
+
+}
diff --git a/Src/Base/AMReX_FabArrayBase.H b/Src/Base/AMReX_FabArrayBase.H
@@ -721,8 +721,6 @@ bool CheckRcvStats (Vector<MPI_Status>& recv_stats, const Vector<std::size_t>& r
 
 std::ostream& operator<< (std::ostream& os, const FabArrayBase::BDKey& id);
 
-//Arena* The_FA_Arena ();
-
 }
 
 #endif
diff --git a/Src/Base/AMReX_FabArrayBase.cpp b/Src/Base/AMReX_FabArrayBase.cpp
@@ -88,7 +88,6 @@ std::vector<std::string>                    FabArrayBase::m_region_tag;
 
 namespace
 {
-    //Arena* the_fa_arena = nullptr;
     bool initialized = false;
 }
 
@@ -123,19 +122,6 @@ FabArrayBase::Initialize ()
         MaxComp = 1;
     }
 
-/*
-#ifdef AMREX_USE_GPU
-    if (ParallelDescriptor::UseGpuAwareMpi()) {
-        // the_fa_arena = The_Device_Arena();
-        the_fa_arena = The_Comms_Arena();
-    } else {
-        the_fa_arena = The_Pinned_Arena();
-    }
-#else
-    the_fa_arena = The_Cpu_Arena();
-#endif
-*/
-
     amrex::ExecOnFinalize(FabArrayBase::Finalize);
 
 #ifdef AMREX_MEM_PROFILING
@@ -162,14 +148,6 @@ FabArrayBase::Initialize ()
 #endif
 }
 
-/*
-Arena*
-The_FA_Arena ()
-{
-    return the_fa_arena;
-}
-*/
-
 FabArrayBase::FabArrayBase (const BoxArray&            bxs,
                             const DistributionMapping& dm,
                             int                        nvar,
@@ -2250,8 +2228,6 @@ FabArrayBase::Finalize ()
 
     m_FA_stats = FabArrayStats();
 
-    //the_fa_arena = nullptr;
-
     initialized = false;
 }