PSATD: More Options for Time Dependency of J, Rho (#3242)

* Rename PsatdAlgorithm as PsatdAlgorithmJConstantInTime

* Add New Inputs: psatd.J_in_time, psatd.rho_in_time

* Update PSATD Classes

* Fix Bug for FDTD Build

* Fix Warning for RZ PSATD Build

* Fix Multi-J Loop w/ J Constant in Time

* Clean up

* Fix Error Message

* Fix Time of Charge Deposition for Rho Linear

* Add 3D Langmuir CI Tests w/ Multi-J Algo

* Fix Checksums of New CI Tests

* Remove Extra CI Tests (added in #3363)

* Fix CI Tests w/ Multi-J PSATD

* Add Docs for New Input Parameters

* Galilean/Comoving PSATD Not Compatible w/ J Linear

1 files changed, 27 insertions, 16 deletions

diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp
index 1a2136021..202e91643 100644
--- a/Source/Evolve/WarpXEvolve.cpp
+++ b/Source/Evolve/WarpXEvolve.cpp
@@ -564,16 +564,19 @@ WarpX::OneStep_multiJ (const amrex::Real cur_time)
 
     // 4) Deposit J at relative time -dt with time step dt
     //    (dt[0] denotes the time step on mesh refinement level 0)
-    auto& current = (WarpX::do_current_centering) ? current_fp_nodal : current_fp;
-    mypc->DepositCurrent(current, dt[0], -dt[0]);
-    // Synchronize J: filter, exchange boundary, and interpolate across levels.
-    // With current centering, the nodal current is deposited in 'current',
-    // namely 'current_fp_nodal': SyncCurrent stores the result of its centering
-    // into 'current_fp' and then performs both filtering, if used, and exchange
-    // of guard cells.
-    SyncCurrent(current_fp, current_cp);
-    // Forward FFT of J
-    PSATDForwardTransformJ(current_fp, current_cp);
+    if (J_in_time == JInTime::Linear)
+    {
+        auto& current = (WarpX::do_current_centering) ? current_fp_nodal : current_fp;
+        mypc->DepositCurrent(current, dt[0], -dt[0]);
+        // Synchronize J: filter, exchange boundary, and interpolate across levels.
+        // With current centering, the nodal current is deposited in 'current',
+        // namely 'current_fp_nodal': SyncCurrent stores the result of its centering
+        // into 'current_fp' and then performs both filtering, if used, and exchange
+        // of guard cells.
+        SyncCurrent(current_fp, current_cp);
+        // Forward FFT of J
+        PSATDForwardTransformJ(current_fp, current_cp);
+    }
 
     // Number of depositions for multi-J scheme
     const int n_depose = WarpX::do_multi_J_n_depositions;
@@ -587,13 +590,21 @@ WarpX::OneStep_multiJ (const amrex::Real cur_time)
     for (int i_depose = 0; i_depose < n_loop; i_depose++)
     {
         // Move J deposited previously, from new to old
-        PSATDMoveJNewToJOld();
+        if (J_in_time == JInTime::Linear)
+        {
+            PSATDMoveJNewToJOld();
+        }
+
+        const amrex::Real t_depose_current = (J_in_time == JInTime::Linear) ?
+            (i_depose-n_depose+1)*sub_dt : (i_depose-n_depose+0.5_rt)*sub_dt;
 
-        const amrex::Real t_depose = (i_depose-n_depose+1)*sub_dt;
+        // TODO Update this when rho quadratic in time is implemented
+        const amrex::Real t_depose_charge = (i_depose-n_depose+1)*sub_dt;
 
-        // Deposit new J at relative time t_depose with time step dt
+        // Deposit new J at relative time t_depose_current with time step dt
         // (dt[0] denotes the time step on mesh refinement level 0)
-        mypc->DepositCurrent(current, dt[0], t_depose);
+        auto& current = (WarpX::do_current_centering) ? current_fp_nodal : current_fp;
+        mypc->DepositCurrent(current, dt[0], t_depose_current);
         // Synchronize J: filter, exchange boundary, and interpolate across levels.
         // With current centering, the nodal current is deposited in 'current',
         // namely 'current_fp_nodal': SyncCurrent stores the result of its centering
@@ -609,8 +620,8 @@ WarpX::OneStep_multiJ (const amrex::Real cur_time)
             // Move rho deposited previously, from new to old
             PSATDMoveRhoNewToRhoOld();
 
-            // Deposit rho at relative time t_depose
-            mypc->DepositCharge(rho_fp, t_depose);
+            // Deposit rho at relative time t_depose_charge
+            mypc->DepositCharge(rho_fp, t_depose_charge);
             // Filter, exchange boundary, and interpolate across levels
             SyncRho();
             // Forward FFT of rho_new