Examples/Tests: New Kin Energy APIs

ECP-WarpX · Oct 20, 2023 · d4e8126 · d4e8126
1 parent 5178726
commit d4e8126
Show file tree

Hide file tree

Showing 52 changed files with 80 additions and 80 deletions.
diff --git a/examples/cfbend/input_cfbend.in b/examples/cfbend/input_cfbend.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3  #2 GeV
+beam.kin_energy = 2.0e3  #2 GeV
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = waterbag

diff --git a/examples/cfbend/run_cfbend.py b/examples/cfbend/run_cfbend.py
@@ -22,13 +22,13 @@
 
 # load a 5 GeV electron beam with an initial
 # normalized transverse rms emittance of 1 um
-energy_MeV = 2.0e3  # reference energy
+kin_energy_MeV = 2.0e3  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/cfchannel/input_cfchannel.in b/examples/cfchannel/input_cfchannel.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-9
 beam.particle = proton
 beam.distribution = waterbag

diff --git a/examples/cfchannel/input_cfchannel_10nC.in b/examples/cfchannel/input_cfchannel_10nC.in
@@ -4,7 +4,7 @@
 beam.npart = 10000
 #beam.npart = 100000  # optional for increased precision
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-8
 beam.particle = proton
 beam.distribution = waterbag

diff --git a/examples/cfchannel/run_cfchannel.py b/examples/cfchannel/run_cfchannel.py
@@ -22,13 +22,13 @@
 
 # load a 2 GeV proton beam with an initial
 # normalized transverse rms emittance of 1 um
-energy_MeV = 2.0e3  # reference energy
+kin_energy_MeV = 2.0e3  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/cfchannel/run_cfchannel_10nC.py b/examples/cfchannel/run_cfchannel_10nC.py
@@ -24,13 +24,13 @@
 
 # load a 2 GeV proton beam with an initial
 # normalized transverse rms emittance of 1 um
-energy_MeV = 2.0e3  # reference energy
+kin_energy_MeV = 2.0e3  # reference energy
 bunch_charge_C = 1.0e-8  # used with space charge
 npart = 10000  # number of macro particles; use 1e5 for increased precision
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/chicane/input_chicane.in b/examples/chicane/input_chicane.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 5.0e3
+beam.kin_energy = 5.0e3
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = waterbag

diff --git a/examples/chicane/run_chicane.py b/examples/chicane/run_chicane.py
@@ -22,13 +22,13 @@
 
 # load a 5 GeV electron beam with an initial
 # normalized transverse rms emittance of 1 um
-energy_MeV = 5.0e3  # reference energy
+kin_energy_MeV = 5.0e3  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/compression/input_compression.in b/examples/compression/input_compression.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 20.0
+beam.kin_energy = 20.0
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = waterbag

diff --git a/examples/compression/run_compression.py b/examples/compression/run_compression.py
@@ -23,13 +23,13 @@
 # load a 250 MeV proton beam with an initial
 # unnormalized rms emittance of 1 mm-mrad in all
 # three phase planes
-energy_MeV = 20.0  # reference energy
+kin_energy_MeV = 20.0  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/cyclotron/input_cyclotron.in b/examples/cyclotron/input_cyclotron.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 4.0e-3
+beam.kin_energy = 4.0e-3
 beam.charge = 1.0e-9
 beam.particle = proton
 beam.distribution = waterbag

diff --git a/examples/cyclotron/run_cyclotron.py b/examples/cyclotron/run_cyclotron.py
@@ -21,13 +21,13 @@
 sim.init_grids()
 
 # load initial beam
-energy_MeV = 4.0e-3  # reference energy
+kin_energy_MeV = 4.0e-3  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/distgen/input_gaussian.in b/examples/distgen/input_gaussian.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = gaussian

diff --git a/examples/distgen/input_kurth4d.in b/examples/distgen/input_kurth4d.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-9
 beam.particle = proton
 beam.distribution = kurth4d

diff --git a/examples/distgen/input_kvdist.in b/examples/distgen/input_kvdist.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = kvdist

diff --git a/examples/distgen/input_semigaussian.in b/examples/distgen/input_semigaussian.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = gaussian

diff --git a/examples/expanding_beam/input_expanding.in b/examples/expanding_beam/input_expanding.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000  # outside tests, use 1e5 or more
 beam.units = static
-beam.energy = 250.0
+beam.kin_energy = 250.0
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = kurth6d

diff --git a/examples/expanding_beam/run_expanding.py b/examples/expanding_beam/run_expanding.py
@@ -27,13 +27,13 @@
 
 # load a 2 GeV electron beam with an initial
 # unnormalized rms emittance of 2 nm
-energy_MeV = 250  # reference energy
+kin_energy_MeV = 250  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles (outside tests, use 1e5 or more)
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Kurth6D(

diff --git a/examples/fodo/input_fodo.in b/examples/fodo/input_fodo.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = waterbag

diff --git a/examples/fodo/run_fodo.py b/examples/fodo/run_fodo.py
@@ -22,13 +22,13 @@
 
 # load a 2 GeV electron beam with an initial
 # unnormalized rms emittance of 2 nm
-energy_MeV = 2.0e3  # reference energy
+kin_energy_MeV = 2.0e3  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/fodo/run_fodo_madx.py b/examples/fodo/run_fodo_madx.py
@@ -23,7 +23,7 @@
 
 # load a 2 GeV electron beam with an initial
 # unnormalized rms emittance of 2 nm
-energy_MeV = 2.0e3  # reference energy
+kin_energy_MeV = 2.0e3  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 

diff --git a/examples/fodo/run_fodo_programmable.py b/examples/fodo/run_fodo_programmable.py
@@ -31,13 +31,13 @@
 
 # load a 2 GeV electron beam with an initial
 # unnormalized rms emittance of 2 nm
-energy_MeV = 2.0e3  # reference energy
+kin_energy_MeV = 2.0e3  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/fodo_chromatic/input_fodo_chr.in b/examples/fodo_chromatic/input_fodo_chr.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = waterbag

diff --git a/examples/fodo_chromatic/run_fodo_chr.py b/examples/fodo_chromatic/run_fodo_chr.py
@@ -22,13 +22,13 @@
 
 # load a 2 GeV electron beam with an initial
 # unnormalized rms emittance of 2 nm
-energy_MeV = 2.0e3  # reference energy
+kin_energy_MeV = 2.0e3  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/fodo_rf/input_fodo_rf.in b/examples/fodo_rf/input_fodo_rf.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 250.0
+beam.kin_energy = 250.0
 beam.charge = 1.0e-9
 beam.particle = proton
 beam.distribution = waterbag

diff --git a/examples/fodo_rf/run_fodo_rf.py b/examples/fodo_rf/run_fodo_rf.py
@@ -23,13 +23,13 @@
 # load a 250 MeV proton beam with an initial
 # unnormalized rms emittance of 1 mm-mrad in all
 # three phase planes
-energy_MeV = 250.0  # reference energy
+kin_energy_MeV = 250.0  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/iota_lattice/input_iotalattice.in b/examples/iota_lattice/input_iotalattice.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.5
+beam.kin_energy = 2.5
 beam.charge = 1.0e-9
 beam.particle = proton
 beam.distribution = waterbag

diff --git a/examples/iota_lattice/run_iotalattice.py b/examples/iota_lattice/run_iotalattice.py
@@ -21,13 +21,13 @@
 sim.init_grids()
 
 # init particle beam
-energy_MeV = 2.5
+kin_energy_MeV = 2.5
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/iota_lens/input_iotalens.in b/examples/iota_lens/input_iotalens.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.5
+beam.kin_energy = 2.5
 beam.charge = 1.0e-9
 beam.particle = proton
 beam.distribution = waterbag

diff --git a/examples/iota_lens/run_iotalens.py b/examples/iota_lens/run_iotalens.py
@@ -21,13 +21,13 @@
 sim.init_grids()
 
 # load a 2.5 MeV proton beam
-energy_MeV = 2.5  # reference energy
+kin_energy_MeV = 2.5  # reference energy
 bunch_charge_C = 1.0e-9  # used with space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/kicker/input_kicker.in b/examples/kicker/input_kicker.in
@@ -3,7 +3,7 @@
 ###############################################################################
 beam.npart = 10000
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-9
 beam.particle = electron
 beam.distribution = waterbag

diff --git a/examples/kicker/run_kicker.py b/examples/kicker/run_kicker.py
@@ -22,13 +22,13 @@
 
 # load a 2 GeV electron beam with an initial
 # unnormalized rms emittance of  nm
-energy_MeV = 2.0e3  # reference energy
+kin_energy_MeV = 2.0e3  # reference energy
 bunch_charge_C = 1.0e-9  # used without space charge
 npart = 10000  # number of macro particles
 
 #   reference particle
 ref = sim.particle_container().ref_particle()
-ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_energy_MeV(energy_MeV)
+ref.set_charge_qe(-1.0).set_mass_MeV(0.510998950).set_kin_energy_MeV(kin_energy_MeV)
 
 #   particle bunch
 distr = distribution.Waterbag(

diff --git a/examples/kurth/input_kurth_10nC_periodic.in b/examples/kurth/input_kurth_10nC_periodic.in
@@ -4,7 +4,7 @@
 beam.npart = 10000
 #beam.npart = 100000 #optional for increased precision
 beam.units = static
-beam.energy = 2.0e3
+beam.kin_energy = 2.0e3
 beam.charge = 1.0e-8
 beam.particle = proton
 beam.distribution = kurth6d