Skip to content

Commit 208ba8d

Browse files
roigcarloroigcarlo
committed
Merge branch 'master' into Release-10.3.0
2 parents 14ee273 + 4ae3393 commit 208ba8d

13 files changed

Lines changed: 1269 additions & 687 deletions

File tree

‎.github/workflows/ci_apps_windows.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"MeshMovingApplication",
99
"LinearSolversApplication",
1010
"StructuralMechanicsApplication",
11+
"ContactStructuralMechanicsApplication",
1112
"DEMApplication",
1213
"ChimeraApplication",
1314
"IgaApplication",

‎.github/workflows/configure.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\MeshingApplication
1818
set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\MeshMovingApplication;
1919
set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\LinearSolversApplication;
2020
set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\StructuralMechanicsApplication;
21+
set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\ContactStructuralMechanicsApplication;
2122
set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\DEMApplication;
2223
set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\ChimeraApplication;
2324
set KRATOS_APPLICATIONS=%KRATOS_APPLICATIONS%%KRATOS_APP_DIR%\IgaApplication;

‎applications/ContactStructuralMechanicsApplication/custom_utilities/mortar_explicit_contribution_utilities.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
namespace Kratos
2222
{
23-
template< const SizeType TDim, const SizeType TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const SizeType TNumNodesMaster>
23+
template< const std::size_t TDim, const std::size_t TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const std::size_t TNumNodesMaster>
2424
typename MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::MortarConditionMatrices MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::AddExplicitContributionOfMortarCondition(
2525
PairedCondition* pCondition,
2626
const ProcessInfo& rCurrentProcessInfo,
@@ -170,7 +170,7 @@ typename MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormal
170170
/***********************************************************************************/
171171
/***********************************************************************************/
172172

173-
template< const SizeType TDim, const SizeType TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const SizeType TNumNodesMaster>
173+
template< const std::size_t TDim, const std::size_t TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const std::size_t TNumNodesMaster>
174174
typename MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::MortarConditionMatrices MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::AddExplicitContributionOfMortarFrictionalCondition(
175175
PairedCondition* pCondition,
176176
const ProcessInfo& rCurrentProcessInfo,
@@ -357,7 +357,7 @@ typename MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormal
357357
/***********************************************************************************/
358358
/***********************************************************************************/
359359

360-
template< const SizeType TDim, const SizeType TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const SizeType TNumNodesMaster>
360+
template< const std::size_t TDim, const std::size_t TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const std::size_t TNumNodesMaster>
361361
void MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::ComputeNodalArea(
362362
PairedCondition* pCondition,
363363
const ProcessInfo& rCurrentProcessInfo,
@@ -374,7 +374,7 @@ void MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVari
374374
/***********************************************************************************/
375375
/***********************************************************************************/
376376

377-
template< const SizeType TDim, const SizeType TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const SizeType TNumNodesMaster>
377+
template< const std::size_t TDim, const std::size_t TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const std::size_t TNumNodesMaster>
378378
bool MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::ComputePreviousMortarOperators(
379379
PairedCondition* pCondition,
380380
const ProcessInfo& rCurrentProcessInfo,
@@ -495,7 +495,7 @@ bool MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVari
495495
/***********************************************************************************/
496496
/***********************************************************************************/
497497

498-
template< SizeType TDim, SizeType TNumNodes, FrictionalCase TFrictional, bool TNormalVariation, SizeType TNumNodesMaster>
498+
template<std::size_t TDim, std::size_t TNumNodes, FrictionalCase TFrictional, bool TNormalVariation, std::size_t TNumNodesMaster>
499499
bool MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::ExplicitCalculateAe(
500500
const GeometryType& rSlaveGeometry,
501501
GeneralVariables& rVariables,
@@ -526,7 +526,7 @@ bool MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVari
526526
bool bad_shape;
527527
if constexpr (TDim == 2) {
528528
bad_shape = MortarUtilities::LengthCheck(decomp_geom, rSlaveGeometry.Length() * CheckThresholdCoefficient);
529-
} else {
529+
} else {
530530
bad_shape = MortarUtilities::HeronCheck(decomp_geom);
531531
}
532532

@@ -557,7 +557,7 @@ bool MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVari
557557
/***********************************************************************************/
558558
/***********************************************************************************/
559559

560-
template< SizeType TDim, SizeType TNumNodes, FrictionalCase TFrictional, bool TNormalVariation, SizeType TNumNodesMaster>
560+
template<std::size_t TDim, std::size_t TNumNodes, FrictionalCase TFrictional, bool TNormalVariation, std::size_t TNumNodesMaster>
561561
void MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::ExplicitCalculateKinematics(
562562
const PairedCondition* pCondition,
563563
GeneralVariables& rVariables,
@@ -591,7 +591,7 @@ void MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVari
591591
/***********************************************************************************/
592592
/***********************************************************************************/
593593

594-
template< SizeType TDim, SizeType TNumNodes, FrictionalCase TFrictional, bool TNormalVariation, SizeType TNumNodesMaster>
594+
template<std::size_t TDim, std::size_t TNumNodes, FrictionalCase TFrictional, bool TNormalVariation, std::size_t TNumNodesMaster>
595595
void MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::CalculateKinematics(
596596
const PairedCondition* pCondition,
597597
GeneralVariables& rVariables,
@@ -625,7 +625,7 @@ void MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVari
625625
/***********************************************************************************/
626626
/***********************************************************************************/
627627

628-
template< SizeType TDim, SizeType TNumNodes, FrictionalCase TFrictional, bool TNormalVariation, SizeType TNumNodesMaster>
628+
template<std::size_t TDim, std::size_t TNumNodes, FrictionalCase TFrictional, bool TNormalVariation, std::size_t TNumNodesMaster>
629629
void MortarExplicitContributionUtilities<TDim,TNumNodes,TFrictional, TNormalVariation,TNumNodesMaster>::MasterShapeFunctionValue(
630630
const PairedCondition* pCondition,
631631
GeneralVariables& rVariables,

‎applications/ContactStructuralMechanicsApplication/custom_utilities/mortar_explicit_contribution_utilities.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace Kratos
6060
* @tparam TNormalVariation If we are consider normal variation
6161
* @tparam TNumNodesMaster The number of nodes of the master
6262
*/
63-
template< const SizeType TDim, const SizeType TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, const SizeType TNumNodesMaster = TNumNodes>
63+
template<std::size_t TDim, std::size_t TNumNodes, const FrictionalCase TFrictional, const bool TNormalVariation, std::size_t TNumNodesMaster = TNumNodes>
6464
class KRATOS_API(CONTACT_STRUCTURAL_MECHANICS_APPLICATION) MortarExplicitContributionUtilities
6565
{
6666
public:
@@ -133,9 +133,9 @@ class KRATOS_API(CONTACT_STRUCTURAL_MECHANICS_APPLICATION) MortarExplicitContrib
133133
/// Type definition for the derivatives utilities
134134
using DerivativesUtilitiesType = DerivativesUtilities<TDim, TNumNodes, IsFrictional, TNormalVariation, TNumNodesMaster>;
135135

136-
///Type definition for integration methods
136+
/// Type definition for the integration method
137137
using IntegrationMethod = GeometryData::IntegrationMethod;
138-
138+
139139
// The threshold coefficient considered for checking
140140
static constexpr double CheckThresholdCoefficient = 1.0e-12;
141141

@@ -212,7 +212,7 @@ class KRATOS_API(CONTACT_STRUCTURAL_MECHANICS_APPLICATION) MortarExplicitContrib
212212
GeneralVariables& rVariables,
213213
const ConditionArrayListType& rConditionsPointsSlave,
214214
BoundedMatrix<double, TNumNodes, TNumNodes>& rAe,
215-
const GeometryData::IntegrationMethod& rIntegrationMethod,
215+
const IntegrationMethod& rIntegrationMethod,
216216
const double AxiSymCoeff = 1.0
217217
);
218218

‎applications/GeoMechanicsApplication/custom_elements/element_hierarchy.puml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ TransientPwInterfaceElement <|-- SteadyStatePwInterfaceElement
4747
SteadyStatePwInterfaceElement <|-- SteadyStatePwPipingElement
4848
UPwSmallStrainInterfaceElement <|-- UPwSmallStrainLinkInterfaceElement
4949

50-
class LineInterfaceElement
51-
Element <|-- LineInterfaceElement
50+
class InterfaceElement
51+
Element <|-- InterfaceElement
5252

5353
'Pw Elements
5454
class TransientPwLineElement

‎applications/GeoMechanicsApplication/custom_elements/element_hierarchy.svg‎

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)