Grackle3

Update cooling wrapper to match last swift development

pyswiftsim/structure.py

@@ -285,26 +285,43 @@ class UnitSystem(SwiftStruct):
 
 ######################################################################
 #                                                                    #
+#                     chemistry_part_data                            #
+#                                                                    #
+######################################################################
+class ChemistryPartData(SwiftStruct):
+    _format = "f"
+    _name = [
+        "he_density"
+    ]
+
+    def __init__(self, data, parent=None):
+        super().__init__(self.struct_format, data, parent)
+
+######################################################################
+#                                                                    #
 #                          Part                                      #
 #                                                                    #
 ######################################################################
 class Part(SwiftStruct):
-    _format = "qP3d3f3ffffffN7f4c"
+    _format = "qP3d3f3ffffffN7f4{chemistry}sc".format(
+        chemistry=struct.calcsize(ChemistryPartData._format)
+    )
     _name = [
-            "id",
-            "gpart",
-            "pos",
-            "vel",
-            "a_hydro",
-            "h",
-            "mass",
-            "rho",
-            "entropy",
-            "entropy_dt",
-            "last_offset",
-            "density",
-            "time_bin"
-        ]
+        "id",
+        "gpart",
+        "pos",
+        "vel",
+        "a_hydro",
+        "h",
+        "mass",
+        "rho",
+        "entropy",
+        "entropy_dt",
+        "last_offset",
+        "density",
+        "chemistry_data",
+        "time_bin"
+    ]
 
     def __init__(self, data, parent=None):
         super().__init__(self.struct_format, data, parent)
@@ -416,7 +433,7 @@ class PhysConst(SwiftStruct):
         super().__init__(self.struct_format, data, parent)
 
 
-class GrackleUnits(SwiftStruct):
+class GrackleCodeUnits(SwiftStruct):
     _format = "idddddd"
     _name = [
         "comoving_coordinates",
@@ -493,17 +510,17 @@ class CoolingFunctionData(SwiftStruct):
             "cooling_tstep_mult"
         ]
     elif cooling_type == "grackle":
-        _format = "200cidd{units}s{chemistry}s".format(
-            units=struct.calcsize(GrackleUnits._format),
+        _format = "200cidd{code_units}s{chemistry}s".format(
+            code_units=struct.calcsize(GrackleCodeUnits._format),
             chemistry=struct.calcsize(GrackleChemistryData._format)
         )
         _name = [
-            "cloudy_table",
-            "uv_background",
-            "redshift",
-            "density_self_shielding",
-            "units",
-            "chemistry"
+            "GrackleCloudyTable",
+            "UVbackground",
+            "GrackleRedshift",
+            "GrackleHSShieldingDensityThreshold",
+            "code_units",
+            "chemistry",
         ]
 
         @property
@@ -514,7 +531,7 @@ class CoolingFunctionData(SwiftStruct):
             }
 
             units = {
-                "class": GrackleUnits,
+                "class": GrackleCodeUnits,
                 "size": 1
             }
             return {