Worked on pushover analysis

Author: JWock82

Pynite/Analysis.py

@@ -305,16 +305,16 @@ def _pushover_step(model: FEModel3D, combo_name: str, push_combo: str, step_num:
             from scipy.sparse.linalg import spsolve
 
             # Calculate the initial stiffness matrix
-            if log: print('-Calculating elastic stiffness matrix [Ke]')
+            if log: print('- Calculating elastic stiffness matrix [Ke]')
             K11, K12, K21, K22 = _partition(model, model.K(combo_name, log, check_stability, sparse).tolil(), D1_indices, D2_indices)
 
             # Calculate the geometric stiffness matrix
             # The `combo_name` variable in the code below is not the name of the pushover load combination. Rather it is the name of the primary combination that the pushover load will be added to. Axial loads used to develop Kg are calculated from the displacements stored in `combo_name`.
-            if log: print('-Calculating geometric stiffness matrix [Kg]')
+            if log: print('- Calculating geometric stiffness matrix [Kg]')
             Kg11, Kg12, Kg21, Kg22 = _partition(model, model.Kg(combo_name, log, sparse, False).tolil(), D1_indices, D2_indices)
 
             # Calculate the stiffness reduction matrix
-            if log: print('-Calculating plastic reduction matrix [Km]')
+            if log: print('- Calculating plastic reduction matrix [Km]')
             Km11, Km12, Km21, Km22 = _partition(model, model.Km(combo_name, push_combo, step_num, log, sparse).tolil(), D1_indices, D2_indices)
 
             # The stiffness matrices are currently `lil` format which is great for
@@ -330,7 +330,7 @@ def _pushover_step(model: FEModel3D, combo_name: str, push_combo: str, step_num:
         else:
 
             # Initial stiffness matrix
-            if log: print('-Calculating elastic stiffness matrix [Ke]')
+            if log: print('- Calculating elastic stiffness matrix [Ke]')
             K11, K12, K21, K22 = _partition(model, model.K(combo_name, log, check_stability, sparse), D1_indices, D2_indices)
 
             # Geometric stiffness matrix
@@ -386,7 +386,7 @@ def _pushover_step(model: FEModel3D, combo_name: str, push_combo: str, step_num:
 
             for sub_member in phys_member.sub_members.values():
 
-                print(f'Member {sub_member.name} lambda = {sub_member.lamb(Delta_D, combo_name, push_combo, step_num)}')
+                # print(f'Member {sub_member.name} lambda = {sub_member.lamb(Delta_D, combo_name, push_combo, step_num)}')
 
                 # Check for plastic load reversal at the i-node in this load step
                 if sub_member.lamb(Delta_D, combo_name, push_combo, step_num)[0, 0] < 0:
@@ -415,7 +415,7 @@ def _pushover_step(model: FEModel3D, combo_name: str, push_combo: str, step_num:
         # Undo the last loadstep if plastic load reversal was discovered. We'll rerun it with the corresponding gradients set to zero vectors.
         if run_step is True:
             _sum_displacements(model, -Delta_D1, D2, D1_indices, D2_indices, model.load_combos[combo_name])
-            print('Restarting load step')
+            if log: print('- Restarting load step')
 
     # Sum the calculated displacements
     _sum_displacements(model, Delta_D1, D2, D1_indices, D2_indices, model.load_combos[combo_name])

Pynite/FEModel3D.py

@@ -1751,15 +1751,14 @@ def Km(self, combo_name='Combo 1', push_combo='Push', step_num=1, log=False, spa
             Km = zeros((len(self.nodes)*6, len(self.nodes)*6))
 
         # Add stiffness terms for each physical member in the model
-        if log: print('- Calculating the plastic reduction matrix')
         for phys_member in self.members.values():
-            
+
             # Check to see if the physical member is active for the given load combination
             if phys_member.active[combo_name] is True:
 
                 # Step through each sub-member in the physical member and add terms
                 for member in phys_member.sub_members.values():
-                    
+
                     # Get the member's global plastic reduction matrix
                     # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                     member_Km = member.Km(combo_name)
@@ -1768,25 +1767,25 @@ def Km(self, combo_name='Combo 1', push_combo='Push', step_num=1, log=False, spa
                     # 'a' & 'b' below are row/column indices in the member's matrix
                     # 'm' & 'n' are corresponding row/column indices in the structure's global matrix
                     for a in range(12):
-                    
+
                         # Determine if index 'a' is related to the i-node or j-node
                         if a < 6:
                             # Find the corresponding index 'm' in the global plastic reduction matrix
                             m = member.i_node.ID*6 + a
                         else:
                             # Find the corresponding index 'm' in the global plastic reduction matrix
                             m = member.j_node.ID*6 + (a-6)
-                        
+
                         for b in range(12):
-                        
+
                             # Determine if index 'b' is related to the i-node or j-node
                             if b < 6:
                                 # Find the corresponding index 'n' in the global plastic reduction matrix
                                 n = member.i_node.ID*6 + b
                             else:
                                 # Find the corresponding index 'n' in the global plastic reduction matrix
                                 n = member.j_node.ID*6 + (b-6)
-                        
+
                             # Now that 'm' and 'n' are known, place the term in the global plastic reduction matrix
                             if sparse is True:
                                 row.append(m)
@@ -1810,7 +1809,7 @@ def Km(self, combo_name='Combo 1', push_combo='Push', step_num=1, log=False, spa
         #     else: Analysis._check_stability(self, Km)
 
         # Return the global plastic reduction matrix
-        return Km 
+        return Km
 
     def FER(self, combo_name='Combo 1') -> NDArray[float64]:
         """Assembles and returns the global fixed end reaction vector for any given load combo.
@@ -2235,7 +2234,7 @@ def analyze(self, log=False, check_stability=True, check_statics=False, max_iter
 
         # Identify which load combinations have the tags the user has given
         combo_list = Analysis._identify_combos(self, combo_tags)
-        
+
         # Get the auxiliary list used to determine how the matrices will be partitioned
         D1_indices, D2_indices, D2 = Analysis._partition_D(self)
 
@@ -2469,23 +2468,25 @@ def _not_ready_yet_analyze_pushover(self, log=False, check_stability=True, push_
             # Apply the pushover load in steps, summing deformations as we go, until the full pushover load has been analyzed
             while load_factor <= 1:
 
-                print(f'load_factor {load_factor}')
-
                 # Inform the user which pushover load step we're on
                 if log:
                     print('- Beginning pushover load step #' + str(step_num))
+                    print(f'- Load_factor = {load_factor}')
 
                 # Run the next pushover load step
                 Analysis._pushover_step(self, combo.name, push_combo, step_num, P1_push, FER1_push, D1_indices, D2_indices, D2, log, sparse, check_stability)
 
                 # Update nonlinear material member end forces for each member
-                for member in self.members.values():
-                    member._fxi = member.f(combo.name, push_combo, step_num)[0, 0]
-                    member._myi = member.f(combo.name, push_combo, step_num)[4, 0]
-                    member._mzi = member.f(combo.name, push_combo, step_num)[5, 0]
-                    member._fxj = member.f(combo.name, push_combo, step_num)[6, 0]
-                    member._myj = member.f(combo.name, push_combo, step_num)[10, 0]
-                    member._mzj = member.f(combo.name, push_combo, step_num)[11, 0]
+                for phys_member in self.members.values():
+
+                    for member in phys_member.sub_members.values():
+
+                        member._fxi = member.f(combo.name, push_combo, step_num)[0, 0]
+                        member._myi = member.f(combo.name, push_combo, step_num)[4, 0]
+                        member._mzi = member.f(combo.name, push_combo, step_num)[5, 0]
+                        member._fxj = member.f(combo.name, push_combo, step_num)[6, 0]
+                        member._myj = member.f(combo.name, push_combo, step_num)[10, 0]
+                        member._mzj = member.f(combo.name, push_combo, step_num)[11, 0]
 
                 # Move on to the next load step
                 step_num += 1