PetThermoTools 0.2.44__py3-none-any.whl → 0.2.45__py3-none-any.whl

PetThermoTools/MELTS.py

@@ -953,7 +953,6 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
                 else:
                     return Results
 
-        print(Liq_Results)
         T_start_C = Liq_Results['T_Liq'] + 0.1
         if T_end_C is None and T_maxdrop_C is not None:
             T_end_C = T_start_C - T_maxdrop_C
@@ -965,6 +964,9 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
             else:
                 melts.engine.setSystemProperties(["Log fO2 Path: " + fO2_buffer, "Log fO2 Offset: " + str(fO2_offset)])
 
+    T = None
+    P = None
+
     if T_path_C is None:
         if T_end_C is None and dt_C is None:
             T = T_start_C
@@ -973,6 +975,8 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
     elif T_path_C is not None:
         T = T_path_C
 
+    
+
     if P_path_bar is None:
         if P_end_bar is None and dp_bar is None:
             P = P_start_bar
@@ -981,12 +985,21 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
     elif P_path_bar is not None:
         P = P_path_bar
 
+    print(P_path_bar)
+    print(P_end_bar)
+    print(P_start_bar)
+    print(dp_bar)
+
+    if type(P) == np.ndarray and T_end_C is not None and dt_C is None:
+        T = np.linspace(T_start_C, T_end_C, len(P))
+
     if type(T) == np.ndarray and P_end_bar is None and dp_bar is not None:
         P = np.linspace(P_start_bar, P_start_bar - dp_bar*(len(T)-1), len(T))
     if type(T) == np.ndarray and P_end_bar is not None and dp_bar is None:
         P = np.linspace(P_start_bar, P_end_bar, len(T))
     elif type(P) == np.ndarray and T_end_C is None and dt_C is not None:
         T = np.linspace(T_start_C, T_start_C - dt_C*(len(P)-1), len(P))
+   
 
     if type(T) == np.ndarray and type(P) == np.ndarray:
         if len(T) != len(P):

PetThermoTools/Path_wrappers.py

@@ -185,7 +185,7 @@ def polybaric_crystallisation_path(Model = None, bulk = None, Frac_solid = None,
                                    Fe3Fet_init = None, Fe3Fet_Liq = None, H2O_init = None, H2O_Liq = None, 
                                    CO2_init = None, CO2_Liq = None, find_liquidus = None, fO2_buffer = None, 
                                    fO2_offset = None, label = None, timeout = None, multi_processing=True,
-                                   Suppress = ['rutile', 'tridymite'], Suppress_except=False):
+                                   Suppress = ['rutile', 'tridymite'], Suppress_except=False, multiprocessing = True):
     """
     Simulates polybaric crystallization along a user-specified P-T path using the `multi_path` function.
 
@@ -275,7 +275,8 @@ def polybaric_crystallisation_onestep(Model = None, bulk = None, Frac_solid = No
                                       P_start_bar = None, P_end_bar = None, Fe3Fet_Liq = None, Fe3Fet_init = None,
                                       H2O_Liq = None, H2O_init = None, CO2_Liq = None, CO2_init = None, 
                                       find_liquidus = None, fO2_buffer = None, fO2_offset = None, label = None, 
-                                      timeout = None, multi_processing = True, Suppress = ['rutile', 'tridymite'], Suppress_except=False,):
+                                      timeout = None, multi_processing = True, Suppress = ['rutile', 'tridymite'], 
+                                      Suppress_except=False,multiprocessing=True):
     """
     Simulates polybaric crystallization along a user-specified P-T path using the `multi_path` function.
 

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.44'
+__version__ = '0.2.45'

{PetThermoTools-0.2.44.dist-info → PetThermoTools-0.2.45.dist-info}/METADATA

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

{PetThermoTools-0.2.44.dist-info → PetThermoTools-0.2.45.dist-info}/RECORD

