From b0c549847ceeb550a5df5b188a7de4ad9b4cf4f5 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 1 Mar 2022 12:54:28 -0800 Subject: ionization_level -> ionizationLevel (#2905) Rename to follow the naming conventions we use for I/O for scalar and vector/tensor attributes. https://warpx.readthedocs.io/en/latest/developers/particles.html#particle-attributes --- Source/Particles/PhysicalParticleContainer.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Source/Particles/PhysicalParticleContainer.cpp') diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index db14c5a35..71baee90e 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -952,7 +952,7 @@ PhysicalParticleContainer::AddPlasma (int lev, RealBox part_realbox) int* pi = nullptr; if (do_field_ionization) { - pi = soa.GetIntData(particle_icomps["ionization_level"]).data() + old_size; + pi = soa.GetIntData(particle_icomps["ionizationLevel"]).data() + old_size; } #ifdef WARPX_QED @@ -1448,7 +1448,7 @@ PhysicalParticleContainer::AddPlasmaFlux (amrex::Real dt) int* p_ion_level = nullptr; if (do_field_ionization) { - p_ion_level = soa.GetIntData(particle_icomps["ionization_level"]).data() + old_size; + p_ion_level = soa.GetIntData(particle_icomps["ionizationLevel"]).data() + old_size; } #ifdef WARPX_QED @@ -1799,7 +1799,7 @@ PhysicalParticleContainer::Evolve (int lev, // Deposit charge before particle push, in component 0 of MultiFab rho. int* AMREX_RESTRICT ion_lev; if (do_field_ionization){ - ion_lev = pti.GetiAttribs(particle_icomps["ionization_level"]).dataPtr(); + ion_lev = pti.GetiAttribs(particle_icomps["ionizationLevel"]).dataPtr(); } else { ion_lev = nullptr; } @@ -1870,7 +1870,7 @@ PhysicalParticleContainer::Evolve (int lev, if (! skip_deposition) { int* AMREX_RESTRICT ion_lev; if (do_field_ionization){ - ion_lev = pti.GetiAttribs(particle_icomps["ionization_level"]).dataPtr(); + ion_lev = pti.GetiAttribs(particle_icomps["ionizationLevel"]).dataPtr(); } else { ion_lev = nullptr; } @@ -1893,7 +1893,7 @@ PhysicalParticleContainer::Evolve (int lev, if (WarpX::do_electrostatic == ElectrostaticSolverAlgo::None) { int* AMREX_RESTRICT ion_lev; if (do_field_ionization){ - ion_lev = pti.GetiAttribs(particle_icomps["ionization_level"]).dataPtr(); + ion_lev = pti.GetiAttribs(particle_icomps["ionizationLevel"]).dataPtr(); } else { ion_lev = nullptr; } @@ -2255,7 +2255,7 @@ PhysicalParticleContainer::PushP (int lev, Real dt, int* AMREX_RESTRICT ion_lev = nullptr; if (do_field_ionization) { - ion_lev = pti.GetiAttribs(particle_icomps["ionization_level"]).dataPtr(); + ion_lev = pti.GetiAttribs(particle_icomps["ionizationLevel"]).dataPtr(); } // Loop over the particles and update their momentum @@ -2621,7 +2621,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, int* AMREX_RESTRICT ion_lev = nullptr; if (do_field_ionization) { - ion_lev = pti.GetiAttribs(particle_icomps["ionization_level"]).dataPtr() + offset; + ion_lev = pti.GetiAttribs(particle_icomps["ionizationLevel"]).dataPtr() + offset; } const bool save_previous_position = m_save_previous_position; @@ -2733,7 +2733,7 @@ PhysicalParticleContainer::InitIonizationModule () pp_species_name.get("ionization_product_species", ionization_product_name); pp_species_name.get("physical_element", physical_element); // Add runtime integer component for ionization level - AddIntComp("ionization_level"); + AddIntComp("ionizationLevel"); // Get atomic number and ionization energies from file int const ion_element_id = ion_map_ids.at(physical_element); ion_atomic_number = ion_atomic_numbers[ion_element_id]; @@ -2802,7 +2802,7 @@ PhysicalParticleContainer::getIonizationFunc (const WarpXParIter& pti, adk_prefactor.dataPtr(), adk_exp_prefactor.dataPtr(), adk_power.dataPtr(), - particle_icomps["ionization_level"], + particle_icomps["ionizationLevel"], ion_atomic_number); } -- cgit v1.2.3