From 9665008751b9cd7b97fc0e8005c95bc859a50bec Mon Sep 17 00:00:00 2001 From: Roelof Groenewald <40245517+roelof-groenewald@users.noreply.github.com> Date: Tue, 27 Jun 2023 00:27:05 -0700 Subject: refactored `HybridPICModel::HybridPICSolveE` to more readable (#4044) --- .../FiniteDifferenceSolver/HybridPICSolveE.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Source/FieldSolver/FiniteDifferenceSolver/HybridPICSolveE.cpp') diff --git a/Source/FieldSolver/FiniteDifferenceSolver/HybridPICSolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/HybridPICSolveE.cpp index 8d74adb45..f4f236e61 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/HybridPICSolveE.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/HybridPICSolveE.cpp @@ -196,7 +196,7 @@ void FiniteDifferenceSolver::HybridPICSolveE ( std::unique_ptr const& Pefield, std::array< std::unique_ptr, 3 > const& edge_lengths, int lev, HybridPICModel const* hybrid_model, - DtType a_dt_type ) + const bool include_resistivity_term ) { // Select algorithm (The choice of algorithm is a runtime option, // but we compile code for each algorithm, using templates) @@ -205,14 +205,14 @@ void FiniteDifferenceSolver::HybridPICSolveE ( HybridPICSolveECylindrical ( Efield, Jfield, Jifield, Bfield, rhofield, Pefield, - edge_lengths, lev, hybrid_model, a_dt_type + edge_lengths, lev, hybrid_model, include_resistivity_term ); #else HybridPICSolveECartesian ( Efield, Jfield, Jifield, Bfield, rhofield, Pefield, - edge_lengths, lev, hybrid_model, a_dt_type + edge_lengths, lev, hybrid_model, include_resistivity_term ); #endif @@ -233,14 +233,14 @@ void FiniteDifferenceSolver::HybridPICSolveECylindrical ( std::unique_ptr const& Pefield, std::array< std::unique_ptr, 3 > const& edge_lengths, int lev, HybridPICModel const* hybrid_model, - DtType a_dt_type ) + const bool include_resistivity_term ) { #ifndef AMREX_USE_EB amrex::ignore_unused(edge_lengths); #endif amrex::ignore_unused( Efield, Jfield, Jifield, Bfield, rhofield, Pefield, edge_lengths, - lev, hybrid_model, a_dt_type + lev, hybrid_model, include_resistivity_term ); amrex::Abort(Utils::TextMsg::Err( "currently hybrid E-solve does not work for RZ")); @@ -258,7 +258,7 @@ void FiniteDifferenceSolver::HybridPICSolveECartesian ( std::unique_ptr const& Pefield, std::array< std::unique_ptr, 3 > const& edge_lengths, int lev, HybridPICModel const* hybrid_model, - DtType a_dt_type ) + const bool include_resistivity_term ) { #ifndef AMREX_USE_EB amrex::ignore_unused(edge_lengths); @@ -435,7 +435,7 @@ void FiniteDifferenceSolver::HybridPICSolveECartesian ( Ex(i, j, k) = (enE_x - grad_Pe) / rho_val; // Add resistivity only if E field value is used to update B - if (a_dt_type != DtType::Full) Ex(i, j, k) += eta(rho_val) * Jx(i, j, k); + if (include_resistivity_term) Ex(i, j, k) += eta(rho_val) * Jx(i, j, k); }, // Ey calculation @@ -465,7 +465,7 @@ void FiniteDifferenceSolver::HybridPICSolveECartesian ( Ey(i, j, k) = (enE_y - grad_Pe) / rho_val; // Add resistivity only if E field value is used to update B - if (a_dt_type != DtType::Full) Ey(i, j, k) += eta(rho_val) * Jy(i, j, k); + if (include_resistivity_term) Ey(i, j, k) += eta(rho_val) * Jy(i, j, k); }, // Ez calculation @@ -490,7 +490,7 @@ void FiniteDifferenceSolver::HybridPICSolveECartesian ( Ez(i, j, k) = (enE_z - grad_Pe) / rho_val; // Add resistivity only if E field value is used to update B - if (a_dt_type != DtType::Full) Ez(i, j, k) += eta(rho_val) * Jz(i, j, k); + if (include_resistivity_term) Ez(i, j, k) += eta(rho_val) * Jz(i, j, k); } ); -- cgit v1.2.3