Merge branch 'dev' into RZgeometry

5 files changed, 8 insertions, 23 deletions

diff --git a/Python/pywarpx/Constants.py b/Python/pywarpx/Constants.py
index eafddd72e..20107ebc4 100644
--- a/Python/pywarpx/Constants.py
+++ b/Python/pywarpx/Constants.py
@@ -3,30 +3,14 @@ from .Bucket import Bucket
 class Constants(Bucket):
     """
     The purpose of this class is to be hold user defined constants
-    The constants will be concatenated into names and values string.
     """
     def __init__(self):
-        Bucket.__init__(self, 'constants')
+        Bucket.__init__(self, 'my_constants')
 
     def __setattr__(self, name, value):
         # Make sure that any constants redefined have a consistent value
         if name in self.argvattrs:
-            assert self.argvattrs[name] == value, Exception('In consistent values given for user defined constants')
+            assert self.argvattrs[name] == value, Exception('An consistent values given for user defined constants')
         Bucket.__setattr__(self, name, value)
 
-    def attrlist(self):
-        "Concatenate the attributes into a string"
-        if self.argvattrs:
-            names = ''
-            values = ''
-            for attr, value in self.argvattrs.items():
-                names += ' ' + attr
-                values += ' {}'.format(value)
-            return ['constants.use_my_constants = 1',
-                    'constants.constant_names = ' + names,
-                    'constants.constant_values = ' + values]
-        else:
-            return []
-
-
-constants = Constants()
+my_constants = Constants()
diff --git a/Python/pywarpx/WarpX.py b/Python/pywarpx/WarpX.py
index f58d4f111..4e4e41187 100644
--- a/Python/pywarpx/WarpX.py
+++ b/Python/pywarpx/WarpX.py
@@ -1,5 +1,5 @@
 from .Bucket import Bucket
-from .Constants import constants
+from .Constants import my_constants
 from .Amr import amr
 from .Geometry import geometry
 from .Algo import algo
@@ -18,7 +18,7 @@ class WarpX(Bucket):
     def create_argv_list(self):
         argv = []
         argv += warpx.attrlist()
-        argv += constants.attrlist()
+        argv += my_constants.attrlist()
         argv += amr.attrlist()
         argv += geometry.attrlist()
         argv += algo.attrlist()
diff --git a/Python/pywarpx/__init__.py b/Python/pywarpx/__init__.py
index 1517bbbaf..0f0d7fb58 100644
--- a/Python/pywarpx/__init__.py
+++ b/Python/pywarpx/__init__.py
@@ -1,5 +1,5 @@
 from .WarpX import warpx
-from .Constants import constants
+from .Constants import my_constants
 from .Amr import amr
 from .Geometry import geometry
 from .Algo import algo
diff --git a/Python/pywarpx/_libwarpx.py b/Python/pywarpx/_libwarpx.py
index 0eab82f64..5044b1d67 100755
--- a/Python/pywarpx/_libwarpx.py
+++ b/Python/pywarpx/_libwarpx.py
@@ -174,6 +174,7 @@ def initialize(argv=None):
     if argv is None:
         argv = sys.argv
     amrex_init(argv)
+    libwarpx.warpx_ConvertLabParamsToBoost()
     libwarpx.warpx_init()
 
 
diff --git a/Python/pywarpx/picmi.py b/Python/pywarpx/picmi.py
index 6fa6e193a..c662a467e 100644
--- a/Python/pywarpx/picmi.py
+++ b/Python/pywarpx/picmi.py
@@ -188,7 +188,7 @@ class AnalyticDistribution(picmistandard.PICMI_AnalyticDistribution):
         species.__setattr__('density_function(x,y,z)', self.density_expression)
 
         for k,v in self.user_defined_kw.items():
-            setattr(pywarpx.constants, k, v)
+            setattr(pywarpx.my_constants, k, v)
 
         if np.any(np.not_equal(self.rms_velocity, 0.)):
             species.momentum_distribution_type = "gaussian"