Skip to content

Clean Species Physical Properties #3505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2022
Merged

Clean Species Physical Properties #3505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Docs/source/usage/parameters.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,11 +568,11 @@ Particle initialization
Type of physical species.
Currently, the accepted species are
``"electron"``, ``"positron"``, ``"muon"``, ``"antimuon"``, ``"photon"``, ``"neutron"``, ``"proton"`` , ``"alpha"``,
``"hydrogen1"`` (a.k.a. ``"protium"``), ``"hydrogen2"`` (a.k.a. ``"deuterium"``), ``"hydrogen3"`` (a.k.a.``"tritium"``),
``"hydrogen1"`` (a.k.a. ``"protium"``), ``"hydrogen2"`` (a.k.a. ``"deuterium"``), ``"hydrogen3"`` (a.k.a. ``"tritium"``),
``"helium"``, ``"helium3"``, ``"helium4"``,
``"lithium"``, ``"lithium6"``, ``"lithium7"``, ``"beryllium"``, ``"boron"``, ``"boron10"``, ``"boron11"``,
``"carbon"``, ``"carbon12"``, ``"carbon13"``, ``"nitrogen"``, ``"nitrogen14"``, ``"nitrogen15"``,
``"oxygen"``, ``"oxygen16"``, ``"oxygen17"``, ``"oxygen18"``, ``"fluorine"``, ``"neon"``, ``"neon20"``,
``"lithium"``, ``"lithium6"``, ``"lithium7"``, ``"beryllium"``, ``"beryllium9"``, ``"boron"``, ``"boron10"``, ``"boron11"``,
``"carbon"``, ``"carbon12"``, ``"carbon13"``, ``"carbon14"``, ``"nitrogen"``, ``"nitrogen14"``, ``"nitrogen15"``,
``"oxygen"``, ``"oxygen16"``, ``"oxygen17"``, ``"oxygen18"``, ``"fluorine"``, ``"fluorine19"``, ``"neon"``, ``"neon20"``,
``"neon21"``, ``"neon22"``, ``"aluminium"``, ``"argon"``, ``"copper"``, ``"xenon"`` and ``"gold"``.
The difference between ``"proton"`` and ``"hydrogen1"`` is that the mass of the latter includes also the mass
of the bound electron (same for ``"alpha"`` and ``"helium4"``). When only the name of an element is specified, the mass
Expand Down
4 changes: 3 additions & 1 deletion Source/Particles/SpeciesPhysicalProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ namespace {
{"tritium" , PhysicalSpecies::hydrogen3},
{"proton" , PhysicalSpecies::proton},
{"helium" , PhysicalSpecies::helium},
{"alpha" , PhysicalSpecies::alpha},
{"helium3" , PhysicalSpecies::helium3},
{"helium4" , PhysicalSpecies::helium4},
{"alpha" , PhysicalSpecies::alpha},
Expand Down Expand Up @@ -255,6 +254,9 @@ namespace {
{PhysicalSpecies::neon22, Properties{
amrex::Real(21.991385114) * PhysConst::m_u,
amrex::Real(10) * PhysConst::q_e}},
{PhysicalSpecies::aluminium, Properties{
amrex::Real(26.98153853) * PhysConst::m_u,
amrex::Real(13) * PhysConst::q_e}},
{PhysicalSpecies::argon, Properties{
amrex::Real(39.948) * PhysConst::m_u,
amrex::Real(18) * PhysConst::q_e}},
Expand Down