From 03b2fe60ff49748aaff8402824ea0457eef24d5c Mon Sep 17 00:00:00 2001
From: Edoardo Zoni <59625522+EZoni@users.noreply.github.com>
Date: Wed, 8 Mar 2023 20:52:56 -0800
Subject: New user input for grid type (collocated, staggered, hybrid) (#3683)

* Introduce `warpx.grid_type` parameter

* Replace `or` with `||`

* Update examples with new user input syntax

* Fix `if` condition

* Improve error message

* Fix `if` condition

* Fix bugs

* Fix warning

* Fix RZ

* Debugging

* Fix RZ

* Fix bug

* Clean up

* More changes:

- set default algo parameters with hybrid grid
- all hybrid input parameters under warpx name

* Set default field gathering algo for hybrid grids

* Update documentation
---
 .../SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H')

diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H
index a2e293dc2..37bb862a9 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H
@@ -63,10 +63,10 @@ class SpectralBaseAlgorithmRZ
         SpectralBaseAlgorithmRZ(SpectralKSpaceRZ const & spectral_kspace,
                                 amrex::DistributionMapping const & dm,
                                 const SpectralFieldIndex& spectral_index,
-                                int const norder_z, bool const nodal)
+                                int const norder_z, short const grid_type)
           // Compute and assign the modified k vectors
           : m_spectral_index(spectral_index),
-            modified_kz_vec(spectral_kspace.getModifiedKComponent(dm, 1, norder_z, nodal))
+            modified_kz_vec(spectral_kspace.getModifiedKComponent(dm, 1, norder_z, grid_type))
           {}
 
         SpectralFieldIndex m_spectral_index;
-- 
cgit v1.2.3