aboutsummaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/WarpXEvolve.cpp3
-rw-r--r--Source/WarpXWrappers.cpp29
-rw-r--r--Source/WarpXWrappers.h12
3 files changed, 26 insertions, 18 deletions
diff --git a/Source/WarpXEvolve.cpp b/Source/WarpXEvolve.cpp
index 794b5aa4c..97d0e49e0 100644
--- a/Source/WarpXEvolve.cpp
+++ b/Source/WarpXEvolve.cpp
@@ -42,10 +42,9 @@ WarpX::Evolve (int numsteps)
// Beyond one step, we have B^{n-1/2} and E^{n}.
// Particles have p^{n-1/2} and x^{n}.
- FillBoundaryB();
-
if (is_synchronized) {
// on first step, push E and X by 0.5*dt
+ FillBoundaryB();
EvolveE(0.5*dt[0]);
mypc->PushX(0.5*dt[0]);
mypc->Redistribute(); // Redistribute particles
diff --git a/Source/WarpXWrappers.cpp b/Source/WarpXWrappers.cpp
index 337472fbb..a17721647 100644
--- a/Source/WarpXWrappers.cpp
+++ b/Source/WarpXWrappers.cpp
@@ -93,7 +93,6 @@ extern "C"
auto & mypc = WarpX::GetInstance().GetPartContainer();
auto & myspc = mypc.GetParticleContainer(speciesnumber);
const int lev = 0;
- amrex::Abort("warpx_addNParticles needs to be updated to include lev argument");
myspc.AddNParticles(lev, lenx, x, y, z, vx, vy, vz, nattr, attr, uniqueparticles);
}
@@ -184,25 +183,33 @@ extern "C"
warpx.MoveWindow (true);
}
- void warpx_EvolveE (int lev, double dt) {
+ void warpx_EvolveE (double dt) {
WarpX& warpx = WarpX::GetInstance();
- warpx.EvolveE (lev, dt);
+ warpx.EvolveE (dt);
}
- void warpx_EvolveB (int lev, double dt) {
+ void warpx_EvolveB (double dt) {
WarpX& warpx = WarpX::GetInstance();
- warpx.EvolveB (lev, dt);
+ warpx.EvolveB (dt);
}
- void warpx_FillBoundaryE (int lev) {
+ void warpx_FillBoundaryE () {
WarpX& warpx = WarpX::GetInstance();
- warpx.FillBoundaryE (lev);
+ warpx.FillBoundaryE ();
}
- void warpx_FillBoundaryB (int lev) {
+ void warpx_FillBoundaryB () {
WarpX& warpx = WarpX::GetInstance();
- warpx.FillBoundaryB (lev);
+ warpx.FillBoundaryB ();
}
- void warpx_PushParticlesandDepose (int lev, double cur_time) {
+ void warpx_SyncCurrent () {
WarpX& warpx = WarpX::GetInstance();
- warpx.PushParticlesandDepose (lev, cur_time);
+ warpx.SyncCurrent ();
+ }
+ void warpx_UpdateAuxilaryData () {
+ WarpX& warpx = WarpX::GetInstance();
+ warpx.UpdateAuxilaryData ();
+ }
+ void warpx_PushParticlesandDepose (double cur_time) {
+ WarpX& warpx = WarpX::GetInstance();
+ warpx.PushParticlesandDepose (cur_time);
}
int warpx_getistep (int lev) {
diff --git a/Source/WarpXWrappers.h b/Source/WarpXWrappers.h
index baca16ec6..aeb5a00c1 100644
--- a/Source/WarpXWrappers.h
+++ b/Source/WarpXWrappers.h
@@ -61,11 +61,13 @@ extern "C" {
void warpx_ComputeDt ();
void warpx_MoveWindow ();
- void warpx_EvolveE (int lev, double dt);
- void warpx_EvolveB (int lev, double dt);
- void warpx_FillBoundaryE (int lev);
- void warpx_FillBoundaryB (int lev);
- void warpx_PushParticlesandDepose (int lev, double cur_time);
+ void warpx_EvolveE (double dt);
+ void warpx_EvolveB (double dt);
+ void warpx_FillBoundaryE ();
+ void warpx_FillBoundaryB ();
+ void warpx_SyncCurrent ();
+ void warpx_UpdateAuxilaryData ();
+ void warpx_PushParticlesandDepose (double cur_time);
int warpx_getistep (int lev);
void warpx_setistep (int lev, int ii);