diff options
author | 2019-09-03 11:35:55 -0700 | |
---|---|---|
committer | 2019-09-03 11:35:55 -0700 | |
commit | f6d3b9fd84d2c131c50e89f1e957ecc6d7960b20 (patch) | |
tree | d2ba8add81837a43c1c511eccdc3caf52b361a4b /Source/WarpX.cpp | |
parent | a3973f060b6e3c26dd04eea00315bc00a94e3725 (diff) | |
parent | daeebcf054e98b0e719d21c1df2b98238b1d481c (diff) | |
download | WarpX-f6d3b9fd84d2c131c50e89f1e957ecc6d7960b20.tar.gz WarpX-f6d3b9fd84d2c131c50e89f1e957ecc6d7960b20.tar.zst WarpX-f6d3b9fd84d2c131c50e89f1e957ecc6d7960b20.zip |
Merge branch 'dev' into RZgeometry
Diffstat (limited to 'Source/WarpX.cpp')
-rw-r--r-- | Source/WarpX.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp index 8e8c25f4d..95826c075 100644 --- a/Source/WarpX.cpp +++ b/Source/WarpX.cpp @@ -38,7 +38,6 @@ Vector<int> WarpX::boost_direction = {0,0,0}; int WarpX::do_compute_max_step_from_zmax = 0; Real WarpX::zmax_plasma_to_compute_max_step = 0.; -long WarpX::use_picsar_deposition = 0; long WarpX::current_deposition_algo; long WarpX::charge_deposition_algo; long WarpX::field_gathering_algo; @@ -398,6 +397,9 @@ WarpX::ReadParameters () pp.query("do_pml", do_pml); pp.query("pml_ncell", pml_ncell); pp.query("pml_delta", pml_delta); + pp.query("pml_has_particles", pml_has_particles); + pp.query("do_pml_j_damping", do_pml_j_damping); + pp.query("do_pml_in_domain", do_pml_in_domain); Vector<int> parse_do_pml_Lo(AMREX_SPACEDIM,1); pp.queryarr("do_pml_Lo", parse_do_pml_Lo); @@ -414,6 +416,9 @@ WarpX::ReadParameters () do_pml_Hi[2] = parse_do_pml_Hi[2]; #endif + if ( (do_pml_j_damping==1)&&(do_pml_in_domain==0) ){ + amrex::Abort("J-damping can only be done when PML are inside simulation domain (do_pml_in_domain=1)"); + } pp.query("dump_openpmd", dump_openpmd); pp.query("openpmd_backend", openpmd_backend); @@ -533,7 +538,6 @@ WarpX::ReadParameters () { ParmParse pp("algo"); - pp.query("use_picsar_deposition", use_picsar_deposition); current_deposition_algo = GetAlgorithmInteger(pp, "current_deposition"); charge_deposition_algo = GetAlgorithmInteger(pp, "charge_deposition"); field_gathering_algo = GetAlgorithmInteger(pp, "field_gathering"); |