ararpy 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl
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.
- ararpy/__init__.py +2 -2
- ararpy/calc/jvalue.py +7 -5
- {ararpy-0.2.1.dist-info → ararpy-0.2.2.dist-info}/METADATA +10 -1
- {ararpy-0.2.1.dist-info → ararpy-0.2.2.dist-info}/RECORD +7 -7
- {ararpy-0.2.1.dist-info → ararpy-0.2.2.dist-info}/WHEEL +0 -0
- {ararpy-0.2.1.dist-info → ararpy-0.2.2.dist-info}/licenses/LICENSE +0 -0
- {ararpy-0.2.1.dist-info → ararpy-0.2.2.dist-info}/top_level.txt +0 -0
ararpy/__init__.py
CHANGED
|
@@ -16,10 +16,10 @@ from . import calc, smp, files, thermo, test
|
|
|
16
16
|
""" Information """
|
|
17
17
|
|
|
18
18
|
name = 'ararpy'
|
|
19
|
-
version = '0.2.
|
|
19
|
+
version = '0.2.2'
|
|
20
20
|
__version__ = version
|
|
21
21
|
full_version = version
|
|
22
|
-
last_update = '
|
|
22
|
+
last_update = '2026-01-01'
|
|
23
23
|
|
|
24
24
|
""" ArArPy Functions """
|
|
25
25
|
|
ararpy/calc/jvalue.py
CHANGED
|
@@ -32,8 +32,10 @@ def j_value(age, sage, r, sr, f, rsf):
|
|
|
32
32
|
f = f * 1000000 # exchange to unit of Ma
|
|
33
33
|
rsf = f * rsf / 100 # exchange to absolute error
|
|
34
34
|
k0 = (np.exp(f * age) - 1) / r
|
|
35
|
-
v1 = rsf ** 2 * (age * np.exp(f * age) / r) ** 2
|
|
36
|
-
v2 = sage ** 2 * (f * np.exp(f * age) / r) ** 2
|
|
37
|
-
v3 = sr ** 2 * ((1 - np.exp(f * age)) / r ** 2) ** 2
|
|
38
|
-
k1 = np.sqrt(
|
|
39
|
-
|
|
35
|
+
v1 = rsf ** 2 * (age * np.exp(f * age) / r) ** 2 # lambda
|
|
36
|
+
v2 = sage ** 2 * (f * np.exp(f * age) / r) ** 2 # age
|
|
37
|
+
v3 = sr ** 2 * ((1 - np.exp(f * age)) / r ** 2) ** 2 # 40/39
|
|
38
|
+
k1 = np.sqrt(v3)
|
|
39
|
+
k2 = np.sqrt(v3 + v2)
|
|
40
|
+
k3 = np.sqrt(v3 + v2 + v1)
|
|
41
|
+
return k0, k1, k2, k3
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: ararpy
|
|
3
|
-
Version: 0.2.
|
|
3
|
+
Version: 0.2.2
|
|
4
4
|
Summary: A project for Ar-Ar geochronology
|
|
5
5
|
Home-page: https://github.com/wuyangchn/ararpy.git
|
|
6
6
|
Author: Yang Wu
|
|
@@ -12,6 +12,14 @@ Classifier: Operating System :: OS Independent
|
|
|
12
12
|
Requires-Python: >=3.5
|
|
13
13
|
Description-Content-Type: text/markdown
|
|
14
14
|
License-File: LICENSE
|
|
15
|
+
Requires-Dist: chardet
|
|
16
|
+
Requires-Dist: numpy
|
|
17
|
+
Requires-Dist: pandas
|
|
18
|
+
Requires-Dist: parse
|
|
19
|
+
Requires-Dist: scipy
|
|
20
|
+
Requires-Dist: xlrd
|
|
21
|
+
Requires-Dist: XlsxWriter
|
|
22
|
+
Requires-Dist: pdf_maker
|
|
15
23
|
Dynamic: author
|
|
16
24
|
Dynamic: author-email
|
|
17
25
|
Dynamic: classifier
|
|
@@ -20,6 +28,7 @@ Dynamic: description-content-type
|
|
|
20
28
|
Dynamic: home-page
|
|
21
29
|
Dynamic: license
|
|
22
30
|
Dynamic: license-file
|
|
31
|
+
Dynamic: requires-dist
|
|
23
32
|
Dynamic: requires-python
|
|
24
33
|
Dynamic: summary
|
|
25
34
|
|
|
@@ -5,7 +5,7 @@ ararpy/Example - Show MDD results.py,sha256=YFkiQual60lyCClsfvivr4REY6waSYuomf0u
|
|
|
5
5
|
ararpy/Example - Show all Kfs age spectra.py,sha256=1edPtBpFfS0lC7vLnLu34mDHt_xjbc8ptk6rZ--pf-I,12304
|
|
6
6
|
ararpy/Example - Show random walk results.py,sha256=8WWvbAI7ySiMR-XwtFe5kTQihW3mcqzL3S7EUZdoxYo,15477
|
|
7
7
|
ararpy/Example - Tc calculation.py,sha256=sD9pu3IaZ8mBV95rV2wOEhlQUexFNqBUoBqnNMdUBis,19617
|
|
8
|
-
ararpy/__init__.py,sha256
|
|
8
|
+
ararpy/__init__.py,sha256=wz69XzhfcI0QMPU2QJ8gZoWEsG2vHeSE7b5E7GytwI0,6767
|
|
9
9
|
ararpy/test.py,sha256=4F46-JJ1Ge12HGae0qO44Qc6kiEMHBgn2MsY_5LlHDo,3973
|
|
10
10
|
ararpy/calc/__init__.py,sha256=kUjRuLE8TLuKOv3i976RnGJoEMj23QBZDu37LWs81U4,322
|
|
11
11
|
ararpy/calc/age.py,sha256=WOZs70zXiBWDIEhXJLIaNiYTOFJNk0NDbH5e5zCbCks,5435
|
|
@@ -15,7 +15,7 @@ ararpy/calc/corr.py,sha256=qh77w1uJ98x6b_N-0_u1seWc7YLtCRClpxG6fuYHx-M,21667
|
|
|
15
15
|
ararpy/calc/err.py,sha256=63LtprqjemlIb1QGDst4Ggcv5KMSDHdlAIL-nyQs1eA,2691
|
|
16
16
|
ararpy/calc/histogram.py,sha256=0GVbDdsjd91KQ1sa2B7NtZ4KGo0XpRIJapgIrzAwQUo,5777
|
|
17
17
|
ararpy/calc/isochron.py,sha256=ej9G2e68k6yszonWHsLcEubh3TA7eh1upTJP_X0ttAA,5726
|
|
18
|
-
ararpy/calc/jvalue.py,sha256=
|
|
18
|
+
ararpy/calc/jvalue.py,sha256=IJan8dNL4vBblSkBHIguPROb-RJPPEej0CpkXm2osMM,1221
|
|
19
19
|
ararpy/calc/plot.py,sha256=Hdtb-q18xYC8ZJeDKGRauCSbj4_7e6Z8HQs9aYgfvao,2139
|
|
20
20
|
ararpy/calc/raw_funcs.py,sha256=sbuCFNWyzIoBkE4Bvka7i2TofXpJtnm6SzGH9VFLtAw,4144
|
|
21
21
|
ararpy/calc/regression.py,sha256=m2_xJAsQ7mBIbnrmxtSPIQapJH61jkxvXskxN-8f86k,42803
|
|
@@ -66,8 +66,8 @@ ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
|
|
|
66
66
|
ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
|
|
67
67
|
ararpy/thermo/atomic_level_random_walk.py,sha256=ncw9DtxRfS6zlQbLVLNX7WNoO9sX_nSomwAsTH0_O3k,25910
|
|
68
68
|
ararpy/thermo/basic.py,sha256=JJRZbYmvXlpRAV2FeFPwLhrig4ZhNQmJnWqgOjo-1YQ,11508
|
|
69
|
-
ararpy-0.2.
|
|
70
|
-
ararpy-0.2.
|
|
71
|
-
ararpy-0.2.
|
|
72
|
-
ararpy-0.2.
|
|
73
|
-
ararpy-0.2.
|
|
69
|
+
ararpy-0.2.2.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
|
|
70
|
+
ararpy-0.2.2.dist-info/METADATA,sha256=wvnw6khN1TWEJEGRbAunuJ3A95geGtqgvmAwCN7wGAc,24726
|
|
71
|
+
ararpy-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
72
|
+
ararpy-0.2.2.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
|
|
73
|
+
ararpy-0.2.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|