@@ -4,17 +4,17 @@ PetThermoTools/GenFuncs.py,sha256=oMV3FYIpfHNpGZloN5a6Vr8Sv_5IRsKt4hHIUNbDu24,19
 PetThermoTools/Holland.py,sha256=udBFeVUyTBpSfLIhx7Hy6o0I8ApNCDvwU_gZa0diY5w,7251
 PetThermoTools/Installation.py,sha256=UfVOW1NZFdzMWPyID5u7t0KwvpJA0AqYohzidXIAwYs,6098
 PetThermoTools/Liq.py,sha256=4tOnVROXr7V6cfvZceKidFT9J20TZE3Om2oem92QC4s,36842
-PetThermoTools/MELTS.py,sha256=2WB4Y11i7yfTM5dRjEr-KrJY2_7f1kLaW4V0di6Qnew,76511
+PetThermoTools/MELTS.py,sha256=sH2sadG2vhr1be0kkMGB_rFJbjF0XDiJ4EZItGRjlD0,76730
 PetThermoTools/Melting.py,sha256=19rFcTegaB04Dx3bsclbLdjzlegJHGlMRn2QnccLqQw,15718
 PetThermoTools/Path.py,sha256=MOQMN9jIBbSsqXD1BCHsWoMPOWphqCYCKQvmm88mltA,39580
-PetThermoTools/Path_wrappers.py,sha256=gUxs_4Qbk4MLlLl4iySxfbfKU34588bIJAYyhHmhFdc,30177
+PetThermoTools/Path_wrappers.py,sha256=Ht-hAxrJvHq6jc8M5LEL319n47zinOu_rCvvaM5G4Lg,30260
 PetThermoTools/PhaseDiagrams.py,sha256=sjjX84LK34m_OjsKCV78zpzRDAXG7oaLu_Z5BxwB_3I,30298
 PetThermoTools/Plotting.py,sha256=KxBNT2nqqrVn9dsAIjGk1hMUVRq7r-WrG_b9quNcRMo,37295
 PetThermoTools/Saturation.py,sha256=3liK4WDVtl5DWpMpE_tQ_fONBCZTctkiNeCXCuNmXoM,29961
 PetThermoTools/__init__.py,sha256=PbiwQj_mNNEwuIZOLETmtMMshiXa50wjCA6mfvpOpOs,2393
-PetThermoTools/_version.py,sha256=YefFKNLbTovWyfWUHpACuEmBVwW4nY9fuZlPRNDqNDY,296
-PetThermoTools-0.2.44.dist-info/LICENSE.txt,sha256=-mkx4iEw8Pk1RZUvncBhGLW87Uur5JB7FBQtOmX-VP0,1752
-PetThermoTools-0.2.44.dist-info/METADATA,sha256=ppYpb851WSgn43kuz_O2fMQLSs1IuFwwlJXq5onq4Nk,773
-PetThermoTools-0.2.44.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-PetThermoTools-0.2.44.dist-info/top_level.txt,sha256=IqK8iYBR3YJozzMOTRZ8x8mU2k6x8ycoMBxZTm-I06U,15
-PetThermoTools-0.2.44.dist-info/RECORD,,
+PetThermoTools/_version.py,sha256=aO6nD2-_TYFrY_TLmEbkDg2SutbHKOk3GYXyyizX_b4,296
+PetThermoTools-0.2.45.dist-info/LICENSE.txt,sha256=-mkx4iEw8Pk1RZUvncBhGLW87Uur5JB7FBQtOmX-VP0,1752
+PetThermoTools-0.2.45.dist-info/METADATA,sha256=GDY65Q6Z12Ur8VgA8YxG_ZMsS8Zl_EBE0dA72cXbfDU,773
+PetThermoTools-0.2.45.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+PetThermoTools-0.2.45.dist-info/top_level.txt,sha256=IqK8iYBR3YJozzMOTRZ8x8mU2k6x8ycoMBxZTm-I06U,15
+PetThermoTools-0.2.45.dist-info/RECORD,,