VolFe 0.4__tar.gz → 0.4.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {volfe-0.4 → volfe-0.4.2}/PKG-INFO +4 -3
- {volfe-0.4 → volfe-0.4.2}/pyproject.toml +2 -1
- {volfe-0.4 → volfe-0.4.2}/src/VolFe/__init__.py +8 -8
- {volfe-0.4 → volfe-0.4.2}/src/VolFe/batch_calculations.py +713 -643
- {volfe-0.4 → volfe-0.4.2}/src/VolFe/calculations.py +83 -87
- {volfe-0.4 → volfe-0.4.2}/src/VolFe/equilibrium_equations.py +64 -12
- {volfe-0.4 → volfe-0.4.2}/src/VolFe/isotopes.py +50 -1
- {volfe-0.4 → volfe-0.4.2}/src/VolFe/model_dependent_variables.py +155 -45
- {volfe-0.4 → volfe-0.4.2}/src/VolFe.egg-info/PKG-INFO +4 -3
- {volfe-0.4 → volfe-0.4.2}/src/VolFe.egg-info/requires.txt +2 -1
- {volfe-0.4 → volfe-0.4.2}/tests/test_S2fO2_functions.py +5 -5
- {volfe-0.4 → volfe-0.4.2}/tests/test_degassing_functions.py +62 -54
- {volfe-0.4 → volfe-0.4.2}/README.md +0 -0
- {volfe-0.4 → volfe-0.4.2}/setup.cfg +0 -0
- {volfe-0.4 → volfe-0.4.2}/src/VolFe/differential_equations.py +0 -0
- {volfe-0.4 → volfe-0.4.2}/src/VolFe/melt_gas.py +0 -0
- {volfe-0.4 → volfe-0.4.2}/src/VolFe.egg-info/SOURCES.txt +0 -0
- {volfe-0.4 → volfe-0.4.2}/src/VolFe.egg-info/dependency_links.txt +0 -0
- {volfe-0.4 → volfe-0.4.2}/src/VolFe.egg-info/top_level.txt +0 -0
- {volfe-0.4 → volfe-0.4.2}/tests/test_model_options.py +0 -0
- {volfe-0.4 → volfe-0.4.2}/tests/test_other_functions.py +0 -0
- {volfe-0.4 → volfe-0.4.2}/tests/test_pvsat_functions.py +0 -0
- {volfe-0.4 → volfe-0.4.2}/tests/test_user_warnings.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: VolFe
|
|
3
|
-
Version: 0.4
|
|
3
|
+
Version: 0.4.2
|
|
4
4
|
Summary: VolFe
|
|
5
5
|
Author: Pip Liggins, Penny Wieser
|
|
6
6
|
Author-email: Ery Hughes <ery.c.hughes@gmail.com>
|
|
@@ -15,7 +15,8 @@ Requires-Dist: gmpy2==2.2.1
|
|
|
15
15
|
Requires-Dist: numpy<2
|
|
16
16
|
Requires-Dist: pandas==2.2.3
|
|
17
17
|
Requires-Dist: PySulfSat==1.0.6
|
|
18
|
-
Requires-Dist: scipy
|
|
18
|
+
Requires-Dist: scipy>=1.13.1
|
|
19
|
+
Requires-Dist: tqdm==4.67.1
|
|
19
20
|
Provides-Extra: dev
|
|
20
21
|
Requires-Dist: pytest; extra == "dev"
|
|
21
22
|
Requires-Dist: pytest-cov; extra == "dev"
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
__author__ = "Ery Hughes, Pip Liggins, Penny Wieser"
|
|
2
|
-
__version__ = "0.4"
|
|
2
|
+
__version__ = "0.4.2"
|
|
3
3
|
|
|
4
4
|
# functions for calculating properties of the melt and gas
|
|
5
|
-
from .melt_gas import *
|
|
5
|
+
from .melt_gas import * # noqa F401 F403
|
|
6
6
|
|
|
7
7
|
# functions for variables that can be model depedent (e.g., solubility constants,
|
|
8
8
|
# fugacity coefficients)
|
|
9
|
-
from .model_dependent_variables import *
|
|
9
|
+
from .model_dependent_variables import * # noqa F401 F403
|
|
10
10
|
|
|
11
11
|
# functions for calculating equilibrium speciation and concentration between melt ± gas
|
|
12
12
|
# at given P and T
|
|
13
|
-
from .equilibrium_equations import *
|
|
14
|
-
from .differential_equations import *
|
|
13
|
+
from .equilibrium_equations import * # noqa F401 F403
|
|
14
|
+
from .differential_equations import * # noqa F401 F403
|
|
15
15
|
|
|
16
16
|
# functions to calculate equilibrium isotope fractionation given melt ± gas composition
|
|
17
|
-
from .batch_calculations import *
|
|
17
|
+
from .batch_calculations import * # noqa F401 F403
|
|
18
18
|
|
|
19
19
|
# functions to run a calculations
|
|
20
|
-
from .calculations import *
|
|
20
|
+
from .calculations import * # noqa F401 F403
|
|
21
21
|
|
|
22
22
|
# functions to run calculations in batch mode
|
|
23
|
-
from .batch_calculations import *
|
|
23
|
+
from .batch_calculations import * # noqa F401 F403
|