updated multiple EBs CI test to have proper resolution (#117)

* new two embedded cylinders test with proper resolution

* changed pytest parameter boxed to forked and updated changelog

Author: roelof-groenewald

mewarpx/changelog.csv

@@ -1,5 +1,18 @@
 Version, Physics version, Date,        List of changes
-2.0.7, 2, In progress, "
+2.0.8, 2, In progress, "
+
+**Other changes**:
+
+- Changed ``pytest`` parameter ``boxed`` to ``forked`` due to deprecation in
+  new versions.
+- Added ``positron`` as an 'inert gas' option in
+  :class:`mewarpx.setups_store.diode_setup.DiodeRun_V1` in order to have 'ions'
+  with dynamics that match the electrons.
+- Changed resolution for ``test_two_embedded_cylinders_scraping`` CI test since
+  it was found that the previous test had overflows in the fieldsolve which
+  probably caused the differences in results on different machines.
+"
+2.0.7, 2, 12/10/2021, "
 
 **Other changes**:
 

mewarpx/mewarpx/_version.py

@@ -1,6 +1,6 @@
 # One and only one place to store the version info
 # https://stackoverflow.com/questions/458550/standard-way-to-embed-version-into-python-package
-__version_info__ = (2, 0, 7)
+__version_info__ = (2, 0, 8)
 __version__ = '.'.join([str(x) for x in __version_info__])
 
 # One and only one place to store the Physics version

mewarpx/mewarpx/setups_store/diode_setup.py

@@ -399,7 +399,7 @@ def init_electrons(self):
 
     def init_inert_gas(self):
         logger.info("### Init Inert Gas Ions ###")
-        if self.INERT_GAS_TYPE not in ['He', 'Ar', 'Xe']:
+        if self.INERT_GAS_TYPE not in ['He', 'Ar', 'Xe', 'positron']:
             raise NotImplementedError(
                 f"Inert gas is not yet implemented in mewarpx with "
                 f"INERT_GAS_TYPE = {self.INERT_GAS_TYPE}"

mewarpx/pytest.ini

@@ -6,7 +6,7 @@ junit_family=xunit2
 # used, because MEWarpX is not designed to reset gracefully between tests.
 # Finally, note that conftest.py can dynamically change command line arguments,
 # but this seems to break with pytest-xdist so cannot be used here.
-addopts = --boxed -n2
+addopts = --forked -n2
 
 # Warnings: In the past -Werror was used in addopts above. Recent changes to
 # pytest cause harmless import warnings to make pytest fail on import. In order

mewarpx/tests/test_assemblies.py

@@ -271,7 +271,7 @@ def test_two_embedded_cylinders_scraping():
     np.random.seed(42147820)
 
     # Specific numbers match older run for consistency
-    D_CA = 1  # m
+    D_CA = 0.025  # m
     NX = 64
     NZ = 64
     run = diode_setup.DiodeRun_V1(
@@ -282,10 +282,12 @@ def test_two_embedded_cylinders_scraping():
         NZ=NZ,
         # This gives equal spacing in x & z
         PERIOD=D_CA * NX / NZ,
-        DT=1e-9,
-        TOTAL_TIMESTEPS=4,
-        DIAG_STEPS=4,
+        DT=1e-10,
+        TOTAL_TIMESTEPS=15,
+        DIAG_STEPS=15,
         FIELD_DIAG_DATA_LIST=['phi'],
+        # FIELD_DIAG_PLOT=True,
+        INERT_GAS_TYPE='positron'
     )
     # Only the functions we change from defaults are listed here
     run.setup_run(
@@ -302,12 +304,12 @@ def test_two_embedded_cylinders_scraping():
 
     # Install the embedded boundaries
     cylinder1 = assemblies.Cylinder(
-        center_x=-0.25, center_z=0.5, radius=0.1,
-        V=-2.0, T=300, WF=4.7, name="Cylinder1"
+        center_x=-0.25*D_CA, center_z=0.5*D_CA, radius=0.1*D_CA,
+        V=-0.5, T=300, WF=4.7, name="Cylinder1"
     )
     cylinder2 = assemblies.Cylinder(
-        center_x=0.25, center_z=0.5, radius=0.1,
-        V=5.0, T=300, WF=4.7, name="Cylinder2"
+        center_x=0.25*D_CA, center_z=0.5*D_CA, radius=0.1*D_CA,
+        V=0.2, T=300, WF=4.7, name="Cylinder2"
     )
 
     # Initialize solver
@@ -318,11 +320,11 @@ def test_two_embedded_cylinders_scraping():
 
     # Inject particles in the simulation
     volemitter = emission.ZSinDistributionVolumeEmitter(
-        T=1550, zmin=0, zmax=run.D_CA,
+        T=3000, zmin=0, zmax=run.D_CA,
     )
     emission.PlasmaInjector(
         emitter=volemitter, species1=run.electrons, species2=run.ions,
-        npart=2000, plasma_density=1e19,
+        npart=4000, plasma_density=1e14,
     )
 
     # Initialize the simulation
@@ -341,12 +343,12 @@ def test_two_embedded_cylinders_scraping():
     cylinder1.record_scrapedparticles()
     cyl1_scraped = cylinder1.get_scrapedparticles()
 
-    cylinder2.init_scrapedparticles(cylinder1.fields)
+    cylinder2.init_scrapedparticles(cylinder2.fields)
     cylinder2.record_scrapedparticles()
     cyl2_scraped = cylinder2.get_scrapedparticles()
 
-    assert np.allclose(cyl1_scraped['n'], np.array([2, 40]))
-    assert np.allclose(cyl2_scraped['n'], np.array([5, 46]))
+    assert np.allclose(cyl1_scraped['n'], np.array([3, 0]))
+    assert np.allclose(cyl2_scraped['n'], np.array([1, 2]))
 
     #######################################################################
     # Check rho results against reference data                            #