exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Porting changes: Intel

Browse source
This commit is contained in:
Hrvoje Jasak 2014-06-14 21:15:10 +01:00
parent b357f5e043
commit 5b17b7bf43
3 changed files with 81 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/solidModels/contactModels/normalContactModels/dirichletNeumann/dirichletNeumann.C
View file

@ -78,21 +78,31 @@ dirichletNeumann::dirichletNeumann
touchFraction_(mesh_.boundaryMesh()[slavePatchID].size(), 0.0), touchFraction_(mesh_.boundaryMesh()[slavePatchID].size(), 0.0),
slaveValueFrac_(mesh_.boundaryMesh()[slavePatchID].size(), symmTensor::zero), slaveValueFrac_(mesh_.boundaryMesh()[slavePatchID].size(), symmTensor::zero),
oldSlaveValueFrac_ oldSlaveValueFrac_
(mesh_.boundaryMesh()[slavePatchID].size(), symmTensor::zero), (
mesh_.boundaryMesh()[slavePatchID].size(), symmTensor::zero
),
limitPenetration_(normalContactModelDict_.lookup("limitPenetration")), limitPenetration_(normalContactModelDict_.lookup("limitPenetration")),
penetrationLimit_ penetrationLimit_
(readScalar(normalContactModelDict_.lookup("penetrationLimit"))), (
readScalar(normalContactModelDict_.lookup("penetrationLimit"))
),
limitPressure_(normalContactModelDict_.lookup("limitPressure")), limitPressure_(normalContactModelDict_.lookup("limitPressure")),
pressureLimit_(readScalar(normalContactModelDict_.lookup("pressureLimit"))), pressureLimit_(readScalar(normalContactModelDict_.lookup("pressureLimit"))),
settleContact_ settleContact_
( (
normalContactModelDict_.found("settleContact") ? normalContactModelDict_.lookupOrDefault<Switch>
normalContactModelDict_.lookup("settleContact") : false (
"settleContact",
false
)
), ),
settleIterationNumber_ settleIterationNumber_
( (
settleContact_ ? normalContactModelDict_.lookupOrDefault<label>
readInt(normalContactModelDict_.lookup("settleIterationNumber")) : GREAT (
"settleIterationNumber",
1000
)
), ),
correctMissedVertices_ correctMissedVertices_
( (

2
src/solidModels/contactModels/normalContactModels/dirichletNeumann/dirichletNeumann.H
View file

@ -116,7 +116,7 @@ class dirichletNeumann
// so we can turn off contact corrections after the specified // so we can turn off contact corrections after the specified
// number of corrections // number of corrections
Switch settleContact_; Switch settleContact_;
int settleIterationNumber_; label settleIterationNumber_;
// correct pointDistToInter misses // correct pointDistToInter misses
// pointPoints are needed // pointPoints are needed

10
src/solidModels/contactModels/normalContactModels/normalContactModel/normalContactModel.C
View file

@ -66,11 +66,11 @@ normalContactModel::normalContactModel
(patch.boundaryMesh().mesh().boundaryMesh()[slavePatchID].nPoints(), 0.0), (patch.boundaryMesh().mesh().boundaryMesh()[slavePatchID].nPoints(), 0.0),
masterToSlaveInterpolatorPtr_ masterToSlaveInterpolatorPtr_
( (
// new zoneToZoneInterpolation new PatchToPatchInterpolation
new PatchToPatchInterpolation< <
PrimitivePatch< PrimitivePatch<face, List, pointField>,
face, List, pointField PrimitivePatch<face, List, pointField>
>, PrimitivePatch<face, List, pointField> > >
( (
masterFaceZonePatch, masterFaceZonePatch,
slaveFaceZonePatch, slaveFaceZonePatch,