clean input files in examples

ECP-WarpX · Aug 11, 2021 · ada9f94 · ada9f94
1 parent 52e3aaf
commit ada9f94
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 17 deletions.
diff --git a/Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration_mr.py b/Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration_mr.py
@@ -35,7 +35,6 @@
                         hi = [25e-6, 25e-6, 200.e-6])
 
 solver = picmi.ElectromagneticSolver(grid=grid, cfl=1,
-                                     warpx_do_pml = True,
                                      warpx_pml_ncell = 10)
 
 beam_distribution = picmi.UniformDistribution(density = 1.e23,

diff --git a/Examples/Tests/Langmuir/PICMI_inputs_langmuir_rz_multimode_analyze.py b/Examples/Tests/Langmuir/PICMI_inputs_langmuir_rz_multimode_analyze.py
@@ -91,7 +91,7 @@
                              moving_window_zvelocity = 0.,
                              warpx_max_grid_size=64)
 
-solver = picmi.ElectromagneticSolver(grid=grid, cfl=1., warpx_do_pml=False)
+solver = picmi.ElectromagneticSolver(grid=grid, cfl=1.)
 
 ##########################
 # diagnostics

diff --git a/Examples/Tests/SilverMueller/inputs_2d_x b/Examples/Tests/SilverMueller/inputs_2d_x
@@ -23,7 +23,6 @@ warpx.verbose = 1
 
 # Algorithms
 warpx.cfl = 1.0
-warpx.do_pml = 0
 warpx.use_filter = 0
 
 warpx.do_moving_window = 0

diff --git a/Examples/Tests/SilverMueller/inputs_2d_z b/Examples/Tests/SilverMueller/inputs_2d_z
@@ -24,7 +24,6 @@ warpx.verbose = 1
 
 # Algorithms
 warpx.cfl = 1.0
-warpx.do_pml = 0
 warpx.use_filter = 0
 
 warpx.do_moving_window = 0

diff --git a/Examples/Tests/SilverMueller/inputs_rz_z b/Examples/Tests/SilverMueller/inputs_rz_z
@@ -27,7 +27,6 @@ warpx.n_rz_azimuthal_modes = 2
 
 # Algorithms
 warpx.cfl = 1.0
-warpx.do_pml = 0
 warpx.use_filter = 0
 
 warpx.do_moving_window = 0

diff --git a/Examples/Tests/boundaries/inputs_3d b/Examples/Tests/boundaries/inputs_3d
@@ -22,8 +22,6 @@ boundary.field_hi = pec pec periodic
 boundary.particle_lo = reflecting absorbing periodic
 boundary.particle_hi = reflecting absorbing periodic
 
-warpx.do_pml = 0
-
 # Algorithms
 algo.particle_shape = 1
 

diff --git a/Examples/Tests/galilean/inputs_rz b/Examples/Tests/galilean/inputs_rz
@@ -36,7 +36,6 @@ particles.species_names = electrons ions
 
 warpx.do_nodal = 1
 warpx.use_filter = 1
-warpx.do_pml = 0
 
 psatd.nox = 16
 psatd.noy = 16

diff --git a/Examples/Tests/multi_J/inputs_rz b/Examples/Tests/multi_J/inputs_rz
@@ -23,7 +23,6 @@ algo.particle_shape = 3
 
 # Numerics
 warpx.do_moving_window = 1
-warpx.do_pml = 0
 warpx.moving_window_dir = z
 warpx.moving_window_v = 1.
 warpx.n_rz_azimuthal_modes = 1

diff --git a/Examples/Tests/photon_pusher/analysis_photon_pusher.py b/Examples/Tests/photon_pusher/analysis_photon_pusher.py
@@ -120,10 +120,10 @@ def generate():
         f.write("amr.max_grid_size = 8\n")
         f.write("amr.plot_int = 1\n")
         f.write("geometry.coord_sys   = 0\n")
-        f.write("geometry.is_periodic = 1 1 1\n")
+        f.write("boundary.field_lo = periodic periodic periodic\n")
+        f.write("boundary.field_hi = periodic periodic periodic\n")
         f.write("geometry.prob_lo = -0.5e-6 -0.5e-6 -0.5e-6\n")
         f.write("geometry.prob_hi = 0.5e-6 0.5e-6 0.5e-6\n")
-        f.write("warpx.do_pml = 0\n")
         f.write("algo.charge_deposition = standard\n")
         f.write("algo.field_gathering = energy-conserving\n")
         f.write("warpx.cfl = 1.0\n")

diff --git a/Examples/Tests/plasma_lens/inputs_3d b/Examples/Tests/plasma_lens/inputs_3d
@@ -16,7 +16,6 @@ boundary.field_hi = pec pec pec
 boundary.particle_lo = absorbing absorbing absorbing
 boundary.particle_hi = absorbing absorbing absorbing
 
-warpx.do_pml = 0
 warpx.const_dt = 1.e-7
 warpx.do_electrostatic = labframe
 

diff --git a/Examples/Tests/radiation_reaction/test_const_B_analytical/analysis_classicalRR.py b/Examples/Tests/radiation_reaction/test_const_B_analytical/analysis_classicalRR.py
@@ -163,10 +163,10 @@ def generate():
         f.write("amr.blocking_factor = 32\n")
         f.write("amr.max_grid_size = 64\n")
         f.write("geometry.coord_sys   = 0\n")
-        f.write("geometry.is_periodic = 1 1 1\n")
+        f.write("boundary.field_lo = periodic periodic periodic\n")
+        f.write("boundary.field_hi = periodic periodic periodic\n")
         f.write("geometry.prob_lo = {} {} {}\n".format(-sim_size, -sim_size, -sim_size))
         f.write("geometry.prob_hi = {} {} {}\n".format(sim_size, sim_size, sim_size))
-        f.write("warpx.do_pml = 0\n")
         f.write("algo.charge_deposition = standard\n")
         f.write("algo.field_gathering = energy-conserving\n")
         f.write("warpx.cfl = 1.0\n")

diff --git a/Examples/Tests/radiation_reaction/test_const_B_analytical/inputs_3d b/Examples/Tests/radiation_reaction/test_const_B_analytical/inputs_3d
@@ -10,7 +10,6 @@ amr.max_grid_size = 64
 geometry.coord_sys   = 0
 geometry.prob_lo = -8e-07 -8e-07 -8e-07
 geometry.prob_hi = 8e-07 8e-07 8e-07
-warpx.do_pml = 0
 algo.charge_deposition = standard
 algo.field_gathering = energy-conserving
 warpx.cfl = 1.0

diff --git a/Python/pywarpx/picmi.py b/Python/pywarpx/picmi.py
@@ -525,7 +525,6 @@ class ElectromagneticSolver(picmistandard.PICMI_ElectromagneticSolver):
     def init(self, kw):
         assert self.method is None or self.method in ['Yee', 'CKC', 'PSATD'], Exception("Only 'Yee', 'CKC', and 'PSATD' are supported")
 
-        self.do_pml = kw.pop('warpx_do_pml', None)
         self.pml_ncell = kw.pop('warpx_pml_ncell', None)
 
         if self.method == 'PSATD':
@@ -539,7 +538,6 @@ def initialize_inputs(self):
 
         self.grid.initialize_inputs()
 
-        pywarpx.warpx.do_pml = self.do_pml
         pywarpx.warpx.pml_ncell = self.pml_ncell
         pywarpx.warpx.do_nodal = self.l_nodal