PetThermoTools 0.2.30__py3-none-any.whl → 0.2.31__py3-none-any.whl

PetThermoTools/MELTS.py

@@ -911,21 +911,22 @@ def path_MELTS(Model = None, comp = None, Frac_solid = None, Frac_fluid = None,
     bulk = list(100*np.array(bulk)/np.sum(bulk))
 
     if Suppress_except is False:
-        if Suppress == "All":
-            melts.engine.pressure = np.random.normal(500, 500/10)
-            melts.engine.temperature = 1200 + 200
-            melts.engine.setBulkComposition(bulk)
-            PL = melts.engine.calcSaturationState()
-            for p in PL:
-                if p != "fluid":
-                    if p != "water":
-                        melts.engine.setSystemProperties("Suppress", p)
-        else:
-            if type(Suppress) == list:
-                for p in Suppress:
-                    melts.engine.setSystemProperties("Suppress", p)
+        if Suppress is not None:
+            if Suppress == "All":
+                melts.engine.pressure = np.random.normal(500, 500/10)
+                melts.engine.temperature = 1200 + 200
+                melts.engine.setBulkComposition(bulk)
+                PL = melts.engine.calcSaturationState()
+                for p in PL:
+                    if p != "fluid":
+                        if p != "water":
+                            melts.engine.setSystemProperties("Suppress", p)
             else:
-                melts.engine.setSystemProperties("Suppress", Suppress)
+                if type(Suppress) == list:
+                    for p in Suppress:
+                        melts.engine.setSystemProperties("Suppress", p)
+                else:
+                    melts.engine.setSystemProperties("Suppress", Suppress)
     else:
         melts.engine.pressure = np.random.normal(500, 500/10)
         melts.engine.temperature = 1200 + 200

PetThermoTools/PhaseDiagrams.py

@@ -148,12 +148,12 @@ def phaseDiagram_calc(cores = None, Model = None, bulk = None, T_C = None, P_bar
         j = j + 1
 
         for i in range(cores):
-            # if "MELTS" in Model:
-            T_path_C = np.array(subarrays_T[i])#T_flat[i*A:(i+1)*A]
-            P_path_bar = np.array(subarrays_P[i])#P_flat[i*A:(i+1)*A]
-            # else:
-            #     T_path_C = subarrays_T[i]
-            #     P_path_bar = subarrays_P[i]
+            if "MELTS" in Model:
+                T_path_C = T_flat[i*A:(i+1)*A]
+                P_path_bar = P_flat[i*A:(i+1)*A]
+            else:
+                T_path_C = np.array(subarrays_T[i])
+                P_path_bar = np.array(subarrays_P[i])
 
 
             if "MELTS" in Model:
@@ -191,7 +191,12 @@ def phaseDiagram_calc(cores = None, Model = None, bulk = None, T_C = None, P_bar
             #     T_path_C = np.array(T_randomized)
             #     P_path_bar = np.array(P_randomized)
 
-            p = Process(target = path, args = (q,i), kwargs = {'Model': Model, 'comp': comp, 'T_path_C': T_path_C, 'P_path_bar': P_path_bar, 'fO2_buffer': fO2_buffer, 'fO2_offset': fO2_offset})
+            p = Process(target = path, args = (q,i), kwargs = {'Model': Model, 'comp': comp, 
+                                                               'T_path_C': T_path_C, 
+                                                               'P_path_bar': P_path_bar, 
+                                                               'fO2_buffer': fO2_buffer, 
+                                                               'fO2_offset': fO2_offset,
+                                                               'Suppress': ['rutile', 'tridymite']})
 
             ps.append(p)
             p.start()

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.30'
+__version__ = '0.2.31'

{PetThermoTools-0.2.30.dist-info → PetThermoTools-0.2.31.dist-info}/METADATA

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

{PetThermoTools-0.2.30.dist-info → PetThermoTools-0.2.31.dist-info}/RECORD

@@ -4,16 +4,16 @@ PetThermoTools/GenFuncs.py,sha256=u2GWqH--Wmqd0WXHxfulEAatQb6uswjl1s9SyyoHSa8,16
 PetThermoTools/Holland.py,sha256=udBFeVUyTBpSfLIhx7Hy6o0I8ApNCDvwU_gZa0diY5w,7251
 PetThermoTools/Installation.py,sha256=UfVOW1NZFdzMWPyID5u7t0KwvpJA0AqYohzidXIAwYs,6098
 PetThermoTools/Liq.py,sha256=I-vYp2i7CpQjzoo-nZ8gQNTP5jrao6pZtmkmwLtjodY,35043
-PetThermoTools/MELTS.py,sha256=wx_j2a63sJcm8dRePVrLzc0XcpngAr7mLHewPe4ODUs,72261
+PetThermoTools/MELTS.py,sha256=-nkyo3yx7dZXVnRwZhlMRGCc5SkYSm1nP3qDbLDNNyY,72354
 PetThermoTools/Melting.py,sha256=iQpSXXDhwfEUTlHa80-XFK1lahb_VNrLW8ISbVCE8lY,10773
 PetThermoTools/Path.py,sha256=RChQYqDayqc0hVugmX3j3uE1x2BvWIfcINFqcqwrRxw,32642
 PetThermoTools/Path_wrappers.py,sha256=_0pBs_cK2hICxAHkYxKXICUnUEBSiUg07-qhgBeuTdc,26555
-PetThermoTools/PhaseDiagrams.py,sha256=J3-h5N2K2uByahgWuBxkvajpx7j_2MJ7QuxEswp3f6Y,30558
+PetThermoTools/PhaseDiagrams.py,sha256=8S_BcqggBzfUbiCPcsJRWFBenGL4tcCevte3-ATQjQI,30884
 PetThermoTools/Plotting.py,sha256=biM4QJFCH6xVDpK-nG2oAIGIFFJCzBt5Uez6XzTFiGY,28107
 PetThermoTools/Saturation.py,sha256=XXY6fKVouQM3RLgQgXur4xSq7_uGp7bCw_k7NNlWYi8,14095
 PetThermoTools/__init__.py,sha256=PbiwQj_mNNEwuIZOLETmtMMshiXa50wjCA6mfvpOpOs,2393
-PetThermoTools/_version.py,sha256=7vyciDXWjHOhht0C35bFPf-Y7bGUJN5nWlLPX5LfaZE,296
-PetThermoTools-0.2.30.dist-info/METADATA,sha256=20BfknXMVWrNDBAHX9ypKqU_y1B70KHD7ve3xrpbiw4,796
-PetThermoTools-0.2.30.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-PetThermoTools-0.2.30.dist-info/top_level.txt,sha256=IqK8iYBR3YJozzMOTRZ8x8mU2k6x8ycoMBxZTm-I06U,15
-PetThermoTools-0.2.30.dist-info/RECORD,,
+PetThermoTools/_version.py,sha256=x3oJ2coFvekDMGQwrW7LzNxduPT9SxWIZWCKamBahjQ,296
+PetThermoTools-0.2.31.dist-info/METADATA,sha256=TDZlBVXnbinSw2bKIR_YvA9KJqR4w2XxlqSGVEe4klg,796
+PetThermoTools-0.2.31.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+PetThermoTools-0.2.31.dist-info/top_level.txt,sha256=IqK8iYBR3YJozzMOTRZ8x8mU2k6x8ycoMBxZTm-I06U,15
+PetThermoTools-0.2.31.dist-info/RECORD,,