Merge pull request #699 from davidrudlstorfer/update_pre_commit_hooks

Update pre commit hooks

Author: davidrudlstorfer

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.6
+    rev: v20.1.0
     hooks:
       - id: clang-format
         name: Format C/C++
@@ -17,13 +17,13 @@ repos:
         additional_dependencies: [pyyaml>=5.1]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 22.3.0
+    rev: 25.1.0
     hooks:
       - id: black
         name: Format python
 
   - repo: https://github.com/pamoller/xmlformatter
-    rev: v0.2.6
+    rev: v0.2.8
     hooks:
       - id: xml-formatter
         name: Format xml
@@ -32,14 +32,14 @@ repos:
         files: \.xml$
 
   - repo: https://github.com/google/yamlfmt
-    rev: v0.12.1
+    rev: v0.16.0
     hooks:
       - id: yamlfmt
         name: Format yaml
         args: [-conf, utilities/code_checks/.yamlfmt.yaml]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         name: Trim trailing whitespace
@@ -73,7 +73,7 @@ repos:
           - --detect-license-in-X-top-lines=3
 
   - repo: https://github.com/crate-ci/typos
-    rev: v1.28.4
+    rev: v1.31.1
     hooks:
       - id: typos
         name: Check for typos in code

.typos.toml

@@ -11,6 +11,7 @@ ue = "ue" # elastic stretch tensor
 ser = "ser" # "switched evolution relaxation" (used for pseudo transient continuation)
 ded = "ded" # derivative w.r.t. electrode variables
 uncomplete = "uncomplete" # used in the context of the uncomplete() call fo a sparse matrix
+Comput = "Comput" # abbreviation Comput. for Computational / Computing (typo fix cannot contain .)
 
 # German words we want to keep as is.
 Interaktion = "Interaktion"

src/beam3/4C_beam3_euler_bernoulli.cpp

