uncrustify

GEOS-DEV · Jul 3, 2024 · 23b65f1 · 23b65f1
1 parent a828539
commit 23b65f1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/coreComponents/constitutive/solid/Damage.hpp b/src/coreComponents/constitutive/solid/Damage.hpp
@@ -106,7 +106,7 @@ class DamageUpdates : public UPDATE_BASE
 
   //Standard quadratic degradation functions
 
-  template< typename DISSIPATION_ORDER = std::integral_constant<int, 1> >
+  template< typename DISSIPATION_ORDER = std::integral_constant< int, 1 > >
   GEOS_HOST_DEVICE
   real64 getDegradationValue( localIndex const k,
                               localIndex const q ) const
@@ -128,7 +128,7 @@ class DamageUpdates : public UPDATE_BASE
     return ((1 - eps)*(1 - pf)*(1 - pf) + eps);
   }
 
-  template< typename DISSIPATION_ORDER = std::integral_constant<int, 1> >
+  template< typename DISSIPATION_ORDER = std::integral_constant< int, 1 > >
   inline
   GEOS_HOST_DEVICE
   real64 getDegradationDerivative( real64 const d ) const
@@ -137,7 +137,7 @@ class DamageUpdates : public UPDATE_BASE
   }
 
 
-  template< typename DISSIPATION_ORDER = std::integral_constant<int, 1> >
+  template< typename DISSIPATION_ORDER = std::integral_constant< int, 1 > >
   inline
   GEOS_HOST_DEVICE
   real64 getDegradationSecondDerivative( real64 const d ) const

diff --git a/src/coreComponents/constitutive/solid/DamageSpectral.hpp b/src/coreComponents/constitutive/solid/DamageSpectral.hpp
@@ -99,7 +99,7 @@ class DamageSpectralUpdates : public DamageUpdates< UPDATE_BASE >
   using UPDATE_BASE::m_shearModulus;
 
   // Lorentz type degradation functions
-  template< typename DISSIPATION_ORDER = std::integral_constant<int, 1> >
+  template< typename DISSIPATION_ORDER = std::integral_constant< int, 1 > >
   inline
   GEOS_HOST_DEVICE
   real64 getDegradationValue( localIndex const k,
@@ -119,7 +119,7 @@ class DamageSpectralUpdates : public DamageUpdates< UPDATE_BASE >
     return pow( 1 - m_damage( k, q ), 2 ) /( pow( 1 - m_damage( k, q ), 2 ) + m * m_damage( k, q ) * (1 + p*m_damage( k, q )) );
   }
 
-  template< typename DISSIPATION_ORDER = std::integral_constant<int, 1> >
+  template< typename DISSIPATION_ORDER = std::integral_constant< int, 1 > >
   inline
   GEOS_HOST_DEVICE
   real64 getDegradationDerivative( real64 const d ) const
@@ -138,7 +138,7 @@ class DamageSpectralUpdates : public DamageUpdates< UPDATE_BASE >
     return -m*(1 - d)*(1 + (2*p + 1)*d) / pow( pow( 1-d, 2 ) + m*d*(1+p*d), 2 );
   }
 
-  template< typename DISSIPATION_ORDER = std::integral_constant<int, 1> >
+  template< typename DISSIPATION_ORDER = std::integral_constant< int, 1 > >
   inline
   GEOS_HOST_DEVICE
   real64 getDegradationSecondDerivative( real64 const d ) const
@@ -191,11 +191,11 @@ class DamageSpectralUpdates : public DamageUpdates< UPDATE_BASE >
     real64 damageFactor = 0;
     if( m_dissipationFuctionType == 1 )
     {
-      damageFactor =  getDegradationValue< std::integral_constant<int, 1> >( k, q );
+      damageFactor =  getDegradationValue< std::integral_constant< int, 1 > >( k, q );
     }
     else if( m_dissipationFuctionType == 2 )
     {
-      damageFactor =  getDegradationValue< std::integral_constant<int, 2> >( k, q );
+      damageFactor =  getDegradationValue< std::integral_constant< int, 2 > >( k, q );
     }
 
     // get eigenvalues and eigenvectors

diff --git a/src/coreComponents/physicsSolvers/simplePDE/PhaseFieldDamageFEMKernels.hpp b/src/coreComponents/physicsSolvers/simplePDE/PhaseFieldDamageFEMKernels.hpp
@@ -246,7 +246,8 @@ struct DamageKernel
           else
           {
             stack.localJacobian[ a ][ b ] -= detJ * ( pow( ell, 2 ) * LvArray::tensorOps::AiBi< 3 >( dNdX[a], dNdX[b] )
-                                                      + N[a] * N[b] * (1 + m_constitutiveUpdate.template getDegradationSecondDerivative< DISSIPATION_FUNCTION_ORDER >( qp_damage ) * ell * strainEnergyDensity/Gc ) );
+                                                      + N[a] * N[b] *
+                                                      (1 + m_constitutiveUpdate.template getDegradationSecondDerivative< DISSIPATION_FUNCTION_ORDER >( qp_damage ) * ell * strainEnergyDensity/Gc ) );
           }
         }
       }
@@ -304,9 +305,9 @@ struct DamageKernel
 };
 
 template< typename SUBREGION_TYPE, typename CONSTITUTIVE_TYPE, typename FE_TYPE >
-using LinearPhaseFieldDamageKernel = DamageKernel< std::integral_constant<int, 1> >::template PhaseFieldDamageKernel< SUBREGION_TYPE, CONSTITUTIVE_TYPE, FE_TYPE >;
+using LinearPhaseFieldDamageKernel = DamageKernel< std::integral_constant< int, 1 > >::template PhaseFieldDamageKernel< SUBREGION_TYPE, CONSTITUTIVE_TYPE, FE_TYPE >;
 template< typename SUBREGION_TYPE, typename CONSTITUTIVE_TYPE, typename FE_TYPE >
-using QuadraticPhaseFieldDamageKernel = DamageKernel< std::integral_constant<int, 2>  >::template PhaseFieldDamageKernel< SUBREGION_TYPE, CONSTITUTIVE_TYPE, FE_TYPE >;
+using QuadraticPhaseFieldDamageKernel = DamageKernel< std::integral_constant< int, 2 > >::template PhaseFieldDamageKernel< SUBREGION_TYPE, CONSTITUTIVE_TYPE, FE_TYPE >;
 
 using LinearPhaseFieldDamageKernelFactory = finiteElement::KernelFactory< LinearPhaseFieldDamageKernel,
                                                                           arrayView1d< globalIndex const > const,