diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 2 | ||||
| -rw-r--r-- | Source/WarpX.H | 2 | ||||
| -rw-r--r-- | Source/WarpX.cpp | 21 |
3 files changed, 17 insertions, 8 deletions
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 161cac6a9..af1992de4 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -791,7 +791,7 @@ PhysicalParticleContainer::AddPlasma (int lev, RealBox part_realbox) } #ifdef AMREX_USE_OMP info.SetDynamic(true); -#pragma omp parallel if (not WarpX::serialize_ics) +#pragma omp parallel if (not WarpX::serialize_initial_conditions) #endif for (MFIter mfi = MakeMFIter(lev, info); mfi.isValid(); ++mfi) { diff --git a/Source/WarpX.H b/Source/WarpX.H index 2fc5b89b7..5e38574aa 100644 --- a/Source/WarpX.H +++ b/Source/WarpX.H @@ -286,7 +286,7 @@ public: static bool use_filter_compensation; //! If true, the initial conditions from random number generators are serialized (useful for reproducible testing with OpenMP) - static bool serialize_ics; + static bool serialize_initial_conditions; // Back transformation diagnostic static bool do_back_transformed_diagnostics; diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp index eb1ee803e..222af4833 100644 --- a/Source/WarpX.cpp +++ b/Source/WarpX.cpp @@ -154,7 +154,7 @@ bool WarpX::use_filter = true; bool WarpX::use_kspace_filter = true; bool WarpX::use_filter_compensation = false; -bool WarpX::serialize_ics = false; +bool WarpX::serialize_initial_conditions = false; bool WarpX::refine_plasma = false; int WarpX::num_mirrors = 0; @@ -752,7 +752,7 @@ WarpX::ReadParameters () } #endif - pp_warpx.query("serialize_ics", serialize_ics); + pp_warpx.query("serialize_initial_conditions", serialize_initial_conditions); pp_warpx.query("refine_plasma", refine_plasma); pp_warpx.query("do_dive_cleaning", do_dive_cleaning); pp_warpx.query("do_divb_cleaning", do_divb_cleaning); @@ -1327,16 +1327,19 @@ WarpX::ReadParameters () void WarpX::BackwardCompatibility () { - ParmParse pp_amr("amr"); + // Auxiliary variables int backward_int; + bool backward_bool; + std::string backward_str; + amrex::Real backward_Real; + + ParmParse pp_amr("amr"); if (pp_amr.query("plot_int", backward_int)){ amrex::Abort("amr.plot_int is not supported anymore. Please use the new syntax for diagnostics:\n" "diagnostics.diags_names = my_diag\n" "my_diag.intervals = 10\n" "for output every 10 iterations. See documentation for more information"); } - - std::string backward_str; if (pp_amr.query("plot_file", backward_str)){ amrex::Abort("amr.plot_file is not supported anymore. " "Please use the new syntax for diagnostics, see documentation."); @@ -1365,7 +1368,6 @@ WarpX::BackwardCompatibility () "Please use the renamed option algo.load_balance_intervals instead."); } - amrex::Real backward_Real; if (pp_warpx.query("load_balance_efficiency_ratio_threshold", backward_Real)){ amrex::Abort("warpx.load_balance_efficiency_ratio_threshold is not supported anymore. " "Please use the renamed option algo.load_balance_efficiency_ratio_threshold."); @@ -1393,6 +1395,11 @@ WarpX::BackwardCompatibility () if ( pp_warpx.query("do_pml", backward_int) ) { amrex::Abort( "do_pml is not supported anymore. Please use boundary.field_lo and boundary.field_hi to set the boundary conditions."); } + if (pp_warpx.query("serialize_ics", backward_bool)) { + amrex::Abort("warpx.serialize_ics is no longer a valid option. " + "Please use the renamed option warpx.serialize_initial_conditions instead."); + } + ParmParse pp_interpolation("interpolation"); if (pp_interpolation.query("nox", backward_int) || pp_interpolation.query("noy", backward_int) || @@ -1416,6 +1423,7 @@ WarpX::BackwardCompatibility () "particles.nspecies is ignored. Just use particles.species_names please.", WarnPriority::low); } + ParmParse pp_collisions("collisions"); int ncollisions; if (pp_collisions.query("ncollisions", ncollisions)){ @@ -1423,6 +1431,7 @@ WarpX::BackwardCompatibility () "collisions.ncollisions is ignored. Just use particles.collision_names please.", WarnPriority::low); } + ParmParse pp_lasers("lasers"); int nlasers; if (pp_lasers.query("nlasers", nlasers)){ |