Skip to content

Commit

Permalink
Update paleopizometry_template.ipynb
Browse files Browse the repository at this point in the history
  • Loading branch information
marcoalopez committed Jun 18, 2024
1 parent e5a281a commit 3d396fb
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions grain_size_tools/paleopizometry_template.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"===================================================\n",
"Welcome to the GrainSizetool piezometers module\n",
"===================================================\n",
"Piezometric database v2024.05.21 loaded.\n",
"Piezometric database v2024.06.06 loaded.\n",
"\n",
"To get or display piezometric properties use:\n",
">>> piezometers.<mineral>.<piezometer>\n",
">>> database.<mineral>.<piezometer>\n",
"\n",
"Available piezometric relationships:\n",
"quartz:\n",
Expand Down Expand Up @@ -114,7 +114,7 @@
],
"source": [
"# display the properties of the piezometric relation to use\n",
"summary(piezometers.olivine.VanderWal_wet)"
"summary(database.olivine.VanderWal_wet)"
]
},
{
Expand Down Expand Up @@ -162,7 +162,7 @@
}
],
"source": [
"calc_diffstress(piezometers.olivine.VanderWal_wet, grain_size=140, correction=True)"
"calc_diffstress(database.olivine.VanderWal_wet, grain_size=140, correction=True)"
]
},
{
Expand Down Expand Up @@ -198,7 +198,7 @@
"ameans = np.array([112.23, 113.71, 112.76, 111.73, 112.69, 110.67])\n",
"\n",
"# estimate the differential stress and store the results\n",
"estimates = calc_diffstress(piezometers.olivine.VanderWal_wet, grain_size=ameans)"
"estimates = calc_diffstress(database.olivine.VanderWal_wet, grain_size=ameans)"
]
},
{
Expand Down Expand Up @@ -268,7 +268,7 @@
}
],
"source": [
"_ = conf_interval(estimates)"
"mean, confi, limits = conf_interval(estimates)"
]
},
{
Expand All @@ -281,10 +281,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Notebook last run in 2024-06-06 using:\n",
"Python 3.10.13 | packaged by Anaconda, Inc. | (main, Sep 11 2023, 13:24:38) [MSC v.1916 64 bit (AMD64)]\n",
"Notebook last run in 2024-06-18 using:\n",
"Python 3.11.5 | packaged by Anaconda, Inc. | (main, Sep 11 2023, 13:16:22) [MSC v.1916 64 bit (AMD64)]\n",
"Numpy 1.26.4\n",
"Pandas 2.2.1\n",
"Pandas 2.2.2\n",
"Database metadata:\n"
]
},
Expand All @@ -294,7 +294,7 @@
"{'author': 'Marco A. Lopez-Sanchez',\n",
" 'contact_email': 'marcoalopez [to be found at] outlook [dot] com',\n",
" 'description': 'Piezometric database from GrainSizeTools script',\n",
" 'created_at': datetime.date(2024, 5, 21),\n",
" 'created_at': datetime.date(2024, 6, 6),\n",
" 'license': 'Open Database License (ODbL) - version 1.0',\n",
" 'usage_terms': 'https://opendatacommons.org/licenses/odbl/summary/',\n",
" 'contributors': None}"
Expand Down Expand Up @@ -336,7 +336,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
"version": "3.11.5"
}
},
"nbformat": 4,
Expand Down

0 comments on commit 3d396fb

Please sign in to comment.