Skip to content

Commit

Permalink
Update piezometric_database.py
Browse files Browse the repository at this point in the history
  • Loading branch information
marcoalopez committed Jan 30, 2024
1 parent 4b5aabd commit 3c19354
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions grain_size_tools/piezometric_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def olivine(piezometer=None):
print('Available piezometers:')
print("'Jung_Karato'")
print("'VanderWal_wet'")
print("'Tasaka_wet'")
# print("'Tasaka_wet'")
return None

elif piezometer == 'Jung_Karato':
Expand All @@ -262,13 +262,13 @@ def olivine(piezometer=None):
empirical equation of De Hoff and Rhines (1968) as follows: \
LI = (1.5 / sqrt(4/pi)) * ECD'

elif piezometer == 'Tasaka_wet':
B, m = 719.7, 0.75
warn = 'Ensure that you entered the apparent grain size as the arithmetic mean in linear scale'
linear_intercepts = False
correction_factor = 4 / 3.141592
reference = 'https://doi.org/10.1002/2015JB012096'
notes = None
# elif piezometer == 'Tasaka_wet':
# B, m = 719.7, 0.75
# warn = 'Ensure that you entered the apparent grain size as the arithmetic mean in linear scale'
# linear_intercepts = False
# correction_factor = 4 / 3.141592
# reference = 'https://doi.org/10.1002/2015JB012096'
# notes = None

else:
olivine()
Expand Down Expand Up @@ -327,4 +327,4 @@ def feldspar(piezometer=None):
if __name__ == '__main__':
pass
else:
print('database imported')
print('database v.2024.02.xx imported')

0 comments on commit 3c19354

Please sign in to comment.