PyCBA 0.4.1__tar.gz → 0.4.2__tar.gz

{PyCBA-0.4.1/src/PyCBA.egg-info → PyCBA-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCBA
-Version: 0.4.1
+Version: 0.4.2
 Summary: Python Continuous Beam Analysis
 Author-email: Colin Caprani <colin.caprani@monash.edu>
 License: Apache 2.0

{PyCBA-0.4.1 → PyCBA-0.4.2/src/PyCBA.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCBA
-Version: 0.4.1
+Version: 0.4.2
 Summary: Python Continuous Beam Analysis
 Author-email: Colin Caprani <colin.caprani@monash.edu>
 License: Apache 2.0

{PyCBA-0.4.1 → PyCBA-0.4.2}/src/pycba/__init__.py

@@ -2,7 +2,7 @@
 PyCBA - Continuous Beam Analysis in Python
 """
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 from .analysis import *
 from .beam import *

{PyCBA-0.4.1 → PyCBA-0.4.2}/src/pycba/beam.py

@@ -219,6 +219,18 @@ class Beam:
             The number of restraints in the beam
         """
         return len(self._restraints)
+    
+    @property
+    def no_fixed_restraints(self):
+        """
+        Returns the number of fixed restraints of the beam (fully-supported DOFs)
+
+        Returns
+        -------
+        no_fixed_restraints : int
+            The number of fixed restraints in the beam
+        """
+        return len(np.where(np.array(self._restraints)==-1)[0])
 
     @property
     def length(self):

{PyCBA-0.4.1 → PyCBA-0.4.2}/src/pycba/inf_lines.py

@@ -121,18 +121,41 @@ class InfluenceLines:
         x = self.vResults[0].results.x
         dx = x[2] - x[1]
         idx = np.where(np.abs(x - poi) <= dx * 1e-6)[0][0]
-        # find the nearest support to the poi
-        idxr = (
-            np.abs(np.cumsum(np.insert(self.ba.beam.mbr_lengths, 0, 0)) - poi)
-        ).argmin()
+        #idx = np.abs(x - poi).argmin()
+        
         npts = len(self.vResults)
         eta = np.zeros(npts)
+        
+        #
+        # Getting the correct vertical reaction is tricky
+        # Should be relatively easy to extend to get moment reactions too.
+        #
+        # Get vector of the node locations
+        node_locations = np.cumsum(np.insert(self.ba.beam.mbr_lengths, 0, 0))
+        # The indices of the supported vertical DOFs wrt the node locations vector
+        vert_sup_dof_idx = np.where(np.array(self.ba._beam.restraints)[::2]==-1)[0]
+        # The locations then of these vertical supports
+        vert_sup_locs = node_locations[vert_sup_dof_idx]
+        # The index of the closest vertical support
+        closest_vert_sup_idx = np.abs(vert_sup_locs-poi).argmin()
+        # And its value
+        closest_vert_sup = vert_sup_locs[closest_vert_sup_idx]
+        # And now the indixe of this support in the node locations vector
+        node_idx = np.where(node_locations==closest_vert_sup)[0][0]
+        # And hence its index in the overall DOFs vector
+        dof_idx = 2*node_idx
+        
+        # Now we must link the supported DOF to the index in the BeamAnalysis reactions vector
+        idx_mask = np.zeros_like(self.ba._beam.restraints)
+        idx_mask[np.where(np.array(self.ba._beam.restraints)==-1)] = np.arange(self.ba.beam.no_fixed_restraints)
+        # And finally the index of the vertical support nearest the POI in the reactions vector
+        vert_sup_idx = idx_mask[dof_idx]
 
         for i, res in enumerate(self.vResults):
             if load_effect == "V":
                 eta[i] = res.results.V[idx]
             elif load_effect == "R":
-                eta[i] = res.R[idxr]
+                eta[i] = res.R[vert_sup_idx]
             else:
                 eta[i] = res.results.M[idx]