PetThermoTools 0.2.35__py3-none-any.whl → 0.2.37__py3-none-any.whl

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/Path.py

@@ -730,11 +730,21 @@ 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()
+        if T_path_C is not None: 
+            T_path_C_julia = jlconvert(jl.Vector[jl.Float64], T_path_C)
+        else:
+            T_path_C_julia = T_path_C
+
+        if P_path_bar is not None:
+            P_path_bar_julia = jlconvert(jl.Vector[jl.Float64], P_path_bar)
+        else:
+            P_path_bar_julia = 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/_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.37'

{PetThermoTools-0.2.35.dist-info → PetThermoTools-0.2.37.dist-info}/METADATA

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

{PetThermoTools-0.2.35.dist-info → PetThermoTools-0.2.37.dist-info}/RECORD

@@ -4,17 +4,17 @@ PetThermoTools/GenFuncs.py,sha256=u2GWqH--Wmqd0WXHxfulEAatQb6uswjl1s9SyyoHSa8,16
 PetThermoTools/Holland.py,sha256=udBFeVUyTBpSfLIhx7Hy6o0I8ApNCDvwU_gZa0diY5w,7251
 PetThermoTools/Installation.py,sha256=UfVOW1NZFdzMWPyID5u7t0KwvpJA0AqYohzidXIAwYs,6098
 PetThermoTools/Liq.py,sha256=2kdU8r00Y20khwvPvCvLr6P7y2HEOvCH2cwrF_qw5u8,35541
-PetThermoTools/MELTS.py,sha256=CjUOJSUEoq4yXEojl77HgCj7aewhFDeSGt4ZGk3L3vs,73688
+PetThermoTools/MELTS.py,sha256=DeTM8j2fJ5dAw_2DVCGfgh1R_lQB4Z5rLopKSJ1Q5xQ,73852
 PetThermoTools/Melting.py,sha256=h1-KchPFw5tI2xoOyNJUfVy_TJqTtcYiHtGuInIwzio,11017
-PetThermoTools/Path.py,sha256=u2PNtgnqsXbiWvpj-shSjzxiC5kLus9aIzsq_YLjRfY,38220
+PetThermoTools/Path.py,sha256=tMxBXiXlcHPMEsEg2-YpaVFh1c1tFhP5hPEVARfbkL0,38597
 PetThermoTools/Path_wrappers.py,sha256=_0pBs_cK2hICxAHkYxKXICUnUEBSiUg07-qhgBeuTdc,26555
 PetThermoTools/PhaseDiagrams.py,sha256=8S_BcqggBzfUbiCPcsJRWFBenGL4tcCevte3-ATQjQI,30884
 PetThermoTools/Plotting.py,sha256=IMYYusZy6REQATG9NI3dGlGs6h3vQ48aJHkZnHmSDDY,28924
 PetThermoTools/Saturation.py,sha256=XXY6fKVouQM3RLgQgXur4xSq7_uGp7bCw_k7NNlWYi8,14095
 PetThermoTools/__init__.py,sha256=PbiwQj_mNNEwuIZOLETmtMMshiXa50wjCA6mfvpOpOs,2393
-PetThermoTools/_version.py,sha256=Yz_zSUyefR3Q96ONxPsaaqcFw6TTx12jT1iGtXcC84o,296
-PetThermoTools-0.2.35.dist-info/LICENSE.txt,sha256=-mkx4iEw8Pk1RZUvncBhGLW87Uur5JB7FBQtOmX-VP0,1752
-PetThermoTools-0.2.35.dist-info/METADATA,sha256=UyTbMSzbIvHSV0GGsJRDvkqlp1P7jAU27wNbIK8MyR4,796
-PetThermoTools-0.2.35.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-PetThermoTools-0.2.35.dist-info/top_level.txt,sha256=IqK8iYBR3YJozzMOTRZ8x8mU2k6x8ycoMBxZTm-I06U,15
-PetThermoTools-0.2.35.dist-info/RECORD,,
+PetThermoTools/_version.py,sha256=4mDaaO_uZuxZxGlV6b9ORssmfFqMyYLBxGtVn0_ha3k,296
+PetThermoTools-0.2.37.dist-info/LICENSE.txt,sha256=-mkx4iEw8Pk1RZUvncBhGLW87Uur5JB7FBQtOmX-VP0,1752
+PetThermoTools-0.2.37.dist-info/METADATA,sha256=2lCbI_ecJwl3J5nfvHiwMk1UJjf1AAQ7HQVS8X3zqkc,796
+PetThermoTools-0.2.37.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+PetThermoTools-0.2.37.dist-info/top_level.txt,sha256=IqK8iYBR3YJozzMOTRZ8x8mU2k6x8ycoMBxZTm-I06U,15
+PetThermoTools-0.2.37.dist-info/RECORD,,