Skip to content

Commit c65b96f

Browse files
committed
Begin Updates for v0.1.7
Begin adding features, additions, and fixes for v0.1.7. In this commit: Added - Use TkAgg backend in matplotlib for consistent performance - Download 2017 logs in kgs_download function - Intersphinx_mapping for docstrings Fixed - Issue 1 calling newer methods from old versions of required packages. Versions added to requirements.txt.
1 parent 16bd947 commit c65b96f

28 files changed

+8162
-8134
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ a petrophysical workflow and a log viewer based on XML templates.
1313
Requirements
1414
------------
1515

16-
- `cchardet <https://github.com/PyYoshi/uchardet>`__
16+
- `cchardet <https://github.com/PyYoshi/cChardet>`__
1717
- `lasio <https://github.com/kinverarity1/lasio>`__
1818
- `numpy <http://www.numpy.org>`__
1919
- `scipy <https://www.scipy.org>`__

changelog.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,18 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [0.1.7] - 2018-
9+
10+
### Added
11+
- Use TkAgg backend in matplotlib for consistent performance
12+
- Download 2017 logs in [kgs_download](https://toddheitmann.github.io/PetroPy/function/download.html#petropy.kgs_download) function
13+
14+
### Fixed
15+
- [Issue 1](https://github.com/toddheitmann/PetroPy/issues/1) calling newer methods from old versions of required packages. Versions added to requirements.txt.
16+
817
## [0.1.6] - 2018-02-15
918

10-
## Fixed
19+
### Fixed
1120
- Issue with show method for LogViewer class using different back ends of matplotlib
1221

1322
## [0.1.5] - 2017-10-24
353 Bytes
Binary file not shown.
519 Bytes
Binary file not shown.

doc/auto_examples/wolfcamp_bulk.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"cell_type": "markdown",
1616
"metadata": {},
1717
"source": [
18-
"\n# Wolfcamp Example - Bulk Process las files\n\n\nThis example shows the full petrophysical workflow avaiable in PetroPy\nfor a folder of wolfcamp las file courtesy of University Lands Texas.\n\nThe workflow progresses in 3 iterations to edit data, calculate the\npetrophysical model, and to calculate statistics and save. To better\nunderstand the worflow first read through the `single well`_ example.\n\n\nThe First Iteration\n\n1. Read las file and create a :class:`petropy.Log` object\n2. Create a :class:`petropy.LogViewer` show in edit_mode to fix data\n3. Writes updated data to new folder via :meth:`petropy.Log.write`\n\nThe Second Iteration\n\n1. Read las file and create a :class:`petropy.Log` object\n2. Load tops from a csv file using :meth:`petropy.Log.tops_from_csv`\n3. Calculate fluid properties by\n 1. Loading parameters via :meth:`petropy.Log.fluid_properties_parameters_from_csv`\n 2. Calculating over formations via :meth:`petropy.Log.formation_fluid_properties`\n4. Calculate mulitmineral properties by\n 1. Loading parameters via :meth:`petropy.Log.multimineral_parameters_from_csv`\n 2. Calculating over formations via :meth:`petropy.Log.formation_multimineral_model`\n5. Curve summations via :meth:`petropy.Log.summations`\n6. Adding pay flags via :meth:`petropy.Log.add_pay_flag`\n\nAfter the second iteration, the list processed_logs is used to perform\nelectrofacies calculations via :meth:`petropy.electrofacies`\n\nThe Third Iteration\n\n1. Exporting log statistics via :meth:`petropy.Log.statistics`\n2. Saving LogViewer to png and Log to las\n\n\n"
18+
"\n# Wolfcamp Example - Bulk Process las files\n\n\nThis example shows the full petrophysical workflow avaiable in PetroPy\nfor a folder of wolfcamp las file courtesy of University Lands Texas.\n\nThe workflow progresses in 3 iterations to edit data, calculate the\npetrophysical model, and to calculate statistics and save. To better\nunderstand the worflow first read through the `single well`_ example.\n\n\nThe First Iteration\n\n1. Read las file and create a :class:`petropy.Log` object\n2. Create a :class:`petropy.LogViewer` show in edit_mode to fix data\n3. Writes updated data to new folder via :meth:`petropy.Log.write`\n\nThe Second Iteration\n\n1. Read las file and create a :class:`petropy.Log` object\n2. Load tops from a csv file using :meth:`petropy.Log.tops_from_csv`\n3. Calculate fluid properties by\n 1. Loading parameters via :meth:`petropy.Log.fluid_properties_parameters_from_csv`\n 2. Calculating over formations via :meth:`petropy.Log.formation_fluid_properties`\n4. Calculate mulitmineral properties by\n 1. Loading parameters via :meth:`petropy.Log.multimineral_parameters_from_csv`\n 2. Calculating over formations via :meth:`petropy.Log.formation_multimineral_model`\n5. Curve summations via :meth:`petropy.Log.summations`\n6. Adding pay flags via :meth:`petropy.Log.add_pay_flag`\n\nAfter the second iteration, the list processed_logs is used to perform\nelectrofacies calculations via :meth:`petropy.electrofacies`\n\nThe Third Iteration\n\n1. Exporting log statistics via :meth:`petropy.Log.statistics`\n2. Saving LogViewer to png and Log to las\n\nDownloading the script at the bottom of this webpage will not download the required las\nfiles or PetroPy logo. To download all files, view the `examples folder`_ on GitHub.\n\n\n"
1919
]
2020
},
2121
{

doc/auto_examples/wolfcamp_bulk.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
1. Exporting log statistics via :meth:`petropy.Log.statistics`
4040
2. Saving LogViewer to png and Log to las
4141

42+
Downloading the script at the bottom of this webpage will not download the required las
43+
files or PetroPy logo. To download all files, view the `examples folder`_ on GitHub.
44+
45+
.. _examples folder: https://github.com/toddheitmann/PetroPy/tree/master/examples
4246
"""
4347

4448
import petropy as ptr

doc/auto_examples/wolfcamp_bulk.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ The Third Iteration
4343
1. Exporting log statistics via :meth:`petropy.Log.statistics`
4444
2. Saving LogViewer to png and Log to las
4545

46+
Downloading the script at the bottom of this webpage will not download the required las
47+
files or PetroPy logo. To download all files, view the `examples folder`_ on GitHub.
48+
49+
.. _examples folder: https://github.com/toddheitmann/PetroPy/tree/master/examples
4650

4751

4852

doc/auto_examples/wolfcamp_single.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"cell_type": "markdown",
1616
"metadata": {},
1717
"source": [
18-
"\n# Wolfcamp Example - Single las file\n\n\nThis example shows the full petrophysical workflow avaiable in PetroPy\nfor a single wolfcamp las file courtesy of University Lands Texas.\n\nThe workflow progresses in these 11 steps\n\n1. Read las file and create a :class:`petropy.Log` object\n2. Load tops from a csv file using :meth:`petropy.Log.tops_from_csv`\n3. Create a :class:`petropy.LogViewer` show in edit_mode to fix data\n4. Define formations for calculations.\n5. Calculate fluid properties by\n 1. Loading parameters via :meth:`petropy.Log.fluid_properties_parameters_from_csv`\n 2. Calculating over formations via :meth:`petropy.Log.formation_fluid_properties`\n6. Calculate mulitmineral properties by\n 1. Loading parameters via :meth:`petropy.Log.multimineral_parameters_from_csv`\n 2. Calculating over formations via :meth:`petropy.Log.formation_multimineral_model`\n7. Curve summations via :meth:`petropy.Log.summations`\n8. Adding pay flags via :meth:`petropy.Log.add_pay_flag`\n9. Clustering intervals into Electrofacies via :meth:`petropy.electrofacies`\n10. Exporting log statistics via :meth:`petropy.Log.statistics`\n11. Saving LogViewer to png and Log to las\n\nTo bulk process a folder of las files at once, use the `bulk example`_ .\n\n\n"
18+
"\n# Wolfcamp Example - Single las file\n\n\nThis example shows the full petrophysical workflow avaiable in PetroPy\nfor a single wolfcamp las file courtesy of University Lands Texas.\n\nThe workflow progresses in these 11 steps\n\n1. Read las file and create a :class:`petropy.Log` object\n2. Load tops from a csv file using :meth:`petropy.Log.tops_from_csv`\n3. Create a :class:`petropy.LogViewer` show in edit_mode to fix data\n4. Define formations for calculations.\n5. Calculate fluid properties by\n 1. Loading parameters via :meth:`petropy.Log.fluid_properties_parameters_from_csv`\n 2. Calculating over formations via :meth:`petropy.Log.formation_fluid_properties`\n6. Calculate mulitmineral properties by\n 1. Loading parameters via :meth:`petropy.Log.multimineral_parameters_from_csv`\n 2. Calculating over formations via :meth:`petropy.Log.formation_multimineral_model`\n7. Curve summations via :meth:`petropy.Log.summations`\n8. Adding pay flags via :meth:`petropy.Log.add_pay_flag`\n9. Clustering intervals into Electrofacies via :meth:`petropy.electrofacies`\n10. Exporting log statistics via :meth:`petropy.Log.statistics`\n11. Saving LogViewer to png and Log to las\n\nTo bulk process a folder of las files at once, use the `bulk example`_ .\n\nDownloading the script at the bottom of this webpage will not download the required las\nfile or PetroPy logo. To download all files, view the `examples folder`_ on GitHub.\n\n\n"
1919
]
2020
},
2121
{

doc/auto_examples/wolfcamp_single.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626

2727
To bulk process a folder of las files at once, use the `bulk example`_ .
2828

29+
Downloading the script at the bottom of this webpage will not download the required las
30+
file or PetroPy logo. To download all files, view the `examples folder`_ on GitHub.
31+
2932
.. _bulk example: wolfcamp_bulk.html
33+
.. _examples folder: https://github.com/toddheitmann/PetroPy/tree/master/examples
3034
"""
3135

3236
import petropy as ptr

doc/auto_examples/wolfcamp_single.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ The workflow progresses in these 11 steps
3030

3131
To bulk process a folder of las files at once, use the `bulk example`_ .
3232

33+
Downloading the script at the bottom of this webpage will not download the required las
34+
file or PetroPy logo. To download all files, view the `examples folder`_ on GitHub.
35+
3336
.. _bulk example: wolfcamp_bulk.html
37+
.. _examples folder: https://github.com/toddheitmann/PetroPy/tree/master/examples
3438

3539

3640

0 commit comments

Comments
 (0)