@@ -457,7 +457,7 @@ void Discret::Elements::Beam3eb::set_up_reference_geometry(
     std::fill(bending_moment_gp_.begin(), bending_moment_gp_.end(), 0.0);
 
 
-    // create Matrix for the derivates of the shapefunctions at the GP
+    // create Matrix for the derivatives of the shapefunctions at the GP
     Core::LinAlg::Matrix<1, nnode> shapefuncderiv;
 
     // Loop through all GPs and compute jacobi at the GPs

src/beamcontact/4C_beamcontact_beam3contact.cpp

@@ -4026,7 +4026,7 @@ void CONTACT::Beam3contact<numnodes, numnodalvalues>::compute_lin_eta_fix_xi(
   //  std::cout << "r2_xi: " << r2_xi << std::endl;
   //  std::cout << "r2_xixi: " << r2_xixi << std::endl;
 
-  if (fabs(Core::FADUtils::cast_to_double(L)) < COLINEARTOL)
+  if (fabs(Core::FADUtils::cast_to_double(L)) < COLLINEARTOL)
     FOUR_C_THROW("Linearization of point to line projection is zero, choose tighter search boxes!");
 
   for (int i = 0; i < 3; i++)
@@ -4080,7 +4080,7 @@ void CONTACT::Beam3contact<numnodes, numnodalvalues>::compute_lin_xi_fix_eta(
   L = Core::FADUtils::scalar_product(r1_xi, r1_xi) +
       Core::FADUtils::scalar_product(delta_r, r1_xixi);
 
-  if (fabs(Core::FADUtils::cast_to_double(L)) < COLINEARTOL)
+  if (fabs(Core::FADUtils::cast_to_double(L)) < COLLINEARTOL)
     FOUR_C_THROW("Linearization of point to line projection is zero, choose tighter search boxes!");
 
   for (int i = 0; i < 3; i++)
@@ -4895,7 +4895,7 @@ void CONTACT::Beam3contact<numnodes, numnodalvalues>::evaluate_lin_orthogonality
   }
 
   // Inverting (2x2) matrix df by hard coded formula, so that it is
-  // possible to handle colinear vectors, because they lead to det(df) =0
+  // possible to handle collinear vectors, because they lead to det(df) =0
   TYPE det_df = df(0, 0) * df(1, 1) - df(1, 0) * df(0, 1);
 
   //********************************************************************
@@ -4907,7 +4907,7 @@ void CONTACT::Beam3contact<numnodes, numnodalvalues>::evaluate_lin_orthogonality
   //********************************************************************
 
   // singular df
-  if (Core::FADUtils::cast_to_double(Core::FADUtils::norm(det_df)) < COLINEARTOL)
+  if (Core::FADUtils::cast_to_double(Core::FADUtils::norm(det_df)) < COLLINEARTOL)
   {
     // sort out
     elementscolinear = true;
@@ -4998,7 +4998,7 @@ bool CONTACT::Beam3contact<numnodes, numnodalvalues>::evaluate_lin_ptl_orthogona
   // check, if df=0: This can happen e.g. when the master beam 2 describes a circle geometry and the
   // projectiong slave point coincides with the cetern of the circle
 
-  if (fabs(Core::FADUtils::cast_to_double(df)) < COLINEARTOL)
+  if (fabs(Core::FADUtils::cast_to_double(df)) < COLLINEARTOL)
     return false;
   else
     return true;

src/beamcontact/4C_beamcontact_beam3contact_manager.cpp

@@ -2137,7 +2137,7 @@ void CONTACT::Beam3cmanager::transform_angle_to_triad(
   for (int i = 0; i < 3; i++)
     for (int j = 0; j < 3; j++)
       R(i, j) = identity(i, j) + spin(i, j) * (sin(theta_abs)) / theta_abs +
-                (1 - (cos(theta_abs))) / (pow(theta_abs, 2))*spin2(i, j);
+                (1 - (cos(theta_abs))) / (pow(theta_abs, 2)) * spin2(i, j);
 
   return;
 }

src/beamcontact/4C_beamcontact_beam3contactnew.cpp

@@ -577,7 +577,7 @@ void CONTACT::Beam3contactnew<numnodes, numnodalvalues>::evaluate_stiffc_contact
 
   // if the bool inactivestiff is true, the contact stiffness will always be applied in the first
   // Newton steps for pair which have been active in the last time step (even when they are
-  // currentely not active) -> This makes the algorithm more robust.
+  // currently not active) -> This makes the algorithm more robust.
   const bool inactivestiff = bcparams_.get<bool>("BEAMS_INACTIVESTIFF");
 
   // In order to accelerate convergence, we only apply the basic stiffness part in case of very
@@ -2442,7 +2442,7 @@ void CONTACT::Beam3contactnew<numnodes, numnodalvalues>::calc_penalty_law()
 {
   // if the bool inactivestiff is true, the contact stiffness will always be applied in the first
   // Newton steps for pair which have been active in the last time step (even when they are
-  // currentely not active) -> This makes the algorithm more robust.
+  // currently not active) -> This makes the algorithm more robust.
   const bool inactivestiff = bcparams_.get<bool>("BEAMS_INACTIVESTIFF");
 
   if (contactflag_ or (iter_ == 0 and inactivestiff and oldcontactflag_))
@@ -3069,7 +3069,7 @@ void CONTACT::Beam3contactnew<numnodes, numnodalvalues>::evaluate_lin_orthogonal
   }
 
   // Inverting (2x2) matrix df by hard coded formula, so that it is
-  // possible to handle colinear vectors, because they lead to det(df) =0
+  // possible to handle collinear vectors, because they lead to det(df) =0
   TYPE det_df = df(0, 0) * df(1, 1) - df(1, 0) * df(0, 1);
 
   //********************************************************************
@@ -3081,7 +3081,7 @@ void CONTACT::Beam3contactnew<numnodes, numnodalvalues>::evaluate_lin_orthogonal
   //********************************************************************
 
   // singular df
-  if (Core::FADUtils::cast_to_double(Core::FADUtils::norm(det_df)) < COLINEARTOL)
+  if (Core::FADUtils::cast_to_double(Core::FADUtils::norm(det_df)) < COLLINEARTOL)
   {
     // sort out
     elementscolinear_ = true;

src/beamcontact/4C_beamcontact_beam3tosolidcontact.cpp

@@ -1879,7 +1879,7 @@ void CONTACT::Beam3tosolidcontact<numnodessol, numnodes, numnodalvalues>::projec
   TYPEBTS residual = 0.0;
 
 
-  // Local netwon iteration
+  // Local newton iteration
   // -----------------------------------------------------------------
 
   int iter;
@@ -1979,13 +1979,13 @@ void CONTACT::Beam3tosolidcontact<numnodessol, numnodes, numnodalvalues>::projec
 #endif
 
     // Inverting 2x2-matrix J by hard coded formula, so that it is possible
-    // to handle colinear vectors, because they lead to det(J) = 0
+    // to handle collinear vectors, because they lead to det(J) = 0
     TYPEBTS det_J = J(0, 0) * J(1, 1) - J(1, 0) * J(0, 1);
 
     // If det_J = 0 we assume, that the beam centerline and the surface edge are parallel.
     // These projection is not needed due the fact that the contact interval can also be
     // identified by two contact interval borders found with the GetContactLines method
-    parallel = Core::FADUtils::cast_to_double(Core::FADUtils::norm(det_J)) < COLINEARTOL;
+    parallel = Core::FADUtils::cast_to_double(Core::FADUtils::norm(det_J)) < COLLINEARTOL;
 
     // Check if the local Newton iteration has converged
     // If the start point fulfills the orthogonalty conditions (residual < BEAMCONTACTTOL), we also

src/beaminteraction/src/4C_beaminteraction_beam_to_beam_contact_defines.hpp

@@ -53,7 +53,7 @@ FOUR_C_NAMESPACE_OPEN
 #define SHIFTVALUE \
   1.0e-7 /* value, one contact point will be shiftet, if contact points are to close */
 // default: 1.0e-7
-#define COLINEARTOL 1.0e-12 /* tolerance when two elements are almost colinear */
+#define COLLINEARTOL 1.0e-12 /* tolerance when two elements are almost collinear */
 // default: 1.0e-12
 #define DETERMINANTTOL                                                                           \
   1.0e-12 /* tolerance how small the determinant appearing in the contact point linearization is \

src/beaminteraction/src/4C_beaminteraction_beam_to_beam_contact_pair.cpp

@@ -3981,7 +3981,7 @@ void BeamInteraction::BeamToBeamContactPair<numnodes, numnodalvalues>::compute_l
   //  std::cout << "r2_xi: " << r2_xi << std::endl;
   //  std::cout << "r2_xixi: " << r2_xixi << std::endl;
 
-  if (fabs(Core::FADUtils::cast_to_double(L)) < COLINEARTOL)
+  if (fabs(Core::FADUtils::cast_to_double(L)) < COLLINEARTOL)
     FOUR_C_THROW("Linearization of point to line projection is zero, choose tighter search boxes!");
 
   for (unsigned int i = 0; i < 3; i++)
@@ -4035,7 +4035,7 @@ void BeamInteraction::BeamToBeamContactPair<numnodes, numnodalvalues>::compute_l
   L = Core::FADUtils::scalar_product(r1_xi, r1_xi) +
       Core::FADUtils::scalar_product(delta_r, r1_xixi);
 
-  if (fabs(Core::FADUtils::cast_to_double(L)) < COLINEARTOL)
+  if (fabs(Core::FADUtils::cast_to_double(L)) < COLLINEARTOL)
     FOUR_C_THROW("Linearization of point to line projection is zero, choose tighter search boxes!");
 
   for (unsigned int i = 0; i < 3; i++)
@@ -4713,7 +4713,7 @@ void BeamInteraction::BeamToBeamContactPair<numnodes,
 
 
   // Inverting (2x2) matrix df by hard coded formula, so that it is
-  // possible to handle colinear vectors, because they lead to det(df) =0
+  // possible to handle collinear vectors, because they lead to det(df) =0
   TYPE det_df = df(0, 0) * df(1, 1) - df(1, 0) * df(0, 1);
 
   //********************************************************************
@@ -4725,7 +4725,7 @@ void BeamInteraction::BeamToBeamContactPair<numnodes,
   //********************************************************************
 
   // singular df
-  if (Core::FADUtils::cast_to_double(Core::FADUtils::norm(det_df)) < COLINEARTOL)
+  if (Core::FADUtils::cast_to_double(Core::FADUtils::norm(det_df)) < COLLINEARTOL)
   {
     // sort out
     elementscolinear = true;
@@ -4818,7 +4818,7 @@ bool BeamInteraction::BeamToBeamContactPair<numnodes,
   // check, if df=0: This can happen e.g. when the master beam 2 describes a circle geometry and the
   // projectiong slave point coincides with the cetern of the circle
 
-  if (fabs(Core::FADUtils::cast_to_double(df)) < COLINEARTOL)
+  if (fabs(Core::FADUtils::cast_to_double(df)) < COLLINEARTOL)
     return false;
   else
     return true;

src/beaminteraction/src/4C_beaminteraction_beam_to_sphere_contact_pair.cpp

@@ -378,7 +378,7 @@ void BeamInteraction::BeamToSphereContactPair<numnodes, numnodalvalues>::closest
     evaluate_lin_orthogonality_condition(df, delta_x, norm_delta_x, dx1, ddx1);
 
     // singular df
-    if (abs(df) < COLINEARTOL)
+    if (abs(df) < COLLINEARTOL)
     {
       FOUR_C_THROW("No solution for Closest Point Projection!");
     }