Add setGreensFunction

Author: WeiqunZhang

Src/Base/AMReX.H

@@ -102,8 +102,8 @@ namespace amrex
     * classes to clean up any "global" state that they maintain when we're
     * exiting from AMReX.
     */
-    void ExecOnFinalize (PTR_TO_VOID_FUNC);
-    void ExecOnInitialize (PTR_TO_VOID_FUNC);
+    void ExecOnFinalize (std::function<void()>);
+    void ExecOnInitialize (std::function<void()>);
 
     //! This shuts up the compiler about unused variables
     template <class... Ts>

Src/Base/AMReX.cpp

@@ -302,20 +302,20 @@ amrex::Assert_host (const char* EX, const char* file, int line, const char* msg)
 
 namespace
 {
-    std::stack<amrex::PTR_TO_VOID_FUNC> The_Finalize_Function_Stack;
-    std::stack<amrex::PTR_TO_VOID_FUNC> The_Initialize_Function_Stack;
+    std::stack<std::function<void()>> The_Finalize_Function_Stack;
+    std::stack<std::function<void()>> The_Initialize_Function_Stack;
 }
 
 void
-amrex::ExecOnFinalize (PTR_TO_VOID_FUNC fp)
+amrex::ExecOnFinalize (std::function<void()> f)
 {
-    The_Finalize_Function_Stack.push(fp);
+    The_Finalize_Function_Stack.push(std::move(f));
 }
 
 void
-amrex::ExecOnInitialize (PTR_TO_VOID_FUNC fp)
+amrex::ExecOnInitialize (std::function<void()> f)
 {
-    The_Initialize_Function_Stack.push(fp);
+    The_Initialize_Function_Stack.push(std::move(f));
 }
 
 amrex::AMReX*
@@ -391,7 +391,7 @@ amrex::Initialize (int& argc, char**& argv, bool build_parm_parse,
         //
         // Call the registered function.
         //
-        (*The_Initialize_Function_Stack.top())();
+        The_Initialize_Function_Stack.top()();
         //
         // And then remove it from the stack.
         //
@@ -756,7 +756,7 @@ amrex::Finalize (amrex::AMReX* pamrex)
         //
         // Call the registered function.
         //
-        (*The_Finalize_Function_Stack.top())();
+        The_Finalize_Function_Stack.top()();
         //
         // And then remove it from the stack.
         //

Src/FFT/AMReX_FFT_OpenBCSolver.H

@@ -15,25 +15,39 @@ public:
     using MF = typename R2C<T>::MF;
     using cMF = typename R2C<T>::cMF;
 
+    explicit OpenBCSolver (Box const& domain);
+
     template <class F>
-    OpenBCSolver (Box const& domain, F const& greens_function);
+    void setGreensFunction (F const& greens_function);
 
     void solve (MF& phi, MF const& rho);
 
+    [[nodiscard]] Box const& Domain () const { return m_domain; }
+
 private:
+    Box m_domain;
     R2C<T> m_r2c;
     cMF m_G_fft;
 };
 
+template <typename T>
+OpenBCSolver<T>::OpenBCSolver (Box const& domain)
+    : m_domain(domain),
+      m_r2c(Box(domain.smallEnd(), domain.bigEnd()+domain.length(), domain.ixType()))
+{
+    auto [sd, ord] = m_r2c.getSpectralData();
+    amrex::ignore_unused(ord);
+    m_G_fft.define(sd->boxArray(), sd->DistributionMap(), 1, 0);
+}
+
 template <typename T>
 template <class F>
-OpenBCSolver<T>::OpenBCSolver (Box const& domain, F const& greens_function)
-    : m_r2c(Box(domain.smallEnd(), domain.bigEnd()+domain.length(), domain.ixType()))
+void OpenBCSolver<T>::setGreensFunction (F const& greens_function)
 {
     auto* infab = detail::get_fab(m_r2c.m_rx);
-    auto const& lo = domain.smallEnd();
+    auto const& lo = m_domain.smallEnd();
     auto const& lo3 = lo.dim3();
-    auto const& len = domain.length3d();
+    auto const& len = m_domain.length3d();
     if (infab) {
         auto const& a = infab->array();
         auto box = infab->box();
@@ -76,7 +90,6 @@ OpenBCSolver<T>::OpenBCSolver (Box const& domain, F const& greens_function)
 
     auto [sd, ord] = m_r2c.getSpectralData();
     amrex::ignore_unused(ord);
-    m_G_fft.define(sd->boxArray(), sd->DistributionMap(), 1, 0);
     auto const* srcfab = detail::get_fab(*sd);
     if (srcfab) {
         auto* dstfab = detail::get_fab(m_G_fft);