Merge pull request #693 from sebproell/typedefs

Remove the `typedef` keyword

Author: sebproell

src/art_net/4C_art_net_artery_ele_calc_lin_exp.hpp

@@ -37,7 +37,7 @@ namespace Discret
     class ArteryEleCalcLinExp : public ArteryEleCalc<distype>
     {
      private:
-      typedef ArteryEleCalc<distype> my;
+      using my = ArteryEleCalc<distype>;
 
       /// private constructor, since we are a Singleton.
       ArteryEleCalcLinExp(const int numdofpernode, const std::string& disname);

src/art_net/4C_art_net_artery_ele_calc_pres_based.hpp

@@ -37,7 +37,7 @@ namespace Discret
     class ArteryEleCalcPresBased : public ArteryEleCalc<distype>
     {
      private:
-      typedef ArteryEleCalc<distype> my;
+      using my = ArteryEleCalc<distype>;
 
       /// private constructor, since we are a Singleton.
       ArteryEleCalcPresBased(const int numdofpernode, const std::string& disname);

src/beam3/4C_beam3_kirchhoff.hpp

@@ -26,7 +26,7 @@
 
 #include <memory>
 
-typedef Sacado::Fad::DFad<double> FAD;
+using FAD = Sacado::Fad::DFad<double>;
 
 #define REFERENCE_NODE \
   2  // number of reference-node for the calculation of the rotation of the other triads (local

src/beam3/4C_beam3_reissner.hpp

@@ -26,7 +26,7 @@
 
 FOUR_C_NAMESPACE_OPEN
 
-typedef Sacado::Fad::DFad<double> FAD;
+using FAD = Sacado::Fad::DFad<double>;
 
 // forward declaration ...
 namespace Core::LinAlg

src/beaminteraction/src/4C_beaminteraction_beam_to_beam_contact_defines.hpp

@@ -103,10 +103,10 @@ NEIGHBORTOL ca. 3, since the sum of |xi1| and |xi2| has to be larger than three
 FOUR_C_THROW(
     "check functionality of FAD based linearization in case of beam3k and beam3r with Hermite cl "
     "intpol");
-typedef Sacado::Fad::DFad<double> TYPE;
+using TYPE = Sacado::Fad::DFad<double>;
 // #define FADCHECKS //Decide whether FAD checks via Sacado are printed as output or not
 #else
-typedef double TYPE;
+using TYPE = double;
 #endif
 
 #define CHECKBOUNDARYCONTACT  // Detection of beam ends in order to open the contact, when one beam
@@ -227,7 +227,7 @@ FOUR_C_THROW("CONSISTENTTRANSITION does not work in combination with ENDPOINTSEG
 // #define AUTOMATICDIFFBTS                        // Decide if automatic differentiation via Sacado
 //  is used default: Off
 #ifdef AUTOMATICDIFFBTS
-typedef Sacado::Fad::DFad<double> TYPEBTS;
+using TYPEBTS = Sacado::Fad::DFad<double>;
 //  #define FADCHECKSTIFFNESS                     // Decide if FAD checks for contact stiffness are
 //  printed as output
 #ifndef FADCHECKSTIFFNESS
@@ -238,7 +238,7 @@ typedef Sacado::Fad::DFad<double> TYPEBTS;
 //    gauss points are printed as output
 #endif
 #else
-typedef double TYPEBTS;
+using TYPEBTS = double;
 #endif
 
 // #define FDCHECKSTIFFNESS                        // Decide if differentiation via finite

src/beaminteraction/src/4C_beaminteraction_beam_to_beam_contact_utils.hpp

@@ -24,7 +24,7 @@
 
 FOUR_C_NAMESPACE_OPEN
 
-typedef Sacado::Fad::DFad<double> FAD;
+using FAD = Sacado::Fad::DFad<double>;
 
 namespace BeamInteraction
 {

src/beaminteraction/src/4C_beaminteraction_str_model_evaluator.hpp

@@ -58,11 +58,10 @@ namespace Solid
     class BeamInteraction : public Generic
     {
      public:
-      typedef std::map<enum Inpar::BeamInteraction::SubModelType,
-          std::shared_ptr<FourC::BeamInteraction::SUBMODELEVALUATOR::Generic>>
-          Map;
-      typedef std::vector<std::shared_ptr<FourC::BeamInteraction::SUBMODELEVALUATOR::Generic>>
-          Vector;
+      using Map = std::map<enum Inpar::BeamInteraction::SubModelType,
+          std::shared_ptr<FourC::BeamInteraction::SUBMODELEVALUATOR::Generic>>;
+      using Vector =
+          std::vector<std::shared_ptr<FourC::BeamInteraction::SUBMODELEVALUATOR::Generic>>;
 
       //! constructor
       BeamInteraction();

src/contact/4C_contact_coupling2d.cpp

@@ -459,7 +459,7 @@ void CONTACT::Coupling2dManager::consistent_dual_shape()
   }
 
   // map iterator
-  typedef Core::Gen::Pairedvector<int, double>::const_iterator _CI;
+  using _CI = Core::Gen::Pairedvector<int, double>::const_iterator;
 
   // no overlap: the applied dual shape functions don't matter, as the integration domain is void
   if ((ximax == -1.0 && ximin == 1.0) || (ximax - ximin < 4. * MORTARINTLIM)) return;

src/contact/4C_contact_coupling3d.cpp

@@ -384,8 +384,8 @@ bool CONTACT::Coupling3d::slave_vertex_linearization(
     sIntEle->node_linearization(nodelin);
 
   // map iterator
-  typedef Core::Gen::Pairedvector<int, double>::const_iterator
-      _CI;  // linearization of element center Auxc()
+  using _CI = Core::Gen::Pairedvector<int,
+      double>::const_iterator;  // linearization of element center Auxc()
   std ::vector<Core::Gen::Pairedvector<int, double>> linauxc(
       3, slave_element().num_node());  // assume 3 dofs per node
 
@@ -523,8 +523,8 @@ bool CONTACT::Coupling3d::master_vertex_linearization(
     sIntEle->node_linearization(snodelin);
 
   // map iterator
-  typedef Core::Gen::Pairedvector<int, double>::const_iterator
-      _CI;  // linearization of element center Auxc()
+  using _CI = Core::Gen::Pairedvector<int,
+      double>::const_iterator;  // linearization of element center Auxc()
   std ::vector<Core::Gen::Pairedvector<int, double>> linauxc(
       3, slave_element().num_node());  // assume 3 dofs per node
 
@@ -639,7 +639,7 @@ bool CONTACT::Coupling3d::lineclip_vertex_linearization(const Mortar::Vertex& cu
   const int nmrows = master_int_element().num_node();
 
   // iterator
-  typedef Core::Gen::Pairedvector<int, double>::const_iterator _CI;
+  using _CI = Core::Gen::Pairedvector<int, double>::const_iterator;
 
   // compute factor Z
   std::array<double, 3> crossZ = {0.0, 0.0, 0.0};
@@ -840,7 +840,7 @@ bool CONTACT::Coupling3d::center_linearization(
 {
   // preparations
   int clipsize = (int)(clip().size());
-  typedef Core::Gen::Pairedvector<int, double>::const_iterator CI;
+  using CI = Core::Gen::Pairedvector<int, double>::const_iterator;
 
   // number of nodes
   const int nsrows = slave_element().num_node();
@@ -1689,7 +1689,7 @@ void CONTACT::Coupling3dManager::consistent_dual_shape()
 
   // various variables
   double detg = 0.0;
-  typedef Core::Gen::Pairedvector<int, double>::const_iterator _CI;
+  using _CI = Core::Gen::Pairedvector<int, double>::const_iterator;
 
   // initialize matrices de and me
   Core::LinAlg::SerialDenseMatrix me(nnodes, nnodes, true);
@@ -1928,8 +1928,8 @@ void CONTACT::Coupling3dManager::consistent_dual_shape()
   // (this is done according to a quite complex formula, which
   // we get from the linearization of the biorthogonality condition:
   // Lin (Me * Ae = De) -> Lin(Ae)=Lin(De)*Inv(Me)-Ae*Lin(Me)*Inv(Me) )
-  typedef Core::Gen::Pairedvector<int,
-      Core::LinAlg::Matrix<max_nnodes + 1, max_nnodes>>::const_iterator _CIM;
+  using _CIM = Core::Gen::Pairedvector<int,
+      Core::LinAlg::Matrix<max_nnodes + 1, max_nnodes>>::const_iterator;
   for (_CIM p = derivde_new.begin(); p != derivde_new.end(); ++p)
   {
     Core::LinAlg::Matrix<max_nnodes + 1, max_nnodes>& dtmp = derivde_new[p->first];