Merge branch 'main' of https://github.com/mosdef-hub/gmso into write_…

…charge_in_elementary

gmso/abc/serialization_utils.py

@@ -4,8 +4,12 @@
 import numpy as np
 import unyt as u
 
+from gmso.utils.units import GMSO_UnitRegistry
+
 __all__ = ["unyt_to_dict", "dict_to_unyt", "GMSOJSONHandler"]
 
+uregistry = GMSO_UnitRegistry()
+
 
 def unyt_to_dict(unyt_qt: Union[u.unyt_array, u.unyt_quantity]) -> dict:
     """Convert a unyt quantity into json serializable dictionary"""
@@ -32,4 +36,6 @@ def dict_to_unyt(dict_obj) -> None:
                 else:
                     unyt_func = u.unyt_array
 
-                dict_obj[key] = unyt_func(np_array, value["unit"])
+                dict_obj[key] = unyt_func(
+                    np_array, value["unit"], registry=uregistry.reg
+                )

gmso/formats/lammpsdata.py

@@ -416,6 +416,7 @@ def _get_connection(filename, topology, base_unyts, connection_type):
             site_list.append(site)
         ctype = copy.copy(connection_type_list[int(line.split()[1]) - 1])
         ctype.member_types = tuple(map(lambda x: x.atom_type.name, site_list))
+        ctype.member_classes = ctype.member_types
         if connection_type == "bond":
             connection = Bond(
                 connection_members=site_list,