PetThermoTools 0.2.35__tar.gz → 0.2.36__tar.gz

{PetThermoTools-0.2.35/src/PetThermoTools.egg-info → PetThermoTools-0.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PetThermoTools
-Version: 0.2.35
+Version: 0.2.36
 Summary: PetThermoTools
 Home-page: https://github.com/gleesonm1/PetThermoTools
 Author: Matthew Gleeson

{PetThermoTools-0.2.35 → PetThermoTools-0.2.36}/src/PetThermoTools/MELTS.py

@@ -1114,7 +1114,8 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
                 else:
                     melts.engine.calcEquilibriumState(2,0)
             except:
-                trail = False
+                if trail is not None:
+                    trail = False
                 # if trail is not None:
                 #     return Results, trail
                 # else:
@@ -1128,7 +1129,8 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
                 else:
                     melts.engine.calcEquilibriumState(3,0)
             except:
-                trail = False
+                if trail is not None:
+                    trail = False
                 # return Results
                 break
 
@@ -1136,7 +1138,8 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
             try:
                 melts.engine.calcEquilibriumState(4,0)
             except:
-                trail = False
+                if trail is not None:
+                    trail = False
                 # return Results
                 break
 
@@ -1156,7 +1159,8 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
         try:
             PhaseList = ['liquid1'] + melts.engine.solidNames
         except:
-            trail = False
+            if trail is not None:
+                trail = False
             # return Results
             break
 

{PetThermoTools-0.2.35 → PetThermoTools-0.2.36}/src/PetThermoTools/Path.py

@@ -730,11 +730,14 @@ def path(q, index, *, Model = None, comp = None, Frac_solid = None, Frac_fluid =
             Frac_solid = False
 
         comp_julia = jl.seval("Dict")(comp)
+        # T_path_C = T_path_C.tolist()
+        T_path_C_julia = jlconvert(jl.Vector[jl.Float64], T_path_C)
+        P_path_bar_julia = jlconvert(jl.Vector[jl.Float64], P_path_bar)
 
         Results = jl.MAGEMinCalc.path(
             comp=comp_julia, T_start_C=T_start_C, T_end_C=T_end_C, dt_C=dt_C,
             T_C=T_C, P_start_bar=P_start_bar, P_end_bar=P_end_bar, dp_bar=dp_bar,
-            P_bar=P_bar, T_path_C=T_path_C, P_path_bar=P_path_bar, frac_xtal=Frac_solid,
+            P_bar=P_bar, T_path_C=T_path_C_julia, P_path_bar=P_path_bar_julia, frac_xtal=Frac_solid,
             Model=Model, fo2_buffer=fO2_buffer, fo2_offset=fO2_offset, find_liquidus=find_liquidus
         )
         # Results = jl.pyconvert(dict, Results)

{PetThermoTools-0.2.35 → PetThermoTools-0.2.36}/src/PetThermoTools/_version.py

@@ -5,4 +5,4 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module
-__version__ = '0.2.35'
+__version__ = '0.2.36'

{PetThermoTools-0.2.35 → PetThermoTools-0.2.36/src/PetThermoTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PetThermoTools
-Version: 0.2.35
+Version: 0.2.36
 Summary: PetThermoTools
 Home-page: https://github.com/gleesonm1/PetThermoTools
 Author: Matthew Gleeson