PetThermoTools 0.2.42__tar.gz → 0.2.43__tar.gz

{PetThermoTools-0.2.42/src/PetThermoTools.egg-info → PetThermoTools-0.2.43}/PKG-INFO

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

{PetThermoTools-0.2.42 → PetThermoTools-0.2.43}/setup.py

@@ -34,7 +34,6 @@ setup(
             'matplotlib',
             'scikit-learn',
             'scipy',
-            'julia',
             'tinynumpy',
             'shapely',
             'Thermobar',

{PetThermoTools-0.2.42 → PetThermoTools-0.2.43}/src/PetThermoTools/Path.py

@@ -491,9 +491,22 @@ def path_multi(q, index, *, Model = None, comp = None, Frac_solid = None, Frac_f
         elif Model == "MELTSv1.2.0":
             melts = MELTSdynamic(4)
     else:
-        from juliacall import Main as jl, convert as jlconvert
+        from juliacall import Main as jl
+
+        # import os, pathlib
+
+        # # 1. Where to install Julia + MAGEMin environment (user home dir, persistent)
+        # home = str(pathlib.Path.home())
+        # env_path = os.path.join(home, ".MAGEMinEnv")
+
+        # jl.seval(f"""
+        # import Pkg
+        # Pkg.activate("{env_path}")
+        # """)
 
         jl.seval("using MAGEMinCalc")
+
+        
   
     for i in index:
         try:
@@ -554,12 +567,22 @@ def path_multi(q, index, *, Model = None, comp = None, Frac_solid = None, Frac_f
                 #                                 T_C = T_C[i], T_path_C = T_path_C[i], P_start_bar = P_start_bar[i], P_end_bar = P_end_bar[i],
                 #                                 dp_bar = dp_bar[i], P_bar = P_bar[i], P_path_bar = P_path_bar[i], frac_xtal = Frac_solid,
                 #                                 fo2_buffer = fO2_buffer, fo2_offset = fO2_offset[i], find_liquidus = find_liquidus)
-                    
+                
+                if Suppress == ['rutile', 'tridymite']:
+                    Suppress = None
+
+                if Suppress is not None:
+                    jl.Suppress = Suppress
+                    jl.seval("Suppress = Vector{String}(Suppress)")
+                    julia_Suppress = jl.Suppress
+
+
                 Results_df = jl.MAGEMinCalc.path(
                                     comp=comp_julia, T_start_C=T_start_C[i], T_end_C=T_end_C[i], dt_C=dt_C[i],
                                     T_C=T_C[i], P_start_bar=P_start_bar[i], P_end_bar=P_end_bar[i], dp_bar=dp_bar[i],
                                     P_bar=P_bar[i], T_path_C=T_path_C[i], P_path_bar=P_path_bar[i], frac_xtal=Frac_solid,
-                                    Model=Model, fo2_buffer=fO2_buffer, fo2_offset=fO2_offset[i], find_liquidus=find_liquidus
+                                    Model=Model, fo2_buffer=fO2_buffer, fo2_offset=fO2_offset[i], find_liquidus=find_liquidus,
+                                    suppress = julia_Suppress
                                 )
                 
                 Results = dict(Results_df)
@@ -721,6 +744,16 @@ def path(q, index, *, Model = None, comp = None, Frac_solid = None, Frac_fluid =
 
         # import julia
         from juliacall import Main as jl, convert as jlconvert
+        # import os, pathlib
+
+        # # 1. Where to install Julia + MAGEMin environment (user home dir, persistent)
+        # home = str(pathlib.Path.home())
+        # env_path = os.path.join(home, ".MAGEMinEnv")
+
+        # jl.seval(f"""
+        # import Pkg
+        # Pkg.activate("{env_path}")
+        # """)
 
         jl.seval("using MAGEMinCalc")
 
@@ -739,11 +772,21 @@ def path(q, index, *, Model = None, comp = None, Frac_solid = None, Frac_fluid =
         else:
             P_path_bar_julia = P_path_bar
 
+        if Suppress == ['rutile', 'tridymite']:
+            Suppress = None
+
+        if Suppress is not None:
+            jl.Suppress = Suppress
+            jl.seval("Suppress = Vector{String}(Suppress)")
+            julia_Suppress = jl.Suppress
+
+
         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_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
+            Model=Model, fo2_buffer=fO2_buffer, fo2_offset=fO2_offset, find_liquidus=find_liquidus,
+            suppress = julia_Suppress
         )
         # Results = jl.pyconvert(dict, Results)
         Results_df = dict(Results)

{PetThermoTools-0.2.42 → PetThermoTools-0.2.43}/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.42'
+__version__ = '0.2.43'

{PetThermoTools-0.2.42 → PetThermoTools-0.2.43/src/PetThermoTools.egg-info}/PKG-INFO

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

{PetThermoTools-0.2.42 → PetThermoTools-0.2.43}/src/PetThermoTools.egg-info/requires.txt

@@ -3,7 +3,6 @@ numpy
 matplotlib
 scikit-learn
 scipy
-julia
 tinynumpy
 shapely
 Thermobar