diff options
| author |  Remi Lehe <remi.lehe@normalesup.org>
| 2019-08-19 15:34:52 -0700 |
|---|---|---|
| committer | Remi Lehe <remi.lehe@normalesup.org>
| 2019-08-19 15:34:52 -0700 |
| commit | 863ff56254f5cc93e7030fa0c35481db42aabe2c (patch) | |
| tree | c45e3cf99053c15a8a3e784bfd45a11fffc63852 /Source/Utils/WarpXAlgorithmSelection.cpp | |
| parent | 9409e1b12c78442323c7181417c811b262d4a694 (diff) | |
| parent | c023286720c7ae8aa2913efc461240a81e8b2bd9 (diff) | |
| download | WarpX-863ff56254f5cc93e7030fa0c35481db42aabe2c.tar.gz WarpX-863ff56254f5cc93e7030fa0c35481db42aabe2c.tar.zst WarpX-863ff56254f5cc93e7030fa0c35481db42aabe2c.zip | |
Merge branch 'dev' into select_fields_in_tests
Diffstat (limited to 'Source/Utils/WarpXAlgorithmSelection.cpp')
| -rw-r--r-- | Source/Utils/WarpXAlgorithmSelection.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/Utils/WarpXAlgorithmSelection.cpp b/Source/Utils/WarpXAlgorithmSelection.cpp index 2c8038ccd..842085a36 100644 --- a/Source/Utils/WarpXAlgorithmSelection.cpp +++ b/Source/Utils/WarpXAlgorithmSelection.cpp @@ -8,7 +8,7 @@ const std::map<std::string, int> maxwell_solver_algo_to_int = { {"yee", MaxwellSolverAlgo::Yee }, -#ifndef WARPX_RZ // Not available in RZ +#ifndef WARPX_DIM_RZ // Not available in RZ {"ckc", MaxwellSolverAlgo::CKC }, #endif {"default", MaxwellSolverAlgo::Yee } @@ -31,12 +31,7 @@ const std::map<std::string, int> current_deposition_algo_to_int = { const std::map<std::string, int> charge_deposition_algo_to_int = { {"standard", ChargeDepositionAlgo::Standard }, -#if (!defined AMREX_USE_GPU)&&(AMREX_SPACEDIM == 3) // Only available on CPU and 3D - {"vectorized", ChargeDepositionAlgo::Vectorized }, - {"default", ChargeDepositionAlgo::Vectorized } -#else {"default", ChargeDepositionAlgo::Standard } -#endif }; const std::map<std::string, int> gathering_algo_to_int = { |