From e3298c3413f7722f3fc04438e2c647c48f483fbc Mon Sep 17 00:00:00 2001 From: Bruno Stuyts Date: Wed, 3 Apr 2024 11:38:40 +0400 Subject: [PATCH] Fixes during course --- CHANGES.txt | 2 ++ groundhog/__version__.py | 2 +- .../onedimensionalconsolidation.py | 2 +- groundhog/general/plotting.py | 10 +++++----- .../insitutests/data/output_pcpt.xlsx | Bin 79171 -> 79171 bytes 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 89d1547..01bd706 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ v0.13.0, TBD + - Ensured the cv arrays in consolidation calcs are treated as Numpy arrays + - Increased the timeout for interactive parameter selection to two minutes - TODO: Add hatching patterns to LogPlot - TODO: Include code for suction caisson penetration in sand + notebook for Deutsche Bucht - TODO: Property mapping takes too much times for CPTs, improve speed of routine diff --git a/groundhog/__version__.py b/groundhog/__version__.py index 44cd721..7b127cc 100755 --- a/groundhog/__version__.py +++ b/groundhog/__version__.py @@ -7,7 +7,7 @@ __title__ = 'groundhog' __description__ = 'Groundhog - A general-purpose geotechnical package' -__version__ = '0.12.0' +__version__ = '0.13.0' __author__ = 'Bruno Stuyts' __author_email__ = 'bruno@pro-found.be' __license__ = 'GNU GPLv3' diff --git a/groundhog/consolidation/dissipation/onedimensionalconsolidation.py b/groundhog/consolidation/dissipation/onedimensionalconsolidation.py index a51f9df..da63920 100644 --- a/groundhog/consolidation/dissipation/onedimensionalconsolidation.py +++ b/groundhog/consolidation/dissipation/onedimensionalconsolidation.py @@ -228,7 +228,7 @@ def consolidation_degree(time, cv, drainage_length, distribution='uniform'): 94.17392451834256, 94.5038268672473, 94.5038268672473, 94.61695217612572, 94.65886439322504, 94.66724683664488, 94.75107127084354, 94.75107127084354, 94.80974837478256, 94.93548502608051]) - _cv_m2_s = cv / (365 * 24 * 3600) + _cv_m2_s = np.array(cv) / (365 * 24 * 3600) _Tv = _cv_m2_s * time / (drainage_length ** 2) if distribution == 'uniform': diff --git a/groundhog/general/plotting.py b/groundhog/general/plotting.py index 1d4b92a..a0412b1 100644 --- a/groundhog/general/plotting.py +++ b/groundhog/general/plotting.py @@ -596,7 +596,7 @@ def select_additional_layers(self, no_additional_layers, panel_no=1, precision=2 The depth of the layer transition is rounded according to the ``precision`` argument. Default=2 for cm accuracy.""" ax = self.axes[panel_no] - xy = plt.ginput(no_additional_layers) + xy = plt.ginput(no_additional_layers, timeout=120) x = [p[0] for p in xy] y = [round(p[1], precision) for p in xy] @@ -621,7 +621,7 @@ def select_layering(self, panel_no=1, precision=2, stop_threshold=0): final = False while not final: - xy = plt.ginput(1) + xy = plt.ginput(1, timeout=120) x = [p[0] for p in xy] y = [round(p[1], precision) for p in xy] @@ -645,7 +645,7 @@ def select_constant(self, panel_no, parametername, units, nan_tolerance=0.1): The parameter is added to the ``SoilProfile`` object with the ``'parametername [units]'`` key. """ ax = self.axes[panel_no] - xy = plt.ginput(self.soilprofile.__len__()) + xy = plt.ginput(self.soilprofile.__len__(), timeout=120) x = [p[0] for p in xy] y = [p[1] for p in xy] @@ -669,7 +669,7 @@ def select_linear(self, panel_no, parametername, units, nan_tolerance=0.1): The parameter is added to the ``SoilProfile`` object with the ``'parametername [units]'`` key. """ ax = self.axes[panel_no] - xy = plt.ginput(2 * self.soilprofile.__len__()) + xy = plt.ginput(2 * self.soilprofile.__len__(), timeout=120) x = [p[0] for p in xy] y = [p[1] for p in xy] @@ -712,7 +712,7 @@ def peak_picker(x, y, correct_selected_point=True): plt.ylabel('$ y $', size=15) # Click on the peak - xy = plt.ginput(1) + xy = plt.ginput(1, timeout=120) # Calculate derived quantities x100 = xy[0][0] if correct_selected_point: diff --git a/tests/siteinvestigation/insitutests/data/output_pcpt.xlsx b/tests/siteinvestigation/insitutests/data/output_pcpt.xlsx index 2580286da8c515a90cd9e4a5e99966eee30028cf..c19271aedddc0d35832cca68fb07f9261594e8c7 100644 GIT binary patch delta 521 zcmX^7iskSt7Ty4FW)=|!1_lm>_m0gIdDqqhsR-$FPZqof3TiVkFbD$al>Fp?qWpql z{p9?jRK1GaoU@ZoXB{>WaIIgOk>4+$DSqgqn(As1F5WFA>PtM8vTP?TyYch)sjNo< zxA-+O7SCL5obE99OU$l@^9L(=mKfgiP1`Whdw-g`(s{;3HVXwe`f$#k#V+2npoG`G z{)1Cphq6;}D1X9)79o`cHnBRzP5Xi;oo;A~+3{d%%!hx*Jd(>)9yGA&x~@1a6=CoH z<$30d2W&GETMiz1&$Oy_#_IZ{V)h%Vmaco394pj0Zua~VpXnakw{f3#wQif(GId6r z>)DrY3eT>a9Dn=lve=wl;Iokrj7uUv66~ z+{FGs;`jOI=O;zWwtN$eU&JqQGHI7|>~-~phiA!lHZgeo>hN1yd>g!re9Am|4+rr1p7XUXsHm^2I{R8|oBxuk-plJ# zSm!dYyIJ}vdh^Y9ax>Sg{7)g9sH?${LQb!@73Py*;xI%zjuAprq=j! z#r+H@!L<1{qa7PFFrYTeaGYlZGv09uF@YJ(JnhUNMsqL!_FjI*?@}Pn_I54Ci(vWb z(YlP!z(Ov1jFZ87r{B_N{0bJjWWX2>5z;YYwB~@t#Pob4MstvY=_`#G?ZAvzMvTs2 qhJi7ZQ3hk|fiaj&7%jkRY)u%=z>G2zMk_F5vk9XsnDN_$(E|WtDaqjg