diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2018-12-11 10:37:21 -0800 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2018-12-11 10:37:21 -0800 |
| commit | b53d4a7ea5c3963e16727aafdbda01771af04c0d (patch) | |
| tree | 33ddccf2ceb4ae6670baa4ed31b9b97cb7035473 /Source/WarpXUtil.cpp | |
| parent | 4e4a84aba36b2d2168cf41077f596549180f0dd9 (diff) | |
| download | WarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.tar.gz WarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.tar.zst WarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.zip | |
fix conflicts for merge revert
Diffstat (limited to 'Source/WarpXUtil.cpp')
| -rw-r--r-- | Source/WarpXUtil.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WarpXUtil.cpp b/Source/WarpXUtil.cpp index 4a884330a..eb0eec92b 100644 --- a/Source/WarpXUtil.cpp +++ b/Source/WarpXUtil.cpp @@ -38,8 +38,9 @@ void ReadBoostedFrameParameters(Real& gamma_boost, Real& beta_boost, void ConvertLabParamsToBoost() { - Real gamma_boost = 1., beta_boost = 0.; - int max_level = 0; + + Real gamma_boost, beta_boost; + int max_level; Vector<int> boost_direction {0,0,0}; ReadBoostedFrameParameters(gamma_boost, beta_boost, boost_direction); |