diff options
Diffstat (limited to 'Source/Laser')
-rw-r--r-- | Source/Laser/LaserParticleContainer.cpp | 4 | ||||
-rw-r--r-- | Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Source/Laser/LaserParticleContainer.cpp b/Source/Laser/LaserParticleContainer.cpp index 05c6c6f29..8f74a9252 100644 --- a/Source/Laser/LaserParticleContainer.cpp +++ b/Source/Laser/LaserParticleContainer.cpp @@ -51,8 +51,8 @@ LaserParticleContainer::LaserParticleContainer (AmrCore* amr_core, int ispecies, pp.getarr("polarization", m_p_X); pp.query("pusher_algo", m_pusher_algo); - pp.get("wavelength", m_wavelength); - pp.get("e_max", m_e_max); + getWithParser(pp, "wavelength", m_wavelength); + getWithParser(pp, "e_max", m_e_max); pp.query("do_continuous_injection", do_continuous_injection); pp.query("min_particles_per_mode", m_min_particles_per_mode); diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp index e7dc795a5..b795174d2 100644 --- a/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp +++ b/Source/Laser/LaserProfilesImpl/LaserProfileGaussian.cpp @@ -8,6 +8,7 @@ #include "Laser/LaserProfiles.H" #include "Utils/WarpX_Complex.H" #include "Utils/WarpXConst.H" +#include "Utils/WarpXUtil.H" #include <cmath> @@ -24,14 +25,14 @@ WarpXLaserProfiles::GaussianLaserProfile::init ( m_common_params = params; // Parse the properties of the Gaussian profile - ppl.get("profile_waist", m_params.waist); - ppl.get("profile_duration", m_params.duration); - ppl.get("profile_t_peak", m_params.t_peak); - ppl.get("profile_focal_distance", m_params.focal_distance); - ppl.query("zeta", m_params.zeta); - ppl.query("beta", m_params.beta); - ppl.query("phi2", m_params.phi2); - ppl.query("phi0", m_params.phi0); + getWithParser(ppl, "profile_waist", m_params.waist); + getWithParser(ppl, "profile_duration", m_params.duration); + getWithParser(ppl, "profile_t_peak", m_params.t_peak); + getWithParser(ppl, "profile_focal_distance", m_params.focal_distance); + queryWithParser(ppl, "zeta", m_params.zeta); + queryWithParser(ppl, "beta", m_params.beta); + queryWithParser(ppl, "phi2", m_params.phi2); + queryWithParser(ppl, "phi0", m_params.phi0); m_params.stc_direction = m_common_params.p_X; ppl.queryarr("stc_direction", m_params.stc_direction); |