PyCBA 0.4.0__tar.gz → 0.4.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCBA
-Version: 0.4.0
+Version: 0.4.2
 Summary: Python Continuous Beam Analysis
 Author-email: Colin Caprani <colin.caprani@monash.edu>
 License: Apache 2.0
@@ -49,3 +49,4 @@ One of the main functions of `PyCBA` is that the basic analysis engine forms the
 
 - Influence line generation
 - Moving load analysis for bridges, targeted at bridge access assessments
+- Load patterning and enveloping

{PyCBA-0.4.0 → PyCBA-0.4.2}/README.md

@@ -14,3 +14,4 @@ One of the main functions of `PyCBA` is that the basic analysis engine forms the
 
 - Influence line generation
 - Moving load analysis for bridges, targeted at bridge access assessments
+- Load patterning and enveloping

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCBA
-Version: 0.4.0
+Version: 0.4.2
 Summary: Python Continuous Beam Analysis
 Author-email: Colin Caprani <colin.caprani@monash.edu>
 License: Apache 2.0
@@ -49,3 +49,4 @@ One of the main functions of `PyCBA` is that the basic analysis engine forms the
 
 - Influence line generation
 - Moving load analysis for bridges, targeted at bridge access assessments
+- Load patterning and enveloping

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

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

{PyCBA-0.4.0 → 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.0 → 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]
 

{PyCBA-0.4.0 → PyCBA-0.4.2}/src/pycba/load.py

@@ -799,7 +799,7 @@ def parse_LM(LM: LoadMatrix) -> List[Load]:
     return loads
 
 
-def add_LM(LM1: LoadMatrix, LM2: LoadMatrix):
+def add_LM(LM1: LoadMatrix, LM2: LoadMatrix) -> LoadMatrix:
     """
     Adds two load matrices and returns the sum; this enables superposition
 
@@ -824,3 +824,35 @@ def add_LM(LM1: LoadMatrix, LM2: LoadMatrix):
         LM.append(load)
 
     return LM
+
+
+def factor_LM(LM: LoadMatrix, gamma: float) -> LoadMatrix:
+    """
+    Applies a factor to the loads in a `LoadMatrix` object
+
+    Parameters
+    ----------
+    LM : LoadMatrix
+        The `LoadMatrix` object
+
+    gamma : float
+        A factor to apply to the load magnitudes
+
+    Returns
+    -------
+    LM : LoadMatrix
+        The factored `LoadMatrix` object
+    """
+    LMnew = []
+    for load in LM:
+        i_span = load[0]
+        l_type = load[1]
+        mag = gamma * load[2]
+        if l_type == 1:  # UDL
+            LMnew.append([i_span, l_type, mag])
+        elif l_type == 2 or l_type == 4:  # PL or ML
+            LMnew.append([i_span, l_type, mag, load[3]])
+        else:  # PUDL
+            LMnew.append([i_span, l_type, mag, load[3], load[4]])
+
+    return LMnew

{PyCBA-0.4.0 → PyCBA-0.4.2}/src/pycba/results.py

@@ -371,7 +371,7 @@ class Envelopes:
             raise ValueError("No results to display")
 
         L = self.x[-1]
-        
+
         fig, axs = plt.subplots(2, 1, sharex=True, **kwargs)
 
         ax = axs[0]
@@ -389,7 +389,7 @@ class Envelopes:
         ax.grid()
         ax.set_ylabel("Shear Force (kN)")
         ax.set_xlabel("Distance along beam (m)")
-        
+
         if each:
             for res in self.vResults:
                 axs[0].plot(self.x, res.results.M, "r", lw=0.5)

{PyCBA-0.4.0 → PyCBA-0.4.2}/tests/test_basic.py

@@ -227,36 +227,41 @@ def test_moment_load():
         d = beam_analysis.beam_results.D[[0, 2]]
         assert d == pytest.approx([0.0, 0.0])
 
+
 def test_envelopes():
-    L = [6,4,6]
+    L = [6, 4, 6]
     EI = 30 * 10e9 * 1e-6
-    R = [-1,0,-1,0,-1,0,-1,0]
+    R = [-1, 0, -1, 0, -1, 0, -1, 0]
     beam_analysis = cba.BeamAnalysis(L, EI, R)
-    
-    LMg = [[1,1,25,0,0],
-           [2,1,25,0,0],
-           [3,1,25,0,0]]
+
+    LMg = [[1, 1, 25, 0, 0], [2, 1, 25, 0, 0], [3, 1, 25, 0, 0]]
     γg_max = 1.4
     γg_min = 1.0
-    LMq = [[1,1,10,0,0],
-           [2,1,10,0,0],
-           [3,1,10,0,0]]
+    LMq = [[1, 1, 10, 0, 0], [2, 1, 10, 0, 0], [3, 1, 10, 0, 0]]
     γq_max = 1.6
     γq_min = 0
-    
+
     lp = cba.LoadPattern(beam_analysis)
-    lp.set_dead_loads(LMg,γg_max,γg_min)
-    lp.set_live_loads(LMq,γq_max,γq_min)
+    lp.set_dead_loads(LMg, γg_max, γg_min)
+    lp.set_live_loads(LMq, γq_max, γq_min)
     env = lp.analyze()
-    
+
     m_locs = np.array([3, 6, 8, 10, 13])
     idx = [(np.abs(env.x - x)).argmin() for x in m_locs]
-    assert np.allclose(env.Mmax[idx],np.array([163.79, 0, 11.75, 0, 163.79]),atol=1e-2)
-    assert np.allclose(env.Mmin[idx],np.array([0, -163.38, -81.42, -163.38, 0]),atol=1e-2)
-    
+    assert np.allclose(
+        env.Mmax[idx], np.array([163.79, 0, 11.75, 0, 163.79]), atol=1e-2
+    )
+    assert np.allclose(
+        env.Mmin[idx], np.array([0, -163.38, -81.42, -163.38, 0]), atol=1e-2
+    )
+
     n = beam_analysis.beam_results.npts
     nspans = beam_analysis.beam.no_spans
-    Vmax = np.array([np.max(env.Vmax[i*(n+3):(i+1)*(n+3)]) for i in range(nspans)])
-    assert np.allclose(Vmax,np.array([131.1, 123.94, 180.23]),atol=1e-2)
-    Vmin = np.array([np.min(env.Vmin[i*(n+3):(i+1)*(n+3)]) for i in range(nspans)])
-    assert np.allclose(Vmin,np.array([-180.23, -123.94, -131.10]),atol=1e-2) 
+    Vmax = np.array(
+        [np.max(env.Vmax[i * (n + 3) : (i + 1) * (n + 3)]) for i in range(nspans)]
+    )
+    assert np.allclose(Vmax, np.array([131.1, 123.94, 180.23]), atol=1e-2)
+    Vmin = np.array(
+        [np.min(env.Vmin[i * (n + 3) : (i + 1) * (n + 3)]) for i in range(nspans)]
+    )
+    assert np.allclose(Vmin, np.array([-180.23, -123.94, -131.10]), atol=1e-2)