Interfacing 1D CurlCurl from AMReX (#5662)

Author: RevathiJambunathan

Source/NonlinearSolvers/CurlCurlMLMGPC.H

@@ -18,12 +18,10 @@
 #include <AMReX_Array.H>
 #include <AMReX_Vector.H>
 #include <AMReX_MultiFab.H>
-#ifndef WARPX_DIM_1D_Z // currently not implemented in 1D
 #include <AMReX_MLLinOp.H>
 #include <AMReX_MLCurlCurl.H>
 #include <AMReX_MLMG.H>
 #include <AMReX_GMRES_MLMG.H>
-#endif
 
 /**
  * \brief Curl-curl Preconditioner
@@ -131,16 +129,13 @@ class CurlCurlMLMGPC : public Preconditioner<T,Ops>
         amrex::Vector<amrex::DistributionMapping> m_dmap;
         amrex::IntVect m_gv;
 
-// currently not implemented in 1D
-#ifndef WARPX_DIM_1D_Z
         amrex::Array<amrex::LinOpBCType, AMREX_SPACEDIM> m_bc_lo;
         amrex::Array<amrex::LinOpBCType, AMREX_SPACEDIM> m_bc_hi;
 
         std::unique_ptr<amrex::LPInfo> m_info;
         std::unique_ptr<amrex::MLCurlCurl> m_curl_curl;
         std::unique_ptr<amrex::MLMGT<MFArr>> m_solver;
         std::unique_ptr<amrex::GMRESMLMGT<MFArr>> m_gmres_solver;
-#endif
 
         /**
          * \brief Read parameters
@@ -208,10 +203,6 @@ void CurlCurlMLMGPC<T,Ops>::Define ( const T& a_U,
     // read preconditioner parameters
     readParameters();
 
-// currently not implemented in 1D
-#ifdef WARPX_DIM_1D_Z
-    WARPX_ABORT_WITH_MESSAGE("CurlCurlMLMGPC not yet implemented for 1D");
-#else
     // create info object for curl-curl op
     m_info = std::make_unique<LPInfo>();
     m_info->setAgglomeration(m_agglomeration);
@@ -256,7 +247,6 @@ void CurlCurlMLMGPC<T,Ops>::Define ( const T& a_U,
         m_gmres_solver->setPrecondNumIters(m_max_iter);
         m_gmres_solver->setVerbose(static_cast<int>(m_verbose));
     }
-#endif
 
     m_is_defined = true;
 }
@@ -276,10 +266,7 @@ void CurlCurlMLMGPC<T,Ops>::Update (const T& a_U)
     const RT alpha = (this->m_dt*PhysConst::c) * (this->m_dt*PhysConst::c);
     const RT beta = RT(1.0);
 
-// currently not implemented in 1D
-#ifndef WARPX_DIM_1D_Z
     m_curl_curl->setScalars(alpha, beta);
-#endif
 
     if (m_verbose) {
         amrex::Print() << "Updating " << amrex::getEnumNameString(PreconditionerType::pc_curl_curl_mlmg)
@@ -322,8 +309,13 @@ void CurlCurlMLMGPC<T,Ops>::Apply (T& a_x, const T& a_b)
 
         // Copy initial guess to local object
 #if defined(WARPX_DIM_1D_Z)
-        // Missing dimensions is x,y in WarpX and y,z in AMReX
-        WARPX_ABORT_WITH_MESSAGE("CurlCurlMLMGPC not yet implemented for 1D");
+        // Missing dimensions are x,y in WarpX and y,z in AMReX
+        Array<MultiFab,3> solution { MultiFab(*x_mfarrvec[n][2], make_alias, 0, 1),
+                                     MultiFab(*x_mfarrvec[n][1], make_alias, 0, 1),
+                                     MultiFab(*x_mfarrvec[n][0], make_alias, 0, 1) };
+        Array<MultiFab,3> rhs      { MultiFab(*b_mfarrvec[n][2], make_alias, 0, 1),
+                                     MultiFab(*b_mfarrvec[n][1], make_alias, 0, 1),
+                                     MultiFab(*b_mfarrvec[n][0], make_alias, 0, 1) };
 #elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ)
         // Missing dimension is y in WarpX and z in AMReX
         Array<MultiFab,3> solution { MultiFab(*x_mfarrvec[n][0], make_alias, 0, 1),
@@ -341,15 +333,12 @@ void CurlCurlMLMGPC<T,Ops>::Apply (T& a_x, const T& a_b)
                                      MultiFab(*b_mfarrvec[n][2], make_alias, 0, 1) };
 #endif
 
-// currently not implemented in 1D
-#ifndef WARPX_DIM_1D_Z
         m_curl_curl->prepareRHS({&rhs});
         if (m_use_gmres) {
             m_gmres_solver->solve(solution, rhs, m_rtol, m_atol);
         } else {
             m_solver->solve({&solution}, {&rhs}, m_rtol, m_atol);
         }
-#endif
     }
 }