Fixes during course

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

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__ = '[email protected]'
 __license__ = 'GNU GPLv3'

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':

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: