From 3241862b6c900253052c72911261d2b6c07666e0 Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Thu, 18 Jul 2013 03:02:34 +0200 Subject: [PATCH 1/5] Remove trailing whitespace systematically --- CMakeLists.txt | 12 +- ContributionsForNextRelease.txt | 2 +- ExtendProjectPreamble | 236 +- HowToContribute | 14 +- README | 6 +- ReleaseNotes-1.6-ext | 168 +- .../solvers/basic/sixDOFSolver/sixDOFSolver.C | 4 +- .../solvers/combustion/PDRFoam/XiEqns | 4 +- .../PDRFoam/XiModels/algebraic/algebraic.C | 2 +- .../SCOPE/SCOPELaminarFlameSpeed.C | 2 +- .../solvers/combustion/PDRFoam/setDeltaT.H | 2 +- .../compressible/rhoCentralFoam/Allwmake | 2 +- .../compressible/rhoSonicFoam/rhoSonicFoam.C | 2 +- .../compressible/rhopSonicFoam/Allwmake | 2 +- .../BCs/p/inviscidWallPFvPatchScalarField.C | 4 +- .../BCs/rhoE/mixedRhoEFvPatchScalarField.C | 4 +- .../BCs/rhoU/fixedRhoUFvPatchVectorField.H | 2 +- .../coupled/conjugateHeatFoam/Make/files | 2 +- .../electrostaticFoam/Make/files | 2 +- .../electromagnetics/mhdFoam/mhdFoam.C | 2 +- .../engine/icoDyMEngineFoam/createFields.H | 2 +- .../engine/icoDyMEngineFoam/meshCourantNo.H | 2 +- .../compressibleCorrectPhi.H | 4 +- .../engine/turbDyMEngineFoam/meshCourantNo.H | 2 +- .../equationReaderDemo/equationReaderDemo.C | 8 +- .../equationReaderTester.C | 10 +- ...ixedTemperatureCoupledFvPatchScalarField.H | 2 +- .../incompressible/icoDyMFoam/createFields.H | 2 +- .../icoDyMSimpleFoam/createFields.H | 2 +- .../solvers/incompressible/icoFoam/Make/files | 2 +- .../nonNewtonianIcoFoam/Make/files | 2 +- .../incompressible/simpleFoam/Make/files | 2 +- .../multiSolverDemo/multiSolverDemo.C | 2 +- .../multiSolverDemo/solverIcoFoam.H | 2 +- .../cavitatingFoam/continuityErrs.H | 4 +- .../multiphase/cavitatingFoam/setDeltaT.H | 2 +- .../alphaContactAngleFvPatchScalarField.C | 2 +- .../multiphaseMixture/multiphaseMixture.C | 4 +- .../multiphaseMixture/phase/phase.C | 2 +- .../porousInterFoam/createPorousZones.H | 2 +- .../settlingFoam/correctViscosity.H | 2 +- .../multiphase/settlingFoam/kEpsilon.H | 2 +- .../multiphase/twoPhaseEulerFoam/Make/options | 2 +- .../multiphase/twoPhaseEulerFoam/UEqns.H | 2 +- .../GidaspowErgunWenYu/GidaspowErgunWenYu.C | 2 +- .../dragModels/dragModel/newDragModel.C | 2 +- .../Gidaspow/GidaspowConductivity.C | 2 +- .../HrenyaSinclairConductivity.C | 2 +- .../conductivityModel/newConductivityModel.C | 4 +- .../JohnsonJacksonFrictionalStress.C | 6 +- .../newFrictionalStressModel.C | 4 +- .../newGranularPressureModel.C | 4 +- .../CarnahanStarling/CarnahanStarlingRadial.C | 6 +- .../radialModel/Gidaspow/GidaspowRadial.C | 2 +- .../SinclairJackson/SinclairJacksonRadial.C | 2 +- .../radialModel/radialModel/newRadialModel.C | 4 +- .../multiphase/twoPhaseEulerFoam/pEqn.H | 2 +- .../twoPhaseEulerFoam/packingLimiter.H | 4 +- .../materialModels/Make/files | 2 +- .../cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H | 2 +- .../cohesiveLaws/cohesiveLaw/cohesiveLaw.C | 2 +- .../cohesiveLaws/cohesiveLaw/cohesiveLaw.H | 6 +- .../cohesiveLaws/linear/linearCohesiveLaw.H | 2 +- .../componentReference/componentReference.H | 2 +- .../cohesiveLawFvPatchVectorField.C | 2 +- .../cohesiveZoneFvPatchVectorField.C | 16 +- .../cohesiveZoneFvPatchVectorField.H | 2 +- .../BurgersViscoelastic/BurgersViscoelastic.C | 6 +- .../KelvinSLSViscoelastic.C | 6 +- .../MaxwellElasticViscoelastic.C | 4 +- .../MaxwellSLSViscoelastic.C | 2 +- .../MaxwellViscoelastic/MaxwellViscoelastic.C | 4 +- .../PronyViscoelastic/PronyViscoelastic.C | 4 +- .../newContactStressFoam/contactPatchPair.C | 4 +- .../newContactStressFoam/contactPatchPair.H | 2 +- .../newContactStressFoam/contactProblem.C | 2 +- .../calculateDivDSigmaExp.H | 4 +- .../correctGlobalFaceZoneMesh.H | 40 +- .../createGlobalToLocalFaceZonePointMap.H | 24 +- .../createSolidInterface.H | 2 +- .../elasticContactIncrSolidFoam.C | 52 +- .../moveMeshLeastSquares.H | 8 +- .../moveSolidMesh.H | 12 +- .../printContactResults.H | 12 +- .../writeBoundaryNetForces.H | 4 +- .../elasticContactIncrSolidFoam/writeFields.H | 4 +- .../calculateDivDSigmaExp.H | 4 +- .../calculateDivDSigmaExpLargeStrain.H | 2 +- .../calculateExtrapolationVectors.H | 14 +- .../calculatePointBoundaryWeights.H | 32 +- .../correctGlobalFaceZoneMesh.H | 40 +- .../createGlobalToLocalFaceZonePointMap.H | 24 +- .../elasticContactNonLinULSolidFoam.C | 52 +- .../findBoundaryPoints.H | 2 +- .../moveMeshInverseDistance.H | 8 +- .../moveMeshLeastSquares.H | 8 +- .../moveSolidMeshForContact.H | 12 +- ...erformEdgeCorrectedVolPointInterpolation.H | 14 +- .../printContactResults.H | 12 +- .../rotateFields.H | 8 +- .../writeBoundaryNetForces.H | 4 +- .../writeFields.H | 4 +- .../calculateDivSigmaExp.H | 4 +- .../correctGlobalFaceZoneMesh.H | 40 +- .../createGlobalToLocalFaceZonePointMap.H | 24 +- .../elasticContactSolidFoam.C | 46 +- .../moveMeshLeastSquares.H | 8 +- .../elasticContactSolidFoam/moveSolidMesh.H | 12 +- .../printContactResults.H | 12 +- .../writeBoundaryNetForces.H | 4 +- .../elasticContactSolidFoam/writeFields.H | 4 +- .../calculateDivSigmaExp.H | 4 +- .../elasticGravitySolidFoam.C | 22 +- .../elasticGravitySolidFoam/writeFields.H | 4 +- .../calculateDivDSigmaExp.H | 4 +- .../elasticIncrSolidFoam/calculateNetForces.H | 4 +- .../elasticIncrSolidFoam/createFields.H | 2 +- .../elasticIncrSolidFoam.C | 20 +- .../elasticIncrSolidFoam/writeFields.H | 4 +- .../correctDirectionMixedTL.H | 2 +- .../elasticNonLinTLSolidFoam.C | 26 +- .../moveMeshLeastSquares.H | 8 +- .../elasticNonLinTLSolidFoam/writeFields.H | 10 +- .../calculateDivDSigmaExp.H | 4 +- .../calculateDivDSigmaLargeStrainExp.H | 2 +- .../calculateExtrapolationVectors.H | 14 +- .../calculatePointBoundaryWeights.H | 32 +- .../elasticNonLinULSolidFoam.C | 40 +- .../findBoundaryPoints.H | 2 +- .../moveMeshInverseDistance.H | 8 +- .../moveMeshLeastSquares.H | 8 +- ...erformEdgeCorrectedVolPointInterpolation.H | 14 +- .../elasticNonLinULSolidFoam/rotateFields.H | 6 +- .../elasticNonLinULSolidFoam/writeFields.H | 4 +- .../calculateDEpsilonDSigma.H | 2 +- .../calculateDivDSigmaExp.H | 4 +- .../calculateDivDSigmaLargeStrainExp.H | 2 +- .../calculateExtrapolationVectors.H | 14 +- .../calculatePointBoundaryWeights.H | 32 +- .../elasticPlasticNonLinULSolidFoam.C | 66 +- .../findBoundaryPoints.H | 2 +- .../moveMeshInverseDistance.H | 8 +- .../moveMeshLeastSquares.H | 8 +- ...erformEdgeCorrectedVolPointInterpolation.H | 14 +- .../rotateFields.H | 2 +- .../writeFields.H | 12 +- .../calculateDivDSigmaExp.H | 4 +- .../elasticPlasticSolidFoam.C | 54 +- .../elasticPlasticSolidFoam/writeFields.H | 12 +- .../elasticSolidFoam/calculateDivSigmaExp.H | 4 +- .../elasticSolidFoam/elasticSolidFoam.C | 22 +- .../elasticSolidFoam/writeFields.H | 4 +- .../calculateSigmaExp.H | 4 +- .../elasticThermalSolidFoam.C | 24 +- .../elasticThermalSolidFoam/writeFields.H | 4 +- .../calcFsiResidual.H | 12 +- .../createInterfaceFields.H | 4 +- .../createStressPointMesh.H | 6 +- .../createZoneToZoneInterpolators.H | 32 +- .../icoFsiElasticNonLinULSolidFoam.C | 4 +- .../moveFluidMesh.H | 28 +- .../moveSolidMesh.H_old | 2 +- .../moveSolidMeshLeastSquares.H | 8 +- .../readCouplingProperties.H | 20 +- .../readFsiControls.H | 8 +- .../rotateSolidFields.H | 8 +- .../setInterfaceDisplacement.H | 12 +- .../setInterfaceForce.H | 12 +- .../solveSolidBackward.H | 8 +- .../solveSolidEuler.H | 8 +- ...ionalParabolicVelocityFvPatchVectorField.C | 2 +- ...ionalParabolicVelocityFvPatchVectorField.H | 2 +- .../cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H | 2 +- .../bilinear/bilinearCohesiveLaw.C | 2 +- .../bilinear/bilinearCohesiveLaw.H | 2 +- .../cohesiveLaws/cohesiveLaw/cohesiveLaw.C | 6 +- .../cohesiveLaws/cohesiveLaw/cohesiveLaw.H | 6 +- .../cohesiveLaws/linear/linearCohesiveLaw.H | 2 +- .../componentReference/componentReference.H | 2 +- .../contactModel/contactPatchPair.C | 24 +- .../contactModel/contactPatchPair.H | 10 +- .../contactModel/contactPatchPairCorrect.C | 72 +- .../solidModels/contactModel/contactProblem.C | 28 +- .../solidModels/contactModel/contactProblem.H | 2 +- ...ticalPlateHoleTractionFvPatchVectorField.C | 18 +- .../cohesiveLawFvPatchVectorField.C | 2 +- .../cohesiveZoneFvPatchVectorField.C | 16 +- .../cohesiveZoneFvPatchVectorField.H | 2 +- ...ohesiveZoneIncrementalFvPatchVectorField.C | 38 +- ...ohesiveZoneIncrementalFvPatchVectorField.H | 4 +- .../fixedDisplacementFvPatchVectorField.C | 6 +- ...dDisplacementZeroShearFvPatchVectorField.C | 18 +- ...dDisplacementZeroShearFvPatchVectorField.H | 2 +- .../fixedRotationFvPatchVectorField.C | 10 +- .../fixedRotationFvPatchVectorField.H | 2 +- .../solidDirectionMixedFvPatchVectorField.C | 14 +- .../solidTractionFvPatchVectorField.C | 22 +- .../solidTractionFvPatchVectorField.H | 2 +- .../solidTractionFreeFvPatchVectorField.C | 20 +- .../solidTractionFreeFvPatchVectorField.H | 2 +- .../tractionDisplacementFvPatchVectorField.C | 2 +- .../leastSquaresVolPointInterpolation.C | 76 +- .../plasticityModel/plasticityModel.C | 82 +- .../plasticityModel/plasticityModel.H | 6 +- .../BurgersViscoelastic/BurgersViscoelastic.C | 6 +- .../KelvinSLSViscoelastic.C | 6 +- .../MaxwellElasticViscoelastic.C | 4 +- .../MaxwellSLSViscoelastic.C | 2 +- .../MaxwellViscoelastic/MaxwellViscoelastic.C | 4 +- .../PronyViscoelastic/PronyViscoelastic.C | 4 +- .../elasticNLPlastic/elasticNLPlastic.C | 12 +- .../nonLinearElasticPlastic.C | 8 +- .../solidInterface/solidInterface.C | 122 +- .../solidInterface/solidInterface.H | 10 +- .../slidingBallIncr/system/decomposeParDict | 2 +- .../slidingBallNonLin/system/decomposeParDict | 2 +- .../slidingBall/0/cellDist | 2 +- .../slidingBall/constant/contactProperties | 8 +- .../slidingBall/system/decomposeParDict | 2 +- .../sphereAndBrick/system/decomposeParDict | 2 +- .../sphereAndBrick/system/mapFieldsDict | 4 +- .../sphereAndBrick/system/sampleDict | 2 +- .../constant/polyMesh/blockMeshDict | 24 +- .../gravityBlock/system/sampleDict | 2 +- .../gravityBlock/system/sampleDict.old | 2 +- .../constant/timeVsRightTraction | 2 +- .../incrPlateHole/system/decomposeParDict | 2 +- .../tutorials/elasticNonLinTLSolidFoam/Allrun | 2 +- .../system/decomposeParDict | 2 +- .../system/fvSolution | 8 +- .../nonLinBlock/system/decomposeParDict | 2 +- .../nonLinBlock/system/fvSolution | 8 +- .../rotateSphereTL/system/decomposeParDict | 2 +- .../rotateSphere/system/decomposeParDict | 2 +- .../constant/polyMesh/blockMeshDict | 26 +- .../constant/timeVsRightTraction | 2 +- .../constant/timeVsRightTraction | 2 +- .../system/decomposeParDict | 2 +- .../constant/timeVsRightTraction | 2 +- .../system/decomposeParDict | 2 +- .../bimaterialCase/0/materials | 2 +- .../constant/polyMesh/blockMeshDict | 24 +- .../bimaterialCase/system/sampleDict | 2 +- .../bimaterialCase/system/sampleDict.old | 2 +- .../analyticalPlateHole/analyticalPlateHole.C | 12 +- .../plateHole/system/decomposeParDict | 2 +- .../constant/timeVsRightTraction | 2 +- .../system/decomposeParDict | 2 +- .../elasticThermalSolidFoam/hotCylinder/0/T | 2 +- .../elasticThermalSolidFoam/hotCylinder/0/U | 2 +- .../analyticalHotCylinder.C | 22 +- .../hotCylinder/system/decomposeParDict | 2 +- .../hotCylinder/system/fvSolution | 6 +- .../fluid/constant/dynamicMeshDict | 2 +- .../fluid/constant/polyMesh/faceZones | 2 +- .../fluid/constant/polyMesh/sets/plateZone | 336 +- .../HronTurekFsi/fluid/system/fvSolution | 4 +- .../HronTurekFsi/info.txt | 4 +- .../HronTurekFsi/makeSerialLinks | 2 +- .../HronTurekFsi/removeSerialLinks | 2 +- .../solid/constant/polyMesh/faceZones | 2 +- .../solid/constant/polyMesh/sets/plateZone | 336 +- .../solid/system/decomposeParDict | 2 +- .../HronTurekFsi/solid/system/fvSolution | 2 +- .../constant/rheologyProperties | 4 +- .../foamMeshToAbaqus/foamMeshToAbaqus.C | 16 +- .../patchStressIntegrate.C | 6 +- .../setMatFromCellZones/setMatFromCellZones.C | 2 +- .../calculateSigmaDSigmaCorr.H | 44 +- .../viscoElasticSolidFoam/createFields.H | 2 +- .../viscoElasticSolidFoam.C | 38 +- .../viscoElasticSolidFoam/writeFields.H | 12 +- .../contactStressFoam/contactPatchPair.C | 2 +- .../contactStressFoam/contactPatchPair.H | 2 +- .../contactPatchPairSlavePressure.C | 2 +- .../contactPatchPairUpdateContact.C | 2 +- .../contactStressFoam/contactStressFoam.C | 2 +- .../stressAnalysis/icoFsiFoam/Make/files | 2 +- .../stressAnalysis/icoFsiFoam/setMotion.H | 8 +- .../stressAnalysis/icoFsiFoam/setPressure.H | 4 +- .../tractionDisplacementFvPatchVectorField.C | 4 +- .../solidEquilibriumDisplacementFoam.C | 2 +- ...DisplacementCorrectionFvPatchVectorField.C | 2 +- .../stressFemFoam/stressFemFoam.C | 2 +- .../bubbleInterTrackFoam/createBubble.H | 10 +- .../bubbleInterTrackFoam/createFields.H | 8 +- .../createSurfactantConcentrationField.H | 6 +- .../bubbleInterTrackFoam/scaleSpacePhi.H | 2 +- .../solveBulkSurfactant.H | 10 +- .../boundaryProcessorFaPatchPoints.H | 2 +- .../fixedGradientCorrectedFvPatchField.C | 2 +- .../fixedValueCorrectedFvPatchField.H | 2 +- .../correctedFvPatchField.C | 14 +- .../surfaceTracking/freeSurface/freeSurface.H | 40 +- .../freeSurfacePointDisplacement.C | 84 +- .../bubbleHistory/bubbleHistory.C | 48 +- .../bubbleHistory/bubbleHistory.H | 2 +- .../sloshingHistory/sloshingHistory.C | 26 +- .../freeSurface/makeFreeSurfaceData.C | 74 +- .../freeSurface/surfactantProperties.H | 4 +- .../include/freeSurfaceContinuityErrs.H | 8 +- .../surfaceTracking/include/scalePhi.H | 6 +- .../surfaceTracking/include/setRefCell.H | 2 +- .../surfaceTracking/include/setReference.H | 2 +- .../interTrackFoam/createFields.H | 8 +- .../interTrackFoam/interTrackFoam.C | 8 +- .../setFluidIndicator/setFluidIndicator.C | 4 +- .../mesh/advanced/selectCells/edgeStats.H | 2 +- .../mesh/advanced/selectCells/selectCells.C | 2 +- .../Optional/ccm26ToFoam/ccm26ToFoam.C | 4 +- .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C | 4 +- .../conversion/fluentMeshToFoam/README.txt | 18 +- .../fluentMeshToFoam/extrudedQuadCellShape.C | 2 +- .../extrudedTriangleCellShape.C | 2 +- .../mesh/conversion/kivaToFoam/checkPatch.H | 2 +- .../mesh/conversion/kivaToFoam/readKivaGrid.H | 2 +- .../conversion/sammToFoam/calcPointCells.C | 2 +- .../conversion/sammToFoam/createPolyCells.C | 4 +- .../conversion/sammToFoam/fixCollapsedEdges.C | 2 +- .../conversion/sammToFoam/purgeCellShapes.C | 2 +- .../mesh/conversion/sammToFoam/readBoundary.C | 2 +- .../cellZoneToCellTableId.C | 4 +- .../star4ToFoam/fStar-utils/fStar-cellTable | 10 +- .../conversion/star4ToFoam/star4ToFoam/README | 10 +- .../star4ToFoam/star4ToFoam/README.cellTable | 2 +- .../star4ToFoam/star4ToFoam/createPolyCells.C | 18 +- .../star4ToFoam/star4ToFoam/meshReader.C | 2 +- .../star4ToFoam/star4ToFoam/meshReader.H | 2 +- .../star4ToFoam/star4ToFoam/starMeshReader.C | 2 +- .../star4ToFoam/star4ToFoam/starMeshReader.H | 2 +- .../conversion/starToFoam/calcPointCells.C | 2 +- .../starToFoam/createBoundaryFaces.C | 2 +- .../conversion/starToFoam/createPolyCells.C | 4 +- .../conversion/starToFoam/fixCollapsedEdges.C | 2 +- .../starToFoam/mergeCoupleFacePoints.C | 4 +- .../conversion/starToFoam/purgeCellShapes.C | 2 +- .../mesh/conversion/starToFoam/readCells.C | 8 +- .../mesh/conversion/starToFoam/starMesh.C | 6 +- .../mesh/conversion/tetgenToFoam/beam.1.ele | 2 +- .../mesh/conversion/tetgenToFoam/beam.1.face | 2 +- .../mesh/conversion/tetgenToFoam/beam.1.node | 2 +- .../mesh/conversion/writeMeshObj/Make/options | 2 +- .../conversion/writeMeshObj/writeMeshObj.C | 2 +- .../blockMesh/curvedEdges/ellipseEdge.H | 2 +- .../blockMesh/curvedEdges/rotEllipse2D.H | 2 +- .../extrudeMesh/extrudedMesh/extrudedMesh.C | 2 +- .../mesh/generation/makeFaMesh/makeFaMesh.C | 4 +- .../moveDyMEngineMesh/Make/options | 2 +- .../moveEngineMesh/moveEngineMesh.C | 4 +- .../mesh/manipulation/objToVTK/Make/options | 2 +- .../mesh/manipulation/splitMesh/regionSide.C | 2 +- .../mesh/manipulation/splitMesh/regionSide.H | 2 +- .../mesh/manipulation/zipUpMesh/zipUpMesh.C | 2 +- .../miscellaneous/findRoot/Make/options | 2 +- .../decomposePar/decomposeMesh.C | 2 +- .../decomposePar/decomposeParDict | 2 +- .../decomposePar/domainDecomposition.C | 2 +- .../decomposePar/faFieldDecomposer.C | 10 +- .../decomposePar/faFieldDecomposer.H | 4 +- .../decomposePar/faMeshDecomposition.H | 2 +- .../decomposePar/fvFieldDecomposer.H | 4 +- .../decomposePar/pointFieldDecomposer.C | 2 +- .../decomposePar/tetPointFieldDecomposer.C | 2 +- .../faFieldReconstructorReconstructFields.C | 34 +- .../reconstructPar/pointFieldReconstructor.C | 2 +- .../reconstructPar/processorFaMeshes.C | 8 +- .../tetPointFieldReconstructor.C | 2 +- ...PointFieldReconstructorReconstructFields.C | 2 +- .../faFieldReconstructorReconstructFields.C | 34 +- .../pointFieldReconstructor.C | 2 +- .../reconstructParMesh/processorFaMeshes.C | 8 +- .../tetPointFieldReconstructor.C | 2 +- ...PointFieldReconstructorReconstructFields.C | 2 +- .../POD/scalarSnapshots/scalarSnapshots.C | 2 +- .../foamDataToFluent/fluentUnitNumbers.txt | 58 +- .../foamToFieldview9/calcFaceAddressing.C | 2 +- .../foamToFieldview9/fieldviewTopology.C | 6 +- .../dataConversion/foamToGMV/Make/options | 4 +- .../foamToGMV/gmvOutputHeader.H | 6 +- .../dataConversion/foamToGMV/moveMesh.H | 4 +- .../foamToGMV/readConversionProperties.H | 4 +- .../foamToTecplot360/tecio/Runmake | 40 +- .../tecio/examples/comtest/comtest.f90 | 126 +- .../examples/gridsolution/gridsolution.cpp | 14 +- .../tecio/examples/simtest/simtest.f90 | 2 +- .../foamToTecplot360/tecio/pltview.cpp | 8 +- .../foamToTecplot360/tecio/readme.txt | 16 +- .../foamToTecplot360/tecio/tecsrc/ALLOC.h | 8 +- .../foamToTecplot360/tecio/tecsrc/ARRLIST.h | 8 +- .../foamToTecplot360/tecio/tecsrc/AUXDATA.h | 8 +- .../foamToTecplot360/tecio/tecsrc/DATAIO.h | 8 +- .../foamToTecplot360/tecio/tecsrc/DATAIO4.h | 8 +- .../foamToTecplot360/tecio/tecsrc/DATASET.h | 8 +- .../foamToTecplot360/tecio/tecsrc/DATASET0.h | 8 +- .../foamToTecplot360/tecio/tecsrc/DATASHR.h | 8 +- .../foamToTecplot360/tecio/tecsrc/DATAUTIL.h | 8 +- .../foamToTecplot360/tecio/tecsrc/FACE.h | 8 +- .../tecio/tecsrc/FILESTREAM.h | 8 +- .../foamToTecplot360/tecio/tecsrc/GEOM.h | 8 +- .../foamToTecplot360/tecio/tecsrc/GEOM2.h | 8 +- .../foamToTecplot360/tecio/tecsrc/GLOBAL.h | 8 +- .../foamToTecplot360/tecio/tecsrc/INPUT.h | 8 +- .../foamToTecplot360/tecio/tecsrc/MASTER.h | 22 +- .../tecio/tecsrc/Make/tecioOptions | 2 +- .../foamToTecplot360/tecio/tecsrc/Q_MSG.h | 8 +- .../foamToTecplot360/tecio/tecsrc/Q_UNICODE.h | 8 +- .../foamToTecplot360/tecio/tecsrc/SET.h | 8 +- .../foamToTecplot360/tecio/tecsrc/STRLIST.h | 8 +- .../foamToTecplot360/tecio/tecsrc/STRUTIL.h | 8 +- .../foamToTecplot360/tecio/tecsrc/SYSTEM.h | 8 +- .../foamToTecplot360/tecio/tecsrc/TASSERT.h | 10 +- .../foamToTecplot360/tecio/tecsrc/TECIO.h | 8 +- .../foamToTecplot360/tecio/tecsrc/TECXXX.h | 8 +- .../foamToTecplot360/tecio/tecsrc/TEXT.h | 8 +- .../tecio/tecsrc/TranslatedString.cpp | 8 +- .../tecio/tecsrc/TranslatedString.h | 8 +- .../foamToTecplot360/tecio/tecsrc/VERSION.h | 8 +- .../foamToTecplot360/tecio/tecsrc/alloc.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/arrlist.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/auxdata.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/dataio.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/dataio4.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/dataset.cpp | 8 +- .../tecio/tecsrc/dataset0.cpp | 8 +- .../tecio/tecsrc/datautil.cpp | 8 +- .../tecio/tecsrc/filestream.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/geom2.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/q_msg.cpp | 8 +- .../tecio/tecsrc/q_unicode.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/set.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/stdafx.h | 8 +- .../foamToTecplot360/tecio/tecsrc/strlist.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/strutil.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/tassert.cpp | 8 +- .../foamToTecplot360/tecio/tecsrc/tecxxx.cpp | 8 +- .../dataConversion/foamToVTK/internalWriter.C | 2 +- .../dataConversion/foamToVTK/readFields.H | 2 +- .../dataConversion/foamToVTK/vtkTopo.C | 2 +- .../dataConversion/foamToVTK/writeFaceSet.C | 4 +- .../dataConversion/foamToVTK/writePointSet.C | 4 +- .../foamToVTK/writeSurfFields.C | 2 +- .../graphics/PV3FoamReader/Allwmake | 4 +- .../PVFoamReader/Make/PVFoamReader.pvsm | 36 +- .../PVFoamReader/PVFoamReader.pvsm.in | 36 +- .../PVFoamReader/PVFoamReader/vtkFoamData.h | 2 +- .../PVFoamReader/vtkFoamReader.cxx | 2 +- .../PVFoamReader/PVFoamReader/vtkFoamReader.h | 4 +- .../PVFoamReader/vtkPVFoamSelectTimeSet.cxx | 72 +- .../PVFoamReader/vtkPVFoamSelectTimeSet.h | 18 +- .../vtkFoam/vtkFoamAddInternalMesh.C | 2 +- .../graphics/ensightFoamReader/README | 56 +- .../graphics/ensightFoamReader/README7 | 56 +- .../ensightFoamReader/README_1.0_to_2.0 | 16 +- .../ensightFoamReader/README_2.01_to_2.03 | 240 +- .../ensightFoamReader/README_USERD_1.0 | 48 +- .../ensightFoamReader/README_USERD_2.0 | 150 +- .../ensightFoamReader/README_USERD_2.01 | 102 +- .../ensightFoamReader/README_USERD_2.03 | 100 +- .../README_USERD_2.03_CHANGES | 240 +- .../graphics/ensightFoamReader/USERD_bkup.H | 2 +- .../ensightFoamReader/USERD_exit_routine.H | 2 +- .../USERD_get_border_availability.H | 4 +- .../USERD_get_border_elements_by_type.H | 2 +- .../USERD_get_descrip_lines.H | 4 +- .../USERD_get_geom_timeset_number.H | 2 +- .../USERD_get_gold_variable_info.H | 4 +- .../USERD_get_matf_set_info.H | 2 +- .../USERD_get_matf_var_info.H | 2 +- .../USERD_get_maxsize_info.H | 6 +- .../USERD_get_model_extents.H | 2 +- .../ensightFoamReader/USERD_get_nfaced_conn.H | 10 +- .../USERD_get_nfaced_nodes_per_face.H | 8 +- .../ensightFoamReader/USERD_get_nsided_conn.H | 8 +- .../USERD_get_num_of_time_steps.H | 2 +- .../USERD_get_number_of_files_in_dataset.H | 2 +- .../USERD_get_number_of_material_sets.H | 8 +- .../USERD_get_number_of_materials.H | 2 +- .../USERD_get_number_timesets.H | 2 +- .../ensightFoamReader/USERD_get_part_coords.H | 6 +- .../USERD_get_part_element_ids_by_type.H | 16 +- .../USERD_get_part_elements_by_type.H | 10 +- .../USERD_get_part_node_ids.H | 8 +- .../USERD_get_reader_version.H | 4 +- .../USERD_get_var_by_component.H | 14 +- .../USERD_get_var_value_at_specific.H | 4 +- .../ensightFoamReader/USERD_load_matf_data.H | 4 +- .../USERD_set_server_number.H | 2 +- .../ensightFoamReader/USERD_size_matf_data.H | 4 +- .../ensightFoamReader/getFieldScalar.H | 4 +- .../ensightFoamReader/getFieldTensor.H | 8 +- .../ensightFoamReader/getFieldVector.H | 10 +- .../ensightFoamReader/global_extern.h | 8 +- .../ensightFoamReader/global_extern_proto.h | 20 +- .../graphics/newEnsightFoamReader/README | 56 +- .../graphics/newEnsightFoamReader/README7 | 56 +- .../newEnsightFoamReader/README_1.0_to_2.0 | 16 +- .../newEnsightFoamReader/README_2.01_to_2.03 | 240 +- .../newEnsightFoamReader/README_USERD_1.0 | 48 +- .../newEnsightFoamReader/README_USERD_2.0 | 150 +- .../newEnsightFoamReader/README_USERD_2.01 | 102 +- .../newEnsightFoamReader/README_USERD_2.03 | 100 +- .../README_USERD_2.03_CHANGES | 240 +- .../newEnsightFoamReader/USERD_bkup.H | 2 +- .../newEnsightFoamReader/USERD_exit_routine.H | 2 +- .../USERD_get_border_availability.H | 4 +- .../USERD_get_border_elements_by_type.H | 2 +- .../USERD_get_descrip_lines.H | 4 +- .../USERD_get_geom_timeset_number.H | 2 +- .../USERD_get_gold_part_build_info.H | 32 +- .../USERD_get_gold_variable_info.H | 6 +- .../USERD_get_matf_set_info.H | 2 +- .../USERD_get_matf_var_info.H | 2 +- .../USERD_get_maxsize_info.H | 2 +- .../USERD_get_model_extents.H | 2 +- .../USERD_get_nfaced_conn.H | 14 +- .../USERD_get_nfaced_nodes_per_face.H | 10 +- .../USERD_get_nsided_conn.H | 12 +- .../USERD_get_num_of_time_steps.H | 2 +- .../USERD_get_number_of_files_in_dataset.H | 2 +- .../USERD_get_number_of_material_sets.H | 8 +- .../USERD_get_number_of_materials.H | 2 +- .../USERD_get_number_timesets.H | 2 +- .../USERD_get_part_coords.H | 14 +- .../USERD_get_part_element_ids_by_type.H | 30 +- .../USERD_get_part_elements_by_type.H | 22 +- .../USERD_get_part_node_ids.H | 8 +- .../USERD_get_reader_version.H | 4 +- .../USERD_get_timeset_description.H | 6 +- .../USERD_get_var_by_component.H | 24 +- .../USERD_get_var_value_at_specific.H | 8 +- .../USERD_load_matf_data.H | 4 +- .../USERD_set_filenames.H | 8 +- .../USERD_set_server_number.H | 2 +- .../USERD_size_matf_data.H | 4 +- .../newEnsightFoamReader/getFieldScalar.H | 8 +- .../newEnsightFoamReader/getFieldTensor.H | 14 +- .../newEnsightFoamReader/getFieldVector.H | 14 +- .../getLagrangianScalar.H | 2 +- .../getPatchFieldScalar.H | 4 +- .../getPatchFieldTensor.H | 4 +- .../getPatchFieldVector.H | 4 +- .../getSecondMeshFieldScalar.H | 4 +- .../getSecondMeshFieldTensor.H | 8 +- .../getSecondMeshFieldVector.H | 10 +- .../newEnsightFoamReader/global_extern.h | 8 +- .../global_extern_proto.h | 20 +- .../miscellaneous/calcLevelSet/Make/options | 2 +- .../miscellaneous/postChannel/channelIndex.C | 2 +- .../miscellaneous/postChannel/sumDataI.H | 2 +- .../postProcessing/multiSolver/multiSolver.C | 36 +- .../stressField/solidStress/solidStress.C | 4 +- .../velocityField/Co/Make/options | 4 +- .../stressDifferences/stressDifferences.C | 2 +- .../fluentDataToFoam/fluentDataConverter.H | 2 +- .../fluentDataToFoam/fluentDataToFoam.L | 6 +- .../fluentDataToFoam/fluentUnitNumbers.txt | 58 +- .../surfaceAutoPatch/surfaceAutoPatch.C | 2 +- .../surface/surfaceClean/collapseBase.C | 16 +- .../surface/surfaceClean/collapseEdge.C | 2 +- .../surfaceCoarsen/bunnylod/bunnygut.C | 566 ++-- .../surfaceCoarsen/bunnylod/bunnylod.dsp | 228 +- .../surfaceCoarsen/bunnylod/bunnylod.dsw | 58 +- .../surface/surfaceCoarsen/bunnylod/font.h | 18 +- .../surface/surfaceCoarsen/bunnylod/list.h | 256 +- .../surfaceCoarsen/bunnylod/progmesh.C | 626 ++-- .../surfaceCoarsen/bunnylod/progmesh.h | 66 +- .../surface/surfaceCoarsen/bunnylod/rabdata.C | 2764 ++++++++--------- .../surface/surfaceCoarsen/bunnylod/rabdata.h | 62 +- .../surface/surfaceCoarsen/bunnylod/vector.C | 216 +- .../surface/surfaceCoarsen/bunnylod/vector.h | 132 +- .../surface/surfaceCoarsen/bunnylod/winmain.C | 422 +-- .../surface/surfaceCoarsen/surfaceCoarsen.C | 8 +- .../surface/surfaceSmooth/Make/options | 2 +- .../IFCLookUpTableGen/SpeciesTable | 6 +- .../equilibriumCO/equilibriumCO.C | 2 +- bin/foamAddAndRemoveFromRelease.py | 2 +- bin/foamBuildTarball.py | 4 +- bin/foamEditProperties.py | 16 +- bin/foamEndJob | 6 +- bin/foamGraphExecTime | 4 +- bin/foamGraphResKE | 4 +- bin/foamGraphResUVWP | 4 +- bin/foamLog | 10 +- bin/foamLog.db | 36 +- bin/foamVersion | 6 +- bin/mpigammarun | 22 +- bin/tools/RunFunctions | 4 +- bin/tools/doxyFilt-ignore.awk | 2 +- bin/tools/replaceAllShellSun | 2 +- buildInstructions.txt | 4 +- doc/Doxygen/tools/find-junkFiles | 6 +- doc/Doxygen/tools/find-suspiciousTags | 4 +- doc/Doxygen/tools/find-templateInComments | 2 +- doc/Doxygen/tools/find-tinyDescription | 6 +- .../5.5/Compilation_Centos_5.5_64bit.txt | 14 +- .../Compilation_Ubuntu_10.04.3_32-bit.txt | 8 +- .../Compilation_Ubuntu_10.04.3_64-bit.txt | 8 +- .../12.04/Compilation_Ubuntu_12.04_32-bit.txt | 8 +- .../12.04/Compilation_Ubuntu_12.04_64-bit.txt | 8 +- .../12.10/Compilation_Ubuntu_12.10_64-bit.txt | 8 +- .../12.1/Compilation_openSUSE_12.1_64bit.txt | 12 +- etc/apps/paraview3/bashrc | 4 +- src/ODE/ODESolvers/KRR4/KRR4.C | 8 +- src/ODE/ODESolvers/KRR4/KRR4.H | 2 +- src/ODE/ODESolvers/RK/RK.C | 2 +- src/ODE/ODESolvers/SIBS/SIBS.C | 6 +- src/ODE/sixDOF/sixDOFbodies/sixDOFbodies.C | 4 +- src/OSspecific/POSIX/printStack.C | 10 +- src/OSspecific/POSIX/signals/sigQuit.C | 6 +- src/OSspecific/POSIX/signals/sigSegv.C | 6 +- .../algorithms/MeshWave/FaceCellWave.H | 2 +- src/OpenFOAM/algorithms/MeshWave/MeshWave.C | 4 +- .../algorithms/octree/octree/PointIndexHit.H | 2 +- .../algorithms/octree/octree/octreeDataCell.C | 4 +- .../octree/octree/octreeDataEdges.C | 4 +- .../octree/octree/octreeDataPointTreeLeaf.C | 2 +- .../polygon/clipping/SutherlandHodgman.C | 24 +- .../polygon/clipping/SutherlandHodgman.H | 8 +- .../polygon/pointInPolygon/HormannAgathos.C | 14 +- .../polygon/pointInPolygon/HormannAgathosI.H | 2 +- .../StaticHashTable/StaticHashTable.C | 2 +- .../IOEquationReader/IOEquationReader.H | 2 +- .../db/IOstreams/gzstream/COPYING.LIB | 20 +- src/OpenFOAM/db/IOstreams/gzstream/gzstream.C | 6 +- src/OpenFOAM/db/IOstreams/gzstream/gzstream.h | 100 +- src/OpenFOAM/db/Time/TimeIO.C | 2 +- .../dictionary/equation/equation/equation.H | 32 +- .../equationOperation/equationOperation.C | 2 +- .../equationOperation/equationOperation.H | 32 +- .../equation/equationReader/equationReader.C | 34 +- .../equation/equationReader/equationReader.H | 106 +- .../equationReaderAssignPointerFunctions.C | 4 +- .../equationReader/equationReaderCreateMap.C | 18 +- .../equationReader/equationReaderEvaluate.C | 14 +- .../equationReader/equationReaderGetSource.C | 6 +- .../equationReader/equationReaderParse.C | 46 +- .../equationReaderPointerFunctions.H | 2 +- .../DimensionedFieldFunctions.C | 2 +- .../FieldFields/FieldField/FieldField.C | 2 +- .../expandContract/ExpandTensorNField.C | 2 +- .../GeometricField/GeometricFieldFunctions.C | 2 +- .../GeometricField/GeometricFieldFunctions.H | 2 +- .../GeometricField/GeometricFieldFunctionsM.H | 2 +- .../transformGeometricField.C | 8 +- .../PointPatchField/PointPatchField.C | 2 +- .../PointPatchField/PointPatchField.H | 2 +- .../constraint/cyclic/CyclicPointPatchField.C | 2 +- src/OpenFOAM/fields/ReadFields/ReadFields.C | 2 +- .../pointConstraint/pointConstraint.H | 2 +- src/OpenFOAM/global/argList/argList.C | 2 +- src/OpenFOAM/global/debug/debug.C | 2 +- .../graph/writers/jplotGraph/jplotGraph.H | 2 +- src/OpenFOAM/include/checkTimeOptions.H | 2 +- .../MixingPlaneInterpolate.C | 26 +- .../MixingPlaneInterpolationAddressing.C | 8 +- .../MixingPlaneInterpolationPatches.C | 4 +- .../PrimitivePatchInterpolation.C | 8 +- .../LUscalarMatrix/procLduInterface.H | 2 +- .../matrices/LUscalarMatrix/procLduMatrix.C | 2 +- .../blockLduMatrix/BlockAmg/BlockAmgCycle.C | 8 +- .../blockLduMatrix/BlockAmg/BlockAmgCycle.H | 2 +- .../BlockAmg/BlockAmgPolicy/BlockAamgPolicy.C | 70 +- .../BlockAmg/BlockAmgPolicy/BlockAamgPolicy.H | 8 +- .../BlockAmg/BlockAmgPolicy/BlockAmgPolicy.C | 2 +- .../BlockAmg/BlockAmgPolicy/BlockAmgPolicy.H | 2 +- .../BlockAmgPolicy/blockAmgPolicies.C | 42 +- .../BlockAmgPolicy/scalarBlockAamgPolicy.H | 2 +- .../BlockAmgPolicy/tensorBlockAamgPolicy.H | 2 +- .../BlockAmgPolicy/vectorBlockAamgPolicy.H | 4 +- .../BlockAmg/coarseBlockAmgLevel.C | 10 +- .../BlockAmg/coarseBlockAmgLevel.H | 2 +- .../BlockAmg/fineBlockAmgLevel.C | 24 +- .../BlockAmg/fineBlockAmgLevel.H | 2 +- .../BlockGAMGInterfaceField.C | 4 +- .../BlockGAMGInterfaceField.H | 6 +- .../blockGAMGInterfaceFields.C | 42 +- .../BlockLduInterfaceFieldPtrsList.H | 2 +- .../blockVectorNLduInterfaceFields.C | 2 +- .../processorBlockGAMGInterfaceField.H | 4 +- .../BlockLduMatrix/BlockLduMatrix.C | 6 +- .../BlockLduMatrix/BlockLduMatrix.H | 2 +- .../BlockLduMatrix/BlockLduMatrixATmul.C | 8 +- .../BlockLduMatrix/scalarBlockLduMatrix.C | 22 +- .../scalarBlockLduMatrixUpdateInterfaces.C | 2 +- .../BlockGaussSeidelPrecon.C | 4 +- .../BlockAmgSolver/BlockAmgSolver.C | 8 +- .../BlockAmgSolver/BlockAmgSolver.H | 4 +- .../BlockLduSolvers/blockVectorNSolvers.C | 2 +- .../lduInterface/processorLduInterface.C | 2 +- .../cyclicLduInterfaceField.C | 2 +- .../DILUPreconditioner/DILUPreconditioner.C | 2 +- .../FDICPreconditioner/FDICPreconditioner.C | 2 +- .../diagonalPreconditioner.C | 2 +- .../diagonalPreconditioner.H | 2 +- .../noPreconditioner/noPreconditioner.C | 2 +- .../lduMatrix/solvers/GAMG/GAMGSolver.H | 2 +- .../cyclicGAMGInterfaceField.H | 2 +- .../GAMGInterface/GAMGInterfaceTemplates.C | 4 +- .../mixingPlaneGAMGInterface.C | 2 +- .../ProcessorTopology/ProcessorTopology.C | 4 +- .../meshes/ProcessorTopology/commSchedule.H | 6 +- .../meshShapes/cellMatcher/cellMatcher.C | 2 +- .../cellMatcher/degenerateMatcher.C | 4 +- .../meshShapes/cellMatcher/hexMatcher.C | 2 +- .../meshShapes/cellMatcher/prismMatcher.C | 8 +- .../meshShapes/cellMatcher/tetWedgeMatcher.C | 2 +- .../meshShapes/cellMatcher/wedgeMatcher.C | 2 +- .../meshes/meshShapes/cellShape/cellShapeI.H | 2 +- .../polyMesh/globalMeshData/globalPoints.H | 4 +- .../mapPolyMesh/cellMapper/cellMapper.C | 4 +- .../mapDistribute/mapDistributePolyMesh.H | 2 +- .../mapPolyMesh/pointMapper/pointMapper.C | 2 +- .../preservePatchTypes/preservePatchTypes.C | 4 +- .../PrimitivePatchProjectPoints.C | 4 +- .../primitiveShapes/objectHit/objectHit.H | 2 +- .../primitiveShapes/triangle/triangleFuncs.C | 2 +- .../primitiveShapes/triangle/triangleI.H | 2 +- .../BlockCoeffComponentNorm.C | 4 +- .../BlockCoeffComponentNorm.H | 8 +- .../BlockCoeffMaxNorm/BlockCoeffMaxNorm.C | 6 +- .../BlockCoeffMaxNorm/BlockCoeffMaxNorm.H | 8 +- .../scalarBlockCoeffMaxNorm.H | 4 +- .../tensorBlockCoeffMaxNorm.H | 4 +- .../BlockCoeffNorm/BlockCoeffNorm.H | 4 +- .../BlockCoeffTwoNorm/BlockCoeffTwoNorm.C | 8 +- .../BlockCoeffTwoNorm/BlockCoeffTwoNorm.H | 6 +- .../tensorBlockCoeffTwoNorm.H | 4 +- .../BlockCoeff/DecoupledBlockCoeff.H | 2 +- src/OpenFOAM/primitives/Scalar/doubleFloat.H | 2 +- .../SphericalTensor2D/SphericalTensor2DI.H | 2 +- .../primitives/Tensor/tensor/tensor.C | 4 +- .../primitives/VectorSpace/VectorSpaceM.H | 4 +- .../primitives/transform/symmTransform.H | 4 +- src/Pstream/dummy/IPread.C | 2 +- .../dimensionedVectorTensorN.H | 4 +- .../dynamicBodyFvMesh/dynamicBodyFvMesh.C | 26 +- .../dynamicFvMesh/newDynamicFvMesh.C | 2 +- .../dynamicTopoFvMesh/tetMetrics/tetMetric.C | 2 +- .../fvMeshAdder/fvMeshAdderTemplates.C | 16 +- .../boundaryMesh/octreeDataFaceList.C | 4 +- .../boundaryMesh/octreeDataFaceList.H | 4 +- .../directActions/combineFaces.C | 2 +- .../directActions/edgeCollapser.C | 6 +- .../directActions/faceCollapser.C | 2 +- .../directActions/removeCells.C | 2 +- .../directActions/removeFaces.C | 16 +- .../directActions/removePoints.C | 4 +- .../meshCut/cellCuts/cellCuts.C | 16 +- .../meshCut/cellCuts/cellCuts.H | 6 +- .../meshCut/cellLooper/cellLooper.H | 2 +- .../meshCut/cellLooper/geomCellLooper.C | 2 +- .../meshCut/cellLooper/hexCellLooper.C | 2 +- .../meshCut/cellLooper/topoCellLooper.C | 12 +- .../directions/directionInfo/directionInfo.C | 10 +- .../directions/directionInfo/directionInfo.H | 4 +- .../directions/directionInfo/directionInfoI.H | 2 +- .../meshCut/directions/directions.C | 4 +- .../meshCut/directions/directions.H | 2 +- .../meshCut/edgeVertex/edgeVertex.H | 6 +- .../modifiers/boundaryCutter/boundaryCutter.C | 8 +- .../meshCutAndRemove/meshCutAndRemove.C | 14 +- .../meshCutAndRemove/meshCutAndRemove.H | 4 +- .../meshCut/modifiers/meshCutter/meshCutter.C | 12 +- .../multiDirRefinement/multiDirRefinement.C | 4 +- .../multiDirRefinement/multiDirRefinement.H | 2 +- .../refinementIterator/refinementIterator.C | 2 +- .../refinementIterator/refinementIterator.H | 2 +- .../undoableMeshCutter/undoableMeshCutter.C | 2 +- .../wallNormalInfo/wallNormalInfoI.H | 4 +- .../polyMeshAdder/faceCoupleInfo.H | 4 +- .../polyMeshAdder/polyMeshAdder.C | 8 +- .../motionSmoother/motionSmootherTemplates.C | 4 +- .../polyMeshGeometry/polyMeshGeometry.C | 6 +- .../layerAdditionRemoval/removeCellLayer.C | 2 +- .../perfectInterface/perfectInterface.C | 4 +- .../polyMeshModifiers/setUpdater/setUpdater.H | 2 +- .../setUpdater/setUpdaterTemplates.C | 2 +- .../enrichedPatch/enrichedPatchPointMap.C | 2 +- .../slidingInterfaceAttachedAddressing.C | 8 +- .../actions/modifyObject/polyModifyFace.H | 2 +- .../polyTopoChange/polyTopoChange.C | 2 +- .../refinementData/refinementDataI.H | 2 +- .../refinementData/refinementDistanceDataI.H | 2 +- .../refinementData/refinementHistory.C | 6 +- ...lacementComponentLaplacianFvMotionSolver.C | 2 +- .../cellMotion/cellMotionFvPatchField.C | 2 +- .../inverseDistanceDiffusivity.H | 2 +- .../inverseFaceDistanceDiffusivity.H | 2 +- .../inversePointDistanceDiffusivity.H | 2 +- .../motionDirectionalDiffusivity.C | 2 +- ...aceSlipDisplacementPointPatchVectorField.C | 2 +- .../msqAdditonalSrc/Mesh/MsqMeshEntity.cpp | 190 +- .../msqAdditonalSrc/Mesh/PatchData.cpp | 438 +-- .../msqAdditonalSrc/Mesh/PatchData.hpp | 328 +- .../Shape/AspectRatioGammaQualityMetric.cpp | 12 +- .../Shape/VolumeRatioQualityMetric.cpp | 14 +- .../Shape/VolumeRatioQualityMetric.hpp | 14 +- .../newSolidBodyMotionFunction.C | 2 +- .../cellQuality/cellQuality.C | 28 +- .../deformationEnergy/deformationEnergyDiff.C | 2 +- .../deformationEnergy/deformationEnergyDiff.H | 2 +- .../distortionEnergy/distortionEnergyDiff.C | 2 +- .../distortionEnergy/distortionEnergyDiff.H | 2 +- .../motionDiffs/file/fileDiff.H | 2 +- .../motionDiffs/linear/linearDiff.H | 2 +- .../motionDiffs/motionDiff/motionDiff.H | 2 +- .../motionDiffs/uniform/uniformDiff.H | 2 +- .../pseudoSolidTetDecompositionMotionSolver.C | 4 +- .../linearValveFvMesh/linearValveFvMesh.C | 2 +- src/finiteArea/Make/files | 10 +- src/finiteArea/faMatrices/faMatrix/faMatrix.C | 8 +- .../faGlobalMeshData/faGlobalMeshData.C | 18 +- .../faGlobalMeshData/faGlobalMeshData.H | 2 +- .../faMesh/faMeshDemandDrivenData.C | 32 +- .../constraint/cyclic/cyclicFaPatch.C | 2 +- .../faPatches/constraint/empty/emptyFaPatch.C | 2 +- .../faPatches/constraint/empty/emptyFaPatch.H | 10 +- .../constraint/processor/processorFaPatch.C | 16 +- .../constraint/processor/processorFaPatch.H | 2 +- .../faPatches/constraint/wedge/wedgeFaPatch.C | 2 +- .../basic/transform/transformFaPatchField.C | 2 +- .../faPatchFields/faPatchField/faPatchField.C | 2 +- .../faPatchFields/faPatchField/faPatchField.H | 2 +- .../faePatchField/faePatchField.H | 2 +- .../gaussFaConvectionScheme.C | 8 +- .../gaussFaConvectionSchemes.C | 2 +- .../EulerFaDdtScheme/EulerFaDdtScheme.C | 2 +- .../EulerFaDdtScheme/EulerFaDdtSchemes.C | 2 +- .../backwardFaDdtScheme/backwardFaDdtScheme.C | 4 +- .../backwardFaDdtSchemes.C | 2 +- .../boundedBackwardFaDdtScheme.C | 2 +- .../steadyStateFaDdtScheme.C | 2 +- .../steadyStateFaDdtSchemes.C | 2 +- .../gaussFaDivScheme/gaussFaDivScheme.C | 2 +- src/finiteArea/finiteArea/fam/famSup.C | 2 +- .../gradSchemes/gaussFaGrad/gaussFaGrad.C | 2 +- .../gradSchemes/gaussFaGrad/gaussFaGrad.H | 2 +- .../leastSquaresFaGrad/leastSquaresFaGrad.C | 4 +- .../gaussFaLaplacianSchemes.C | 2 +- .../limitedLnGrad/limitedLnGrad.C | 2 +- .../edgeInterpolation/edgeInterpolate.C | 18 +- .../edgeInterpolationScheme.C | 8 +- .../schemes/NVDscheme/faNVDscheme.C | 8 +- .../schemes/NVDscheme/faNVDscheme.H | 2 +- .../schemes/linear/linearEdgeInterpolation.H | 2 +- .../schemes/upwind/upwindEdgeInterpolation.H | 2 +- .../volSurfaceMapping/volSurfaceMapping.C | 2 +- .../basic/coupled/coupledFvPatchField.H | 2 +- .../basic/transform/transformFvPatchField.C | 2 +- .../cyclicGgi/cyclicGgiFvPatchField.H | 4 +- .../cyclicGgi/cyclicGgiFvPatchFields.C | 16 +- .../mixingPlane/mixingPlaneFvPatchField.C | 4 +- .../overlapGgi/overlapGgiFvPatchField.H | 2 +- .../processor/processorFvPatchField.H | 2 +- .../processor/processorFvPatchScalarField.C | 4 +- .../buoyantPressureFvPatchScalarField.C | 2 +- .../derived/fan/fanFvPatchField.H | 2 +- .../freestreamPressureFvPatchScalarField.C | 4 +- ...tedInletOutletVelocityFvPatchVectorField.H | 2 +- ...ureInletOutletVelocityFvPatchVectorField.C | 2 +- .../rotatingTotalPressureFvPatchScalarField.C | 2 +- .../supersonicFreestreamFvPatchVectorField.H | 2 +- .../syringePressureFvPatchScalarField.C | 18 +- .../totalTemperatureFvPatchScalarField.C | 2 +- .../fvsPatchField/newFvsPatchField.C | 2 +- .../noAdjConvectionSchemes.C | 2 +- .../gaussConvectionSchemes.C | 2 +- .../multivariateGaussConvectionScheme.C | 2 +- .../multivariateGaussConvectionSchemes.C | 2 +- .../noConvectionScheme/noConvectionSchemes.C | 2 +- .../EulerD2dt2Scheme/EulerD2dt2Scheme.C | 4 +- .../EulerD2dt2Scheme/EulerD2dt2Schemes.C | 2 +- .../steadyStateD2dt2Scheme.C | 2 +- .../steadyStateD2dt2Schemes.C | 2 +- .../CoEulerDdtScheme/CoEulerDdtSchemes.C | 2 +- .../CrankNicholsonDdtScheme.H | 2 +- .../CrankNicholsonDdtSchemes.C | 2 +- .../EulerDdtScheme/EulerDdtSchemes.C | 2 +- .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C | 2 +- .../ddtSchemes/SLTSDdtScheme/SLTSDdtSchemes.C | 2 +- .../backwardDdtScheme/backwardDdtSchemes.C | 2 +- .../boundedBackwardDdtSchemes.C | 2 +- .../steadyStateDdtSchemes.C | 2 +- .../gaussDivScheme/gaussDivSchemes.C | 2 +- .../finiteVolume/fvc/fvcAverage.C | 2 +- src/finiteVolume/finiteVolume/fvc/fvcDDt.C | 2 +- .../finiteVolume/fvc/fvcMagSqrGradGrad.C | 2 +- .../gradSchemes/beGaussGrad/beGaussGrad.C | 2 +- .../extendedLeastSquaresGrads.C | 2 +- .../gradSchemes/fourthGrad/fourthGrads.C | 2 +- .../gradSchemes/gaussGrad/gaussGrad.H | 2 +- .../gradSchemes/gaussGrad/gaussGrads.C | 2 +- .../leastSquaresGrad/leastSquaresGrads.C | 2 +- .../cellMDLimitedGrad/cellMDLimitedGrads.C | 2 +- .../faceMDLimitedGrad/faceMDLimitedGrads.C | 2 +- .../noLaplacianScheme/noLaplacianSchemes.C | 2 +- .../quadraticFitSnGrad/quadraticFitSnGrads.C | 2 +- .../fullStencils/CFCCellToCellStencil.C | 6 +- .../fullStencils/cellToCellStencil.H | 2 +- .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.C | 2 +- src/finiteVolume/fvMesh/fvMeshGeometry.C | 2 +- .../fvMesh/fvMeshSubset/fvMeshSubset.C | 4 +- .../mixingPlane/traceMixingPlaneFlux.H | 2 +- src/finiteVolume/fvMesh/wallDist/wallDist.C | 2 +- .../fvMesh/wallDist/wallDistData.H | 4 +- .../wallDist/wallPointYPlus/wallPointYPlusI.H | 8 +- .../findCellPointFaceTriangle.H | 2 +- .../interpolationCellPointFace.C | 54 +- .../interpolationCellPointFace.H | 2 +- .../DeferredCorrectionLimitedScheme.C | 2 +- .../limitedSchemes/Phi/Phi.H | 2 +- .../limitedSchemes/PhiScheme/PhiScheme.C | 2 +- .../limitedSchemes/PhiScheme/PhiScheme.H | 2 +- .../limitedCubic/limitedCubic.H | 2 +- .../limitedCubic/limitedCubicV.H | 2 +- .../multivariateScheme/multivariateScheme.C | 4 +- .../upwind/multivariateUpwind.H | 2 +- .../schemes/clippedLinear/clippedLinear.H | 2 +- .../schemes/cubic/cubic.H | 2 +- .../schemes/downwind/downwind.H | 2 +- .../schemes/localBlended/localBlended.H | 4 +- .../schemes/localMin/localMin.H | 2 +- .../schemes/reverseLinear/reverseLinear.C | 2 +- .../schemes/skewCorrected/skewCorrected.H | 4 +- .../commonRailInjector/commonRailInjector.C | 10 +- .../commonRailInjector/commonRailInjector.H | 6 +- .../definedInjector/definedInjector.C | 10 +- .../definedInjector/definedInjector.H | 6 +- .../dieselSpray/injector/injector/injector.H | 2 +- .../dieselSpray/injector/injector/injectorI.H | 2 +- .../injector/injectorType/injectorType.C | 2 +- .../injector/injectorType/injectorType.H | 10 +- .../multiHoleInjector/multiHoleInjector.C | 16 +- .../multiHoleInjector/multiHoleInjector.H | 6 +- .../injector/swirlInjector/swirlInjector.H | 6 +- .../injector/unitInjector/unitInjector.H | 2 +- .../dieselSpray/parcel/boundaryTreatment.H | 2 +- src/lagrangian/dieselSpray/parcel/parcel.H | 2 +- .../dieselSpray/spray/findInjectorCell.H | 16 +- .../dieselSpray/spray/sprayFunctions.C | 10 +- .../dieselSpray/spray/sprayInject.C | 2 +- .../spraySubModels/breakupModel/TAB/TAB.C | 16 +- .../breakupModel/breakupModel/breakupModel.C | 20 +- .../breakupModel/breakupModel/breakupModel.H | 8 +- .../ORourke/ORourkeCollisionModel.C | 8 +- .../collisionModel/ORourke/sameCell.H | 2 +- .../trajectoryModel/trajectoryCM.H | 18 +- .../trajectoryModel/trajectoryModel.C | 4 +- .../gradientDispersionRAS.C | 8 +- .../gradientDispersionRAS.H | 2 +- .../stochasticDispersionRAS.C | 4 +- .../stochasticDispersionRAS.H | 2 +- .../RutlandFlashBoil/RutlandFlashBoil.C | 84 +- .../saturateEvaporationModel.C | 18 +- .../saturateEvaporationModel.H | 20 +- .../injectorModel/Chomiak/Chomiak.C | 8 +- .../injectorModel/Chomiak/Chomiak.H | 6 +- .../blobsSwirl/blobsSwirlInjector.C | 56 +- .../injectorModel/constant/constInjector.C | 10 +- .../injectorModel/constant/constInjector.H | 4 +- .../definedHollowCone/definedHollowCone.C | 10 +- .../definedHollowCone/definedHollowCone.H | 4 +- .../definedPressureSwirl.C | 80 +- .../definedPressureSwirl.H | 2 +- .../injectorModel/hollowCone/hollowCone.C | 8 +- .../injectorModel/hollowCone/hollowCone.H | 4 +- .../injectorModel/injectorModel.H | 8 +- .../pressureSwirl/pressureSwirlInjector.C | 36 +- .../pressureSwirl/pressureSwirlInjector.H | 22 +- .../wallModel/reflectParcel/reflectParcel.C | 14 +- src/lduSolvers/amg/amgPolicy/pamgPolicy.C | 4 +- src/meshTools/PointEdgeWave/pointEdgePointI.H | 18 +- src/meshTools/cellClassification/cellInfo.H | 4 +- src/meshTools/cellClassification/cellInfoI.H | 8 +- .../cellDist/wallPoint/wallPointDataI.H | 10 +- src/meshTools/cellDist/wallPoint/wallPointI.H | 12 +- src/meshTools/cellQuality/cellQuality.C | 20 +- src/meshTools/meshSearch/meshSearch.C | 6 +- src/meshTools/meshSearch/meshSearch.H | 2 +- .../polyMeshZipUpCells/polyMeshZipUpCells.C | 4 +- .../primitiveMeshGeometry.C | 6 +- .../searchableSurfaceWithGaps.C | 2 +- src/meshTools/surfaceSets/surfaceSets.C | 14 +- src/meshTools/surfaceSets/surfaceSets.H | 4 +- .../booleanSurface/booleanSurface.H | 2 +- .../intersectedSurface/intersectedSurface.H | 2 +- .../surfaceIntersection/surfaceIntersection.H | 2 +- .../octreeData/octreeDataTriSurface.H | 2 +- .../orientedSurface/orientedSurface.C | 4 +- .../surfaceLocation/surfaceLocation.H | 8 +- .../triSurfaceTools/geompack/geompack.H | 20 +- .../triSurfaceTools/triSurfaceTools.C | 22 +- .../dummyControlDict/dummyControlDict.H | 2 +- src/multiSolver/include/setSolverDomain.H | 2 +- src/multiSolver/multiSolver/multiSolver.C | 80 +- src/multiSolver/multiSolver/multiSolver.H | 104 +- src/multiSolver/multiSolver/multiSolverI.H | 4 +- src/multiSolver/multiSolver/multiSolverInit.H | 6 +- .../multiSolver/multiSolverSetControls.C | 28 +- .../multiSolverSetInitialSolverDomain.C | 12 +- .../multiSolverSetNextSolverDomain.C | 18 +- .../multiSolver/multiSolverTimeFunctions.C | 52 +- src/multiSolver/timeCluster/timeCluster.C | 2 +- src/multiSolver/timeCluster/timeCluster.H | 24 +- src/multiSolver/timeCluster/timeClusterList.C | 8 +- src/multiSolver/timeCluster/timeClusterList.H | 8 +- .../writeComponentTurboFields.C | 4 +- .../mixingPlaneCheckFunctionObject.C | 8 +- .../field/readFields/readFields.C | 2 +- .../surfaceInterpolateFields.C | 2 +- src/sampling/include/buildPatch.H | 2 +- src/sampling/include/mapPatch.H | 10 +- .../meshToMesh/calculateMeshToMeshWeights.C | 4 +- .../meshToMesh/meshToMesh.C | 2 +- .../meshToMesh/meshToMeshInterpolate.C | 8 +- .../isoSurface/sampledIsoSurfaceCell.C | 2 +- .../thresholdCellFaces/thresholdCellFaces.H | 2 +- .../elementMesh/elementMesh.H | 2 +- .../tetFemMatrix/tetFemMatrix.C | 2 +- .../tetPointMapperCellDecomp.C | 2 +- .../tetPolyMeshLduAddressingCellDecomp.C | 2 +- .../global/globalTetPolyPatchCellDecomp.H | 2 +- .../mixingPlaneTetPolyPatchCellDecomp.H | 2 +- .../tetPolyBoundaryMeshFaceDecomp.H | 2 +- .../tetPolyMeshLduAddressingFaceDecomp.C | 2 +- .../fixedInternalEnergyFvPatchScalarField.C | 4 +- ...gradientInternalEnergyFvPatchScalarField.C | 4 +- .../mixedInternalEnergyFvPatchScalarField.C | 2 +- .../chemistryModel/chemPoint/chemPoint.C | 98 +- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 2 +- .../fixedUnburntEnthalpyFvPatchScalarField.C | 4 +- ...radientUnburntEnthalpyFvPatchScalarField.C | 4 +- .../mixedUnburntEnthalpyFvPatchScalarField.C | 2 +- .../specie/atomicWeights/atomicWeights.C | 2 +- .../IrreversibleReaction.C | 2 +- .../NonEquilibriumReversibleReaction.C | 2 +- .../reaction/Reactions/Reaction/Reaction.C | 2 +- .../ReversibleReaction/ReversibleReaction.C | 2 +- .../thirdBodyArrheniusReactionRateI.H | 4 +- .../meshTriangulation/meshTriangulation.C | 8 +- .../meshTriangulation/meshTriangulation.H | 2 +- .../triSurface/interfaces/AC3D/readAC.C | 4 +- .../triSurface/interfaces/TRI/readTRI.C | 2 +- .../surfacePatch/surfacePatchIOList.C | 4 +- .../smoothDelta/smoothDeltaDeltaDataI.H | 10 +- .../LES/LESfilters/LESfilter/LESfilter.H | 2 +- ...ngLengthFrequencyInletFvPatchScalarField.H | 2 +- .../kqRWallFunctionFvPatchField.C | 2 +- ...ngLengthFrequencyInletFvPatchScalarField.H | 2 +- .../Turbomachinery/CMakeFiles/CMakeLists.txt | 14 +- ...ryTestsuites_ercoftacCentrifugalPump.cmake | 2 +- ...ryTestsuites_ercoftacConicalDiffuser.cmake | 2 +- ...achineryTestsuites_singleChannelPump.cmake | 2 +- .../TurbomachineryTestsuites_tutorials.cmake | 6 +- testHarness/OSIG/Turbomachinery/README.txt | 6 +- .../OSIG/Turbomachinery/runDir/Allclean | 2 +- .../Turbomachinery/runDir/Allrun_CMakeOnly | 20 +- .../Turbomachinery/runDir/Allrun_Experimental | 20 +- .../OSIG/Turbomachinery/runDir/Allrun_Nightly | 20 +- .../scripts/prepareCasesForTestHarness.sh | 4 +- .../1.6-ext/CMakeFiles/CMakeLists.txt | 12 +- .../CMakeFiles/OpenFOAM_Tutorials.cmake | 4 +- testHarness/OpenFOAM/1.6-ext/README.txt | 6 +- testHarness/OpenFOAM/1.6-ext/runDir/Allclean | 2 +- .../OpenFOAM/1.6-ext/runDir/Allrun_CMakeOnly | 18 +- .../1.6-ext/runDir/Allrun_Experimental | 18 +- .../OpenFOAM/1.6-ext/runDir/Allrun_Nightly | 18 +- .../scripts/addMissingAllrunFileToTutorial.sh | 4 +- .../scripts/prepareCasesForTestHarness.sh | 2 +- testHarness/README.txt | 28 +- .../0_orig/T | 26 +- .../Allclean | 2 +- .../Allrun | 4 +- .../constant/polyMesh/blockMeshDict.m4 | 42 +- .../constant/polyMesh/boundary.preconfigured | 100 +- .../postProcessing/compareAll.html | 50 +- .../system/sampleDict | 4 +- .../twoBlocksMixingPlane/Allclean | 2 +- .../laplacianFoam/twoBlocksMixingPlane/Allrun | 8 +- .../constant/polyMesh/boundary.preconfigured | 8 +- .../twoBlocksMixingPlaneMismatch/Allclean | 2 +- .../twoBlocksMixingPlaneMismatch/Allrun | 8 +- .../constant/polyMesh/boundary.preconfigured | 8 +- .../analyticalCylinder/analyticalCylinder.C | 6 +- .../analyticalCylinder/createFields.H | 4 +- .../dieselFoam/aachenBomb/chemkin/chem.inp | 2 +- .../dieselFoam/aachenBomb/chemkin/chem.inp.1 | 2 +- .../aachenBomb/chemkin/chem.inp.full | 66 +- .../dieselFoam/aachenBomb/chemkin/chem.inp_15 | 14 +- .../combustion/engineFoam/kivaTest/otape17 | 2 +- .../conjugateHeatFoam/heatedBlock/Allrun | 2 +- .../equationReaderDemo/expectedOutput | 6 +- .../equationReader/equationReaderTester/0/U | 6 +- .../equationReaderTester/0/eqns | 66 +- .../equationReader/equationReaderTester/0/p | 6 +- .../constant/polyMesh/blockMeshDict | 16 +- .../boussinesqBuoyantFoam/Allclean | 4 +- .../heatTransfer/boussinesqBuoyantFoam/Allrun | 2 +- .../hotRoom/setHotRoom/setHotRoom.C | 16 +- .../heatTransfer/setHotRoom/setHotRoom.C | 14 +- .../icoDyMFoam/turboPassageRotating/Allclean | 2 +- .../Allclean | 2 +- .../Allrun | 8 +- .../constant/polyMesh/boundary.preconfigured | 8 +- .../twoBlocksMixingPlane_dirY_spanZ/Allclean | 2 +- .../twoBlocksMixingPlane_dirY_spanZ/Allrun | 8 +- .../constant/polyMesh/boundary.preconfigured | 8 +- .../twoBlocksMixingPlane_dirZ_spanY/Allclean | 2 +- .../twoBlocksMixingPlane_dirZ_spanY/Allrun | 8 +- .../constant/polyMesh/boundary.preconfigured | 8 +- .../simpleFoam/mixingPlaneAxial/0_orig/U | 24 +- .../simpleFoam/mixingPlaneAxial/0_orig/alpha | 18 +- .../mixingPlaneAxial/0_orig/epsilon | 24 +- .../simpleFoam/mixingPlaneAxial/0_orig/k | 24 +- .../simpleFoam/mixingPlaneAxial/0_orig/p | 18 +- .../simpleFoam/mixingPlaneAxial/0_orig/phi | 20 +- .../simpleFoam/mixingPlaneAxial/Allclean | 2 +- .../simpleFoam/mixingPlaneAxial/Allrun | 8 +- .../constant/polyMesh/blockMeshDict.m4 | 12 +- .../constant/polyMesh/boundary.preconfigured | 124 +- .../constant/polyMesh/blockMeshDict | 2 +- .../icoLagrangianFoam/Make/files | 2 +- .../circCylinder3dHex/system/decomposeParDict | 2 +- .../constant/polyMesh/blockMeshDict | 10 +- .../teeFitting2d/system/multiFvSolution | 2 +- .../multiphase/cavitatingFoam/les/Allrun | 2 +- tutorials/multiphase/interFoam/ras/Allrun | 8 +- .../stressAnalysis/contactStressFoam/Allclean | 2 +- .../flappingConsoleSmall/fluid/0/motionU | 10 +- .../fluid/system/sampleDict | 4 +- .../solid/constant/polyMesh/blockMeshDict | 2 +- .../stressAnalysis/stressFemFoam/Allclean | 2 +- .../bubble2D_r0.75mm/Allclean | 6 +- .../tank3D/constant/polyMesh/blockMeshDict | 10 +- .../tank3D/system/decomposeParDict | 4 +- .../sphereSurfactantFoam/surfactantFoam.C | 4 +- .../sphereTransport/sphereTransport/0/Cvf | 2 +- .../sphereTransport/sphereTransport/0/U | 2 +- .../viscoelasticFluidFoam/DCPP/Allclean | 2 +- .../viscoelasticFluidFoam/FENE-CR/README | 8 +- .../viscoelasticFluidFoam/FENE-P/Allclean | 2 +- .../viscoelasticFluidFoam/Feta-PTT/README | 8 +- .../viscoelasticFluidFoam/Giesekus/Allclean | 2 +- .../viscoelasticFluidFoam/Leonov/README | 4 +- .../viscoelasticFluidFoam/Oldroyd-B/Allclean | 2 +- .../viscoelasticFluidFoam/Oldroyd-B/README | 6 +- .../PTT-Exponential/README | 6 +- .../viscoelasticFluidFoam/PTT-Linear/Allclean | 2 +- .../viscoelasticFluidFoam/S-MDCPP/README | 12 +- .../WhiteMetzner/CarreauYasuda/README | 12 +- .../viscoelasticFluidFoam/XPP_DE/README | 10 +- .../viscoelasticFluidFoam/XPP_SE/README | 8 +- wmake/MakefileApps | 2 +- wmake/rules/FreeBSD/c++Opt | 2 +- wmake/rules/FreeBSD/cOpt | 2 +- wmake/rules/FreeBSD/mplib | 6 +- wmake/rules/FreeBSD/mplibMPICH | 2 +- wmake/rules/FreeBSD/mplibOPENMPI | 2 +- wmake/rules/General/bison | 4 +- wmake/rules/General/btyacc | 2 +- wmake/rules/General/btyacc++ | 2 +- wmake/rules/General/byacc | 2 +- wmake/rules/General/flex | 2 +- wmake/rules/General/flex++.test | 2 +- wmake/rules/General/moc | 2 +- wmake/rules/General/mplibMPICH | 2 +- wmake/rules/General/yacc | 4 +- wmake/rules/SiCortex64Gcc/c++Opt | 2 +- wmake/rules/SiCortex64Gcc/cOpt | 2 +- wmake/rules/SiCortex64Gcc/flex++ | 2 +- wmake/rules/SunOS64Gcc/c++Opt | 2 +- wmake/rules/SunOS64Gcc/cOpt | 2 +- wmake/rules/SunOS64Gcc/mplib | 6 +- wmake/rules/darwinIntel/c++Opt | 2 +- wmake/rules/darwinIntel/cOpt | 2 +- wmake/rules/darwinIntel/mplib | 6 +- wmake/rules/darwinIntel64/c++Opt | 2 +- wmake/rules/darwinIntel64/cOpt | 2 +- wmake/rules/darwinIntel64/mplib | 6 +- wmake/rules/darwinPpc/c++Opt | 2 +- wmake/rules/darwinPpc/cOpt | 2 +- wmake/rules/darwinPpc/mplib | 6 +- wmake/rules/linux64Gcc/cOpt | 2 +- wmake/rules/linux64Gcc/mplib | 6 +- wmake/rules/linux64Gcc/mplibGAMMA | 2 +- wmake/rules/linux64Gcc/mplibMPICH | 2 +- wmake/rules/linux64Gcc45/cOpt | 2 +- wmake/rules/linux64Gcc45/mplib | 6 +- wmake/rules/linux64Gcc45/mplibGAMMA | 2 +- wmake/rules/linux64Gcc45/mplibMPICH | 2 +- wmake/rules/linux64Gcc46/cOpt | 2 +- wmake/rules/linux64Gcc46/mplib | 6 +- wmake/rules/linux64Gcc46/mplibGAMMA | 2 +- wmake/rules/linux64Gcc46/mplibMPICH | 2 +- wmake/rules/linux64Icc/c | 2 +- wmake/rules/linux64Icc/c++Opt | 2 +- wmake/rules/linux64Icc/cDebug | 2 +- wmake/rules/linux64Icc/cOpt | 2 +- wmake/rules/linux64Icc/mplib | 6 +- wmake/rules/linuxGcc/c++Opt | 2 +- wmake/rules/linuxGcc/cOpt | 2 +- wmake/rules/linuxGcc/mplib | 6 +- wmake/rules/linuxGcc/mplibGAMMA | 2 +- wmake/rules/linuxGcc45/c++Opt | 2 +- wmake/rules/linuxGcc45/cOpt | 2 +- wmake/rules/linuxGcc45/mplib | 6 +- wmake/rules/linuxGcc45/mplibGAMMA | 2 +- wmake/rules/linuxGcc46/c++Opt | 2 +- wmake/rules/linuxGcc46/cOpt | 2 +- wmake/rules/linuxGcc46/mplib | 6 +- wmake/rules/linuxGcc46/mplibGAMMA | 2 +- wmake/rules/linuxIA64Gcc/c++Opt | 2 +- wmake/rules/linuxIA64Gcc/cOpt | 2 +- wmake/rules/linuxIA64Gcc/mplib | 6 +- wmake/rules/linuxIA64Gcc/mplibMPI | 2 +- wmake/rules/linuxIA64I64/c | 2 +- wmake/rules/linuxIA64I64/c++Debug | 2 +- wmake/rules/linuxIA64I64/c++Opt | 2 +- wmake/rules/linuxIA64I64/cDebug | 2 +- wmake/rules/linuxIA64I64/cOpt | 2 +- wmake/rules/linuxIA64I64/mplib | 6 +- wmake/rules/linuxIA64I64/mplibMPICH | 2 +- wmake/rules/linuxIA64Icc/c | 2 +- wmake/rules/linuxIA64Icc/c++Debug | 2 +- wmake/rules/linuxIA64Icc/c++Opt | 2 +- wmake/rules/linuxIA64Icc/cDebug | 2 +- wmake/rules/linuxIA64Icc/cOpt | 2 +- wmake/rules/linuxIA64Icc/mplib | 6 +- wmake/rules/linuxIA64Icc/mplibIMPI | 2 +- wmake/rules/linuxIA64Icc/mplibMPI | 2 +- wmake/rules/linuxIcc/c | 2 +- wmake/rules/linuxIcc/c++Debug | 2 +- wmake/rules/linuxIcc/c++Opt | 2 +- wmake/rules/linuxIcc/cDebug | 2 +- wmake/rules/linuxIcc/cOpt | 2 +- wmake/rules/linuxIcc/mplib | 6 +- wmake/rules/linuxIcc/mplibMPICH | 2 +- wmake/rules/linuxPPC64Gcc/mplib | 6 +- wmake/rules/linuxPPC64Gcc/mplibGAMMA | 2 +- wmake/rules/linuxPPC64Gcc/mplibMPICH | 2 +- wmake/rules/solarisGcc/c++Opt | 2 +- wmake/rules/solarisGcc/cOpt | 2 +- wmake/rules/solarisGcc/mplib | 6 +- wmake/rules/solarisGcc/mplibMPI | 4 +- wmake/rules/solarisGcc/mplibMPICH | 2 +- wmake/rules/solarisGcc/mplibPVM | 2 +- 1246 files changed, 9623 insertions(+), 9623 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aac37fb6d..9a4298e5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,16 +81,16 @@ SET( ) # Find out the version of the compiler being used. -# Add this information to the buildname +# Add this information to the buildname # This is for gcc or icc because they both support the -dumpversion option EXEC_PROGRAM($ENV{WM_CC} ARGS -dumpversion OUTPUT_VARIABLE COMPILER_VERSION ) -SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}") +SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}") # # We will support more compilers eventually. -# +# # Timeout for running every single test: 4 hours: 4 x 3600 seconds #SET( @@ -133,7 +133,7 @@ if(GIT_FOUND) ) message("Git branch (mercurial): ${GIT_BRANCH_NAME}") endif() - SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}") + SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}") endif() # Some last minute cleanup @@ -158,7 +158,7 @@ set_property( # Compile the OpenFOAM unit tests located under applications/test # This part will not be compiled and run by default. # This would be a good candidate for a sub-project -add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests +add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests wmake all ${OF_ROOT}/applications/test ) @@ -184,7 +184,7 @@ IF(BUILD_TESTING) # Modify this variable if you want the full length test case simulations # Beware, this might take a long time to execute. - # Otherwise, the default behaviour is to run each tutorial for 1 "timestep" + # Otherwise, the default behaviour is to run each tutorial for 1 "timestep" #SET(RUN_FROM_ONE_TIMESTEP 0) SET(RUN_FROM_ONE_TIMESTEP 1) diff --git a/ContributionsForNextRelease.txt b/ContributionsForNextRelease.txt index aff262727..6ec94b8b7 100644 --- a/ContributionsForNextRelease.txt +++ b/ContributionsForNextRelease.txt @@ -14,7 +14,7 @@ Contributions: - TU Braunschweig: real gas thermo - Kornev, Rostock: inlet turbulence generator; locDynV2F hybrid turbulence model - Christoph Goniva: and multi-mixer dynamic mesh class -- +- - segregated pressure-based turbomachinery (Wikki) diff --git a/ExtendProjectPreamble b/ExtendProjectPreamble index 80314d499..62e0e6ffc 100644 --- a/ExtendProjectPreamble +++ b/ExtendProjectPreamble @@ -1,118 +1,118 @@ -The OpenFOAM-Extend Project - -Web site: http://www.extend-project.de/ - -The goal of the OpenFOAM -Extend Project is to open the OpenFOAM CFD toolbox -to community contributed extensions in the spirit of the Open Source -development model. - -Software under the name OpenFOAM has been developed by a large group of -volunteers starting in 1991 and has spread through scientific and engineering -community in the late 1990s and early 2000s. Its main strength was the spirit -of open collaboration in the community: the aim of the OpenFOAM-Extend Project -is to formalize this spirit. - - * Trademark notice - Currently, the word "OpenFOAM" is held as a trademark by a commercial - company, not associated with the Open Source development effort of this - software. While the author acknowledges the existence of Trademark, - association of trademarked phrase with the the code developed by third - parties and including the author is misleading in terms of authorship, - ownership of intellectual property of the source code. - - In the absence of a legal resolution, we shall refer to the project as the - -Extend project and software as "OpenFOAM", as per agreement between - Prof. Hrvoje Jasak and Mr. Henry G. Weller of 30 September 2004. - - The excerpts below are from the correspondences of Dr.Jasak and are to - his knowledge all the relevant writings about this topic. Although - this topic has been discussed before in public forums there exists no - 'official' answer by OpenCFD on this issue. In the interest of - fairness a reference (link) to such an answer will be added to this - document as soon as we come aware of it. - - 09/30/2004 01:45 PM - - Dear Dr. Jasak, - - I propose that we make FOAM open-source and shutdown Nabla, that way we - are free to pursue whatever future we wish independently. - - Henry G. Weller - Managing Director - Nabla Ltd - - The first release of the OpenFOAM source code of 10 December 2004 - and subsequent clarification of 16 February 2005. - - Hi Henry, - - ... - - Regarding the new setup, I would like to thank you for your effort i - n making FOAM public domain, with crucial comments regarding some - important details. - - - in the header files for the open version of foam there exists a line - which claims copyright for OpenCFD Ltd: - - Copyright (C) 1991-2004 OpenCFD Ltd. - - I am not sure whether it is possible to claim copyright over a GPL piece - of software, but this is at least misleading. In order for this - statement to be true, OpenCFD Ltd. would need to purchase the copyright - from Nabla Ltd. and from you and me personally (due to unresolved - ownership and the remaining payments Nabla Ltd. needs to make to us - regarding the original transfer of copyright). I can offer a number - of solutions acceptable to me as follows: - - 1) no Copyright statement apart from the required GPL statement - 2) Copyright OpenFOAM.org - 3) Copyright Henry Weller, Hrvoje Jasak et al - 4) Copyright OpenCFD and Hrvoje Jasak - 5) List of authors instead of the copyright statement - - I am also prepared to consider any other reasonable ideas along the same - lines (including the sale of copyright, which would be a bit pointless - at this stage) - please advise. - - - 02/17/2005 11:09 PM - - Under the GPL there has to be an organization in place to enforce the GPL - if there are violation, these are part of the rules. OpenCFD undertakes - that responsibility hence the copyright. - - Henry G. Weller - Managing Director - - - 12 November 2010 - - From the above it is clear that OpenCFD does not own the rights or - authorship of the source code, which is currently concealed in public. - For further details, I have been attempting to get a formal response by - this company for 6 years now, without success. It is time to move on. - - The current Copyright notice does not fairly describe the authorship of - the software. In the spirit of the open source development model, the - -Extend project wishes to formally acknowledge all contributors and - developers of OpenFOAM from its inception to today. - - As this issue still remains unresolved, and the list of contributors - has been removed from the OpenFOAM source code by Mr. Weller in 2006, - we shall re-base OpenFOAM as an Open Source community-based project - and associate the authorship and Copyright in each case with the - original author. - - Hrvoje Jasak - - -This offering is not affiliated with OpenCFD Limited, owner of the OpenFOAM -trade mark. - - -Please find the official website of OpenCFD Limited at http://www.openfoam.org -In particular, OpenCFD Limited hosts the following legal statements: -- licensing and intellectual property: http://www.openfoam.com/legal/index.php -- trademark policy: http://www.openfoam.com/legal/trademark-policy.php +The OpenFOAM-Extend Project + +Web site: http://www.extend-project.de/ + +The goal of the OpenFOAM -Extend Project is to open the OpenFOAM CFD toolbox +to community contributed extensions in the spirit of the Open Source +development model. + +Software under the name OpenFOAM has been developed by a large group of +volunteers starting in 1991 and has spread through scientific and engineering +community in the late 1990s and early 2000s. Its main strength was the spirit +of open collaboration in the community: the aim of the OpenFOAM-Extend Project +is to formalize this spirit. + + * Trademark notice + Currently, the word "OpenFOAM" is held as a trademark by a commercial + company, not associated with the Open Source development effort of this + software. While the author acknowledges the existence of Trademark, + association of trademarked phrase with the the code developed by third + parties and including the author is misleading in terms of authorship, + ownership of intellectual property of the source code. + + In the absence of a legal resolution, we shall refer to the project as the + -Extend project and software as "OpenFOAM", as per agreement between + Prof. Hrvoje Jasak and Mr. Henry G. Weller of 30 September 2004. + + The excerpts below are from the correspondences of Dr.Jasak and are to + his knowledge all the relevant writings about this topic. Although + this topic has been discussed before in public forums there exists no + 'official' answer by OpenCFD on this issue. In the interest of + fairness a reference (link) to such an answer will be added to this + document as soon as we come aware of it. + + 09/30/2004 01:45 PM + + Dear Dr. Jasak, + + I propose that we make FOAM open-source and shutdown Nabla, that way we + are free to pursue whatever future we wish independently. + + Henry G. Weller + Managing Director + Nabla Ltd + + The first release of the OpenFOAM source code of 10 December 2004 + and subsequent clarification of 16 February 2005. + + Hi Henry, + + ... + + Regarding the new setup, I would like to thank you for your effort i + n making FOAM public domain, with crucial comments regarding some + important details. + + - in the header files for the open version of foam there exists a line + which claims copyright for OpenCFD Ltd: + + Copyright (C) 1991-2004 OpenCFD Ltd. + + I am not sure whether it is possible to claim copyright over a GPL piece + of software, but this is at least misleading. In order for this + statement to be true, OpenCFD Ltd. would need to purchase the copyright + from Nabla Ltd. and from you and me personally (due to unresolved + ownership and the remaining payments Nabla Ltd. needs to make to us + regarding the original transfer of copyright). I can offer a number + of solutions acceptable to me as follows: + + 1) no Copyright statement apart from the required GPL statement + 2) Copyright OpenFOAM.org + 3) Copyright Henry Weller, Hrvoje Jasak et al + 4) Copyright OpenCFD and Hrvoje Jasak + 5) List of authors instead of the copyright statement + + I am also prepared to consider any other reasonable ideas along the same + lines (including the sale of copyright, which would be a bit pointless + at this stage) - please advise. + + + 02/17/2005 11:09 PM + + Under the GPL there has to be an organization in place to enforce the GPL + if there are violation, these are part of the rules. OpenCFD undertakes + that responsibility hence the copyright. + + Henry G. Weller + Managing Director + + + 12 November 2010 + + From the above it is clear that OpenCFD does not own the rights or + authorship of the source code, which is currently concealed in public. + For further details, I have been attempting to get a formal response by + this company for 6 years now, without success. It is time to move on. + + The current Copyright notice does not fairly describe the authorship of + the software. In the spirit of the open source development model, the + -Extend project wishes to formally acknowledge all contributors and + developers of OpenFOAM from its inception to today. + + As this issue still remains unresolved, and the list of contributors + has been removed from the OpenFOAM source code by Mr. Weller in 2006, + we shall re-base OpenFOAM as an Open Source community-based project + and associate the authorship and Copyright in each case with the + original author. + + Hrvoje Jasak + + +This offering is not affiliated with OpenCFD Limited, owner of the OpenFOAM +trade mark. + + +Please find the official website of OpenCFD Limited at http://www.openfoam.org +In particular, OpenCFD Limited hosts the following legal statements: +- licensing and intellectual property: http://www.openfoam.com/legal/index.php +- trademark policy: http://www.openfoam.com/legal/trademark-policy.php diff --git a/HowToContribute b/HowToContribute index 674db4a5f..9c2f9f4b2 100644 --- a/HowToContribute +++ b/HowToContribute @@ -10,7 +10,7 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk) Martin Beaudoin (beaudoin.martin@ireq.ca) 1. SourceForge Access - ~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~ To make contributions to the -extend project, you should first obtain an account at SourceForge.net. (SourceForge will suggest a username @@ -46,7 +46,7 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk) The article listed above should be considered mandatory reading material for those planning to make contributions to the repository. Some links about - the general usage of GIT can be found in Section 8. + the general usage of GIT can be found in Section 8. Please do not hesitate to ask one of the "git Repository" contacts at the top of this document if you are not sure about specific operation relative to the git @@ -81,14 +81,14 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk) + git checkout -b my-feature-branch Feature branches should be named after the fix or feature that they contain, - *not* named after the author. There may be more than one author, after all, and + *not* named after the author. There may be more than one author, after all, and this information is recorded in the commit anyway. As an example, a bug fix to the mesquite package should be committed to a branch named "hotfix/mesquite". Carefully organized commits and branches, clear commit messages, and well-chosen branch names will make it easier for the release committee to review and merge - each contribution. - + each contribution. + When you have a feature branch that is ready to be merged, push it to the server using a command such as this: @@ -125,7 +125,7 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk) The feature branches provided by users will be merged by the release committee into an integration branch called "nextRelease", and then both the local - and remote copy of the feature branch will be deleted. The merge will be performed + and remote copy of the feature branch will be deleted. The merge will be performed using a "git merge --no-ff" command, which forces the creation of a merge commit even in the case where the merge could be accomplished by fast-forward. Note that the automated test loop will be run off of this integration branch. @@ -136,7 +136,7 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk) and hotfixes. Note that hotfixes should be branched off of the master branch and should be merged - twice - once into the integration branch and once into the master branch - in order to + twice - once into the integration branch and once into the master branch - in order to guarantee that a merge of the integration branch into the master branch can be accomplished by a fast-forward. diff --git a/README b/README index f540fcd00..e9773b85c 100644 --- a/README +++ b/README @@ -93,7 +93,7 @@ of the OpenFOAM installation. * Building the ThirdParty packages from Sources - A new way of compiling and installing the ThirdParty suite of packages is proposed with OpenFOAM-1.6-ext. + A new way of compiling and installing the ThirdParty suite of packages is proposed with OpenFOAM-1.6-ext. Please consult the file ThirdParty/README.ThirdParty a for more information. * Building from Sources (Optional) @@ -154,7 +154,7 @@ * Reporting Bugs in OpenFOAM Please report all bugs and feature requests using our bug tracking system: - http://sourceforge.net/apps/mantisbt/openfoam-extend/main_page.php or + http://sourceforge.net/apps/mantisbt/openfoam-extend/main_page.php or http://www.extend-project.de/project-final/openfoam-extend-bug-tracker Please also report bugs at the CFD-Online User Forum. @@ -188,7 +188,7 @@ David Hill Niklas Wikstrom Dubravko Matijasevic - Darrin Stephens + Darrin Stephens Christian Beck Oliver Borm James Criner diff --git a/ReleaseNotes-1.6-ext b/ReleaseNotes-1.6-ext index ab014f87c..ed1fb84b4 100644 --- a/ReleaseNotes-1.6-ext +++ b/ReleaseNotes-1.6-ext @@ -1,84 +1,84 @@ -# -*- mode: org; -*- -# -#+TITLE: *OpenFOAM release notes for version 1.6-ext* -#+AUTHOR: Hrvoje Jasak. -#+DATE: 12 November 2010 -#+LINK: http://www.extend-project.de -#+OPTIONS: author:nil - -* Overview - OpenFOAM-1.6-ext is a formal release of the community developments in the - OpenFOAM software library, following the establishment of the -Extend Project - and web portal. - - This release includes many improvements, including an automatic test harness - which provides basic quality control by running OpenFOAM over a growing - suite of tutorials and test cases. - -* Compatibility - OpenFOAM-1.6-ext is compatible with the OpenFOAM-1.6.x and 1.7.1 versions - of the code and incorporate most developments and changes from above versions - and ensure top-level compatibility. In some cases, the differences are - caused by bug fixes and algorithmic improvements, considered more important - than inter-operability. - - The list of developments is a result of the work of numerous contributors. - The Extend Project Admins would formally like to thank all contributors; - the list will be updated with further code development - -* Fundamental developments - Improvements in accuracy and stability on tetrahedral and tet-dominant meshes - Implicit coupled multi-domain solver - Block-implicit multi-equation matrix support - Proper Orthogonal Decomposition (POD) data analysis tools - Rewrite of Ordinary Differential Equation (ODE) and ODE solver classes - Dynamic remeshing classes, based on tetrahedral edge swapping - Radial Basis Function interpolation and mesh motion classes - Turbomachinery features: GGI interface, cyclic GGI, partial overlap GGI - Parallelisation of topological change engine - Support for parallelisation and topological changes in the Finite Area Method - Library preparation for Python/Swig interface for OpenFOAM: VulaSHAKA project - (http://sourceforge.net/projects/vulashaka/) - Basic implementation of OpenMP wrapping for multi-core support - -* Ongoing developments - This section lists the applications that existed in versions of OpenFOAM - but were abandoned by OpenCFD due to lack of expertise. In some cases, code - may still be present but it is buggy or unusable. The -Extend project line - maintains, validates and develops the features in contact with original - authors and contributes new features and bug fixes. - - Working parallel point mesh and field tools, shared between interpolation - and FEM discretisation solvers - FEM-based automatic mesh motion solver, with working parallelisation - Dynamic mesh features and topological mesh changes - The Finite Area Method: parallelisation, volume-to-surface mapping - New generation of linear equation solvers, including accelerated AMG - -* Developments to solvers (applications) - Basic 6-degree-of-freedom (6-DOF) solver - POD solver tools: prototype - Demonstration solver for fully implicit block-matrix coupling - -* Developments to utilities - New parallel decomposition and reconstruction formulation, with support - for topologically changing meshes - Level-set support tools - -* Model development - Transport models and top-level solver for visco-elasto-plastic flows - Updates to internal combustion engine simulation tools - Updated version of free surface tracking tools for free surface flows - Updated fluid-structure interaction solver with parallelisation support - Updated stress analysis tools, new large deformation solver formulation - -* Quality Control - Integrated automatic and publicly available test harness with ~150 cases - http://openfoam-extend.sourceforge.net/CDash/index.php - Community-driven test-case base to enhance code quality and integrity. - Contributions under - http://www.extend-project.de/project-final/openfoam-extend-test-harness - -* Other - The number of cumulative bug fixes compared to OpenFOAM-1.6.x is over - 5000; we will stop counting. +# -*- mode: org; -*- +# +#+TITLE: *OpenFOAM release notes for version 1.6-ext* +#+AUTHOR: Hrvoje Jasak. +#+DATE: 12 November 2010 +#+LINK: http://www.extend-project.de +#+OPTIONS: author:nil + +* Overview + OpenFOAM-1.6-ext is a formal release of the community developments in the + OpenFOAM software library, following the establishment of the -Extend Project + and web portal. + + This release includes many improvements, including an automatic test harness + which provides basic quality control by running OpenFOAM over a growing + suite of tutorials and test cases. + +* Compatibility + OpenFOAM-1.6-ext is compatible with the OpenFOAM-1.6.x and 1.7.1 versions + of the code and incorporate most developments and changes from above versions + and ensure top-level compatibility. In some cases, the differences are + caused by bug fixes and algorithmic improvements, considered more important + than inter-operability. + + The list of developments is a result of the work of numerous contributors. + The Extend Project Admins would formally like to thank all contributors; + the list will be updated with further code development + +* Fundamental developments + Improvements in accuracy and stability on tetrahedral and tet-dominant meshes + Implicit coupled multi-domain solver + Block-implicit multi-equation matrix support + Proper Orthogonal Decomposition (POD) data analysis tools + Rewrite of Ordinary Differential Equation (ODE) and ODE solver classes + Dynamic remeshing classes, based on tetrahedral edge swapping + Radial Basis Function interpolation and mesh motion classes + Turbomachinery features: GGI interface, cyclic GGI, partial overlap GGI + Parallelisation of topological change engine + Support for parallelisation and topological changes in the Finite Area Method + Library preparation for Python/Swig interface for OpenFOAM: VulaSHAKA project + (http://sourceforge.net/projects/vulashaka/) + Basic implementation of OpenMP wrapping for multi-core support + +* Ongoing developments + This section lists the applications that existed in versions of OpenFOAM + but were abandoned by OpenCFD due to lack of expertise. In some cases, code + may still be present but it is buggy or unusable. The -Extend project line + maintains, validates and develops the features in contact with original + authors and contributes new features and bug fixes. + + Working parallel point mesh and field tools, shared between interpolation + and FEM discretisation solvers + FEM-based automatic mesh motion solver, with working parallelisation + Dynamic mesh features and topological mesh changes + The Finite Area Method: parallelisation, volume-to-surface mapping + New generation of linear equation solvers, including accelerated AMG + +* Developments to solvers (applications) + Basic 6-degree-of-freedom (6-DOF) solver + POD solver tools: prototype + Demonstration solver for fully implicit block-matrix coupling + +* Developments to utilities + New parallel decomposition and reconstruction formulation, with support + for topologically changing meshes + Level-set support tools + +* Model development + Transport models and top-level solver for visco-elasto-plastic flows + Updates to internal combustion engine simulation tools + Updated version of free surface tracking tools for free surface flows + Updated fluid-structure interaction solver with parallelisation support + Updated stress analysis tools, new large deformation solver formulation + +* Quality Control + Integrated automatic and publicly available test harness with ~150 cases + http://openfoam-extend.sourceforge.net/CDash/index.php + Community-driven test-case base to enhance code quality and integrity. + Contributions under + http://www.extend-project.de/project-final/openfoam-extend-test-harness + +* Other + The number of cumulative bug fixes compared to OpenFOAM-1.6.x is over + 5000; we will stop counting. diff --git a/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C b/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C index b6be6d139..ea3636ff0 100644 --- a/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C +++ b/applications/solvers/basic/sixDOFSolver/sixDOFSolver.C @@ -62,12 +62,12 @@ int main(int argc, char *argv[]) forAll (structure.names(), bodyI) { - Info<< nl << "Average velocity of " << structure.names()[bodyI] + Info<< nl << "Average velocity of " << structure.names()[bodyI] << " in time step = " << structure()[bodyI].Uaverage().value() << nl << "Current velocity in time instant = " << structure()[bodyI].U().value() << nl - << "Average omega of " << structure.names()[bodyI] + << "Average omega of " << structure.names()[bodyI] << " in time step = " << structure()[bodyI].omegaAverage().value() << nl << "Current omega in time instant = " diff --git a/applications/solvers/combustion/PDRFoam/XiEqns b/applications/solvers/combustion/PDRFoam/XiEqns index bd5ca3066..8de3bffe4 100644 --- a/applications/solvers/combustion/PDRFoam/XiEqns +++ b/applications/solvers/combustion/PDRFoam/XiEqns @@ -22,7 +22,7 @@ volScalarField GEta = GEtaCoef/tauEta; volScalarField XiEqEta = 1.0 + XiCoef*sqrt(up/(Su + SuMin))*Reta; - volScalarField R = + volScalarField R = GEta*XiEqEta/(XiEqEta - 0.999) + GIn*XiIn/(XiIn - 0.999); volScalarField XiEqStar = R/(R - GEta - GIn); @@ -42,7 +42,7 @@ volScalarField GEta = GEtaCoef/tauEta; volScalarField XiEqEta = 1.0 + XiCoef*sqrt(up/(Su + SuMin))*Reta; - volScalarField R = + volScalarField R = GEta*XiEqEta/(XiEqEta - 0.999) + GIn*XiIn/(XiIn - 0.999); volScalarField XiEqStar = R/(R - GEta - GIn); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C index cfa992f77..b705c5efb 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C @@ -91,7 +91,7 @@ bool Foam::XiModels::algebraic::read(const dictionary& XiProperties) XiModel::read(XiProperties); XiModelCoeffs_.lookup("XiShapeCoef") >> XiShapeCoef; - + return true; } diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index cb67681f0..adfb9ceff 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -117,7 +117,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::polyPhi { scalar x = phi - 1.0; - return + return a[0] *( scalar(1) diff --git a/applications/solvers/combustion/PDRFoam/setDeltaT.H b/applications/solvers/combustion/PDRFoam/setDeltaT.H index 707ccceef..c906d9a39 100644 --- a/applications/solvers/combustion/PDRFoam/setDeltaT.H +++ b/applications/solvers/combustion/PDRFoam/setDeltaT.H @@ -45,7 +45,7 @@ if (adjustTimeStep) maxDeltaT ) ); - + Info<< "deltaT = " << runTime.deltaT().value() << endl; } diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake index 698558da0..5f01d96a7 100755 --- a/applications/solvers/compressible/rhoCentralFoam/Allwmake +++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso BCs +wmake libso BCs wmake # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C index 4f025b504..8ff886333 100644 --- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C +++ b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) ( fvm::ddt(rhoU) + fvm::div(phiv, rhoU) - == + == - fvc::grad(p) ); diff --git a/applications/solvers/compressible/rhopSonicFoam/Allwmake b/applications/solvers/compressible/rhopSonicFoam/Allwmake index 698558da0..5f01d96a7 100755 --- a/applications/solvers/compressible/rhopSonicFoam/Allwmake +++ b/applications/solvers/compressible/rhopSonicFoam/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso BCs +wmake libso BCs wmake # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C b/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C index aea2e1df5..1f06a0fa5 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C @@ -131,7 +131,7 @@ void inviscidWallPFvPatchScalarField::updateCoeffs() const fvPatchField& rhoUp = lookupPatchField("rhoU"); - const fvsPatchField& phip = + const fvsPatchField& phip = lookupPatchField("phi"); const fvsPatchField& rAp = @@ -147,7 +147,7 @@ void inviscidWallPFvPatchScalarField::updateCoeffs() void inviscidWallPFvPatchScalarField::write(Ostream& os) const { fixedGradientFvPatchScalarField::write(os); - os.writeKeyword("fluxFraction") + os.writeKeyword("fluxFraction") << fluxFraction_ << token::END_STATEMENT << nl; writeEntry("value", os); } diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C index 06f94d262..e992d722a 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C @@ -145,7 +145,7 @@ void mixedRhoEFvPatchScalarField::updateCoeffs() const volScalarField& T = db().lookupObject("T"); const label patchi = patch().index(); - fvPatchScalarField& Tp = + fvPatchScalarField& Tp = const_cast(T.boundaryField()[patchi]); Tp.evaluate(); @@ -164,7 +164,7 @@ void mixedRhoEFvPatchScalarField::updateCoeffs() refGrad() = rhop*Cv.value()*Tp.snGrad() + ( - refValue() + refValue() - (0.5*rhop.patchInternalField()* magSqr(rhoUp.patchInternalField()/rhop.patchInternalField())) )*patch().deltaCoeffs(); diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H index 0eb667cab..57030daf2 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H @@ -66,7 +66,7 @@ public: const dictionary& ); - //- Construct by mapping given fixedRhoUFvPatchVectorField + //- Construct by mapping given fixedRhoUFvPatchVectorField // onto a new patch fixedRhoUFvPatchVectorField ( diff --git a/applications/solvers/coupled/conjugateHeatFoam/Make/files b/applications/solvers/coupled/conjugateHeatFoam/Make/files index 4a3cb8acf..18d6456ca 100644 --- a/applications/solvers/coupled/conjugateHeatFoam/Make/files +++ b/applications/solvers/coupled/conjugateHeatFoam/Make/files @@ -1,3 +1,3 @@ -conjugateHeatFoam.C +conjugateHeatFoam.C EXE = $(FOAM_APPBIN)/conjugateHeatFoam diff --git a/applications/solvers/electromagnetics/electrostaticFoam/Make/files b/applications/solvers/electromagnetics/electrostaticFoam/Make/files index 073ad4cd7..d5cb4f139 100644 --- a/applications/solvers/electromagnetics/electrostaticFoam/Make/files +++ b/applications/solvers/electromagnetics/electrostaticFoam/Make/files @@ -1,3 +1,3 @@ -electrostaticFoam.C +electrostaticFoam.C EXE = $(FOAM_APPBIN)/electrostaticFoam diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C index 5dfd54f0d..ea4f934be 100644 --- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C +++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) U = rUA*UEqn.H(); - phi = (fvc::interpolate(U) & mesh.Sf()) + phi = (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, U, phi); for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) diff --git a/applications/solvers/engine/icoDyMEngineFoam/createFields.H b/applications/solvers/engine/icoDyMEngineFoam/createFields.H index e885cdf93..52faaaaa0 100644 --- a/applications/solvers/engine/icoDyMEngineFoam/createFields.H +++ b/applications/solvers/engine/icoDyMEngineFoam/createFields.H @@ -83,6 +83,6 @@ momentumPredictor = false; # include "UEqn.H" momentumPredictor = momentumPredictorSave; - + rUA = 1.0/UEqn.A(); } diff --git a/applications/solvers/engine/icoDyMEngineFoam/meshCourantNo.H b/applications/solvers/engine/icoDyMEngineFoam/meshCourantNo.H index eec8feee1..21f3de5b5 100644 --- a/applications/solvers/engine/icoDyMEngineFoam/meshCourantNo.H +++ b/applications/solvers/engine/icoDyMEngineFoam/meshCourantNo.H @@ -35,7 +35,7 @@ scalar meanMeshCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = + surfaceScalarField SfUfbyDelta = mesh.surfaceInterpolation::deltaCoeffs()*mag(mesh.phi()); meshCoNum = max(SfUfbyDelta/mesh.magSf()) diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/compressibleCorrectPhi.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/compressibleCorrectPhi.H index e28a92438..f71258e73 100644 --- a/applications/solvers/engine/sonicTurbDyMEngineFoam/compressibleCorrectPhi.H +++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/compressibleCorrectPhi.H @@ -28,7 +28,7 @@ pcorr.oldTime() == p.oldTime(); phi = fvc::interpolate(rho) - *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)); + *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)); for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { @@ -43,7 +43,7 @@ if (nonOrth == nNonOrthCorr) { - phi += pcorrEqn.flux(); + phi += pcorrEqn.flux(); } } } diff --git a/applications/solvers/engine/turbDyMEngineFoam/meshCourantNo.H b/applications/solvers/engine/turbDyMEngineFoam/meshCourantNo.H index eec8feee1..21f3de5b5 100644 --- a/applications/solvers/engine/turbDyMEngineFoam/meshCourantNo.H +++ b/applications/solvers/engine/turbDyMEngineFoam/meshCourantNo.H @@ -35,7 +35,7 @@ scalar meanMeshCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = + surfaceScalarField SfUfbyDelta = mesh.surfaceInterpolation::deltaCoeffs()*mag(mesh.phi()); meshCoNum = max(SfUfbyDelta/mesh.magSf()) diff --git a/applications/solvers/equationReader/equationReaderDemo/equationReaderDemo.C b/applications/solvers/equationReader/equationReaderDemo/equationReaderDemo.C index 263201aed..decb8e75e 100644 --- a/applications/solvers/equationReader/equationReaderDemo/equationReaderDemo.C +++ b/applications/solvers/equationReader/equationReaderDemo/equationReaderDemo.C @@ -28,7 +28,7 @@ Application Description Sample application testing the equationReader extension, and demonstrating its use. - + Author David L. F. Gaden @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) Info << "Reading equation b from testDict, linking an output variable" << endl; eqns.readEquation(testDict, "b", activeOutB); - + Info << "Output variable before update() = " << activeOutB << endl; Info << "Begining .update() - this evaluates all equations with active " << "output..." << endl; @@ -161,11 +161,11 @@ int main(int argc, char *argv[]) Info << "done. Evaluating equation f ... "; passiveOutF = eqns.evaluate("f"); Info << "done." << token::NL << "The result is: " << passiveOutF << endl; - + Info << token::NL << "Creating output..." << endl; OFstream os(path/"outputDict"); os << eqns; eqns.dataSourceStatus(os); - + return(0); } diff --git a/applications/solvers/equationReader/equationReaderTester/equationReaderTester.C b/applications/solvers/equationReader/equationReaderTester/equationReaderTester.C index becb0cc04..db912f62e 100644 --- a/applications/solvers/equationReader/equationReaderTester/equationReaderTester.C +++ b/applications/solvers/equationReader/equationReaderTester/equationReaderTester.C @@ -28,7 +28,7 @@ Application Description Sample application testing the equationReader in a finite volume solver environment. - + Author David L. F. Gaden @@ -174,7 +174,7 @@ int main(int argc, char *argv[]) eqns.addDataSource(Sj, "Sj"); eqns.addDataSource(Sk, "Sk"); eqns.addDataSource(Sl, "Sl"); - + label listIndex(0); eqns.addDataSource(p); eqns.addDataSource(dummy); @@ -201,7 +201,7 @@ int main(int argc, char *argv[]) scalar saD(readScalar(testDict1.lookup("saD"))); scalar saE(readScalar(testDict1.lookup("saE"))); scalar saF(readScalar(testDict1.lookup("saF"))); - + dimensionedScalar dsaA(testDict1.lookup("dsaA")); dimensionedScalar dsaB(testDict1.lookup("dsaB")); dimensionedScalar dsaC(testDict1.lookup("dsaC")); @@ -244,7 +244,7 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; DStime.value() = runTime.value(); - + Info << "Moving p index to "; listIndex++; if (listIndex == p.size()) @@ -313,7 +313,7 @@ int main(int argc, char *argv[]) volScalarField rUA = 1.0/UEqn.A(); U = rUA*UEqn.H(); - phi = (fvc::interpolate(U) & mesh.Sf()) + phi = (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, U, phi); adjustPhi(phi, U, p); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H index 3bded31e1..a088b9d34 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H @@ -71,7 +71,7 @@ class solidWallMixedTemperatureCoupledFvPatchScalarField //- Name of field on the neighbour region const word neighbourFieldName_; - + //- Name of thermal conductivity field const word KName_; diff --git a/applications/solvers/incompressible/icoDyMFoam/createFields.H b/applications/solvers/incompressible/icoDyMFoam/createFields.H index 561cd7bf4..9c918b565 100644 --- a/applications/solvers/incompressible/icoDyMFoam/createFields.H +++ b/applications/solvers/incompressible/icoDyMFoam/createFields.H @@ -85,6 +85,6 @@ momentumPredictor = false; # include "UEqn.H" momentumPredictor = momentumPredictorSave; - + rAU = 1.0/UEqn.A(); } diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H index 561cd7bf4..9c918b565 100644 --- a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H +++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H @@ -85,6 +85,6 @@ momentumPredictor = false; # include "UEqn.H" momentumPredictor = momentumPredictorSave; - + rAU = 1.0/UEqn.A(); } diff --git a/applications/solvers/incompressible/icoFoam/Make/files b/applications/solvers/incompressible/icoFoam/Make/files index 964e46e15..f1564ba48 100644 --- a/applications/solvers/incompressible/icoFoam/Make/files +++ b/applications/solvers/incompressible/icoFoam/Make/files @@ -1,3 +1,3 @@ -icoFoam.C +icoFoam.C EXE = $(FOAM_APPBIN)/icoFoam diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/files b/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/files index ad5215ffd..8b68719cc 100644 --- a/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/files +++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/files @@ -1,3 +1,3 @@ -nonNewtonianIcoFoam.C +nonNewtonianIcoFoam.C EXE = $(FOAM_APPBIN)/nonNewtonianIcoFoam diff --git a/applications/solvers/incompressible/simpleFoam/Make/files b/applications/solvers/incompressible/simpleFoam/Make/files index 22ef53883..693d26fd8 100644 --- a/applications/solvers/incompressible/simpleFoam/Make/files +++ b/applications/solvers/incompressible/simpleFoam/Make/files @@ -1,3 +1,3 @@ -simpleFoam.C +simpleFoam.C EXE = $(FOAM_APPBIN)/simpleFoam diff --git a/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C b/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C index c12a074ab..83a48db6e 100644 --- a/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C +++ b/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) # include "solverScalarTransportFoam.H" multiRun++; - + // * * * * * * * * * * * * * * * * icoFoam2 * * * * * * * * * * * * * * * * // Info << "*** Switching to icoFoam2 ***\n" << endl; diff --git a/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H b/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H index f62ba240e..1fedb60d0 100644 --- a/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H +++ b/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H @@ -31,7 +31,7 @@ volScalarField rUA = 1.0/UEqn.A(); U = rUA*UEqn.H(); - phi = (fvc::interpolate(U) & mesh.Sf()) + phi = (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, U, phi); adjustPhi(phi, U, p); diff --git a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H index 6f1622510..c5e93c7ef 100644 --- a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H +++ b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H @@ -3,12 +3,12 @@ dimensionedScalar totalMass = fvc::domainIntegrate(rho); - scalar sumLocalContErr = + scalar sumLocalContErr = ( fvc::domainIntegrate(mag(rho - thermoRho))/totalMass ).value(); - scalar globalContErr = + scalar globalContErr = ( fvc::domainIntegrate(rho - thermoRho)/totalMass ).value(); diff --git a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H index 9233804c4..95e0c4fa1 100644 --- a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H +++ b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H @@ -47,7 +47,7 @@ if (adjustTimeStep) maxDeltaT ) ); - + Info<< "deltaT = " << runTime.deltaT().value() << endl; } diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index bd209f4b5..91967aeb5 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C @@ -63,7 +63,7 @@ Ostream& operator<< ) { os << tp.theta0_ << token::SPACE - << tp.uTheta_ << token::SPACE + << tp.uTheta_ << token::SPACE << tp.thetaA_ << token::SPACE << tp.thetaR_; diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index 62f40a821..01154f4a2 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -166,13 +166,13 @@ Foam::tmp Foam::multiphaseMixture::muf() const { PtrDictionary::const_iterator iter = phases_.begin(); - tmp tmuf = + tmp tmuf = fvc::interpolate(iter().limitedAlpha())*iter().rho()* fvc::interpolate(iter().nu()); for(++iter; iter != phases_.end(); ++iter) { - tmuf() += + tmuf() += fvc::interpolate(iter().limitedAlpha())*iter().rho()* fvc::interpolate(iter().nu()); } diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C index a726a75d8..4af2f36e9 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C @@ -28,7 +28,7 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::phase::phase +Foam::phase::phase ( const word& name, const dictionary& phaseDict, diff --git a/applications/solvers/multiphase/porousInterFoam/createPorousZones.H b/applications/solvers/multiphase/porousInterFoam/createPorousZones.H index 37e26b34e..1593cd563 100644 --- a/applications/solvers/multiphase/porousInterFoam/createPorousZones.H +++ b/applications/solvers/multiphase/porousInterFoam/createPorousZones.H @@ -19,7 +19,7 @@ forAll( pZones, zoneI ) { const label & zoneId( pZones[zoneI].zoneId() ); - + const labelList & cells(mesh.cellZones()[zoneId]); const scalar & zonePorosity( pZones[zoneI].porosity() ); diff --git a/applications/solvers/multiphase/settlingFoam/correctViscosity.H b/applications/solvers/multiphase/settlingFoam/correctViscosity.H index 0c22a12ea..ddc539dcd 100644 --- a/applications/solvers/multiphase/settlingFoam/correctViscosity.H +++ b/applications/solvers/multiphase/settlingFoam/correctViscosity.H @@ -1,5 +1,5 @@ { - mul = muc + + mul = muc + plasticViscosity ( plasticViscosityCoeff, diff --git a/applications/solvers/multiphase/settlingFoam/kEpsilon.H b/applications/solvers/multiphase/settlingFoam/kEpsilon.H index 0c0930dd1..67dbfc7b5 100644 --- a/applications/solvers/multiphase/settlingFoam/kEpsilon.H +++ b/applications/solvers/multiphase/settlingFoam/kEpsilon.H @@ -26,7 +26,7 @@ if(turbulence) + fvm::div(phi, epsilon) - fvm::laplacian ( - alphaEps*mut + mul, epsilon, + alphaEps*mut + mul, epsilon, "laplacian(DepsilonEff,epsilon)" ) == diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options index 78af0f414..8ddc2ab0b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -IinterfacialModels/lnInclude \ -IphaseModel/lnInclude \ -Iaveraging - + EXE_LIBS = \ -lEulerianInterfacialModels \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H index 93593196a..9f0417045 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H @@ -56,7 +56,7 @@ fvVectorMatrix UbEqn(Ub, Ub.dimensions()*dimVol/dimTime); -fvc::interpolate(nuEffb)*mesh.magSf()*fvc::snGrad(beta) /fvc::interpolate(beta + scalar(0.001)); - UbEqn = + UbEqn = ( (scalar(1) + Cvm*rhob*alpha/rhob)* ( diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C index a8de3ea2b..d52f7ec6e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C @@ -83,7 +83,7 @@ Foam::tmp Foam::GidaspowErgunWenYu::K Cds[celli] = 0.44; } } - + // Wen and Yu (1966) tmp tKWenYu = 0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d(); volScalarField& KWenYu = tKWenYu(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index a575614be..54f03d530 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::dragModel::New interfaceDict.lookup("dragModel" + phasea.name()) ); - Info << "Selecting dragModel for phase " + Info << "Selecting dragModel for phase " << phasea.name() << ": " << dragModelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C index e357ad713..75b17320d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C @@ -75,7 +75,7 @@ Foam::tmp Foam::GidaspowConductivity::kappa ( 2.0*sqr(alpha)*g0*(1.0 + e)/sqrtPi + (9.0/8.0)*sqrtPi*g0*0.5*(1.0 + e)*sqr(alpha) - + (15.0/16.0)*sqrtPi*alpha + + (15.0/16.0)*sqrtPi*alpha + (25.0/64.0)*sqrtPi/((1.0 + e)*g0) ); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C index deea98f09..fc4fd6914 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C @@ -76,7 +76,7 @@ Foam::tmp Foam::HrenyaSinclairConductivity::kappa { const scalar sqrtPi = sqrt(mathematicalConstant::pi); - volScalarField lamda = + volScalarField lamda = scalar(1) + da/(6.0*sqrt(2.0)*(alpha + scalar(1.0e-5)))/L_; return rhoa*da*sqrt(Theta)* diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C index a138e2bd4..d0f25d9c9 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::conductivityModel::New { word conductivityModelType(dict.lookup("conductivityModel")); - Info<< "Selecting conductivityModel " + Info<< "Selecting conductivityModel " << conductivityModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(conductivityModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index f7ff84669..821ce51be 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C @@ -73,7 +73,7 @@ frictionalPressure ) const { - return + return Fr*pow(max(alpha - alphaMinFriction, scalar(0)), eta) /pow(max(alphaMax - alpha, scalar(5.0e-2)), p); } @@ -104,9 +104,9 @@ Foam::tmp Foam::JohnsonJacksonFrictionalStress::muf const dimensionedScalar& alphaMax, const volScalarField& pf, const volTensorField& D, - const dimensionedScalar& phi + const dimensionedScalar& phi ) const -{ +{ return dimensionedScalar("0.5", dimTime, 0.5)*pf*sin(phi); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C index 648e4a935..007226bbc 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::frictionalStressModel::New { word frictionalStressModelType(dict.lookup("frictionalStressModel")); - Info<< "Selecting frictionalStressModel " + Info<< "Selecting frictionalStressModel " << frictionalStressModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(frictionalStressModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C index c4175d429..a69867eab 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::granularPressureModel::New { word granularPressureModelType(dict.lookup("granularPressureModel")); - Info<< "Selecting granularPressureModel " + Info<< "Selecting granularPressureModel " << granularPressureModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(granularPressureModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C index 4d663a2c5..12d8810f6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C @@ -65,7 +65,7 @@ Foam::tmp Foam::CarnahanStarlingRadial::g0 ) const { - return + return 1.0/(1.0 - alpha) + 3.0*alpha/(2.0*sqr(1.0 - alpha)) + sqr(alpha)/(2.0*pow(1.0 - alpha, 3)); @@ -78,8 +78,8 @@ Foam::tmp Foam::CarnahanStarlingRadial::g0prime const dimensionedScalar& alphaMax ) const { - return - - alpha/sqr(1.0 - alpha) + return + - alpha/sqr(1.0 - alpha) + (3.0*(1.0 - alpha) + 6.0*sqr(alpha))/(2.0*(1.0 - alpha)) + (2.0*alpha*(1.0 - alpha) + 3.0*pow(alpha, 3)) /(2.0*pow(1.0 - alpha, 4)); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C index 07dc32ee0..8aad9f39f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C @@ -74,7 +74,7 @@ Foam::tmp Foam::GidaspowRadial::g0prime const dimensionedScalar& alphaMax ) const { - return + return (-1.0/5.0)*pow(alpha/alphaMax, -2.0/3.0) /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C index c9c870b02..652971a2b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C @@ -74,7 +74,7 @@ Foam::tmp Foam::SinclairJacksonRadial::g0prime const dimensionedScalar& alphaMax ) const { - return + return (-1.0/3.0)*pow(alpha/alphaMax, -2.0/3.0) /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C index 2722fece0..832898495 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::radialModel::New { word radialModelType(dict.lookup("radialModel")); - Info<< "Selecting radialModel " + Info<< "Selecting radialModel " << radialModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(radialModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H index ad4874551..ade4ce0b3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H @@ -42,7 +42,7 @@ phib = (fvc::interpolate(Ub) & mesh.Sf()) + fvc::ddtPhiCorr(rUbA, Ub, phib) + phiDragb; - + phi = alphaf*phia + betaf*phib; surfaceScalarField Dp("(rho*(1|A(U)))", alphaf*rUaAf/rhoa + betaf*rUbAf/rhob); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H b/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H index 457e476b2..ba6dcf7ce 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H @@ -14,12 +14,12 @@ // Initializing neighbouring cells contribution scalar neighboursEx = 0.0; - + forAll (neighbourCell, cellj) { labelList neighboursNeighbour = neighbour[neighbourCell[cellj]]; scalar neighboursNeighbourCellVolumes = 0.0; - + forAll (neighboursNeighbour, cellk) { neighboursNeighbourCellVolumes += diff --git a/applications/solvers/newStressAnalysis/materialModels/Make/files b/applications/solvers/newStressAnalysis/materialModels/Make/files index 5b798f25b..63dde3fe5 100644 --- a/applications/solvers/newStressAnalysis/materialModels/Make/files +++ b/applications/solvers/newStressAnalysis/materialModels/Make/files @@ -16,7 +16,7 @@ $(rheologyLaws)/PronyViscoelastic/PronyViscoelastic.C thermalModel/thermalModel.C thermalLaws = thermalModel/thermalLaws -$(thermalLaws)/thermalLaw/thermalLaw.C +$(thermalLaws)/thermalLaw/thermalLaw.C $(thermalLaws)/thermalLaw/newThermalLaw.C $(thermalLaws)/constantThermal/constantThermal.C $(thermalLaws)/multiMaterialThermal/multiMaterialThermal.C diff --git a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H index 2e30e7e74..18d79b207 100644 --- a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H +++ b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H @@ -71,7 +71,7 @@ public: DugdaleCohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy diff --git a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C index 2ea3e3a7d..634663d82 100644 --- a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C +++ b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C @@ -74,7 +74,7 @@ Foam::autoPtr Foam::cohesiveLaw::New Foam::cohesiveLaw::cohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ) : cohesiveLawCoeffs_(dict.subDict(cohesiveLawName + "Coeffs")), diff --git a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H index 6a98e59ce..6ad767f52 100644 --- a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H +++ b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H @@ -97,7 +97,7 @@ public: static autoPtr New ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); @@ -107,7 +107,7 @@ public: cohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy @@ -124,7 +124,7 @@ public: // Member Functions - + //- Return cohesive law coefficients const dictionary& cohesiveLawCoeffs() const { diff --git a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/linear/linearCohesiveLaw.H b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/linear/linearCohesiveLaw.H index 53d4ee100..d77823b27 100644 --- a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/linear/linearCohesiveLaw.H +++ b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/linear/linearCohesiveLaw.H @@ -71,7 +71,7 @@ public: linearCohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy diff --git a/applications/solvers/newStressAnalysis/materialModels/componentReference/componentReference.H b/applications/solvers/newStressAnalysis/materialModels/componentReference/componentReference.H index f4d4b2e83..37b6d97ae 100644 --- a/applications/solvers/newStressAnalysis/materialModels/componentReference/componentReference.H +++ b/applications/solvers/newStressAnalysis/materialModels/componentReference/componentReference.H @@ -171,7 +171,7 @@ public: { checkPatchFace(mesh); } - + //- Construct from dictionary componentReference diff --git a/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C b/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C index f1a3119dc..5a263ab76 100644 --- a/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C +++ b/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C @@ -245,7 +245,7 @@ void cohesiveLawFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); traction_.writeEntry("traction", os); - os.writeKeyword("cohesiveLaw") << law().type() + os.writeKeyword("cohesiveLaw") << law().type() << token::END_STATEMENT << nl; os.writeKeyword("relaxationFactor") << relaxationFactor_ << token::END_STATEMENT << nl; diff --git a/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C b/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C index d3af686e7..8d69cde47 100644 --- a/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C +++ b/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C @@ -99,7 +99,7 @@ cohesiveZoneFvPatchVectorField::cohesiveZoneFvPatchVectorField { this->refValue() = vector::zero; } - + if (dict.found("refGradient")) { this->refGrad() = vectorField("refGradient", dict, p.size()); @@ -111,7 +111,7 @@ cohesiveZoneFvPatchVectorField::cohesiveZoneFvPatchVectorField if (dict.found("valueFraction")) { - this->valueFraction() = + this->valueFraction() = symmTensorField("valueFraction", dict, p.size()); } else @@ -206,7 +206,7 @@ void cohesiveZoneFvPatchVectorField::updateCoeffs() const rheologyModel& rheology = this->db().objectRegistry::lookupObject(rheologyName_); - const scalarField mu = + const scalarField mu = rheology.mu()().boundaryField()[patch().index()]; const scalarField lambda = @@ -276,17 +276,17 @@ void cohesiveZoneFvPatchVectorField::updateCoeffs() if(magSqr(valueFraction()[faceI]) < SMALL) { - cohesiveTraction = - relaxationFactor_*cohesiveTraction + cohesiveTraction = + relaxationFactor_*cohesiveTraction + (1.0 - relaxationFactor_)*sigmaN[faceI]*n[faceI]; refGrad()[faceI] = ( cohesiveTraction - ( - n[faceI] + n[faceI] & ( - mu[faceI]*gradU[faceI].T() + mu[faceI]*gradU[faceI].T() - (mu[faceI] + lambda[faceI])*gradU[faceI] ) ) @@ -306,7 +306,7 @@ void cohesiveZoneFvPatchVectorField::write(Ostream& os) const directionMixedFvPatchVectorField::write(os); os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl; os.writeKeyword("rheology") << rheologyName_ << token::END_STATEMENT << nl; - os.writeKeyword("cohesiveLaw") << law().type() + os.writeKeyword("cohesiveLaw") << law().type() << token::END_STATEMENT << nl; os.writeKeyword("relaxationFactor") << relaxationFactor_ << token::END_STATEMENT << nl; diff --git a/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H b/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H index 2ae87d9d3..c322b1eaa 100644 --- a/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H +++ b/applications/solvers/newStressAnalysis/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H @@ -174,7 +174,7 @@ public: //- Update the coefficients associated with the patch field virtual void updateCoeffs(); - + //- Write virtual void write(Ostream&) const; diff --git a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C index 01070f220..12ec4a171 100644 --- a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C +++ b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C @@ -107,7 +107,7 @@ Foam::tmp Foam::BurgersViscoelastic::E(scalar t) const + eta2_.value()/k2_.value(); scalar p2 = eta1_.value()*eta2_.value()/(k1_.value()*k2_.value()); - + scalar q1 = eta1_.value(); scalar q2 = eta1_.value()*eta2_.value()/k2_.value(); @@ -120,7 +120,7 @@ Foam::tmp Foam::BurgersViscoelastic::E(scalar t) const E = (q1 - q2*r1)*exp(-r1*t)/A - (q1 - q2*r2)*exp(-r2*t)/A; } - + tmp tresult ( @@ -178,7 +178,7 @@ Foam::tmp Foam::BurgersViscoelastic::J(scalar t) const if(t >= 0) { - J = 1.0/k1_.value() + J = 1.0/k1_.value() + (1 - exp(-k2_.value()*t/eta2_.value()))/k2_.value() + t/eta1_.value(); } diff --git a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C index 6f5eee04f..e902243fb 100644 --- a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C +++ b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C @@ -102,14 +102,14 @@ Foam::tmp Foam::KelvinSLSViscoelastic::E(scalar t) const if(t>=0) { scalar p1 = eta2_.value()/(k1_.value() + k2_.value()); - + scalar q0 = k1_.value()*k2_.value()/(k1_.value() + k2_.value()); scalar q1 = k1_.value()*eta2_.value()/(k1_.value() + k2_.value()); E = q0 + (q1/p1 - q0)*exp(-t/p1); } - + tmp tresult ( @@ -168,7 +168,7 @@ Foam::tmp Foam::KelvinSLSViscoelastic::J(scalar t) const if(t >= 0) { scalar p1 = eta2_.value()/(k1_.value() + k2_.value()); - + scalar q0 = k1_.value()*k2_.value()/(k1_.value() + k2_.value()); scalar q1 = k1_.value()*eta2_.value()/(k1_.value() + k2_.value()); diff --git a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C index 2ff2ff7f3..19137ea1e 100644 --- a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C +++ b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C @@ -183,8 +183,8 @@ Foam::MaxwellElasticViscoelastic::J(scalar t) const mesh(), dimensionedScalar ( - "J", - dimless/k_.dimensions(), + "J", + dimless/k_.dimensions(), 1.0/k_.value() + t/eta_.value() ), zeroGradientFvPatchScalarField::typeName diff --git a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C index 7db135033..25edfff3b 100644 --- a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C +++ b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C @@ -101,7 +101,7 @@ Foam::tmp Foam::MaxwellSLSViscoelastic::E(scalar t) const { E = k2_.value() + k1_.value()*exp(-k1_.value()*t/eta1_.value()); } - + tmp tresult ( diff --git a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C index ead261907..c2ea155b7 100644 --- a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C +++ b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C @@ -169,8 +169,8 @@ Foam::tmp Foam::MaxwellViscoelastic::J(scalar t) const mesh(), dimensionedScalar ( - "J", - dimless/k_.dimensions(), + "J", + dimless/k_.dimensions(), 1.0/k_.value() + t/eta_.value() ), zeroGradientFvPatchScalarField::typeName diff --git a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C index 297988a02..c0b319c72 100644 --- a/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C +++ b/applications/solvers/newStressAnalysis/materialModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C @@ -105,7 +105,7 @@ Foam::tmp Foam::PronyViscoelastic::E(scalar t) const { E += k_[i]*exp(-t/tau_[i]); } - + if(t < 0) { E = 0; @@ -162,7 +162,7 @@ Foam::tmp Foam::PronyViscoelastic::nu(scalar t) const Foam::tmp Foam::PronyViscoelastic::J(scalar t) const { notImplemented(type() + "::J(scalar t)"); - + return 1.0/E(t); } diff --git a/applications/solvers/newStressAnalysis/newContactStressFoam/contactPatchPair.C b/applications/solvers/newStressAnalysis/newContactStressFoam/contactPatchPair.C index 86416ce20..ce69f8c32 100644 --- a/applications/solvers/newStressAnalysis/newContactStressFoam/contactPatchPair.C +++ b/applications/solvers/newStressAnalysis/newContactStressFoam/contactPatchPair.C @@ -104,7 +104,7 @@ Foam::contactPatchPair::contactPatchPair cp.mesh().boundaryMesh()[slavePatch_.index()], // to patch intersection::algorithmNames_.read(dict.lookup("projectionAlgo")), intersection::directionNames_.read(dict.lookup("projectionDir")) - + ), slaveToMasterInterpolate_ ( @@ -112,7 +112,7 @@ Foam::contactPatchPair::contactPatchPair cp.mesh().boundaryMesh()[masterPatch_.index()], // to patch intersection::algorithmNames_.read(dict.lookup("projectionAlgo")), intersection::directionNames_.read(dict.lookup("projectionDir")) - + ) {} diff --git a/applications/solvers/newStressAnalysis/newContactStressFoam/contactPatchPair.H b/applications/solvers/newStressAnalysis/newContactStressFoam/contactPatchPair.H index cb2d65ae0..2fa8ffe32 100644 --- a/applications/solvers/newStressAnalysis/newContactStressFoam/contactPatchPair.H +++ b/applications/solvers/newStressAnalysis/newContactStressFoam/contactPatchPair.H @@ -27,7 +27,7 @@ Class Description A pair of surfaces in contact. - + SourceFiles contactPatchPair.C diff --git a/applications/solvers/newStressAnalysis/newContactStressFoam/contactProblem.C b/applications/solvers/newStressAnalysis/newContactStressFoam/contactProblem.C index 63010d8fe..8a9a0ee9e 100644 --- a/applications/solvers/newStressAnalysis/newContactStressFoam/contactProblem.C +++ b/applications/solvers/newStressAnalysis/newContactStressFoam/contactProblem.C @@ -241,7 +241,7 @@ void contactProblem::correct() ( lambdaPatches[patchI]*tr(gradUpatches[patchI]) ) - + )/(2.0*muPatches[patchI] + lambdaPatches[patchI]); // Set the value fractions diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/calculateDivDSigmaExp.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/calculateDivDSigmaExp.H index b44a5cd85..dd9244a67 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/calculateDivDSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/calculateDivDSigmaExp.H @@ -7,7 +7,7 @@ if(divDSigmaExpMethod == "standard") ); } else if(divDSigmaExpMethod == "surface") - { + { divDSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradDU.T())) @@ -19,7 +19,7 @@ if(divDSigmaExpMethod == "standard") { surfaceTensorField shearGradDU = ((I - n*n)&fvc::interpolate(gradDU)); - + divDSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/correctGlobalFaceZoneMesh.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/correctGlobalFaceZoneMesh.H index 55b3d0b3c..6565fc33d 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/correctGlobalFaceZoneMesh.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/correctGlobalFaceZoneMesh.H @@ -26,12 +26,12 @@ if(Pstream::parRun()) { //***** FIX INCORRECT POINT ON PATCHES WITH FACEZONE *****// contactPatchPairList& contacts = contact; - + forAll(contacts, contactI) { label masterID = contacts[contactI].masterPatch().index(); label slaveID = contacts[contactI].slavePatch().index(); - + primitivePatchInterpolation masterInterpolator (mesh.boundaryMesh()[masterID]); primitivePatchInterpolation slaveInterpolator @@ -49,17 +49,17 @@ if(Pstream::parRun()) ( U.boundaryField()[slaveID] ); - + vectorField oldMasterPoints = mesh.boundaryMesh()[masterID].localPoints(); vectorField oldSlavePoints = mesh.boundaryMesh()[slaveID].localPoints(); - + labelList masterPointLabels = mesh.boundaryMesh()[masterID].meshPoints(); labelList slavePointLabels = mesh.boundaryMesh()[slaveID].meshPoints(); - + //- correct the patch newPoints forAll(masterPointLabels, pointI) { @@ -79,7 +79,7 @@ if(Pstream::parRun()) } } - + //***** NOW FIX AND SYNCHRONISE ALL THE FACEZONE POINTS *****// @@ -97,21 +97,21 @@ if(Pstream::parRun()) FatalError << "Patch " << patchName << " not found corresponding for faceZone" << faceZoneName << exit(FatalError); } - + vectorField globalFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + //- new points for the face zone vectorField globalFZnewPoints(globalFZpoints.size(), vector::zero); - + //- inter-proc points are shared by multiple procs //- pointNumProc is the number of procs which a point lies on scalarField pointNumProcs(globalFZpoints.size(), 0.0); - + forAll(globalFZnewPoints, globalPointI) { label localPoint = procToGlobalFZmap[faceZoneI][globalPointI]; - + //if(localPoint < mesh.boundaryMesh()[patchID].localPoints().size()) if(pointOnLocalProcPatch[faceZoneI][localPoint]) { @@ -120,36 +120,36 @@ if(Pstream::parRun()) globalFZnewPoints[globalPointI] = newPoints[procPoint]; pointNumProcs[globalPointI] = 1; - } + } } - + reduce(globalFZnewPoints, sumOp()); reduce(pointNumProcs, sumOp()); - + //- now average the newPoints between all procs if(min(pointNumProcs) < 1) { FatalError << "pointNumProc has not been set for all points" << exit(FatalError); } globalFZnewPoints /= pointNumProcs; - + //- the globalFZnewPoints now contains the correct FZ new points in //- a global order, now convert them back into the local proc order - + vectorField procFZnewPoints(globalFZpoints.size(), vector::zero); - + forAll(globalFZnewPoints, globalPointI) { label localPoint = procToGlobalFZmap[faceZoneI][globalPointI]; - + procFZnewPoints[localPoint] = globalFZnewPoints[globalPointI]; } - + //- now fix the newPoints points on the globalFaceZones labelList procFZmeshPoints = mesh.faceZones()[faceZoneI]().meshPoints(); - + forAll(procFZmeshPoints, pointI) { label procPoint = procFZmeshPoints[pointI]; diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/createGlobalToLocalFaceZonePointMap.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/createGlobalToLocalFaceZonePointMap.H index ef00ba1e1..eb84b8420 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/createGlobalToLocalFaceZonePointMap.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/createGlobalToLocalFaceZonePointMap.H @@ -48,7 +48,7 @@ bool globalFaceZoneMappingSet = false; if(gMax(procToGlobalFZmap[0]) > 0 && gMax(pointOnLocalProcPatch[0]) > 0) { Info << "Reading procToGlobalFZmap and pointOnLocalProcPatch allowing restart of contact cases" - << endl; + << endl; globalFaceZoneMappingSet = true; } else @@ -65,23 +65,23 @@ if(Pstream::parRun()) forAll(mesh.faceZones(), faceZoneI) { vectorField globalFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + procToGlobalFZmap[faceZoneI].setSize(globalFZpoints.size(), 0); - + //- set all slave points to zero because only the master order is used if(!Pstream::master()) globalFZpoints *= 0.0; - + //- pass points to all procs reduce(globalFZpoints, sumOp()); - - + + //- now every proc has the master's list of FZ points //- every proc must now find the mapping from their local FZpoints to //- the globalFZpoints - + vectorField procFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + forAll(globalFZpoints, globalPointI) { forAll(procFZpoints, procPointI) @@ -95,10 +95,10 @@ if(Pstream::parRun()) } //- procToGlobalFZmap now contains the local FZpoint label for each //- global FZ point label - for each faceZone - + //- check what points are on the current proc patch pointOnLocalProcPatch[faceZoneI].setSize(globalFZpoints.size(), 0); - + //- find corresponding patch string faceZoneName = mesh.faceZones().names()[faceZoneI]; //- remove the string FaceZone from the end of the face zone name to get the patch name @@ -109,7 +109,7 @@ if(Pstream::parRun()) FatalError << "Patch " << patchName << " not found corresponding for faceZone" << faceZoneName << exit(FatalError); } - + forAll(mesh.faceZones()[faceZoneI]().localPoints(), fzpi) { forAll(mesh.boundaryMesh()[patchID].localPoints(), pi) @@ -126,7 +126,7 @@ if(Pstream::parRun()) } //- write to disk to allow restart of cases -//- because it is not possible to calculate the +//- because it is not possible to calculate the //- mapping after the meshes have moved if(!globalFaceZoneMappingSet && Pstream::parRun()) { diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/createSolidInterface.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/createSolidInterface.H index 6698c5831..42705b924 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/createSolidInterface.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/createSolidInterface.H @@ -14,7 +14,7 @@ solidInterface* solidInterfacePtr(NULL); solidInterfacePtr = new solidInterface(mesh, rheology); solidInterfacePtr->modifyProperties(muf, lambdaf); gradDU = solidInterfacePtr->grad(DU); - + //- solidInterface needs muf and lambdaf to be used for divSigmaExp if(divDSigmaExpMethod != "surface" && divDSigmaExpMethod != "decompose") { diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/elasticContactIncrSolidFoam.C b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/elasticContactIncrSolidFoam.C index a3fd09ca8..f0234a310 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/elasticContactIncrSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/elasticContactIncrSolidFoam.C @@ -76,20 +76,20 @@ int main(int argc, char *argv[]) # include "createSolidInterface.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - + Info<< "\nStarting time loop\n" << endl; - + for (runTime++; !runTime.end(); runTime++) { Info<< "Time: " << runTime.timeName() << endl; - + # include "readContactControls.H" # include "readStressedFoamControls.H" - + //-- for moving the mesh and then back again vectorField oldMeshPoints = mesh.allPoints(); - + int iCorr = 0; lduMatrix::solverPerformance solverPerf; word solverName; @@ -106,8 +106,8 @@ int main(int argc, char *argv[]) do //- start of momentum loop { DU.storePrevIter(); - - //- correct the contact boundaries + + //- correct the contact boundaries if(iCorr % uEqnContactCorrFreq == 0) { Info << "\t\tCorrecting contact in the momentum loop " @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) contact.correct(); mesh.movePoints(oldMeshPoints); } - + # include "calculateDivDSigmaExp.H" fvVectorMatrix DUEqn @@ -129,18 +129,18 @@ int main(int argc, char *argv[]) fvm::laplacian(2*mu + lambda, DU, "laplacian(DDU,DU)") + divDSigmaExp ); - + if(solidInterfaceCorr) { solidInterfacePtr->correct(DUEqn); } solverPerf = DUEqn.solve(); - + DU.relax(); - + solverName = solverPerf.solverName(); - + if(solidInterfaceCorr) { gradDU = solidInterfacePtr->grad(DU); @@ -149,11 +149,11 @@ int main(int argc, char *argv[]) { gradDU = fvc::grad(DU); } - + U = U.oldTime() + DU; residual = solverPerf.initialResidual(); - + //****************************************************// // The contact residual is the initial residual for the // first iteration of the momentum equation @@ -162,8 +162,8 @@ int main(int argc, char *argv[]) { initialResidual = solverPerf.initialResidual(); } - -# include "calculateRelativeResidual.H" + +# include "calculateRelativeResidual.H" Info << "\tTime " << runTime.value() << ", Corrector " << iCorr @@ -179,38 +179,38 @@ int main(int argc, char *argv[]) && ++iCorr < nCorr ); - + // Print out info per contact iteration Info << "\t\tSolving for " << DU.name() << " using " << solverName << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", No outer iterations " << iCorr << endl; - + lduMatrix::debug = 1; - + # include "calculateDEpsilonDSigma.H" - + epsilon += DEpsilon; - + sigma += DSigma; # include "writeFields.H" - + //# include "writeBoundaryNetForces.H" - + //# include "moveMeshLeastSquares.H" //# include "moveSolidMesh.H" //# include "printContactResults.H" //mesh.movePoints(oldMeshPoints); - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/moveMeshLeastSquares.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/moveMeshLeastSquares.H index 6f7ffb2ff..65373c592 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/moveMeshLeastSquares.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/moveMeshLeastSquares.H @@ -6,16 +6,16 @@ if(min(J.internalField()) > 0) Info << "Moving mesh using least squares interpolation" << endl; leastSquaresVolPointInterpolation pointInterpolation(mesh); - + // Create point mesh pointMesh pMesh(mesh); - + wordList types ( pMesh.boundary().size(), calculatedFvPatchVectorField::typeName ); - + pointVectorField pointDU ( IOobject @@ -28,7 +28,7 @@ if(min(J.internalField()) > 0) dimensionedVector("zero", dimLength, vector::zero), types ); - + pointInterpolation.interpolate(DU, pointDU); const vectorField& pointDUI = diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/moveSolidMesh.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/moveSolidMesh.H index 95753e149..4b5bb274a 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/moveSolidMesh.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/moveSolidMesh.H @@ -1,4 +1,4 @@ -{ +{ //- move mesh for the contact correction // Create point interpolation @@ -8,20 +8,20 @@ pointVectorField pointU = pointInterpolation.interpolate(U); const vectorField& pointUI = pointU.internalField(); - + // Move mesh vectorField newPoints = mesh.allPoints(); - + forAll (pointUI, pointI) { newPoints[pointI] += pointUI[pointI]; } # include "correctGlobalFaceZoneMesh.H" - + twoDPointCorrector twoDCorrector(mesh); - twoDCorrector.correctPoints(newPoints); - + twoDCorrector.correctPoints(newPoints); + mesh.movePoints(newPoints); mesh.V00(); mesh.moving(false); diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/printContactResults.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/printContactResults.H index e87af322a..2600c9ea4 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/printContactResults.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/printContactResults.H @@ -4,14 +4,14 @@ if (runTime.outputTime()) // Info << "Print contact area" << endl; //volScalarField ca = contact.contactArea(); //ca.write(); - + //-------------------------------------------------------------// // I couldn't get tmp to return the pointScalarField correctly // // so I had to make the pointScalarField here and pass it to // // contactGapPoints and pointContactForce to populate // //-------------------------------------------------------------// //This is the point distance for each contact vertex - pointScalarField cGapPoints + pointScalarField cGapPoints ( IOobject ( @@ -28,10 +28,10 @@ if (runTime.outputTime()) contact.contactGapPoints(cGapPoints); cGapPoints.write(); - - + + //- This is the point distance for each contact vertex - pointVectorField cPointForce + pointVectorField cPointForce ( IOobject ( @@ -47,7 +47,7 @@ if (runTime.outputTime()) ); contact.contactPointForce(cPointForce); cPointForce.write(); - + //- this is the actual (sigma&n)&n) on the contact patches //- SHOULD THIS BE A REF TO A TMP...? volScalarField cPressure = contact.contactPressure(); diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/writeBoundaryNetForces.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/writeBoundaryNetForces.H index 429f86d75..ae84eb2d6 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/writeBoundaryNetForces.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/writeBoundaryNetForces.H @@ -6,9 +6,9 @@ Info << nl; forAll(netForces, patchI) { netForces[patchI] = gSum(mesh.Sf().boundaryField()[patchI] & sigma.boundaryField()[patchI]); - + Info << "patch\t" << mesh.boundary()[patchI].name() << "\t\tnet force is\t" << netForces[patchI] << " N" << endl; -} +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/writeFields.H index dd5b144aa..48bf04546 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/writeFields.H @@ -28,7 +28,7 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; @@ -71,7 +71,7 @@ if (runTime.outputTime()) ); contact.contactGapPoints(cGapPoints); cGapPoints.write(); - mesh.movePoints(oldMeshPoints); + mesh.movePoints(oldMeshPoints); runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateDivDSigmaExp.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateDivDSigmaExp.H index b44a5cd85..dd9244a67 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateDivDSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateDivDSigmaExp.H @@ -7,7 +7,7 @@ if(divDSigmaExpMethod == "standard") ); } else if(divDSigmaExpMethod == "surface") - { + { divDSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradDU.T())) @@ -19,7 +19,7 @@ if(divDSigmaExpMethod == "standard") { surfaceTensorField shearGradDU = ((I - n*n)&fvc::interpolate(gradDU)); - + divDSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateDivDSigmaExpLargeStrain.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateDivDSigmaExpLargeStrain.H index 2562c5a56..922801ec6 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateDivDSigmaExpLargeStrain.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateDivDSigmaExpLargeStrain.H @@ -6,7 +6,7 @@ if(divDSigmaLargeStrainExpMethod == "standard") divDSigmaLargeStrainExp = fvc::div ( - mu*(gradDU & gradDU.T()) + mu*(gradDU & gradDU.T()) + 0.5*lambda*(gradDU && gradDU)*I //- equivalent to 0.5*lambda*(I*tr(gradDU & gradDU.T())) + ((sigma + DSigma) & DF.T()), "div(sigma)" diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateExtrapolationVectors.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateExtrapolationVectors.H index 53ef67047..a8008f025 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateExtrapolationVectors.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculateExtrapolationVectors.H @@ -24,9 +24,9 @@ FieldField extraVecs(ptc.size()); forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = pfaces[curPoint]; - + // extraVecs.hook(new vectorField(curFaces.size())); //- no hook function extraVecs.set ( @@ -35,11 +35,11 @@ FieldField extraVecs(ptc.size()); ); vectorField& curExtraVectors = extraVecs[pointI]; - + label nFacesAroundPoint = 0; const vector& pointLoc = mesh.points()[curPoint]; - + // Go through all the faces forAll (curFaces, faceI) { @@ -49,7 +49,7 @@ FieldField extraVecs(ptc.size()); // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(bm[patchID]) @@ -61,12 +61,12 @@ FieldField extraVecs(ptc.size()); pointLoc - centres.boundaryField()[patchID] [bm[patchID].patch().whichFace(curFaces[faceI])]; - + nFacesAroundPoint++; } } } - + curExtraVectors.setSize(nFacesAroundPoint); } diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculatePointBoundaryWeights.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculatePointBoundaryWeights.H index 276c25f03..664110dc4 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculatePointBoundaryWeights.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/calculatePointBoundaryWeights.H @@ -13,7 +13,7 @@ FieldField w(ptc.size()); const volVectorField& centres = mesh.C(); const fvBoundaryMesh& bm = mesh.boundary(); - + pointScalarField volPointSumWeights ( IOobject @@ -25,13 +25,13 @@ FieldField w(ptc.size()); pMesh, dimensionedScalar("zero", dimless, 0) ); - + forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = pf[curPoint]; - + //w.hook(new scalarField(curFaces.size())); //philipc no hook function w.set ( @@ -40,11 +40,11 @@ FieldField w(ptc.size()); ); scalarField& curWeights = w[pointI]; - + label nFacesAroundPoint = 0; - + const vector& pointLoc = mesh.points()[curPoint]; - + // Go through all the faces forAll (curFaces, faceI) { @@ -54,7 +54,7 @@ FieldField w(ptc.size()); // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(bm[patchID]) @@ -74,23 +74,23 @@ FieldField w(ptc.size()); bm[patchID].patch().whichFace(curFaces[faceI]) ] ); - + nFacesAroundPoint++; } } } - + // Reset the sizes of the local weights curWeights.setSize(nFacesAroundPoint); - + // Collect the sum of weights for parallel correction volPointSumWeights[curPoint] += sum(curWeights); } - + // Do parallel correction of weights - + // Update coupled boundaries - // Work-around for cyclic parallels. + // Work-around for cyclic parallels. /*if (Pstream::parRun() && !mesh.parallelData().cyclicParallel()) { forAll (volPointSumWeights.boundaryField(), patchI) @@ -100,7 +100,7 @@ FieldField w(ptc.size()); volPointSumWeights.boundaryField()[patchI].initAddField(); } } - + forAll (volPointSumWeights.boundaryField(), patchI) { if (volPointSumWeights.boundaryField()[patchI].coupled()) @@ -112,7 +112,7 @@ FieldField w(ptc.size()); } } }*/ - + // Re-scale the weights for the current point forAll (ptc, pointI) { diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/correctGlobalFaceZoneMesh.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/correctGlobalFaceZoneMesh.H index c2429e99b..d249bf17f 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/correctGlobalFaceZoneMesh.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/correctGlobalFaceZoneMesh.H @@ -26,12 +26,12 @@ if(Pstream::parRun()) { //***** FIX INCORRECT POINT ON PATCHES WITH FACEZONE *****// contactPatchPairList& contacts = contact; - + forAll(contacts, contactI) { label masterID = contacts[contactI].masterPatch().index(); label slaveID = contacts[contactI].slavePatch().index(); - + primitivePatchInterpolation masterInterpolator (mesh.boundaryMesh()[masterID]); primitivePatchInterpolation slaveInterpolator @@ -49,17 +49,17 @@ if(Pstream::parRun()) ( DU.boundaryField()[slaveID] ); - + vectorField oldMasterPoints = mesh.boundaryMesh()[masterID].localPoints(); vectorField oldSlavePoints = mesh.boundaryMesh()[slaveID].localPoints(); - + labelList masterPointLabels = mesh.boundaryMesh()[masterID].meshPoints(); labelList slavePointLabels = mesh.boundaryMesh()[slaveID].meshPoints(); - + //- correct the patch newPoints forAll(masterPointLabels, pointI) { @@ -79,7 +79,7 @@ if(Pstream::parRun()) } } - + //***** NOW FIX AND SYNCHRONISE ALL THE FACEZONE POINTS *****// @@ -97,21 +97,21 @@ if(Pstream::parRun()) FatalError << "Patch " << patchName << " not found corresponding for faceZone" << faceZoneName << exit(FatalError); } - + vectorField globalFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + //- new points for the face zone vectorField globalFZnewPoints(globalFZpoints.size(), vector::zero); - + //- inter-proc points are shared by multiple procs //- pointNumProc is the number of procs which a point lies on scalarField pointNumProcs(globalFZpoints.size(), 0.0); - + forAll(globalFZnewPoints, globalPointI) { label localPoint = procToGlobalFZmap[faceZoneI][globalPointI]; - + //if(localPoint < mesh.boundaryMesh()[patchID].localPoints().size()) if(pointOnLocalProcPatch[faceZoneI][localPoint]) { @@ -120,36 +120,36 @@ if(Pstream::parRun()) globalFZnewPoints[globalPointI] = newPoints[procPoint]; pointNumProcs[globalPointI] = 1; - } + } } - + reduce(globalFZnewPoints, sumOp()); reduce(pointNumProcs, sumOp()); - + //- now average the newPoints between all procs if(min(pointNumProcs) < 1) { FatalError << "pointNumProc has not been set for all points" << exit(FatalError); } globalFZnewPoints /= pointNumProcs; - + //- the globalFZnewPoints now contains the correct FZ new points in //- a global order, now convert them back into the local proc order - + vectorField procFZnewPoints(globalFZpoints.size(), vector::zero); - + forAll(globalFZnewPoints, globalPointI) { label localPoint = procToGlobalFZmap[faceZoneI][globalPointI]; - + procFZnewPoints[localPoint] = globalFZnewPoints[globalPointI]; } - + //- now fix the newPoints points on the globalFaceZones labelList procFZmeshPoints = mesh.faceZones()[faceZoneI]().meshPoints(); - + forAll(procFZmeshPoints, pointI) { label procPoint = procFZmeshPoints[pointI]; diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/createGlobalToLocalFaceZonePointMap.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/createGlobalToLocalFaceZonePointMap.H index e6297b5c3..971bc377e 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/createGlobalToLocalFaceZonePointMap.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/createGlobalToLocalFaceZonePointMap.H @@ -48,7 +48,7 @@ bool globalFaceZoneMappingSet = false; if(gMax(procToGlobalFZmap[0]) > 0 && gMax(pointOnLocalProcPatch[0]) > 0) { Info << "Reading procToGlobalFZmap and pointOnLocalProcPatch allowing restart of contact cases" - << endl; + << endl; globalFaceZoneMappingSet = true; } else @@ -65,23 +65,23 @@ if(Pstream::parRun()) forAll(mesh.faceZones(), faceZoneI) { vectorField globalFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + procToGlobalFZmap[faceZoneI].setSize(globalFZpoints.size(), 0); - + //- set all slave points to zero because only the master order is used if(!Pstream::master()) globalFZpoints *= 0.0; - + //- pass points to all procs reduce(globalFZpoints, sumOp()); - - + + //- now every proc has the master's list of FZ points //- every proc must now find the mapping from their local FZpoints to //- the globalFZpoints - + vectorField procFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + forAll(globalFZpoints, globalPointI) { forAll(procFZpoints, procPointI) @@ -95,10 +95,10 @@ if(Pstream::parRun()) } //- procToGlobalFZmap now contains the local FZpoint label for each //- global FZ point label - for each faceZone - + //- check what points are on the current proc patch pointOnLocalProcPatch[faceZoneI].setSize(globalFZpoints.size(), 0); - + //- find corresponding patch string faceZoneName = mesh.faceZones().names()[faceZoneI]; //- remove the string FaceZone from the end of the face zone name to get the patch name @@ -109,7 +109,7 @@ if(Pstream::parRun()) FatalError << "Patch " << patchName << " not found corresponding for faceZone" << faceZoneName << exit(FatalError); } - + forAll(mesh.faceZones()[faceZoneI]().localPoints(), fzpi) { forAll(mesh.boundaryMesh()[patchID].localPoints(), pi) @@ -126,7 +126,7 @@ if(Pstream::parRun()) } //- write to disk to allow restart of cases -//- because it is not possible to calculate the +//- because it is not possible to calculate the //- mapping after the meshes have moved if(!globalFaceZoneMappingSet) { diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/elasticContactNonLinULSolidFoam.C b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/elasticContactNonLinULSolidFoam.C index d60ebf99a..67f296bcc 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/elasticContactNonLinULSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/elasticContactNonLinULSolidFoam.C @@ -83,20 +83,20 @@ int main(int argc, char *argv[]) # include "createGlobalToLocalFaceZonePointMap.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - + Info<< "\nStarting time loop\n" << endl; - + for (runTime++; !runTime.end(); runTime++) { Info<< "Time: " << runTime.timeName() << endl; - + # include "readContactControls.H" # include "readStressedFoamControls.H" - + //-- for moving the mesh and then back again vectorField oldMeshPoints = mesh.allPoints(); - + int iCorr = 0; lduMatrix::solverPerformance solverPerf; word solverName; @@ -104,14 +104,14 @@ int main(int argc, char *argv[]) scalar residual = GREAT; scalar initialResidual = 0; scalar relativeResidual = GREAT; - + do //- start of momentum loop { DU.storePrevIter(); - + divDSigmaLargeStrainExp.storePrevIter(); - //- correct the contact boundaries + //- correct the contact boundaries if(iCorr % uEqnContactCorrFreq == 0) { Info << "\t\tCorrecting contact in the momentum loop " @@ -123,9 +123,9 @@ int main(int argc, char *argv[]) contact.correct(); mesh.movePoints(oldMeshPoints); } - + # include "calculateDivDSigmaExp.H" - + # include "calculateDivDSigmaExpLargeStrain.H" fvVectorMatrix DUEqn @@ -137,28 +137,28 @@ int main(int argc, char *argv[]) + divDSigmaLargeStrainExp ); - + solverPerf = DUEqn.solve(); - + DU.relax(); - + solverName = solverPerf.solverName(); - + gradDU = fvc::grad(DU); - + DF = gradDU.T(); # include "calculateDEpsilonDSigma.H" residual = solverPerf.initialResidual(); - + if(iCorr == 0) { initialResidual = solverPerf.initialResidual(); } - -# include "calculateRelativeResidual.H" - + +# include "calculateRelativeResidual.H" + Info << "\tTime " << runTime.value() << ", Corrector " << iCorr << ", Solving for " << DU.name() @@ -173,29 +173,29 @@ int main(int argc, char *argv[]) && ++iCorr < nCorr ); - + // Print out info per contact iteration Info << "\t\tSolving for " << DU.name() << " using " << solverName - << ", Initial residual = " << initialResidual + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", No outer iterations " << iCorr << endl; - + lduMatrix::debug = 1; - + # include "rotateFields.H" # include "moveMesh.H" # include "writeFields.H" - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/findBoundaryPoints.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/findBoundaryPoints.H index 07ee1f644..0e75c6a56 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/findBoundaryPoints.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/findBoundaryPoints.H @@ -21,7 +21,7 @@ forAll (bm, patchI) ) { const labelList& bp = bm[patchI].patch().boundaryPoints(); - + const labelList& meshPoints = bm[patchI].patch().meshPoints(); forAll (bp, pointI) diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveMeshInverseDistance.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveMeshInverseDistance.H index 389847569..7015034a1 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveMeshInverseDistance.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveMeshInverseDistance.H @@ -4,13 +4,13 @@ if(min(J.internalField()) > 0) { Info << "Move solid mesh using inverse distance interpolation" << endl; - + // Create point mesh pointMesh pMesh(mesh); // Create point interpolation volPointInterpolation pointInterpolation(mesh); - + wordList types ( pMesh.boundary().size(), @@ -46,12 +46,12 @@ if(min(J.internalField()) > 0) // Move mesh vectorField newPoints = mesh.allPoints(); - + forAll (pointDUI, pointI) { newPoints[pointI] += pointDUI[pointI]; } - + twoDPointCorrector twoDCorrector(mesh); twoDCorrector.correctPoints(newPoints); mesh.movePoints(newPoints); diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveMeshLeastSquares.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveMeshLeastSquares.H index 6f7ffb2ff..65373c592 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveMeshLeastSquares.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveMeshLeastSquares.H @@ -6,16 +6,16 @@ if(min(J.internalField()) > 0) Info << "Moving mesh using least squares interpolation" << endl; leastSquaresVolPointInterpolation pointInterpolation(mesh); - + // Create point mesh pointMesh pMesh(mesh); - + wordList types ( pMesh.boundary().size(), calculatedFvPatchVectorField::typeName ); - + pointVectorField pointDU ( IOobject @@ -28,7 +28,7 @@ if(min(J.internalField()) > 0) dimensionedVector("zero", dimLength, vector::zero), types ); - + pointInterpolation.interpolate(DU, pointDU); const vectorField& pointDUI = diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveSolidMeshForContact.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveSolidMeshForContact.H index 41184fd34..e592c90fe 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveSolidMeshForContact.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/moveSolidMeshForContact.H @@ -1,4 +1,4 @@ -{ +{ // Create point interpolation volPointInterpolation pointInterpolation(mesh); @@ -6,20 +6,20 @@ pointVectorField pointDU = pointInterpolation.interpolate(DU); vectorField pointDUI = pointDU.internalField(); - + // Move mesh vectorField newPoints = mesh.allPoints(); - + forAll (pointDUI, pointI) { newPoints[pointI] += pointDUI[pointI]; } # include "correctGlobalFaceZoneMesh.H" - + twoDPointCorrector twoDCorrector(mesh); - twoDCorrector.correctPoints(newPoints); - + twoDCorrector.correctPoints(newPoints); + mesh.movePoints(newPoints); // pMesh.movePoints(newPoints); mesh.V00(); diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H index f352e9442..577713009 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H @@ -25,7 +25,7 @@ pointVectorField& pf = pointDU; pf.boundaryField().types() );*/ -pointVectorField pfCorr +pointVectorField pfCorr ( IOobject ( @@ -58,11 +58,11 @@ const labelListList& PointFaces = mesh.pointFaces(); forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = PointFaces[curPoint]; - + label fI = 0; - + // Go through all the faces forAll (curFaces, faceI) { @@ -72,7 +72,7 @@ forAll (ptc, pointI) // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(mesh.boundary()[patchID]) @@ -81,14 +81,14 @@ forAll (ptc, pointI) { label faceInPatchID = bm[patchID].patch().whichFace(curFaces[faceI]); - + pfCorr[curPoint] += w[pointI][fI]* ( extraVecs[pointI][fI] & gradDU.boundaryField()[patchID][faceInPatchID] ); - + fI++; } } diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/printContactResults.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/printContactResults.H index e87af322a..2600c9ea4 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/printContactResults.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/printContactResults.H @@ -4,14 +4,14 @@ if (runTime.outputTime()) // Info << "Print contact area" << endl; //volScalarField ca = contact.contactArea(); //ca.write(); - + //-------------------------------------------------------------// // I couldn't get tmp to return the pointScalarField correctly // // so I had to make the pointScalarField here and pass it to // // contactGapPoints and pointContactForce to populate // //-------------------------------------------------------------// //This is the point distance for each contact vertex - pointScalarField cGapPoints + pointScalarField cGapPoints ( IOobject ( @@ -28,10 +28,10 @@ if (runTime.outputTime()) contact.contactGapPoints(cGapPoints); cGapPoints.write(); - - + + //- This is the point distance for each contact vertex - pointVectorField cPointForce + pointVectorField cPointForce ( IOobject ( @@ -47,7 +47,7 @@ if (runTime.outputTime()) ); contact.contactPointForce(cPointForce); cPointForce.write(); - + //- this is the actual (sigma&n)&n) on the contact patches //- SHOULD THIS BE A REF TO A TMP...? volScalarField cPressure = contact.contactPressure(); diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/rotateFields.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/rotateFields.H index 486ed6cf7..edc549fcf 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/rotateFields.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/rotateFields.H @@ -5,9 +5,9 @@ Info << "Rotating fields" << endl; F = I + DF; - + U += DU; - + epsilon += DEpsilon; sigma += DSigma; @@ -15,9 +15,9 @@ volTensorField Finv = inv(F); J = det(F); - + rho = rho/J; - + epsilon = symm(Finv.T() & epsilon & Finv); sigma = 1/J * symm(F & sigma & F.T()); diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/writeBoundaryNetForces.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/writeBoundaryNetForces.H index e0f7bdb31..7c8108614 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/writeBoundaryNetForces.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/writeBoundaryNetForces.H @@ -6,9 +6,9 @@ Info << nl; forAll(netForces, patchI) { netForces[patchI] = gSum(mesh.Sf().boundaryField()[patchI] & sigma.boundaryField()[patchI]); - + Info << "patch " << mesh.boundary()[patchI].name() << " net force is " << netForces[patchI] << " N" << endl; -} +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/writeFields.H index 574bd09a9..aea728db8 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/writeFields.H @@ -28,9 +28,9 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/calculateDivSigmaExp.H b/applications/solvers/solidMechanics/elasticContactSolidFoam/calculateDivSigmaExp.H index 7ccf03e23..dbc16076f 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/calculateDivSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/calculateDivSigmaExp.H @@ -7,7 +7,7 @@ if(divSigmaExpMethod == "standard") ); } else if(divSigmaExpMethod == "surface") - { + { divSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradU.T())) @@ -19,7 +19,7 @@ if(divSigmaExpMethod == "standard") { surfaceTensorField shearGradU = ((I - n*n)&fvc::interpolate(gradU)); - + divSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/correctGlobalFaceZoneMesh.H b/applications/solvers/solidMechanics/elasticContactSolidFoam/correctGlobalFaceZoneMesh.H index 55b3d0b3c..6565fc33d 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/correctGlobalFaceZoneMesh.H +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/correctGlobalFaceZoneMesh.H @@ -26,12 +26,12 @@ if(Pstream::parRun()) { //***** FIX INCORRECT POINT ON PATCHES WITH FACEZONE *****// contactPatchPairList& contacts = contact; - + forAll(contacts, contactI) { label masterID = contacts[contactI].masterPatch().index(); label slaveID = contacts[contactI].slavePatch().index(); - + primitivePatchInterpolation masterInterpolator (mesh.boundaryMesh()[masterID]); primitivePatchInterpolation slaveInterpolator @@ -49,17 +49,17 @@ if(Pstream::parRun()) ( U.boundaryField()[slaveID] ); - + vectorField oldMasterPoints = mesh.boundaryMesh()[masterID].localPoints(); vectorField oldSlavePoints = mesh.boundaryMesh()[slaveID].localPoints(); - + labelList masterPointLabels = mesh.boundaryMesh()[masterID].meshPoints(); labelList slavePointLabels = mesh.boundaryMesh()[slaveID].meshPoints(); - + //- correct the patch newPoints forAll(masterPointLabels, pointI) { @@ -79,7 +79,7 @@ if(Pstream::parRun()) } } - + //***** NOW FIX AND SYNCHRONISE ALL THE FACEZONE POINTS *****// @@ -97,21 +97,21 @@ if(Pstream::parRun()) FatalError << "Patch " << patchName << " not found corresponding for faceZone" << faceZoneName << exit(FatalError); } - + vectorField globalFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + //- new points for the face zone vectorField globalFZnewPoints(globalFZpoints.size(), vector::zero); - + //- inter-proc points are shared by multiple procs //- pointNumProc is the number of procs which a point lies on scalarField pointNumProcs(globalFZpoints.size(), 0.0); - + forAll(globalFZnewPoints, globalPointI) { label localPoint = procToGlobalFZmap[faceZoneI][globalPointI]; - + //if(localPoint < mesh.boundaryMesh()[patchID].localPoints().size()) if(pointOnLocalProcPatch[faceZoneI][localPoint]) { @@ -120,36 +120,36 @@ if(Pstream::parRun()) globalFZnewPoints[globalPointI] = newPoints[procPoint]; pointNumProcs[globalPointI] = 1; - } + } } - + reduce(globalFZnewPoints, sumOp()); reduce(pointNumProcs, sumOp()); - + //- now average the newPoints between all procs if(min(pointNumProcs) < 1) { FatalError << "pointNumProc has not been set for all points" << exit(FatalError); } globalFZnewPoints /= pointNumProcs; - + //- the globalFZnewPoints now contains the correct FZ new points in //- a global order, now convert them back into the local proc order - + vectorField procFZnewPoints(globalFZpoints.size(), vector::zero); - + forAll(globalFZnewPoints, globalPointI) { label localPoint = procToGlobalFZmap[faceZoneI][globalPointI]; - + procFZnewPoints[localPoint] = globalFZnewPoints[globalPointI]; } - + //- now fix the newPoints points on the globalFaceZones labelList procFZmeshPoints = mesh.faceZones()[faceZoneI]().meshPoints(); - + forAll(procFZmeshPoints, pointI) { label procPoint = procFZmeshPoints[pointI]; diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/createGlobalToLocalFaceZonePointMap.H b/applications/solvers/solidMechanics/elasticContactSolidFoam/createGlobalToLocalFaceZonePointMap.H index e6297b5c3..971bc377e 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/createGlobalToLocalFaceZonePointMap.H +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/createGlobalToLocalFaceZonePointMap.H @@ -48,7 +48,7 @@ bool globalFaceZoneMappingSet = false; if(gMax(procToGlobalFZmap[0]) > 0 && gMax(pointOnLocalProcPatch[0]) > 0) { Info << "Reading procToGlobalFZmap and pointOnLocalProcPatch allowing restart of contact cases" - << endl; + << endl; globalFaceZoneMappingSet = true; } else @@ -65,23 +65,23 @@ if(Pstream::parRun()) forAll(mesh.faceZones(), faceZoneI) { vectorField globalFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + procToGlobalFZmap[faceZoneI].setSize(globalFZpoints.size(), 0); - + //- set all slave points to zero because only the master order is used if(!Pstream::master()) globalFZpoints *= 0.0; - + //- pass points to all procs reduce(globalFZpoints, sumOp()); - - + + //- now every proc has the master's list of FZ points //- every proc must now find the mapping from their local FZpoints to //- the globalFZpoints - + vectorField procFZpoints = mesh.faceZones()[faceZoneI]().localPoints(); - + forAll(globalFZpoints, globalPointI) { forAll(procFZpoints, procPointI) @@ -95,10 +95,10 @@ if(Pstream::parRun()) } //- procToGlobalFZmap now contains the local FZpoint label for each //- global FZ point label - for each faceZone - + //- check what points are on the current proc patch pointOnLocalProcPatch[faceZoneI].setSize(globalFZpoints.size(), 0); - + //- find corresponding patch string faceZoneName = mesh.faceZones().names()[faceZoneI]; //- remove the string FaceZone from the end of the face zone name to get the patch name @@ -109,7 +109,7 @@ if(Pstream::parRun()) FatalError << "Patch " << patchName << " not found corresponding for faceZone" << faceZoneName << exit(FatalError); } - + forAll(mesh.faceZones()[faceZoneI]().localPoints(), fzpi) { forAll(mesh.boundaryMesh()[patchID].localPoints(), pi) @@ -126,7 +126,7 @@ if(Pstream::parRun()) } //- write to disk to allow restart of cases -//- because it is not possible to calculate the +//- because it is not possible to calculate the //- mapping after the meshes have moved if(!globalFaceZoneMappingSet) { diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/elasticContactSolidFoam.C b/applications/solvers/solidMechanics/elasticContactSolidFoam/elasticContactSolidFoam.C index 377312e3a..3769c9003 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/elasticContactSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/elasticContactSolidFoam.C @@ -79,20 +79,20 @@ int main(int argc, char *argv[]) # include "createGlobalToLocalFaceZonePointMap.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - + Info<< "\nStarting time loop\n" << endl; - + for (runTime++; !runTime.end(); runTime++) { Info<< "Time: " << runTime.timeName() << endl; - + # include "readContactControls.H" # include "readStressedFoamControls.H" - + //-- for moving the mesh and then back again vectorField oldMeshPoints = mesh.allPoints(); - + int iCorr = 0; lduMatrix::solverPerformance solverPerf; word solverName; @@ -113,8 +113,8 @@ int main(int argc, char *argv[]) do //- start of momentum loop { U.storePrevIter(); - - //- correct the contact boundaries + + //- correct the contact boundaries if(iCorr % uEqnContactCorrFreq == 0) { Info << "\t\tCorrecting contact in the momentum loop " @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) contact.correct(); mesh.movePoints(oldMeshPoints); } - + # include "calculateDivSigmaExp.H" fvVectorMatrix UEqn @@ -136,24 +136,24 @@ int main(int argc, char *argv[]) fvm::laplacian(2*mu + lambda, U, "laplacian(DU,U)") + divSigmaExp ); - + solverPerf = UEqn.solve(); - + U.relax(); - + solverName = solverPerf.solverName(); - + gradU = fvc::grad(U); snGradU = fvc::snGrad(U); residual = solverPerf.initialResidual(); - + if(iCorr == 0) { initialResidual = solverPerf.initialResidual(); } - -# include "calculateRelativeResidual.H" + +# include "calculateRelativeResidual.H" Info << "\tTime " << runTime.value() << ", Corrector " << iCorr @@ -169,36 +169,36 @@ int main(int argc, char *argv[]) && ++iCorr < nCorr ); - + // Print out info per contact iteration Info << "\t\tSolving for " << U.name() << " using " << solverName << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", No outer iterations " << iCorr << endl; - + lduMatrix::debug = 1; - + V = fvc::ddt(U); gradV = fvc::ddt(gradU); snGradV = (snGradU - snGradU.oldTime())/runTime.deltaT(); # include "calculateEpsilonSigma.H" - + # include "writeFields.H" - + //# include "moveMeshLeastSquares.H" //# include "moveSolidMesh.H" //# include "printContactResults.H" //mesh.movePoints(oldMeshPoints); - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/moveMeshLeastSquares.H b/applications/solvers/solidMechanics/elasticContactSolidFoam/moveMeshLeastSquares.H index 6f7ffb2ff..65373c592 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/moveMeshLeastSquares.H +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/moveMeshLeastSquares.H @@ -6,16 +6,16 @@ if(min(J.internalField()) > 0) Info << "Moving mesh using least squares interpolation" << endl; leastSquaresVolPointInterpolation pointInterpolation(mesh); - + // Create point mesh pointMesh pMesh(mesh); - + wordList types ( pMesh.boundary().size(), calculatedFvPatchVectorField::typeName ); - + pointVectorField pointDU ( IOobject @@ -28,7 +28,7 @@ if(min(J.internalField()) > 0) dimensionedVector("zero", dimLength, vector::zero), types ); - + pointInterpolation.interpolate(DU, pointDU); const vectorField& pointDUI = diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/moveSolidMesh.H b/applications/solvers/solidMechanics/elasticContactSolidFoam/moveSolidMesh.H index 37128a5be..b0f696503 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/moveSolidMesh.H +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/moveSolidMesh.H @@ -1,4 +1,4 @@ -{ +{ // Create point interpolation volPointInterpolation pointInterpolation(mesh); @@ -8,21 +8,21 @@ // const vectorField& pointUI = pointU.internalField(); vectorField pointUI = pointU.internalField(); - + // Move mesh vectorField newPoints = mesh.allPoints(); - + forAll (pointUI, pointI) { newPoints[pointI] += pointUI[pointI]; } # include "correctGlobalFaceZoneMesh.H" - + twoDPointCorrector twoDCorrector(mesh); - twoDCorrector.correctPoints(newPoints); - + twoDCorrector.correctPoints(newPoints); + mesh.movePoints(newPoints); // pMesh.movePoints(newPoints); mesh.V00(); diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/printContactResults.H b/applications/solvers/solidMechanics/elasticContactSolidFoam/printContactResults.H index e87af322a..2600c9ea4 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/printContactResults.H +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/printContactResults.H @@ -4,14 +4,14 @@ if (runTime.outputTime()) // Info << "Print contact area" << endl; //volScalarField ca = contact.contactArea(); //ca.write(); - + //-------------------------------------------------------------// // I couldn't get tmp to return the pointScalarField correctly // // so I had to make the pointScalarField here and pass it to // // contactGapPoints and pointContactForce to populate // //-------------------------------------------------------------// //This is the point distance for each contact vertex - pointScalarField cGapPoints + pointScalarField cGapPoints ( IOobject ( @@ -28,10 +28,10 @@ if (runTime.outputTime()) contact.contactGapPoints(cGapPoints); cGapPoints.write(); - - + + //- This is the point distance for each contact vertex - pointVectorField cPointForce + pointVectorField cPointForce ( IOobject ( @@ -47,7 +47,7 @@ if (runTime.outputTime()) ); contact.contactPointForce(cPointForce); cPointForce.write(); - + //- this is the actual (sigma&n)&n) on the contact patches //- SHOULD THIS BE A REF TO A TMP...? volScalarField cPressure = contact.contactPressure(); diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/writeBoundaryNetForces.H b/applications/solvers/solidMechanics/elasticContactSolidFoam/writeBoundaryNetForces.H index 429f86d75..ae84eb2d6 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/writeBoundaryNetForces.H +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/writeBoundaryNetForces.H @@ -6,9 +6,9 @@ Info << nl; forAll(netForces, patchI) { netForces[patchI] = gSum(mesh.Sf().boundaryField()[patchI] & sigma.boundaryField()[patchI]); - + Info << "patch\t" << mesh.boundary()[patchI].name() << "\t\tnet force is\t" << netForces[patchI] << " N" << endl; -} +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticContactSolidFoam/writeFields.H index 574bd09a9..aea728db8 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/writeFields.H @@ -28,9 +28,9 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticGravitySolidFoam/calculateDivSigmaExp.H b/applications/solvers/solidMechanics/elasticGravitySolidFoam/calculateDivSigmaExp.H index 5759d3fd6..adba22d5d 100644 --- a/applications/solvers/solidMechanics/elasticGravitySolidFoam/calculateDivSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticGravitySolidFoam/calculateDivSigmaExp.H @@ -7,7 +7,7 @@ if(divSigmaExpMethod == "standard") ); } else if(divSigmaExpMethod == "surface") - { + { divSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradU.T())) @@ -19,7 +19,7 @@ if(divSigmaExpMethod == "standard") { surfaceTensorField shearGradU = ((I - n*n)&fvc::interpolate(gradU)); - + divSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticGravitySolidFoam/elasticGravitySolidFoam.C b/applications/solvers/solidMechanics/elasticGravitySolidFoam/elasticGravitySolidFoam.C index 75996ea24..dabb562e8 100644 --- a/applications/solvers/solidMechanics/elasticGravitySolidFoam/elasticGravitySolidFoam.C +++ b/applications/solvers/solidMechanics/elasticGravitySolidFoam/elasticGravitySolidFoam.C @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) while(runTime.loop()) { Info<< "Time: " << runTime.timeName() << nl << endl; - + # include "readStressedFoamControls.H" int iCorr = 0; @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) do { U.storePrevIter(); - + # include "calculateDivSigmaExp.H" //- linear momentum equation @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) { initialResidual = solverPerf.initialResidual(); } - + U.relax(); if(solidInterfaceCorr) @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) } # include "calculateRelativeResidual.H" - + Info << "\tTime " << runTime.value() << ", Corrector " << iCorr << ", Solving for " << U.name() @@ -138,16 +138,16 @@ int main(int argc, char *argv[]) && ++iCorr < nCorr ); - - Info << nl << "Time " << runTime.value() << ", Solving for " << U.name() - << ", Initial residual = " << initialResidual + + Info << nl << "Time " << runTime.value() << ", Solving for " << U.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", Relative residual = " << relativeResidual << ", No outer iterations " << iCorr << nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl; - + lduMatrix::debug=0; # include "calculateEpsilonSigma.H" @@ -158,9 +158,9 @@ int main(int argc, char *argv[]) << runTime.elapsedCpuTime() << " s\n\n" << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticGravitySolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticGravitySolidFoam/writeFields.H index 574bd09a9..aea728db8 100644 --- a/applications/solvers/solidMechanics/elasticGravitySolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticGravitySolidFoam/writeFields.H @@ -28,9 +28,9 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticIncrSolidFoam/calculateDivDSigmaExp.H b/applications/solvers/solidMechanics/elasticIncrSolidFoam/calculateDivDSigmaExp.H index b44a5cd85..dd9244a67 100644 --- a/applications/solvers/solidMechanics/elasticIncrSolidFoam/calculateDivDSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticIncrSolidFoam/calculateDivDSigmaExp.H @@ -7,7 +7,7 @@ if(divDSigmaExpMethod == "standard") ); } else if(divDSigmaExpMethod == "surface") - { + { divDSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradDU.T())) @@ -19,7 +19,7 @@ if(divDSigmaExpMethod == "standard") { surfaceTensorField shearGradDU = ((I - n*n)&fvc::interpolate(gradDU)); - + divDSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticIncrSolidFoam/calculateNetForces.H b/applications/solvers/solidMechanics/elasticIncrSolidFoam/calculateNetForces.H index a0c5cedaa..9e48bfd6a 100644 --- a/applications/solvers/solidMechanics/elasticIncrSolidFoam/calculateNetForces.H +++ b/applications/solvers/solidMechanics/elasticIncrSolidFoam/calculateNetForces.H @@ -6,7 +6,7 @@ Info << nl; forAll(netForces, patchI) { netForces[patchI] = gSum(mesh.Sf().boundaryField()[patchI] & sigma.boundaryField()[patchI]); - + Info << "patch\t" << mesh.boundary()[patchI].name() << "\t\tnet force is\t" << netForces[patchI] << " N" << endl; -} +} diff --git a/applications/solvers/solidMechanics/elasticIncrSolidFoam/createFields.H b/applications/solvers/solidMechanics/elasticIncrSolidFoam/createFields.H index 48f9c12b1..889105a2f 100644 --- a/applications/solvers/solidMechanics/elasticIncrSolidFoam/createFields.H +++ b/applications/solvers/solidMechanics/elasticIncrSolidFoam/createFields.H @@ -24,7 +24,7 @@ IOobject::AUTO_WRITE ), mesh, - dimensionedVector("zero", dimLength, vector::zero) + dimensionedVector("zero", dimLength, vector::zero) ); volSymmTensorField DEpsilon diff --git a/applications/solvers/solidMechanics/elasticIncrSolidFoam/elasticIncrSolidFoam.C b/applications/solvers/solidMechanics/elasticIncrSolidFoam/elasticIncrSolidFoam.C index 12e09a824..d116ff7cf 100644 --- a/applications/solvers/solidMechanics/elasticIncrSolidFoam/elasticIncrSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticIncrSolidFoam/elasticIncrSolidFoam.C @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) while(runTime.loop()) { Info<< "Time: " << runTime.timeName() << nl << endl; - + # include "readStressedFoamControls.H" int iCorr = 0; @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) { initialResidual = solverPerf.initialResidual(); } - + DU.relax(); if(solidInterfaceCorr) @@ -118,7 +118,7 @@ int main(int argc, char *argv[]) } # include "calculateRelativeResidual.H" - + Info << "\tTime " << runTime.value() << ", Corrector " << iCorr << ", Solving for " << DU.name() @@ -133,16 +133,16 @@ int main(int argc, char *argv[]) && ++iCorr < nCorr ); - - Info << nl << "Time " << runTime.value() << ", Solving for " << DU.name() - << ", Initial residual = " << initialResidual + + Info << nl << "Time " << runTime.value() << ", Solving for " << DU.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", Relative residual = " << relativeResidual << ", No outer iterations " << iCorr << nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl; - + lduMatrix::debug=0; # include "calculateDEpsilonDSigma.H" @@ -159,9 +159,9 @@ int main(int argc, char *argv[]) << runTime.elapsedCpuTime() << " s\n\n" << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticIncrSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticIncrSolidFoam/writeFields.H index 574bd09a9..aea728db8 100644 --- a/applications/solvers/solidMechanics/elasticIncrSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticIncrSolidFoam/writeFields.H @@ -28,9 +28,9 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/correctDirectionMixedTL.H b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/correctDirectionMixedTL.H index b6aba6a41..5561a4804 100644 --- a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/correctDirectionMixedTL.H +++ b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/correctDirectionMixedTL.H @@ -10,7 +10,7 @@ ( U.boundaryField()[patchID] ); - + tensorField Finv = inv(I + gradU); vectorField newN = Finv & n.boundaryField()[patchID]; newN /= mag(newN); diff --git a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/elasticNonLinTLSolidFoam.C b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/elasticNonLinTLSolidFoam.C index 47ab58eab..56f5fe7c8 100644 --- a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/elasticNonLinTLSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/elasticNonLinTLSolidFoam.C @@ -28,13 +28,13 @@ Application Description Finite volume structural solver employing a total strain total Lagrangian approach. - + Valid for finite strains, finite displacements and finite rotations. Author Micheal Leonard Philip Cardiff - + \*---------------------------------------------------------------------------*/ #include "fvCFD.H" @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) while(runTime.loop()) { Info<< "Time: " << runTime.timeName() << nl << endl; - + # include "readStressedFoamControls.H" int iCorr = 0; @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) U.storePrevIter(); # include "correctDirectionMixedTL.H" - + fvVectorMatrix UEqn ( fvm::d2dt2(rho, U) @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) { initialResidual = solverPerf.initialResidual(); } - + U.relax(); gradU = fvc::grad(U); @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) # include "calculateEpsilonSigma.H" # include "calculateRelativeResidual.H" - + Info << "\tTime " << runTime.value() << ", Corrector " << iCorr << ", Solving for " << U.name() @@ -123,16 +123,16 @@ int main(int argc, char *argv[]) && ++iCorr < nCorr ); - - Info << nl << "Time " << runTime.value() << ", Solving for " << U.name() - << ", Initial residual = " << initialResidual + + Info << nl << "Time " << runTime.value() << ", Solving for " << U.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", Relative residual = " << relativeResidual << ", No outer iterations " << iCorr << nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl; - + lduMatrix::debug=0; # include "writeFields.H" @@ -141,9 +141,9 @@ int main(int argc, char *argv[]) << runTime.elapsedCpuTime() << " s\n\n" << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/moveMeshLeastSquares.H b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/moveMeshLeastSquares.H index 007e9d423..08933d061 100644 --- a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/moveMeshLeastSquares.H +++ b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/moveMeshLeastSquares.H @@ -6,16 +6,16 @@ if(min(J.internalField()) > 0) Info << "Moving mesh using least squares interpolation" << endl; leastSquaresVolPointInterpolation pointInterpolation(mesh); - + // Create point mesh pointMesh pMesh(mesh); - + wordList types ( pMesh.boundary().size(), calculatedFvPatchVectorField::typeName ); - + pointVectorField pointU ( IOobject @@ -28,7 +28,7 @@ if(min(J.internalField()) > 0) dimensionedVector("zero", dimLength, vector::zero), types ); - + pointInterpolation.interpolate(U, pointU); const vectorField& pointUI = diff --git a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/writeFields.H index ef9004345..3f3a04905 100644 --- a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/writeFields.H @@ -28,10 +28,10 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + //- Calculate Cauchy stress volTensorField F = I + gradU; volScalarField J = det(F); @@ -65,7 +65,7 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigmaCauchy))) ); - + Info<< "Max sigmaCauchyEq = " << max(sigmaCauchyEq).value() << endl; @@ -82,7 +82,7 @@ if (runTime.outputTime()) vector force = sum( totalForce ); Info << "\ttotal force is " << force << " N" << endl; - + tensorField Finv = inv(F); vectorField nCurrent = Finv & n.boundaryField()[patchi]; nCurrent /= mag(nCurrent); @@ -96,7 +96,7 @@ if (runTime.outputTime()) //- move mesh for visualisation and move it back after writing vectorField oldPoints = mesh.allPoints(); #include "moveMeshLeastSquares.H" - + runTime.write(); //- move mesh back diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateDivDSigmaExp.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateDivDSigmaExp.H index b44a5cd85..dd9244a67 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateDivDSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateDivDSigmaExp.H @@ -7,7 +7,7 @@ if(divDSigmaExpMethod == "standard") ); } else if(divDSigmaExpMethod == "surface") - { + { divDSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradDU.T())) @@ -19,7 +19,7 @@ if(divDSigmaExpMethod == "standard") { surfaceTensorField shearGradDU = ((I - n*n)&fvc::interpolate(gradDU)); - + divDSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateDivDSigmaLargeStrainExp.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateDivDSigmaLargeStrainExp.H index ddcdfbd34..10722f94f 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateDivDSigmaLargeStrainExp.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateDivDSigmaLargeStrainExp.H @@ -6,7 +6,7 @@ if(divDSigmaLargeStrainExpMethod == "standard") divDSigmaLargeStrainExp = fvc::div ( - mu*(gradDU & gradDU.T()) + mu*(gradDU & gradDU.T()) + 0.5*lambda*(gradDU && gradDU)*I //- equivalent to 0.5*lambda*(I*tr(gradDU & gradDU.T())) + ((sigma + DSigma) & gradDU), "div(sigma)" diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateExtrapolationVectors.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateExtrapolationVectors.H index 53ef67047..a8008f025 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateExtrapolationVectors.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculateExtrapolationVectors.H @@ -24,9 +24,9 @@ FieldField extraVecs(ptc.size()); forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = pfaces[curPoint]; - + // extraVecs.hook(new vectorField(curFaces.size())); //- no hook function extraVecs.set ( @@ -35,11 +35,11 @@ FieldField extraVecs(ptc.size()); ); vectorField& curExtraVectors = extraVecs[pointI]; - + label nFacesAroundPoint = 0; const vector& pointLoc = mesh.points()[curPoint]; - + // Go through all the faces forAll (curFaces, faceI) { @@ -49,7 +49,7 @@ FieldField extraVecs(ptc.size()); // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(bm[patchID]) @@ -61,12 +61,12 @@ FieldField extraVecs(ptc.size()); pointLoc - centres.boundaryField()[patchID] [bm[patchID].patch().whichFace(curFaces[faceI])]; - + nFacesAroundPoint++; } } } - + curExtraVectors.setSize(nFacesAroundPoint); } diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculatePointBoundaryWeights.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculatePointBoundaryWeights.H index 276c25f03..664110dc4 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculatePointBoundaryWeights.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/calculatePointBoundaryWeights.H @@ -13,7 +13,7 @@ FieldField w(ptc.size()); const volVectorField& centres = mesh.C(); const fvBoundaryMesh& bm = mesh.boundary(); - + pointScalarField volPointSumWeights ( IOobject @@ -25,13 +25,13 @@ FieldField w(ptc.size()); pMesh, dimensionedScalar("zero", dimless, 0) ); - + forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = pf[curPoint]; - + //w.hook(new scalarField(curFaces.size())); //philipc no hook function w.set ( @@ -40,11 +40,11 @@ FieldField w(ptc.size()); ); scalarField& curWeights = w[pointI]; - + label nFacesAroundPoint = 0; - + const vector& pointLoc = mesh.points()[curPoint]; - + // Go through all the faces forAll (curFaces, faceI) { @@ -54,7 +54,7 @@ FieldField w(ptc.size()); // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(bm[patchID]) @@ -74,23 +74,23 @@ FieldField w(ptc.size()); bm[patchID].patch().whichFace(curFaces[faceI]) ] ); - + nFacesAroundPoint++; } } } - + // Reset the sizes of the local weights curWeights.setSize(nFacesAroundPoint); - + // Collect the sum of weights for parallel correction volPointSumWeights[curPoint] += sum(curWeights); } - + // Do parallel correction of weights - + // Update coupled boundaries - // Work-around for cyclic parallels. + // Work-around for cyclic parallels. /*if (Pstream::parRun() && !mesh.parallelData().cyclicParallel()) { forAll (volPointSumWeights.boundaryField(), patchI) @@ -100,7 +100,7 @@ FieldField w(ptc.size()); volPointSumWeights.boundaryField()[patchI].initAddField(); } } - + forAll (volPointSumWeights.boundaryField(), patchI) { if (volPointSumWeights.boundaryField()[patchI].coupled()) @@ -112,7 +112,7 @@ FieldField w(ptc.size()); } } }*/ - + // Re-scale the weights for the current point forAll (ptc, pointI) { diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/elasticNonLinULSolidFoam.C b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/elasticNonLinULSolidFoam.C index cbdf9931f..d65925456 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/elasticNonLinULSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/elasticNonLinULSolidFoam.C @@ -28,9 +28,9 @@ Application Description Finite volume structural solver employing a incremental strain updated Lagrangian approach. - + Valid for small strains, finite displacements and finite rotations. - + Author Philip Cardiff @@ -72,11 +72,11 @@ int main(int argc, char *argv[]) //* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info << "\nStarting time loop\n" << endl; - + for (runTime++; !runTime.end(); runTime++) { Info<< "Time = " << runTime.timeName() << nl << endl; - + # include "readStressedFoamControls.H" int iCorr = 0; @@ -84,15 +84,15 @@ int main(int argc, char *argv[]) scalar initialResidual = 0; scalar relativeResidual = GREAT; lduMatrix::debug = 0; - + do - { + { DU.storePrevIter(); divDSigmaLargeStrainExp.storePrevIter(); # include "calculateDivDSigmaExp.H" - + # include "calculateDivDSigmaLargeStrainExp.H" //----------------------------------------------------// @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) + divDSigmaExp + divDSigmaLargeStrainExp ); - + if(solidInterfaceCorr) { solidInterfacePtr->correct(DUEqn); @@ -118,9 +118,9 @@ int main(int argc, char *argv[]) { initialResidual = solverPerf.initialResidual(); } - + DU.relax(); - + if(solidInterfaceCorr) { gradDU = solidInterfacePtr->grad(DU); @@ -129,11 +129,11 @@ int main(int argc, char *argv[]) { gradDU = fvc::grad(DU); } - + # include "calculateDEpsilonDSigma.H" # include "calculateRelativeResidual.H" - + Info << "\tTime " << runTime.value() << ", Corrector " << iCorr << ", Solving for " << DU.name() @@ -144,18 +144,18 @@ int main(int argc, char *argv[]) } while ( - //solverPerf.initialResidual() > convergenceTolerance + //solverPerf.initialResidual() > convergenceTolerance relativeResidual > convergenceTolerance && ++iCorr < nCorr ); lduMatrix::debug = 1; - - Info << nl << "Time " << runTime.value() << ", Solving for " << DU.name() - << ", Initial residual = " << initialResidual + + Info << nl << "Time " << runTime.value() << ", Solving for " << DU.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", No outer iterations " << iCorr << endl; - + # include "rotateFields.H" # include "moveMesh.H" @@ -171,12 +171,12 @@ int main(int argc, char *argv[]) } Info << nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/findBoundaryPoints.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/findBoundaryPoints.H index 07ee1f644..0e75c6a56 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/findBoundaryPoints.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/findBoundaryPoints.H @@ -21,7 +21,7 @@ forAll (bm, patchI) ) { const labelList& bp = bm[patchI].patch().boundaryPoints(); - + const labelList& meshPoints = bm[patchI].patch().meshPoints(); forAll (bp, pointI) diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/moveMeshInverseDistance.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/moveMeshInverseDistance.H index 7e0b88462..77bc161cd 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/moveMeshInverseDistance.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/moveMeshInverseDistance.H @@ -4,13 +4,13 @@ if(min(J.internalField()) > 0) { Info << "Move solid mesh using inverse distance interpolation" << endl; - + // Create point mesh pointMesh pMesh(mesh); // Create point interpolation volPointInterpolation pointInterpolation(mesh); - + wordList types ( pMesh.boundary().size(), @@ -45,12 +45,12 @@ if(min(J.internalField()) > 0) // Move mesh vectorField newPoints = mesh.allPoints(); - + forAll (pointDUI, pointI) { newPoints[pointI] += pointDUI[pointI]; } - + twoDPointCorrector twoDCorrector(mesh); twoDCorrector.correctPoints(newPoints); mesh.movePoints(newPoints); diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/moveMeshLeastSquares.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/moveMeshLeastSquares.H index 6f7ffb2ff..65373c592 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/moveMeshLeastSquares.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/moveMeshLeastSquares.H @@ -6,16 +6,16 @@ if(min(J.internalField()) > 0) Info << "Moving mesh using least squares interpolation" << endl; leastSquaresVolPointInterpolation pointInterpolation(mesh); - + // Create point mesh pointMesh pMesh(mesh); - + wordList types ( pMesh.boundary().size(), calculatedFvPatchVectorField::typeName ); - + pointVectorField pointDU ( IOobject @@ -28,7 +28,7 @@ if(min(J.internalField()) > 0) dimensionedVector("zero", dimLength, vector::zero), types ); - + pointInterpolation.interpolate(DU, pointDU); const vectorField& pointDUI = diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H index f352e9442..577713009 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H @@ -25,7 +25,7 @@ pointVectorField& pf = pointDU; pf.boundaryField().types() );*/ -pointVectorField pfCorr +pointVectorField pfCorr ( IOobject ( @@ -58,11 +58,11 @@ const labelListList& PointFaces = mesh.pointFaces(); forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = PointFaces[curPoint]; - + label fI = 0; - + // Go through all the faces forAll (curFaces, faceI) { @@ -72,7 +72,7 @@ forAll (ptc, pointI) // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(mesh.boundary()[patchID]) @@ -81,14 +81,14 @@ forAll (ptc, pointI) { label faceInPatchID = bm[patchID].patch().whichFace(curFaces[faceI]); - + pfCorr[curPoint] += w[pointI][fI]* ( extraVecs[pointI][fI] & gradDU.boundaryField()[patchID][faceInPatchID] ); - + fI++; } } diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/rotateFields.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/rotateFields.H index 550ed49cc..386bf7ccd 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/rotateFields.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/rotateFields.H @@ -5,9 +5,9 @@ Info << "Rotating fields" << endl; F = I + gradDU; - + U += DU; - + epsilon += DEpsilon; sigma += DSigma; @@ -15,7 +15,7 @@ volTensorField Finv = inv(F); J = det(F); - + rho = rho/J; epsilon = symm(Finv & epsilon & Finv.T()); diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/writeFields.H index 574bd09a9..aea728db8 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/writeFields.H @@ -28,9 +28,9 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDEpsilonDSigma.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDEpsilonDSigma.H index bfbfa7e47..17df85aec 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDEpsilonDSigma.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDEpsilonDSigma.H @@ -1,4 +1,4 @@ DEpsilon = symm(gradDU) + 0.5*symm(gradDU & gradDU.T()); - + DSigma = 2*rheology.newMu()*(DEpsilon - DEpsilonP) + rheology.newLambda()*(I*tr(DEpsilon)); diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDivDSigmaExp.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDivDSigmaExp.H index b44a5cd85..dd9244a67 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDivDSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDivDSigmaExp.H @@ -7,7 +7,7 @@ if(divDSigmaExpMethod == "standard") ); } else if(divDSigmaExpMethod == "surface") - { + { divDSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradDU.T())) @@ -19,7 +19,7 @@ if(divDSigmaExpMethod == "standard") { surfaceTensorField shearGradDU = ((I - n*n)&fvc::interpolate(gradDU)); - + divDSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDivDSigmaLargeStrainExp.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDivDSigmaLargeStrainExp.H index 11ea74c0e..fa44d00e1 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDivDSigmaLargeStrainExp.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateDivDSigmaLargeStrainExp.H @@ -6,7 +6,7 @@ if(divDSigmaLargeStrainExpMethod == "standard") divDSigmaLargeStrainExp = fvc::div ( - mu*(gradDU & gradDU.T()) + mu*(gradDU & gradDU.T()) + 0.5*lambda*(gradDU && gradDU)*I //- equivalent to 0.5*lambda*(I*tr(gradDU & gradDU.T())) + ((sigma + DSigma) & DF.T()), "div(sigma)" diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateExtrapolationVectors.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateExtrapolationVectors.H index 53ef67047..a8008f025 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateExtrapolationVectors.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculateExtrapolationVectors.H @@ -24,9 +24,9 @@ FieldField extraVecs(ptc.size()); forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = pfaces[curPoint]; - + // extraVecs.hook(new vectorField(curFaces.size())); //- no hook function extraVecs.set ( @@ -35,11 +35,11 @@ FieldField extraVecs(ptc.size()); ); vectorField& curExtraVectors = extraVecs[pointI]; - + label nFacesAroundPoint = 0; const vector& pointLoc = mesh.points()[curPoint]; - + // Go through all the faces forAll (curFaces, faceI) { @@ -49,7 +49,7 @@ FieldField extraVecs(ptc.size()); // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(bm[patchID]) @@ -61,12 +61,12 @@ FieldField extraVecs(ptc.size()); pointLoc - centres.boundaryField()[patchID] [bm[patchID].patch().whichFace(curFaces[faceI])]; - + nFacesAroundPoint++; } } } - + curExtraVectors.setSize(nFacesAroundPoint); } diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculatePointBoundaryWeights.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculatePointBoundaryWeights.H index 276c25f03..664110dc4 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculatePointBoundaryWeights.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/calculatePointBoundaryWeights.H @@ -13,7 +13,7 @@ FieldField w(ptc.size()); const volVectorField& centres = mesh.C(); const fvBoundaryMesh& bm = mesh.boundary(); - + pointScalarField volPointSumWeights ( IOobject @@ -25,13 +25,13 @@ FieldField w(ptc.size()); pMesh, dimensionedScalar("zero", dimless, 0) ); - + forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = pf[curPoint]; - + //w.hook(new scalarField(curFaces.size())); //philipc no hook function w.set ( @@ -40,11 +40,11 @@ FieldField w(ptc.size()); ); scalarField& curWeights = w[pointI]; - + label nFacesAroundPoint = 0; - + const vector& pointLoc = mesh.points()[curPoint]; - + // Go through all the faces forAll (curFaces, faceI) { @@ -54,7 +54,7 @@ FieldField w(ptc.size()); // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(bm[patchID]) @@ -74,23 +74,23 @@ FieldField w(ptc.size()); bm[patchID].patch().whichFace(curFaces[faceI]) ] ); - + nFacesAroundPoint++; } } } - + // Reset the sizes of the local weights curWeights.setSize(nFacesAroundPoint); - + // Collect the sum of weights for parallel correction volPointSumWeights[curPoint] += sum(curWeights); } - + // Do parallel correction of weights - + // Update coupled boundaries - // Work-around for cyclic parallels. + // Work-around for cyclic parallels. /*if (Pstream::parRun() && !mesh.parallelData().cyclicParallel()) { forAll (volPointSumWeights.boundaryField(), patchI) @@ -100,7 +100,7 @@ FieldField w(ptc.size()); volPointSumWeights.boundaryField()[patchI].initAddField(); } } - + forAll (volPointSumWeights.boundaryField(), patchI) { if (volPointSumWeights.boundaryField()[patchI].coupled()) @@ -112,7 +112,7 @@ FieldField w(ptc.size()); } } }*/ - + // Re-scale the weights for the current point forAll (ptc, pointI) { diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/elasticPlasticNonLinULSolidFoam.C b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/elasticPlasticNonLinULSolidFoam.C index 1603b38f8..dd85df0ff 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/elasticPlasticNonLinULSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/elasticPlasticNonLinULSolidFoam.C @@ -80,11 +80,11 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info << "\nStarting time loop\n" << endl; - + for (runTime++; !runTime.end(); runTime++) { Info<< "Time: " << runTime.timeName() << nl << endl; - + # include "readStressedFoamControls.H" int iCorr = 0; @@ -92,9 +92,9 @@ int main(int argc, char *argv[]) scalar initialResidual = 0; scalar relativeResidual = GREAT; lduMatrix::debug = 0; - + const volSymmTensorField& DEpsilonP = rheology.DEpsilonP(); - + do { DU.storePrevIter(); @@ -102,12 +102,12 @@ int main(int argc, char *argv[]) divDSigmaLargeStrainExp.storePrevIter(); # include "calculateDivDSigmaExp.H" - + # include "calculateDivDSigmaLargeStrainExp.H" - + //----------------------------------------------------// //- updated lagrangian large strain momentum equation - //----------------------------------------------------// + //----------------------------------------------------// fvVectorMatrix DUEqn ( fvm::d2dt2(rho, DU) @@ -117,21 +117,21 @@ int main(int argc, char *argv[]) + divDSigmaLargeStrainExp - fvc::div(2*muf*(mesh.Sf() & fvc::interpolate(DEpsilonP))) ); - + if(solidInterfaceCorr) { solidInterfacePtr->correct(DUEqn); } solverPerf = DUEqn.solve(); - + if(iCorr == 0) { initialResidual = solverPerf.initialResidual(); } - + DU.relax(); - + if(solidInterfaceCorr) { gradDU = solidInterfacePtr->grad(DU); @@ -140,11 +140,11 @@ int main(int argc, char *argv[]) { gradDU = fvc::grad(DU); } - + DF = gradDU.T(); - + # include "calculateRelativeResidual.H" - + rheology.correct(); mu = rheology.newMu(); lambda = rheology.newLambda(); @@ -154,7 +154,7 @@ int main(int argc, char *argv[]) { solidInterfacePtr->modifyProperties(muf, lambdaf); } - + # include "calculateDEpsilonDSigma.H" Info << "\tTime " << runTime.value() @@ -167,44 +167,44 @@ int main(int argc, char *argv[]) while ( //relativeResidual - solverPerf.initialResidual() > convergenceTolerance + solverPerf.initialResidual() > convergenceTolerance && ++iCorr < nCorr ); - - Info << nl << "Time " << runTime.value() << ", Solving for " << DU.name() - << ", Initial residual = " << initialResidual + + Info << nl << "Time " << runTime.value() << ", Solving for " << DU.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", No outer iterations " << iCorr << endl; - + lduMatrix::debug = 1; - + U += DU; - + epsilon += DEpsilon; - + epsilonP += DEpsilonP; - + volSymmTensorField DEpsilonE = DEpsilon - DEpsilonP; - + epsilonE += DEpsilonE; - + sigma += DSigma; - + rheology.updateYieldStress(); - + # include "rotateFields.H" - + # include "moveMesh.H" - + # include "writeFields.H" - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/findBoundaryPoints.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/findBoundaryPoints.H index 07ee1f644..0e75c6a56 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/findBoundaryPoints.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/findBoundaryPoints.H @@ -21,7 +21,7 @@ forAll (bm, patchI) ) { const labelList& bp = bm[patchI].patch().boundaryPoints(); - + const labelList& meshPoints = bm[patchI].patch().meshPoints(); forAll (bp, pointI) diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/moveMeshInverseDistance.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/moveMeshInverseDistance.H index 389847569..7015034a1 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/moveMeshInverseDistance.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/moveMeshInverseDistance.H @@ -4,13 +4,13 @@ if(min(J.internalField()) > 0) { Info << "Move solid mesh using inverse distance interpolation" << endl; - + // Create point mesh pointMesh pMesh(mesh); // Create point interpolation volPointInterpolation pointInterpolation(mesh); - + wordList types ( pMesh.boundary().size(), @@ -46,12 +46,12 @@ if(min(J.internalField()) > 0) // Move mesh vectorField newPoints = mesh.allPoints(); - + forAll (pointDUI, pointI) { newPoints[pointI] += pointDUI[pointI]; } - + twoDPointCorrector twoDCorrector(mesh); twoDCorrector.correctPoints(newPoints); mesh.movePoints(newPoints); diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/moveMeshLeastSquares.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/moveMeshLeastSquares.H index 6f7ffb2ff..65373c592 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/moveMeshLeastSquares.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/moveMeshLeastSquares.H @@ -6,16 +6,16 @@ if(min(J.internalField()) > 0) Info << "Moving mesh using least squares interpolation" << endl; leastSquaresVolPointInterpolation pointInterpolation(mesh); - + // Create point mesh pointMesh pMesh(mesh); - + wordList types ( pMesh.boundary().size(), calculatedFvPatchVectorField::typeName ); - + pointVectorField pointDU ( IOobject @@ -28,7 +28,7 @@ if(min(J.internalField()) > 0) dimensionedVector("zero", dimLength, vector::zero), types ); - + pointInterpolation.interpolate(DU, pointDU); const vectorField& pointDUI = diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H index f352e9442..577713009 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/performEdgeCorrectedVolPointInterpolation.H @@ -25,7 +25,7 @@ pointVectorField& pf = pointDU; pf.boundaryField().types() );*/ -pointVectorField pfCorr +pointVectorField pfCorr ( IOobject ( @@ -58,11 +58,11 @@ const labelListList& PointFaces = mesh.pointFaces(); forAll (ptc, pointI) { const label curPoint = ptc[pointI]; - + const labelList& curFaces = PointFaces[curPoint]; - + label fI = 0; - + // Go through all the faces forAll (curFaces, faceI) { @@ -72,7 +72,7 @@ forAll (ptc, pointI) // or coupled calculate the extrapolation vector label patchID = mesh.boundaryMesh().whichPatch(curFaces[faceI]); - + if ( !isA(mesh.boundary()[patchID]) @@ -81,14 +81,14 @@ forAll (ptc, pointI) { label faceInPatchID = bm[patchID].patch().whichFace(curFaces[faceI]); - + pfCorr[curPoint] += w[pointI][fI]* ( extraVecs[pointI][fI] & gradDU.boundaryField()[patchID][faceInPatchID] ); - + fI++; } } diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/rotateFields.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/rotateFields.H index 6a15dbd2d..6730d1c14 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/rotateFields.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/rotateFields.H @@ -8,7 +8,7 @@ F = I + DF; volTensorField Finv = inv(F); J = det(F); - + rho = rho/J; sigma = 1/J * symm(F & sigma & F.T()); epsilon = symm(Finv.T() & epsilon & Finv); diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/writeFields.H index f519b4cce..fff740d9f 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/writeFields.H @@ -12,10 +12,10 @@ if (runTime.outputTime()) ), sqrt((2.0/3.0)*magSqr(dev(epsilon))) ); - + Info<< "Max epsilonEq = " << max(epsilonEq).value() << endl; - + volScalarField sigmaEq ( IOobject @@ -28,10 +28,10 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + volScalarField sigmaHyd ( IOobject @@ -48,9 +48,9 @@ if (runTime.outputTime()) + sigma.component(symmTensor::ZZ) )/3 ); - + Info<< "Max sigmaHyd = " << max(sigmaHyd).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/calculateDivDSigmaExp.H b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/calculateDivDSigmaExp.H index 6d9e9ce46..14700f71a 100644 --- a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/calculateDivDSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/calculateDivDSigmaExp.H @@ -7,7 +7,7 @@ if(divDSigmaExpMethod == "standard") ); } else if(divDSigmaExpMethod == "surface") - { + { divDSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradDU.T())) @@ -19,7 +19,7 @@ if(divDSigmaExpMethod == "standard") { surfaceTensorField shearGradU = ((I - n*n)&fvc::interpolate(gradDU)); - + divDSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/elasticPlasticSolidFoam.C b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/elasticPlasticSolidFoam.C index 4bab52b5c..88aac318c 100644 --- a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/elasticPlasticSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/elasticPlasticSolidFoam.C @@ -63,29 +63,29 @@ int main(int argc, char *argv[]) # include "createSolidInterface.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - + Info<< "\nCalculating displacement field\n" << endl; - + for (runTime++; !runTime.end(); runTime++) { Info<< "Time: " << runTime.timeName() << nl << endl; - + # include "readStressedFoamControls.H" - + int iCorr = 0; scalar initialResidual = 0; scalar relativeResidual = GREAT; lduMatrix::solverPerformance solverPerf; lduMatrix::debug = 0; - + const volSymmTensorField& DEpsilonP = rheology.DEpsilonP(); - + do - { + { DU.storePrevIter(); # include "calculateDivDSigmaExp.H" - + fvVectorMatrix DUEqn ( fvm::d2dt2(rho, DU) @@ -99,16 +99,16 @@ int main(int argc, char *argv[]) { solidInterfacePtr->correct(DUEqn); } - + solverPerf = DUEqn.solve(); - + if(iCorr == 0) { initialResidual = solverPerf.initialResidual(); } - + DU.relax(); - + if(solidInterfaceCorr) { gradDU = solidInterfacePtr->grad(DU); @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) } # include "calculateRelativeResidual.H" - + rheology.correct(); mu = rheology.newMu(); lambda = rheology.newLambda(); @@ -138,38 +138,38 @@ int main(int argc, char *argv[]) } while ( - solverPerf.initialResidual() > convergenceTolerance + solverPerf.initialResidual() > convergenceTolerance && ++iCorr < nCorr ); - - Info << nl << "Time " << runTime.value() << ", Solving for " << DU.name() - << ", Initial residual = " << initialResidual + + Info << nl << "Time " << runTime.value() << ", Solving for " << DU.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", No outer iterations " << iCorr << endl; - + lduMatrix::debug = 1; - + # include "calculateDEpsilonDSigma.H" U += DU; - + epsilon += DEpsilon; - + epsilonP += rheology.DEpsilonP(); - + sigma += DSigma; - + rheology.updateYieldStress(); - + # include "writeFields.H" - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/writeFields.H index f519b4cce..fff740d9f 100644 --- a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/writeFields.H @@ -12,10 +12,10 @@ if (runTime.outputTime()) ), sqrt((2.0/3.0)*magSqr(dev(epsilon))) ); - + Info<< "Max epsilonEq = " << max(epsilonEq).value() << endl; - + volScalarField sigmaEq ( IOobject @@ -28,10 +28,10 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + volScalarField sigmaHyd ( IOobject @@ -48,9 +48,9 @@ if (runTime.outputTime()) + sigma.component(symmTensor::ZZ) )/3 ); - + Info<< "Max sigmaHyd = " << max(sigmaHyd).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticSolidFoam/calculateDivSigmaExp.H b/applications/solvers/solidMechanics/elasticSolidFoam/calculateDivSigmaExp.H index 5759d3fd6..adba22d5d 100644 --- a/applications/solvers/solidMechanics/elasticSolidFoam/calculateDivSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticSolidFoam/calculateDivSigmaExp.H @@ -7,7 +7,7 @@ if(divSigmaExpMethod == "standard") ); } else if(divSigmaExpMethod == "surface") - { + { divSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradU.T())) @@ -19,7 +19,7 @@ if(divSigmaExpMethod == "standard") { surfaceTensorField shearGradU = ((I - n*n)&fvc::interpolate(gradU)); - + divSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticSolidFoam/elasticSolidFoam.C b/applications/solvers/solidMechanics/elasticSolidFoam/elasticSolidFoam.C index 2c4d99c15..019f7794d 100644 --- a/applications/solvers/solidMechanics/elasticSolidFoam/elasticSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticSolidFoam/elasticSolidFoam.C @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) while(runTime.loop()) { Info<< "Time: " << runTime.timeName() << nl << endl; - + # include "readStressedFoamControls.H" int iCorr = 0; @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) do { U.storePrevIter(); - + # include "calculateDivSigmaExp.H" //- linear momentum equation @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) { initialResidual = solverPerf.initialResidual(); } - + U.relax(); if(solidInterfaceCorr) @@ -118,7 +118,7 @@ int main(int argc, char *argv[]) } # include "calculateRelativeResidual.H" - + Info << "\tTime " << runTime.value() << ", Corrector " << iCorr << ", Solving for " << U.name() @@ -133,16 +133,16 @@ int main(int argc, char *argv[]) && ++iCorr < nCorr ); - - Info << nl << "Time " << runTime.value() << ", Solving for " << U.name() - << ", Initial residual = " << initialResidual + + Info << nl << "Time " << runTime.value() << ", Solving for " << U.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", Relative residual = " << relativeResidual << ", No outer iterations " << iCorr << nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl; - + lduMatrix::debug=0; # include "calculateEpsilonSigma.H" @@ -153,9 +153,9 @@ int main(int argc, char *argv[]) << runTime.elapsedCpuTime() << " s\n\n" << endl; } - + Info<< "End\n" << endl; - + return(0); } diff --git a/applications/solvers/solidMechanics/elasticSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticSolidFoam/writeFields.H index 574bd09a9..aea728db8 100644 --- a/applications/solvers/solidMechanics/elasticSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticSolidFoam/writeFields.H @@ -28,9 +28,9 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/elasticThermalSolidFoam/calculateSigmaExp.H b/applications/solvers/solidMechanics/elasticThermalSolidFoam/calculateSigmaExp.H index c137d6075..58cf03951 100644 --- a/applications/solvers/solidMechanics/elasticThermalSolidFoam/calculateSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticThermalSolidFoam/calculateSigmaExp.H @@ -7,7 +7,7 @@ if(sigmaExpMethod == "standard") ); } else if(sigmaExpMethod == "surface") - { + { sigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradU.T())) @@ -19,7 +19,7 @@ if(sigmaExpMethod == "standard") { surfaceTensorField shearGradU = ((I - n*n)&fvc::interpolate(gradU)); - + sigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticThermalSolidFoam/elasticThermalSolidFoam.C b/applications/solvers/solidMechanics/elasticThermalSolidFoam/elasticThermalSolidFoam.C index dccac1558..08f6fc0dc 100644 --- a/applications/solvers/solidMechanics/elasticThermalSolidFoam/elasticThermalSolidFoam.C +++ b/applications/solvers/solidMechanics/elasticThermalSolidFoam/elasticThermalSolidFoam.C @@ -62,21 +62,21 @@ int main(int argc, char *argv[]) while(runTime.loop()) { Info<< "Time: " << runTime.timeName() << nl << endl; - + # include "readStressedFoamControls.H" - + int iCorr = 0; scalar initialResidual = GREAT; scalar residual = GREAT; lduMatrix::solverPerformance solverPerfU; lduMatrix::solverPerformance solverPerfT; - + lduMatrix::debug=0; do { U.storePrevIter(); - + # include "calculateSigmaExp.H" //- energy equation @@ -123,9 +123,9 @@ int main(int argc, char *argv[]) ); U.relax(); - + gradU = fvc::grad(U); - + Info << "\t\tSolving for " << U.name() << " using " << solverPerfU.solverName() << ", residual = " << solverPerfU.initialResidual() << endl; @@ -136,18 +136,18 @@ int main(int argc, char *argv[]) && ++iCorr < nCorr ); - + Info << nl << "Time " << runTime.value() - << ", Solving for " << U.name() - << ", Solving for " << T.name() - << ", Initial residual = " << initialResidual + << ", Solving for " << U.name() + << ", Solving for " << T.name() + << ", Initial residual = " << initialResidual << ", Final U residual = " << solverPerfU.initialResidual() << ", Final T residual = " << solverPerfT.initialResidual() << ", No outer iterations " << iCorr << nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" << endl; - + lduMatrix::debug=0; # include "calculateEpsilonSigma.H" diff --git a/applications/solvers/solidMechanics/elasticThermalSolidFoam/writeFields.H b/applications/solvers/solidMechanics/elasticThermalSolidFoam/writeFields.H index 574bd09a9..aea728db8 100644 --- a/applications/solvers/solidMechanics/elasticThermalSolidFoam/writeFields.H +++ b/applications/solvers/solidMechanics/elasticThermalSolidFoam/writeFields.H @@ -28,9 +28,9 @@ if (runTime.outputTime()) ), sqrt((3.0/2.0)*magSqr(dev(sigma))) ); - + Info<< "Max sigmaEq = " << max(sigmaEq).value() << endl; - + runTime.write(); } diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/calcFsiResidual.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/calcFsiResidual.H index f0b6436e1..f85627e60 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/calcFsiResidual.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/calcFsiResidual.H @@ -1,14 +1,14 @@ { - const vectorField& solidPatchDisplacement = + const vectorField& solidPatchDisplacement = DU.boundaryField()[solidPatchID]; vectorField solidZoneDisplacement ( - stressMesh.faceZones()[solidZoneID]().size(), + stressMesh.faceZones()[solidZoneID]().size(), vector::zero ); - const label solidPatchStart = + const label solidPatchStart = stressMesh.boundaryMesh()[solidPatchID].start(); forAll(solidPatchDisplacement, i) @@ -17,7 +17,7 @@ [ stressMesh.faceZones()[solidZoneID] .whichFace(solidPatchStart + i) - ] = + ] = solidPatchDisplacement[i]; } @@ -36,7 +36,7 @@ vector::zero ); - const label fluidPatchStart = + const label fluidPatchStart = mesh.boundaryMesh()[fluidPatchID].start(); forAll(fluidPatchDisplacement, i) @@ -63,7 +63,7 @@ fsiResidual = solidPatchPointsDispl - fluidPatchPointsDispl; -// maxFsiResidual = +// maxFsiResidual = // gMax // ( // mag(fsiResidual) diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createInterfaceFields.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createInterfaceFields.H index cd6f621e4..4ffea09ad 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createInterfaceFields.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createInterfaceFields.H @@ -30,13 +30,13 @@ vectorField fsiResidualOld vectorField solidPatchTraction ( - stressMesh.boundary()[solidPatchID].size(), + stressMesh.boundary()[solidPatchID].size(), vector::zero ); scalarField solidPatchPressure ( - stressMesh.boundary()[solidPatchID].size(), + stressMesh.boundary()[solidPatchID].size(), 0.0 ); diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createStressPointMesh.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createStressPointMesh.H index e51f7fdf5..46d7df051 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createStressPointMesh.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createStressPointMesh.H @@ -9,7 +9,7 @@ pointPatchInterpolation patchPointInterpolator(stressMesh); wordList types ( - pStressMesh.boundary().size(), + pStressMesh.boundary().size(), calculatedFvPatchVectorField::typeName ); @@ -17,9 +17,9 @@ wordList types forAll(DU.boundaryField().types(), patchI) { - if + if ( - DU.boundaryField().types()[patchI] + DU.boundaryField().types()[patchI] == fixedValueFvPatchVectorField::typeName ) { diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createZoneToZoneInterpolators.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createZoneToZoneInterpolators.H index 24eef3e18..fa666a5b9 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createZoneToZoneInterpolators.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createZoneToZoneInterpolators.H @@ -27,17 +27,17 @@ if(!interpolatorFluidSolidPtr || !interpolatorSolidFluidPtr) Info << "Check fluid-to-solid and solid-to-fluid interpolators" << endl; { - vectorField fluidPatchFaceCentres = + vectorField fluidPatchFaceCentres = vectorField(mesh.boundaryMesh()[fluidPatchID].faceCentres()); vectorField fluidZoneFaceCentres ( - mesh.faceZones()[fluidZoneID].size(), + mesh.faceZones()[fluidZoneID].size(), vector::zero ); - - const label fluidPatchStart = + + const label fluidPatchStart = mesh.boundaryMesh()[fluidPatchID].start(); forAll (fluidPatchFaceCentres, i) @@ -45,7 +45,7 @@ if(!interpolatorFluidSolidPtr || !interpolatorSolidFluidPtr) fluidZoneFaceCentres [ mesh.faceZones()[fluidZoneID].whichFace(fluidPatchStart + i) - ] = + ] = fluidPatchFaceCentres[i]; } @@ -60,11 +60,11 @@ if(!interpolatorFluidSolidPtr || !interpolatorSolidFluidPtr) vectorField solidPatchFaceCentres ( - stressMesh.boundaryMesh()[solidPatchID].size(), + stressMesh.boundaryMesh()[solidPatchID].size(), vector::zero ); - const label solidPatchStart = + const label solidPatchStart = stressMesh.boundaryMesh()[solidPatchID].start(); forAll(solidPatchFaceCentres, i) @@ -86,23 +86,23 @@ if(!interpolatorFluidSolidPtr || !interpolatorSolidFluidPtr) ) ); - Info << "Fluid-to-solid face interpolation error: " << maxDist + Info << "Fluid-to-solid face interpolation error: " << maxDist << endl; } { - vectorField solidPatchFaceCentres = + vectorField solidPatchFaceCentres = vectorField(stressMesh.boundaryMesh()[solidPatchID].faceCentres()); vectorField solidZoneFaceCentres ( - stressMesh.faceZones()[solidZoneID].size(), + stressMesh.faceZones()[solidZoneID].size(), vector::zero ); - const label solidPatchStart = + const label solidPatchStart = stressMesh.boundaryMesh()[solidPatchID].start(); forAll (solidPatchFaceCentres, i) @@ -111,7 +111,7 @@ if(!interpolatorFluidSolidPtr || !interpolatorSolidFluidPtr) [ stressMesh.faceZones()[solidZoneID] .whichFace(solidPatchStart + i) - ] = + ] = solidPatchFaceCentres[i]; } @@ -126,11 +126,11 @@ if(!interpolatorFluidSolidPtr || !interpolatorSolidFluidPtr) vectorField fluidPatchFaceCentres ( - mesh.boundaryMesh()[fluidPatchID].size(), + mesh.boundaryMesh()[fluidPatchID].size(), vector::zero ); - const label fluidPatchStart = + const label fluidPatchStart = mesh.boundaryMesh()[fluidPatchID].start(); forAll(fluidPatchFaceCentres, i) @@ -157,9 +157,9 @@ if(!interpolatorFluidSolidPtr || !interpolatorSolidFluidPtr) } } -zoneToZoneInterpolation& interpolatorFluidSolid = +zoneToZoneInterpolation& interpolatorFluidSolid = *interpolatorFluidSolidPtr; -zoneToZoneInterpolation& interpolatorSolidFluid = +zoneToZoneInterpolation& interpolatorSolidFluid = *interpolatorSolidFluidPtr; diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/icoFsiElasticNonLinULSolidFoam.C b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/icoFsiElasticNonLinULSolidFoam.C index a88fcd7cf..dd31175e6 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/icoFsiElasticNonLinULSolidFoam.C +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/icoFsiElasticNonLinULSolidFoam.C @@ -29,7 +29,7 @@ Description Transient solver for fluid-solid interaction for an incompressible fluid and a large strain solid solid mesh is moved using U interpolated using least squares method - + Author Zeljko Tukovic FSB Zagreb adapted by Philip Cardiff @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) } while ( - (fsiResidualNorm > outerCorrTolerance) + (fsiResidualNorm > outerCorrTolerance) && (outerCorr < nOuterCorr) ); diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveFluidMesh.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveFluidMesh.H index 7b4d92dab..c4a8339cd 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveFluidMesh.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveFluidMesh.H @@ -1,6 +1,6 @@ { // Move fluid mesh - const vectorField& n = + const vectorField& n = mesh.boundaryMesh()[fluidPatchID].pointNormals(); primitivePatchInterpolation patchInterpolator @@ -14,7 +14,7 @@ mesh.boundary()[fluidPatchID].deltaCoeffs() ); - scalar delta = + scalar delta = gMax ( mag @@ -29,7 +29,7 @@ *pointDeltaCoeffs ); - Info << "Maximal accumulated displacement of interface points: " + Info << "Maximal accumulated displacement of interface points: " << delta << endl; if(delta < interfaceDeformationLimit) @@ -37,12 +37,12 @@ // Move only interface points pointField newPoints = mesh.allPoints(); - const labelList& meshPoints = + const labelList& meshPoints = mesh.boundaryMesh()[fluidPatchID].meshPoints(); forAll (fluidPatchPointsDispl, pointI) { - newPoints[meshPoints[pointI]] += + newPoints[meshPoints[pointI]] += fluidPatchPointsDispl[pointI] - fluidPatchPointsDisplOld[pointI]; } @@ -54,7 +54,7 @@ mesh.movePoints(newPoints); // Accumulate interface points displacement - accumulatedFluidInterfaceDisplacement += + accumulatedFluidInterfaceDisplacement += fluidPatchPointsDispl - fluidPatchPointsDisplOld; } @@ -63,13 +63,13 @@ // Move whole fluid mesh pointField newPoints = mesh.allPoints(); - const labelList& meshPoints = + const labelList& meshPoints = mesh.boundaryMesh()[fluidPatchID].meshPoints(); forAll (accumulatedFluidInterfaceDisplacement, pointI) { - newPoints[meshPoints[pointI]] -= - accumulatedFluidInterfaceDisplacement[pointI]; + newPoints[meshPoints[pointI]] -= + accumulatedFluidInterfaceDisplacement[pointI]; } twoDPointCorrector twoDCorrector(mesh); @@ -78,7 +78,7 @@ mesh.movePoints(newPoints); - accumulatedFluidInterfaceDisplacement += + accumulatedFluidInterfaceDisplacement += fluidPatchPointsDispl - fluidPatchPointsDisplOld; @@ -94,7 +94,7 @@ "motionU" ) ); - + fixedValueTetPolyPatchVectorField& motionUFluidPatch = refCast ( @@ -106,7 +106,7 @@ refCast(motionUFluidPatch.patch()) ); - motionUFluidPatch == + motionUFluidPatch == tppi.pointToPointInterpolate ( accumulatedFluidInterfaceDisplacement @@ -124,14 +124,14 @@ "pointMotionU" ) ); - + fixedValuePointPatchVectorField& motionUFluidPatch = refCast ( motionU.boundaryField()[fluidPatchID] ); - motionUFluidPatch == + motionUFluidPatch == accumulatedFluidInterfaceDisplacement /runTime.deltaT().value(); } diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveSolidMesh.H_old b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveSolidMesh.H_old index 4fce86e25..f8994482f 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveSolidMesh.H_old +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveSolidMesh.H_old @@ -24,7 +24,7 @@ stressMesh.moving(false); // Rotate stress field (old Cauchy becomes new 2nd Piola) - //sigma = 1/J * symm(F & sigma & F.T()); + //sigma = 1/J * symm(F & sigma & F.T()); //rho = rho/J; } diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveSolidMeshLeastSquares.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveSolidMeshLeastSquares.H index a31defca8..e90ba107a 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveSolidMeshLeastSquares.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/moveSolidMeshLeastSquares.H @@ -6,16 +6,16 @@ if(min(J.internalField()) > 0) Info << "Moving mesh using least squares interpolation" << endl; leastSquaresVolPointInterpolation pointInterpolation(stressMesh); - + // Create point mesh pointMesh pMesh(stressMesh); - + wordList types ( pMesh.boundary().size(), calculatedFvPatchVectorField::typeName ); - + pointVectorField pointDU ( IOobject @@ -28,7 +28,7 @@ if(min(J.internalField()) > 0) dimensionedVector("zero", dimLength, vector::zero), types ); - + pointInterpolation.interpolate(DU, pointDU); const vectorField& pointDUI = diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readCouplingProperties.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readCouplingProperties.H index 9dbd86998..8974864fe 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readCouplingProperties.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readCouplingProperties.H @@ -39,7 +39,7 @@ << abort(FatalError); } -// const label solidPatchStart = +// const label solidPatchStart = // stressMesh.boundaryMesh()[solidPatchID].start(); // const faceZone& solidZone = stressMesh.faceZones()[solidZoneID]; @@ -70,14 +70,14 @@ << abort(FatalError); } -// const label fluidPatchStart = +// const label fluidPatchStart = // mesh.boundaryMesh()[fluidPatchID].start(); // const faceZone& fluidZone = mesh.faceZones()[fluidZoneID]; - // Check mesh motion solver type - bool feMotionSolver = + // Check mesh motion solver type + bool feMotionSolver = mesh.objectRegistry::foundObject ( "motionU" @@ -98,10 +98,10 @@ ) { FatalErrorIn(args.executable()) - << "Bounary condition on " << DU.name() - << " is " - << DU.boundaryField()[solidPatchID].type() - << "for fluid -solid interface patch, instead " + << "Bounary condition on " << DU.name() + << " is " + << DU.boundaryField()[solidPatchID].type() + << "for fluid -solid interface patch, instead " << solidTractionFvPatchVectorField::typeName //<< tractionDisplacementIncrementFvPatchVectorField::typeName << abort(FatalError); @@ -159,12 +159,12 @@ ), vectorField ( - mesh.boundaryMesh()[fluidPatchID].nPoints(), + mesh.boundaryMesh()[fluidPatchID].nPoints(), vector::zero ) ); } - vectorField& accumulatedFluidInterfaceDisplacement + vectorField& accumulatedFluidInterfaceDisplacement = *accumulatedFluidInterfaceDisplacementPtr; diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readFsiControls.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readFsiControls.H index e899e8476..df139c64b 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readFsiControls.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readFsiControls.H @@ -4,9 +4,9 @@ if (couplingProperties.found("couplingScheme")) { couplingScheme = word(couplingProperties.lookup("couplingScheme")); - if + if ( - (couplingScheme == "IQN-ILS") + (couplingScheme == "IQN-ILS") || (couplingScheme == "Aitken") || (couplingScheme == "FixedRelaxation") ) @@ -31,7 +31,7 @@ if (couplingProperties.found("couplingScheme")) // ( // couplingProperties.lookup("couplingReuse") // ) -// ); +// ); scalar interfaceDeformationLimit ( @@ -66,6 +66,6 @@ fsiRelaxationFactor = fsiRelaxationFactorMin; scalar outerCorrTolerance ( readScalar(couplingProperties.lookup("outerCorrTolerance")) -); +); Switch fsi(couplingProperties.lookup("fsi")); diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/rotateSolidFields.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/rotateSolidFields.H index e3ed1aab2..2dc37a2c2 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/rotateSolidFields.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/rotateSolidFields.H @@ -5,10 +5,10 @@ Info << "Rotating fields" << endl; F = I + DF; - + //U += DU; Usolid += DU; - + //epsilon += DEpsilon; sigma += DSigma; @@ -16,9 +16,9 @@ //volTensorField Finv = inv(F); J = det(F); - + rho = rho/J; - + //epsilon = symm(Finv.T() & epsilon & Finv); sigma = 1/J * symm(F & sigma & F.T()); diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/setInterfaceDisplacement.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/setInterfaceDisplacement.H index a22bc581c..50fb929b9 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/setInterfaceDisplacement.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/setInterfaceDisplacement.H @@ -1,9 +1,9 @@ -Info << "\nTime = " << runTime.timeName() +Info << "\nTime = " << runTime.timeName() << ", iteration: " << outerCorr << endl; if (outerCorr < 3 || couplingScheme == "FixedRelaxation") { - Info << "Current fsi under-relaxation factor: " + Info << "Current fsi under-relaxation factor: " << fsiRelaxationFactor << endl; fluidPatchPointsDisplOld = fluidPatchPointsDispl; @@ -14,7 +14,7 @@ else { if (couplingScheme == "Aitken") { - fsiRelaxationFactor = + fsiRelaxationFactor = -fsiRelaxationFactor *( gSum @@ -33,12 +33,12 @@ else fsiRelaxationFactor = mag(fsiRelaxationFactor); - Info << "Current fsi under-relaxation factor (Aitken): " - << fsiRelaxationFactor << endl; + Info << "Current fsi under-relaxation factor (Aitken): " + << fsiRelaxationFactor << endl; fluidPatchPointsDisplOld = fluidPatchPointsDispl; - fluidPatchPointsDispl += + fluidPatchPointsDispl += fsiRelaxationFactor*fsiResidual; } // else if (couplingScheme == "IQN-ILS") diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/setInterfaceForce.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/setInterfaceForce.H index 2769d4cf8..0e0941464 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/setInterfaceForce.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/setInterfaceForce.H @@ -16,11 +16,11 @@ vectorField fluidZoneTraction ( - mesh.faceZones()[fluidZoneID].size(), + mesh.faceZones()[fluidZoneID].size(), vector::zero ); - const label fluidPatchStart = + const label fluidPatchStart = mesh.boundaryMesh()[fluidPatchID].start(); forAll(fluidPatchTraction, i) @@ -28,7 +28,7 @@ fluidZoneTraction [ mesh.faceZones()[fluidZoneID].whichFace(fluidPatchStart + i) - ] = + ] = fluidPatchTraction[i]; } @@ -38,7 +38,7 @@ scalarField fluidZonePressure ( - mesh.faceZones()[fluidZoneID].size(), + mesh.faceZones()[fluidZoneID].size(), 0.0 ); @@ -47,7 +47,7 @@ fluidZonePressure [ mesh.faceZones()[fluidZoneID].whichFace(fluidPatchStart + i) - ] = + ] = fluidPatchPressure[i]; } @@ -66,7 +66,7 @@ fluidZonePressure ); - const label solidPatchStart = + const label solidPatchStart = stressMesh.boundaryMesh()[solidPatchID].start(); forAll(solidPatchTraction, i) diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveSolidBackward.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveSolidBackward.H index 4c737efac..66e0155af 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveSolidBackward.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveSolidBackward.H @@ -47,15 +47,15 @@ DF = gradDU.T(); # include "calculateDSigma.H" - } + } while ( - solverPerf.initialResidual() > convergenceTolerance + solverPerf.initialResidual() > convergenceTolerance && ++iCorr < nCorr ); - Info << "Solving for " << DU.name() - << ", Initial residual = " << initialResidual + Info << "Solving for " << DU.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", No outer iterations " << iCorr << endl; diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveSolidEuler.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveSolidEuler.H index 9b9aa32bb..2ab5b0c25 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveSolidEuler.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveSolidEuler.H @@ -46,15 +46,15 @@ DF = gradDU.T(); # include "calculateDSigma.H" - } + } while ( - solverPerf.initialResidual() > convergenceTolerance + solverPerf.initialResidual() > convergenceTolerance && ++iCorr < nCorr ); - Info << "Solving for " << DU.name() - << ", Initial residual = " << initialResidual + Info << "Solving for " << DU.name() + << ", Initial residual = " << initialResidual << ", Final residual = " << solverPerf.initialResidual() << ", No outer iterations " << iCorr << endl; diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.C b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.C index 14eda463c..4b82db4ba 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.C @@ -140,7 +140,7 @@ void transitionalParabolicVelocityFvPatchVectorField::updateCoeffs() // // Get range and orientation // boundBox bb(patch().patch().localPoints(), true); - + // boundBox bb(vector(0, 0, -0.025334), vector(0, 0.41, 0.025334)); vector ctr = 0.5*(boundBoxMax_ + boundBoxMin_); diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.H index 3a6d5b179..e5a640cf7 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.H @@ -100,7 +100,7 @@ public: const dictionary& ); - //- Construct by mapping given + //- Construct by mapping given // transitionalParabolicVelocityFvPatchVectorField // onto a new patch transitionalParabolicVelocityFvPatchVectorField diff --git a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H index 2e30e7e74..18d79b207 100644 --- a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H +++ b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H @@ -71,7 +71,7 @@ public: DugdaleCohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy diff --git a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/bilinear/bilinearCohesiveLaw.C b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/bilinear/bilinearCohesiveLaw.C index 87a91e66d..6ecb71c30 100644 --- a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/bilinear/bilinearCohesiveLaw.C +++ b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/bilinear/bilinearCohesiveLaw.C @@ -89,7 +89,7 @@ Foam::scalar Foam::bilinearCohesiveLaw::traction(scalar delta) const else if (delta > delta1().value()) { - return sigma1().value()*(1.0 - (delta-delta1().value())/(deltaC().value()-delta1().value())); + return sigma1().value()*(1.0 - (delta-delta1().value())/(deltaC().value()-delta1().value())); } return sigmaMax().value() + (sigma1().value()-sigmaMax().value())*delta/delta1().value(); diff --git a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/bilinear/bilinearCohesiveLaw.H b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/bilinear/bilinearCohesiveLaw.H index e963487bb..5aed3cd72 100644 --- a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/bilinear/bilinearCohesiveLaw.H +++ b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/bilinear/bilinearCohesiveLaw.H @@ -77,7 +77,7 @@ public: bilinearCohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy diff --git a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C index ee9329c0f..9b2b62738 100644 --- a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C +++ b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C @@ -74,7 +74,7 @@ Foam::autoPtr Foam::cohesiveLaw::New Foam::cohesiveLaw::cohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ) : cohesiveLawCoeffs_(dict.subDict(cohesiveLawName + "Coeffs")), @@ -107,8 +107,8 @@ void Foam::cohesiveLaw::writeDict(Ostream& os) const //- philipc word keyword(type() + "Coeffs"); - // os.writeKeyword(type() + "Coeffs") - os.writeKeyword(keyword) + // os.writeKeyword(type() + "Coeffs") + os.writeKeyword(keyword) << cohesiveLawCoeffs(); } diff --git a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H index 6a98e59ce..6ad767f52 100644 --- a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H +++ b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H @@ -97,7 +97,7 @@ public: static autoPtr New ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); @@ -107,7 +107,7 @@ public: cohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy @@ -124,7 +124,7 @@ public: // Member Functions - + //- Return cohesive law coefficients const dictionary& cohesiveLawCoeffs() const { diff --git a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/linear/linearCohesiveLaw.H b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/linear/linearCohesiveLaw.H index 53d4ee100..d77823b27 100644 --- a/applications/solvers/solidMechanics/solidModels/cohesiveLaws/linear/linearCohesiveLaw.H +++ b/applications/solvers/solidMechanics/solidModels/cohesiveLaws/linear/linearCohesiveLaw.H @@ -71,7 +71,7 @@ public: linearCohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy diff --git a/applications/solvers/solidMechanics/solidModels/componentReference/componentReference.H b/applications/solvers/solidMechanics/solidModels/componentReference/componentReference.H index f4d4b2e83..37b6d97ae 100644 --- a/applications/solvers/solidMechanics/solidModels/componentReference/componentReference.H +++ b/applications/solvers/solidMechanics/solidModels/componentReference/componentReference.H @@ -171,7 +171,7 @@ public: { checkPatchFace(mesh); } - + //- Construct from dictionary componentReference diff --git a/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.C b/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.C index 999652d78..7e352e6f1 100644 --- a/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.C +++ b/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.C @@ -106,7 +106,7 @@ Foam::contactPatchPair::contactPatchPair << "\n\t\tmaster patch:\t" << masterPatch_.name() << "\n\t\tslave patch:\t" << slavePatch_.name() << endl; - + if(rigidMaster_) Info << "\t\tThe master surface is considered rigid and is set as traction-free" << endl; @@ -193,9 +193,9 @@ Foam::contactPatchPair::masterTouchFraction() const scalarField pDistToInter(cp_.mesh().boundaryMesh()[masterPatch_.index()].size(), 0.0); // = slaveToMasterInterpolateDeformed.pointDistanceToIntersection(); - + scalarField vertexMasterGap = pDistToInter; - + // Calculate area in contact const faceList& masterPatchLocalFaces = mesh.boundaryMesh()[masterPatch_.index()].localFaces(); @@ -234,7 +234,7 @@ Foam::contactPatchPair::slaveTouchFraction() const scalarField vertexSlaveGap = slavePointPenetration_; // (cp_.mesh().boundaryMesh()[slavePatch_.index()].size(), 0.0); - + // Calculate area in contact const faceList& slavePatchLocalFaces = mesh.boundaryMesh()[slavePatch_.index()].localFaces(); @@ -275,7 +275,7 @@ Foam::contactPatchPair::masterGapPoints() const scalarField vertexMasterGap = masterPointPenetration_; //globalMasterPointPenetration; - + tmp tcontactGapPoints ( new scalarField(vertexMasterGap.size(), 0) @@ -324,18 +324,18 @@ Foam::contactPatchPair::masterPointForce() const cp_.mesh().boundaryMesh()[masterPatch_.index()].meshPoints().size(), vector::zero ); - + tmp tcontactPointForce ( new vectorField(masterPointForce.size(), vector::zero) ); vectorField& contactPointForce = tcontactPointForce(); - + forAll (contactPointForce, pointI) { contactPointForce[pointI] = masterPointForce[pointI]; } - + return tcontactPointForce; } @@ -344,21 +344,21 @@ Foam::contactPatchPair::masterPointForce() const Foam::tmp Foam::contactPatchPair::slavePointForce() const -{ +{ vectorField slavePointForce = totalSlavePointForce_; - + tmp tcontactPointForce ( new vectorField(slavePointForce.size(), vector::zero) ); - + vectorField& contactPointForce = tcontactPointForce(); forAll (contactPointForce, pointI) { contactPointForce[pointI] = slavePointForce[pointI]; } - + return tcontactPointForce; } diff --git a/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.H b/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.H index fd8697bad..b1ccc3a92 100644 --- a/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.H +++ b/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.H @@ -27,7 +27,7 @@ Class Description A pair of surfaces in contact. - + SourceFiles contactPatchPair.C @@ -76,7 +76,7 @@ private: //- Reference to contact problem contactProblem& cp_; - + //- patch to patch algorithm const intersection::algorithm alg_; @@ -143,12 +143,12 @@ private: //- interpolation method for passing traction from slave to master word interpolationMethod_; - + //- zoneToZoneInterpolation for the calculation of pointDistanceToIntersection zoneToZoneInterpolation faceZoneMasterToSlaveInterpolator_; //- zoneToZone or ggiZone for interpolation of traction from slave to master - zoneToZoneInterpolation* faceZoneSlaveToMasterInterpolatorPtr_; + zoneToZoneInterpolation* faceZoneSlaveToMasterInterpolatorPtr_; ggiZoneInterpolation* faceZoneGgiInterpolatorPtr_; //- interpolation from slave vertices to slave face centres @@ -223,7 +223,7 @@ public: //- Correct contact data void correct(); - + //- if contact correction on or off Switch contactActive() { diff --git a/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPairCorrect.C b/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPairCorrect.C index 4418f9410..bafd71370 100644 --- a/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPairCorrect.C +++ b/applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPairCorrect.C @@ -35,19 +35,19 @@ Description void Foam::contactPatchPair::correct() { - //---------------------PRELIMINARIES---------------------------------// + //---------------------PRELIMINARIES---------------------------------// const fvMesh& mesh = cp_.mesh(); const label& masterIndex = masterPatch_.index(); const label& slaveIndex = slavePatch_.index(); scalar maxMagSlaveTraction = 0.0; contactIterNum_++; - - - //--------CALCULATE MASTER AND SLAVE PENETRATIONS----------------------// + + + //--------CALCULATE MASTER AND SLAVE PENETRATIONS----------------------// scalarField& globalSlavePointPenetration = globalSlavePointPenetration_; //scalarField& globalMasterPointPenetration = globalMasterPointPenetration_; - + //- tell zoneToZone that mesh has moved, so the intersection will be recalculated faceZoneMasterToSlaveInterpolator_.movePoints(); //- calculate intersection distances @@ -59,11 +59,11 @@ void Foam::contactPatchPair::correct() //globalMasterPointPenetration //= faceZoneSlaveToMasterInterpolator.pointDistanceToIntersection(); - + scalarField& slavePointPenetration = slavePointPenetration_; //scalarField& masterPointPenetration = masterPointPenetration_; - + forAll(slavePointPenetration, pointI) { //label pointGlobalLabel = slavePointLabels[pointI]; @@ -72,7 +72,7 @@ void Foam::contactPatchPair::correct() [ pointI //mesh.pointZones()[slavePointZoneID].whichPoint(pointGlobalLabel) ]; - + //- when the master surface surrounds the slave (like the pelvis and femur head) then //- the slave penetration can sometimes calculate the distance through the femur head //- to the pelvis which is wrong so I limit slavePenetration here @@ -93,10 +93,10 @@ void Foam::contactPatchPair::correct() // pointI // ]; // } - - - + + + //------CALCULATE SLAVE VERTEX FORCES BASED ON PENETRATION-------------// //- approximation of penaltyFactor //- this should be automatic, these numbers don't really matter, the scaleFactor @@ -106,15 +106,15 @@ void Foam::contactPatchPair::correct() scalar cellVolume = 2.7e-8; //0.001; //0.00031; //approx scalar penaltyFactor = penaltyScaleFactor_*bulkModulus*faceArea*faceArea/cellVolume; scalar returnPenaltyFactor = returnScaleFactor_*penaltyFactor; - + //-- slave const vectorField& slavePointNormals = mesh.boundaryMesh()[slaveIndex].pointNormals(); vectorField& totalSlavePointForce = totalSlavePointForce_; - + int numSlaveContactPoints = 0; int numSlaveContactPointsReducing = 0; int numSlavesUpdated = 0; - + //- so the procs know the global min //scalar minSlavePointPenetration = gMin(slavePointPenetration); scalar minSlavePointPenetration = gMin(globalSlavePointPenetration); @@ -122,12 +122,12 @@ void Foam::contactPatchPair::correct() { //- update old point force oldTotalSlavePointForce_ = totalSlavePointForce; - + forAll(totalSlavePointForce, pointI) { // if a point has penetrated (i.e. if the penetration is negative), //add a force to it relative to the penetration - if(slavePointPenetration[pointI] < -contactGapTol_) //-I had this before < 0.0) + if(slavePointPenetration[pointI] < -contactGapTol_) //-I had this before < 0.0) { //contactStep = true; numSlaveContactPoints++; // count points in contact @@ -149,10 +149,10 @@ void Foam::contactPatchPair::correct() numSlavesUpdated++; numSlaveContactPointsReducing++; // point forces must be reduced slowly - + totalSlavePointForce[pointI] += ( slavePointNormals[pointI] * returnPenaltyFactor * slavePointPenetration[pointI] ); - + // if a tensile force develops if((totalSlavePointForce[pointI] & slavePointNormals[pointI]) > 0.0) { @@ -160,7 +160,7 @@ void Foam::contactPatchPair::correct() } } } - + //--------INTERPOLATE SLAVE POINT FORCE TO SLAVE FACES AND APPLY----------// //- tell interpolation that mesh has moved slaveInterpolator_.movePoints(); @@ -180,8 +180,8 @@ void Foam::contactPatchPair::correct() slavePatch.pressure() = slavePressure; maxMagSlaveTraction = gMax(slavePressure); } - - //--------INTERPOLATE SLAVE POINT FORCE TO MASTER FACE TRACTIONS----------// + + //--------INTERPOLATE SLAVE POINT FORCE TO MASTER FACE TRACTIONS----------// //- for a deformable master if(!rigidMaster_) { @@ -189,13 +189,13 @@ void Foam::contactPatchPair::correct() = mesh.faceZones().findZoneID(slaveFaceZoneName_); const label slavePatchStart = mesh.boundaryMesh()[slaveIndex].start(); - + scalarField globalSlavePressure ( mesh.faceZones()[slaveFaceZoneID].size(), 0.0 ); - + forAll(slavePressure, i) { globalSlavePressure[mesh.faceZones()[slaveFaceZoneID].whichFace(slavePatchStart + i)] = @@ -203,10 +203,10 @@ void Foam::contactPatchPair::correct() } //- exchange parallel data reduce(globalSlavePressure, maxOp()); - + const label masterFaceZoneID = cp_.mesh().faceZones().findZoneID(masterFaceZoneName_); scalarField globalMasterPressure(mesh.faceZones()[masterFaceZoneID].size(),0.0); - + if(faceZoneSlaveToMasterInterpolatorPtr_) { zoneToZoneInterpolation& faceZoneSlaveToMasterInterpolator = *faceZoneSlaveToMasterInterpolatorPtr_; @@ -222,7 +222,7 @@ void Foam::contactPatchPair::correct() { ggiZoneInterpolation& faceZoneGgiInterpolator = *faceZoneGgiInterpolatorPtr_; faceZoneGgiInterpolator.movePoints(); - + //- GGI interpolate tractions globalMasterPressure = faceZoneGgiInterpolator.slaveToMaster @@ -230,18 +230,18 @@ void Foam::contactPatchPair::correct() globalSlavePressure ); } - - + + //- exchange parallel data reduce(globalMasterPressure, maxOp()); - + //Pout << "The max global master trac is " << max(globalMasterPressure) << endl; - + const label masterPatchStart = mesh.boundaryMesh()[masterIndex].start(); - + scalarField masterPressure(mesh.boundaryMesh()[masterIndex].size(), 0.0); - + forAll(masterPressure, i) { masterPressure[i] = @@ -250,7 +250,7 @@ void Foam::contactPatchPair::correct() mesh.faceZones()[masterFaceZoneID].whichFace(masterPatchStart + i) ]; } - + //- apply master traction { solidTractionFvPatchVectorField& masterPatch = @@ -268,19 +268,19 @@ void Foam::contactPatchPair::correct() } } - + //--------MASTER PROCS WRITES CONTACT INFO FILE----------// reduce(numSlaveContactPoints, sumOp()); reduce(numSlaveContactPointsReducing, sumOp()); if(Pstream::master()) - { + { OFstream& contactFile = *contactFilePtr_; // contactFile << cp_.U().time().value() << "\t\t" << contactStep << "\t\t" << contactIterNum_ // << "\t\t" << penaltyScaleFactor_ << "\t\t" << penaltyFactor << "\t\t" << numSlaveContactPoints // << "\t\t\t" << minSlavePointPenetration // << "\t\t" << numSlaveContactPointsReducing << endl; - + int width = 20; contactFile << cp_.U().time().value(); contactFile.width(width); diff --git a/applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.C b/applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.C index dfb760925..70a60450d 100644 --- a/applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.C +++ b/applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.C @@ -88,11 +88,11 @@ contactProblem::contactProblem Istream& is = lookup("contacts"); PtrList contactEntries(is); - + contactPatchPairList& contacts = *this; - + contacts.setSize(contactEntries.size()); - + forAll(contacts, contactI) { contacts.set @@ -110,7 +110,7 @@ contactProblem::contactProblem Info << "Contact problem constructed" << endl; } - + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // @@ -204,7 +204,7 @@ tmp contactProblem::contactArea() const mag( mesh().Sf().boundaryField()[slaveIndex] ) - ); + ); Info << "\nContact area of master patch is: " << contactAreaMaster << " m^2" << "\nContact area of slave patch is: " @@ -223,16 +223,16 @@ tmp contactProblem::contactArea() const void contactProblem::contactGapPoints(pointScalarField& cGapPoints) { const contactPatchPairList& contacts = *this; - + scalarField& cGapPointsInternal = cGapPoints.internalField(); - + forAll (contacts, contactI) { scalarField masterGapPoints = contacts[contactI].masterGapPoints(); - labelList masterBoundaryLabels = mesh().boundaryMesh()[contacts[contactI].masterPatch().index()].meshPoints(); - + labelList masterBoundaryLabels = mesh().boundaryMesh()[contacts[contactI].masterPatch().index()].meshPoints(); + scalarField slaveGapPoints = contacts[contactI].slaveGapPoints(); - labelList slaveBoundaryLabels = mesh().boundaryMesh()[contacts[contactI].slavePatch().index()].meshPoints(); + labelList slaveBoundaryLabels = mesh().boundaryMesh()[contacts[contactI].slavePatch().index()].meshPoints(); forAll(masterBoundaryLabels, pointI) { @@ -252,17 +252,17 @@ void contactProblem::contactPointForce(pointVectorField& cPointForce) { pointMesh pMesh(mesh()); const contactPatchPairList& contacts = *this; - + vectorField& cPointForceInternal = cPointForce.internalField(); - + forAll (contacts, contactI) { vectorField masterContactPointForce = contacts[contactI].masterPointForce(); labelList masterBoundaryLabels = pMesh.boundary()[contacts[contactI].masterPatch().index()].meshPoints(); - + vectorField slaveContactPointForce = contacts[contactI].slavePointForce(); labelList slaveBoundaryLabels = pMesh.boundary()[contacts[contactI].slavePatch().index()].meshPoints(); - + forAll(masterBoundaryLabels, pointI) { cPointForceInternal[masterBoundaryLabels[pointI]] = masterContactPointForce[pointI]; diff --git a/applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.H b/applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.H index 9a915aaa9..2ee69da36 100644 --- a/applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.H +++ b/applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.H @@ -135,7 +135,7 @@ public: //- Return contact pressure field tmp contactPressure() const; - + //- Return a list of contact patch pair names wordList names() const; diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/analyticalPlateHoleTraction/analyticalPlateHoleTractionFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/analyticalPlateHoleTraction/analyticalPlateHoleTractionFvPatchVectorField.C index dfca8536d..8e665b3f8 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/analyticalPlateHoleTraction/analyticalPlateHoleTractionFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/analyticalPlateHoleTraction/analyticalPlateHoleTractionFvPatchVectorField.C @@ -142,7 +142,7 @@ void analyticalPlateHoleTractionFvPatchVectorField::updateCoeffs() const rheologyModel& rheology = this->db().objectRegistry::lookupObject("rheologyProperties"); - scalarField mu = + scalarField mu = rheology.mu()().boundaryField()[patch().index()]; scalarField lambda = rheology.lambda()().boundaryField()[patch().index()]; @@ -158,21 +158,21 @@ void analyticalPlateHoleTractionFvPatchVectorField::updateCoeffs() { vector curC(Cf[faceI].x(), Cf[faceI].y(), 0); vector curN = n[faceI]; - + if (patch().name() == "hole") { curC /= mag(curC); curC *= 0.5; - + curN = -curC/mag(curC); } - - Traction[faceI] = + + Traction[faceI] = (n[faceI] & plateHoleSolution(curC)); } //- set patch gradient - vectorField newGradient = + vectorField newGradient = Traction - (n & (mu*gradU.T() - (mu + lambda)*gradU)) - n*lambda*tr(gradU); @@ -233,7 +233,7 @@ symmTensor analyticalPlateHoleTractionFvPatchVectorField::plateHoleSolution(cons coordinateSystem cs("polarCS", C, vector(0, 0, 1), C/mag(C)); sigma.xx() = - T*(1 - sqr(a)/sqr(r))/2 + T*(1 - sqr(a)/sqr(r))/2 + T*(1 + 3*pow(a,4)/pow(r,4) - 4*sqr(a)/sqr(r))*::cos(2*theta)/2; sigma.xy() = @@ -242,7 +242,7 @@ symmTensor analyticalPlateHoleTractionFvPatchVectorField::plateHoleSolution(cons sigma.yx() = sigma.xy(); sigma.yy() = - T*(1 + sqr(a)/sqr(r))/2 + T*(1 + sqr(a)/sqr(r))/2 - T*(1 + 3*pow(a,4)/pow(r,4))*::cos(2*theta)/2; @@ -254,7 +254,7 @@ symmTensor analyticalPlateHoleTractionFvPatchVectorField::plateHoleSolution(cons S.xx() = sigma.xx(); S.xy() = sigma.xy(); S.yy() = sigma.yy(); - + return S; } diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C index b76999797..281fcba44 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C @@ -245,7 +245,7 @@ void cohesiveLawFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); traction_.writeEntry("traction", os); - os.writeKeyword("cohesiveLaw") << law().type() + os.writeKeyword("cohesiveLaw") << law().type() << token::END_STATEMENT << nl; os.writeKeyword("relaxationFactor") << relaxationFactor_ << token::END_STATEMENT << nl; diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C index 22fd6460a..0345449e8 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C @@ -104,7 +104,7 @@ cohesiveZoneFvPatchVectorField::cohesiveZoneFvPatchVectorField { this->refValue() = vector::zero; } - + if (dict.found("refGradient")) { this->refGrad() = vectorField("refGradient", dict, p.size()); @@ -116,7 +116,7 @@ cohesiveZoneFvPatchVectorField::cohesiveZoneFvPatchVectorField if (dict.found("valueFraction")) { - this->valueFraction() = + this->valueFraction() = symmTensorField("valueFraction", dict, p.size()); } else @@ -210,7 +210,7 @@ void cohesiveZoneFvPatchVectorField::updateCoeffs() const rheologyModel& rheology = this->db().objectRegistry::lookupObject("rheologyProperties"); - const scalarField mu = + const scalarField mu = rheology.mu()().boundaryField()[patch().index()]; const scalarField lambda = @@ -280,17 +280,17 @@ void cohesiveZoneFvPatchVectorField::updateCoeffs() if(magSqr(valueFraction()[faceI]) < SMALL) { - cohesiveTraction = - relaxationFactor_*cohesiveTraction + cohesiveTraction = + relaxationFactor_*cohesiveTraction + (1.0 - relaxationFactor_)*sigmaN[faceI]*n[faceI]; refGrad()[faceI] = ( cohesiveTraction - ( - n[faceI] + n[faceI] & ( - mu[faceI]*gradField[faceI].T() + mu[faceI]*gradField[faceI].T() - (mu[faceI] + lambda[faceI])*gradField[faceI] ) ) @@ -308,7 +308,7 @@ void cohesiveZoneFvPatchVectorField::updateCoeffs() void cohesiveZoneFvPatchVectorField::write(Ostream& os) const { directionMixedFvPatchVectorField::write(os); - os.writeKeyword("cohesiveLaw") << law().type() + os.writeKeyword("cohesiveLaw") << law().type() << token::END_STATEMENT << nl; os.writeKeyword("relaxationFactor") << relaxationFactor_ << token::END_STATEMENT << nl; diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H index aed54e215..fa2434a30 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H @@ -175,7 +175,7 @@ public: //- Update the coefficients associated with the patch field virtual void updateCoeffs(); - + //- Write virtual void write(Ostream&) const; diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZoneIncremental/cohesiveZoneIncrementalFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZoneIncremental/cohesiveZoneIncrementalFvPatchVectorField.C index 109c6e618..fab52d3a7 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZoneIncremental/cohesiveZoneIncrementalFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZoneIncremental/cohesiveZoneIncrementalFvPatchVectorField.C @@ -94,8 +94,8 @@ cohesiveZoneIncrementalFvPatchVectorField::cohesiveZoneIncrementalFvPatchVectorF ( cohesiveLaw::New(dict.lookup("cohesiveLaw"), dict).ptr() ), - crackIndicator_(p.size(), 0.0), - crazeIndicator_(p.size(), 0.0), + crackIndicator_(p.size(), 0.0), + crazeIndicator_(p.size(), 0.0), relaxationFactor_(readScalar(dict.lookup("relaxationFactor"))) { if (dict.found("refValue")) @@ -106,7 +106,7 @@ cohesiveZoneIncrementalFvPatchVectorField::cohesiveZoneIncrementalFvPatchVectorF { this->refValue() = vector::zero; } - + if (dict.found("refGradient")) { this->refGrad() = vectorField("refGradient", dict, p.size()); @@ -118,7 +118,7 @@ cohesiveZoneIncrementalFvPatchVectorField::cohesiveZoneIncrementalFvPatchVectorF if (dict.found("valueFraction")) { - this->valueFraction() = + this->valueFraction() = symmTensorField("valueFraction", dict, p.size()); } else @@ -229,7 +229,7 @@ void cohesiveZoneIncrementalFvPatchVectorField::updateCoeffs() const rheologyModel& rheology = this->db().objectRegistry::lookupObject("rheologyProperties"); - scalarField mu = + scalarField mu = rheology.mu()().boundaryField()[patch().index()]; scalarField lambda = @@ -261,10 +261,10 @@ void cohesiveZoneIncrementalFvPatchVectorField::updateCoeffs() symmTensorField DEpsilonP(size(), symmTensor::zero); if(rheology.type() == plasticityModel::typeName) { - const plasticityModel& plasticity = + const plasticityModel& plasticity = refCast(rheology); - DEpsilonP = + DEpsilonP = plasticity.DEpsilonP().boundaryField()[patch().index()]; mu = plasticity.newMu().boundaryField()[patch().index()]; @@ -273,7 +273,7 @@ void cohesiveZoneIncrementalFvPatchVectorField::updateCoeffs() } // Patch stress increment - symmTensorField DSigma = + symmTensorField DSigma = 2*mu*(DEpsilon - DEpsilonP) + I*(lambda*tr(DEpsilon)); @@ -307,11 +307,11 @@ void cohesiveZoneIncrementalFvPatchVectorField::updateCoeffs() valueFraction()[faceI] = symmTensor::zero; crazeIndicator_[faceI] = 1; crackIndicator_[faceI] = 0; - + Pout << "Crack started at face: " << faceI << endl; // Cohesive traction - cohesiveTractionIncrement = + cohesiveTractionIncrement = n[faceI]*law().sigmaMax().value() - n[faceI]*oldSigmaN[faceI]; } @@ -333,7 +333,7 @@ void cohesiveZoneIncrementalFvPatchVectorField::updateCoeffs() else { // Calculate cohesive traction from cohesive zone model - cohesiveTractionIncrement = + cohesiveTractionIncrement = law().traction(2*Un)*n[faceI] - n[faceI]*oldSigmaN[faceI]; @@ -372,7 +372,7 @@ void cohesiveZoneIncrementalFvPatchVectorField::updateCoeffs() // else // { // // Calculate cohesive traction from cohesive zone model -// cohesiveTractionIncrement = +// cohesiveTractionIncrement = // law().traction(2*Un)*n[faceI] // - n[faceI]*oldSigmaN[faceI]; @@ -383,17 +383,17 @@ void cohesiveZoneIncrementalFvPatchVectorField::updateCoeffs() if(magSqr(valueFraction()[faceI]) < SMALL) { - cohesiveTractionIncrement = - relaxationFactor_*cohesiveTractionIncrement + cohesiveTractionIncrement = + relaxationFactor_*cohesiveTractionIncrement + (1.0 - relaxationFactor_)*DSigmaN[faceI]*n[faceI]; refGrad()[faceI] = ( cohesiveTractionIncrement - ( - n[faceI] + n[faceI] & ( - mu[faceI]*gradDU[faceI].T() + mu[faceI]*gradDU[faceI].T() - (mu[faceI] + lambda[faceI])*gradDU[faceI] ) ) @@ -427,7 +427,7 @@ void cohesiveZoneIncrementalFvPatchVectorField::updateCoeffs() // vectorField nGradUp = (n&gradU.patchInternalField()); // Field gradValue = -// this->patchInternalField() +// this->patchInternalField() // + 0.5*nGradUp/this->patch().deltaCoeffs() // + 0.5*refGrad()/this->patch().deltaCoeffs(); @@ -446,7 +446,7 @@ void cohesiveZoneIncrementalFvPatchVectorField::write(Ostream& os) const directionMixedFvPatchVectorField::write(os); // os.writeKeyword("fieldName") << fieldName_ << token::END_STATEMENT << nl; // os.writeKeyword("fieldIncrName") << fieldIncrName_ << token::END_STATEMENT << nl; - os.writeKeyword("cohesiveLaw") << law().type() + os.writeKeyword("cohesiveLaw") << law().type() << token::END_STATEMENT << nl; crazeIndicator_.writeEntry("crazeIndicator", os); crackIndicator_.writeEntry("crackIndicator", os); @@ -460,7 +460,7 @@ void cohesiveZoneIncrementalFvPatchVectorField::write(Ostream& os) const makePatchTypeField ( - fvPatchVectorField, + fvPatchVectorField, cohesiveZoneIncrementalFvPatchVectorField ); diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZoneIncremental/cohesiveZoneIncrementalFvPatchVectorField.H b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZoneIncremental/cohesiveZoneIncrementalFvPatchVectorField.H index b0996fe1e..0f556f9db 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZoneIncremental/cohesiveZoneIncrementalFvPatchVectorField.H +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/cohesiveZoneIncremental/cohesiveZoneIncrementalFvPatchVectorField.H @@ -106,7 +106,7 @@ public: const dictionary& ); - //- Construct by mapping given + //- Construct by mapping given // cohesiveZoneIncrementalFvPatchVectorField onto // a new patch cohesiveZoneIncrementalFvPatchVectorField @@ -196,7 +196,7 @@ public: //- Update the coefficients associated with the patch field virtual void updateCoeffs(); - + // //- Evaluate the patch field // virtual void evaluate(); diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacement/fixedDisplacementFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacement/fixedDisplacementFvPatchVectorField.C index 90ca9ee0f..46f318f1f 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacement/fixedDisplacementFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacement/fixedDisplacementFvPatchVectorField.C @@ -120,7 +120,7 @@ snGrad() const { //- fixedValue snGrad with no correction // return (*this - patchInternalField())*this->patch().deltaCoeffs(); - + const fvPatchField& gradField = patch().lookupPatchField ( @@ -133,9 +133,9 @@ snGrad() const //- correction vector vectorField k = delta - n*(n&delta); - return + return ( - *this + *this - (patchInternalField() + (k&gradField.patchInternalField())) )*this->patch().deltaCoeffs(); } diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.C index 01ca316e9..c78d40f3f 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.C @@ -195,14 +195,14 @@ void fixedDisplacementZeroShearFvPatchVectorField::updateCoeffs() //---------------------------// const rheologyModel& rheology = this->db().objectRegistry::lookupObject("rheologyProperties"); - scalarField mu = + scalarField mu = rheology.mu()().boundaryField()[patch().index()]; scalarField lambda = rheology.lambda()().boundaryField()[patch().index()]; if(rheology.type() == plasticityModel::typeName) { - const plasticityModel& plasticity = + const plasticityModel& plasticity = refCast(rheology); mu = plasticity.newMu().boundaryField()[patch().index()]; @@ -247,7 +247,7 @@ void fixedDisplacementZeroShearFvPatchVectorField::updateCoeffs() { const fvPatchField& sigma = patch().lookupPatchField("sigma"); - + //- increment of traction Traction = -(n & sigma); } @@ -255,7 +255,7 @@ void fixedDisplacementZeroShearFvPatchVectorField::updateCoeffs() //---------------------------// //- calculate the normal gradient based on the traction //---------------------------// - vectorField newGradient = + vectorField newGradient = Traction - (n & (mu*gradField.T() - (mu + lambda)*gradField)) - n*lambda*tr(gradField); @@ -263,7 +263,7 @@ void fixedDisplacementZeroShearFvPatchVectorField::updateCoeffs() //- if there is plasticity if(rheology.type() == plasticityModel::typeName) { - const plasticityModel& plasticity = + const plasticityModel& plasticity = refCast(rheology); newGradient += @@ -275,16 +275,16 @@ void fixedDisplacementZeroShearFvPatchVectorField::updateCoeffs() { const thermalModel& thermo = this->db().objectRegistry::lookupObject("thermalProperties"); - + const fvPatchField& T = patch().lookupPatchField("T"); - + const scalarField threeKalpha = (3*lambda + 2*mu)* thermo.alpha()().boundaryField()[patch().index()]; - + const scalarField T0 = thermo.T0()().boundaryField()[patch().index()]; - + newGradient += (n*threeKalpha*(T - T0)); } diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.H b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.H index 501b88bff..2d4c9bb0a 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.H +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.H @@ -70,7 +70,7 @@ class fixedDisplacementZeroShearFvPatchVectorField UPDATED_LAGRANGIAN, TOTAL_LAGRANGIAN }; - + static const NamedEnum nonLinearNames_; //- if it is a non linear solver diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedRotation/fixedRotationFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedRotation/fixedRotationFvPatchVectorField.C index 0f56006b6..eafab70e2 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedRotation/fixedRotationFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedRotation/fixedRotationFvPatchVectorField.C @@ -137,7 +137,7 @@ snGrad() const { //- fixedValue snGrad with no correction // return (*this - patchInternalField())*this->patch().deltaCoeffs(); - + const fvPatchField& gradField = patch().lookupPatchField ( @@ -150,9 +150,9 @@ snGrad() const //- correction vector vectorField k = delta - n*(n&delta); - return + return ( - *this + *this - (patchInternalField() + (k&gradField.patchInternalField())) )*this->patch().deltaCoeffs(); } @@ -175,9 +175,9 @@ void fixedRotationFvPatchVectorField::updateCoeffs() tensor rotMat = RodriguesRotation(rotationAxis_, rotationAngle_); const vectorField& oldFaceCentres = dimensionedInternalField().mesh().C().boundaryField()[patch().index()]; - + vectorField newFaceCentres = (rotMat & (oldFaceCentres - rotationOrigin_)) + rotationOrigin_; - + fvPatchField::operator== ( newFaceCentres - oldFaceCentres diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedRotation/fixedRotationFvPatchVectorField.H b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedRotation/fixedRotationFvPatchVectorField.H index bf7b0984c..e740e95a0 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedRotation/fixedRotationFvPatchVectorField.H +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedRotation/fixedRotationFvPatchVectorField.H @@ -152,7 +152,7 @@ public: //- Update the coefficients associated with the patch field virtual void updateCoeffs(); - + //- Return the matrix source coefficients corresponding to the // evaluation of the gradient of this patchField virtual tmp > gradientBoundaryCoeffs() const; diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidDirectionMixed/solidDirectionMixedFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidDirectionMixed/solidDirectionMixedFvPatchVectorField.C index a6641ea79..845aed0b6 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidDirectionMixed/solidDirectionMixedFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidDirectionMixed/solidDirectionMixedFvPatchVectorField.C @@ -80,7 +80,7 @@ solidDirectionMixedFvPatchVectorField::solidDirectionMixedFvPatchVectorField Field gradValue = this->patchInternalField() + refGrad()/this->patch().deltaCoeffs(); - + //- non-ortho corrected gradValue //- gradField will not have been created so I must do this during updateCoeffs /*const fvPatchField& gradField = @@ -95,7 +95,7 @@ solidDirectionMixedFvPatchVectorField::solidDirectionMixedFvPatchVectorField Field transformGradValue = transform(I - valueFraction(), gradValue); - + Field::operator=(normalValue + transformGradValue); } @@ -144,13 +144,13 @@ void solidDirectionMixedFvPatchVectorField::evaluate(const Pstream::commsTypes) { this->updateCoeffs(); } - + Field normalValue = transform(valueFraction(), refValue()); //- no correction //Field gradValue = //this->patchInternalField() + refGrad()/this->patch().deltaCoeffs(); - + //- non-ortho corrected gradValue const fvPatchField& gradField = patch().lookupPatchField("grad(" +fieldName_ + ")"); @@ -160,7 +160,7 @@ void solidDirectionMixedFvPatchVectorField::evaluate(const Pstream::commsTypes) Field gradValue = this->patchInternalField() + (k&gradField.patchInternalField()) + refGrad()/this->patch().deltaCoeffs(); - + Field transformGradValue = transform(I - valueFraction(), gradValue); @@ -188,13 +188,13 @@ Foam::tmp > solidDirectionMixedFvPatchVectorField::snGrad() (this->refGrad()/this->patch().deltaCoeffs()) + (pif) + (k&gradField.patchInternalField()); - + Field transformGradValue = transform(I - (this->valueFraction()), gradValue); Field patchValue = normalValue + transformGradValue; - return + return ( patchValue - ((this->patchInternalField()) + (k&gradField.patchInternalField())) diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.C index 666b6367a..d9d1ba530 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.C @@ -72,7 +72,7 @@ solidTractionFvPatchVectorField { fvPatchVectorField::operator=(patchInternalField()); gradient() = vector::zero; - + Info << "Patch " << patch().name() << "\tTraction boundary field: " << fieldName_ << endl; @@ -96,7 +96,7 @@ solidTractionFvPatchVectorField //- the leastSquares has zero non-orthogonal correction //- on the boundary //- so the gradient scheme should be extendedLeastSquares - if + if ( Foam::word ( @@ -203,14 +203,14 @@ void solidTractionFvPatchVectorField::updateCoeffs() //---------------------------// const rheologyModel& rheology = this->db().objectRegistry::lookupObject("rheologyProperties"); - scalarField mu = + scalarField mu = rheology.mu()().boundaryField()[patch().index()]; scalarField lambda = rheology.lambda()().boundaryField()[patch().index()]; if(rheology.type() == plasticityModel::typeName) { - const plasticityModel& plasticity = + const plasticityModel& plasticity = refCast(rheology); mu = plasticity.newMu().boundaryField()[patch().index()]; @@ -244,7 +244,7 @@ void solidTractionFvPatchVectorField::updateCoeffs() { const fvPatchField& sigma = patch().lookupPatchField("sigma"); - + //- increment of traction Traction = (traction_ - n*pressure_) - (n & sigma); } @@ -253,7 +253,7 @@ void solidTractionFvPatchVectorField::updateCoeffs() { const fvPatchField& sigma = patch().lookupPatchField("sigma"); - + tensorField F = I + gradField; tensorField Finv = inv(F); scalarField J = det(F); @@ -282,7 +282,7 @@ void solidTractionFvPatchVectorField::updateCoeffs() //---------------------------// //- calculate the normal gradient based on the traction //---------------------------// - vectorField newGradient = + vectorField newGradient = Traction - (n & (mu*gradField.T() - (mu + lambda)*gradField)) - n*lambda*tr(gradField); @@ -290,7 +290,7 @@ void solidTractionFvPatchVectorField::updateCoeffs() //- if there is plasticity if(rheology.type() == plasticityModel::typeName) { - const plasticityModel& plasticity = + const plasticityModel& plasticity = refCast(rheology); newGradient += @@ -302,15 +302,15 @@ void solidTractionFvPatchVectorField::updateCoeffs() { const thermalModel& thermo = this->db().objectRegistry::lookupObject("thermalProperties"); - + const fvPatchField& T = patch().lookupPatchField("T"); const fvPatchField& threeKalpha = patch().lookupPatchField("((threeK*rho)*alpha)"); - + const scalarField T0 = thermo.T0()().boundaryField()[patch().index()]; - + newGradient += (n*threeKalpha*(T - T0)); } diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.H b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.H index c4f1b6083..4d121d9e6 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.H +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.H @@ -79,7 +79,7 @@ class solidTractionFvPatchVectorField UPDATED_LAGRANGIAN, TOTAL_LAGRANGIAN }; - + static const NamedEnum nonLinearNames_; //- if it is a non linear solver diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.C index 79c90c974..88e66f5d1 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.C @@ -92,7 +92,7 @@ solidTractionFreeFvPatchVectorField //- the leastSquares has zero non-orthogonal correction //- on the boundary //- so the gradient scheme should be extendedLeastSquares - if + if ( Foam::word ( @@ -185,14 +185,14 @@ void solidTractionFreeFvPatchVectorField::updateCoeffs() //---------------------------// const rheologyModel& rheology = this->db().objectRegistry::lookupObject("rheologyProperties"); - scalarField mu = + scalarField mu = rheology.mu()().boundaryField()[patch().index()]; scalarField lambda = rheology.lambda()().boundaryField()[patch().index()]; if(rheology.type() == plasticityModel::typeName) { - const plasticityModel& plasticity = + const plasticityModel& plasticity = refCast(rheology); mu = plasticity.newMu().boundaryField()[patch().index()]; @@ -220,7 +220,7 @@ void solidTractionFreeFvPatchVectorField::updateCoeffs() { const fvPatchField& sigma = patch().lookupPatchField("sigma"); - + //- increment of traction Traction = - (n & sigma); } @@ -229,7 +229,7 @@ void solidTractionFreeFvPatchVectorField::updateCoeffs() //---------------------------// //- calculate the normal gradient based on the traction //---------------------------// - vectorField newGradient = + vectorField newGradient = Traction - (n & (mu*gradField.T() - (mu + lambda)*gradField)) - n*lambda*tr(gradField); @@ -237,7 +237,7 @@ void solidTractionFreeFvPatchVectorField::updateCoeffs() //- if there is plasticity if(rheology.type() == plasticityModel::typeName) { - const plasticityModel& plasticity = + const plasticityModel& plasticity = refCast(rheology); newGradient += @@ -249,15 +249,15 @@ void solidTractionFreeFvPatchVectorField::updateCoeffs() { const thermalModel& thermo = this->db().objectRegistry::lookupObject("thermalProperties"); - + const fvPatchField& T = patch().lookupPatchField("T"); - + const fvPatchField& threeKalpha = patch().lookupPatchField("((threeK*rho)*alpha)"); - + const scalarField T0 = thermo.T0()().boundaryField()[patch().index()]; - + newGradient += (n*threeKalpha*(T - T0)); } diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.H b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.H index d162ffad5..2f0ec8983 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.H +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.H @@ -73,7 +73,7 @@ class solidTractionFreeFvPatchVectorField UPDATED_LAGRANGIAN, TOTAL_LAGRANGIAN }; - + static const NamedEnum nonLinearNames_; //- if it is a non linear solver diff --git a/applications/solvers/solidMechanics/solidModels/fvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/solidMechanics/solidModels/fvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C index 764d08ea9..8d42f6ff6 100644 --- a/applications/solvers/solidMechanics/solidModels/fvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/solidModels/fvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C @@ -171,7 +171,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs() const fvPatchField& gradU = patch().lookupPatchField("grad(" +UName_ + ")"); - + gradient() = ( (traction_ - (pressure_)*n) diff --git a/applications/solvers/solidMechanics/solidModels/interpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C b/applications/solvers/solidMechanics/solidModels/interpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C index e2bed35e7..e6b922a2b 100644 --- a/applications/solvers/solidMechanics/solidModels/interpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C +++ b/applications/solvers/solidMechanics/solidModels/interpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C @@ -44,10 +44,10 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); const fvMesh& mesh = mesh_; const pointField& points = mesh.points(); - + //- construct 4x4 A matrix for each point //List& A = A_; - + //- populate A matrix forAll(points, pointi) { @@ -60,33 +60,33 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); forAll(pointCells, pointCelli) { const label& celli = pointCells[pointCelli]; - + const scalar& x = mesh.C()[celli].component(vector::X); const scalar& y = mesh.C()[celli].component(vector::Y); const scalar& z = mesh.C()[celli].component(vector::Z); - + A[pointi][0][0] += x*x; A[pointi][0][1] += x*y; A[pointi][0][2] += x*z; A[pointi][0][3] += x; - + A[pointi][1][0] += x*y; A[pointi][1][1] += y*y; A[pointi][1][2] += y*z; A[pointi][1][3] += y; - + A[pointi][2][0] += x*z; A[pointi][2][1] += y*z; A[pointi][2][2] += z*z; A[pointi][2][3] += z; - + A[pointi][3][0] += x; A[pointi][3][1] += y; A[pointi][3][2] += z; //A[pointi][3][3] = pointCells.size(); // set above } } - + //- for boundary points we will include the surrounding face centres forAll(mesh.boundary(), patchi) { @@ -115,24 +115,24 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); const scalar& x = neiCellC[neiCelli].component(vector::X); const scalar& y = neiCellC[neiCelli].component(vector::Y); const scalar& z = neiCellC[neiCelli].component(vector::Z); - + label globalPointi = mesh.boundaryMesh()[patchi].meshPoints()[pointi]; A[globalPointi][0][0] += x*x; A[globalPointi][0][1] += x*y; A[globalPointi][0][2] += x*z; A[globalPointi][0][3] += x; - + A[globalPointi][1][0] += x*y; A[globalPointi][1][1] += y*y; A[globalPointi][1][2] += y*z; A[globalPointi][1][3] += y; - + A[globalPointi][2][0] += x*z; A[globalPointi][2][1] += y*z; A[globalPointi][2][2] += z*z; A[globalPointi][2][3] += z; - + A[globalPointi][3][0] += x; A[globalPointi][3][1] += y; A[globalPointi][3][2] += z; @@ -144,7 +144,7 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); { //- each point must use at least 4 neighbouring locations otherwise A is singular //- and simpleMatrix will cannot invert it - //- therefore empty patches values are included to make sure A is not singular + //- therefore empty patches values are included to make sure A is not singular forAll(pointFaces, pointi) { label globalPointi = mesh.boundaryMesh()[patchi].meshPoints()[pointi]; @@ -156,22 +156,22 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); const scalar& x = faceCentres[facei].component(vector::X); const scalar& y = faceCentres[facei].component(vector::Y); const scalar& z = faceCentres[facei].component(vector::Z); - + A[globalPointi][0][0] += x*x; A[globalPointi][0][1] += x*y; A[globalPointi][0][2] += x*z; A[globalPointi][0][3] += x; - + A[globalPointi][1][0] += x*y; A[globalPointi][1][1] += y*y; A[globalPointi][1][2] += y*z; A[globalPointi][1][3] += y; - + A[globalPointi][2][0] += x*z; A[globalPointi][2][1] += y*z; A[globalPointi][2][2] += z*z; A[globalPointi][2][3] += z; - + A[globalPointi][3][0] += x; A[globalPointi][3][1] += y; A[globalPointi][3][2] += z; @@ -189,7 +189,7 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); const fvMesh& mesh = mesh_; const pointField& points = mesh.points(); - + //List >& B = B_; for (direction compi = 0; compi < 3; compi++) @@ -197,31 +197,31 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); forAll(points, pointi) { const labelList& pointCells = mesh.pointCells()[pointi]; - + forAll(pointCells, pointCelli) { const label& celli = pointCells[pointCelli]; - + const scalar& x = mesh.C()[celli].component(vector::X); const scalar& y = mesh.C()[celli].component(vector::Y); const scalar& z = mesh.C()[celli].component(vector::Z); - + const scalar& phiCompi = vf.internalField()[celli].component(compi); - + B[pointi][0].component(compi) += phiCompi*x; B[pointi][1].component(compi) += phiCompi*y; B[pointi][2].component(compi) += phiCompi*z; B[pointi][3].component(compi) += phiCompi; } } - + //- for boundary points we will include the surrounding face centres forAll(mesh.boundary(), patchi) { const vectorField& faceCentres = mesh.boundaryMesh()[patchi].faceCentres(); const labelListList& pointFaces = mesh.boundaryMesh()[patchi].pointFaces(); const labelList& faceCells = mesh.boundaryMesh()[patchi].faceCells(); - + //- fix: do not calculate B for empty patches - philipc if(mesh.boundary()[patchi].coupled()) { @@ -236,7 +236,7 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); faceCellC[facei] = mesh.C()[celli]; } vectorField neiCellC = faceCellC + pDelta; - + vectorField phiNeiField = vf.boundaryField()[patchi].patchNeighbourField(); forAll(pointFaces, pointi) @@ -247,9 +247,9 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); const scalar& x = neiCellC[neiCelli].component(vector::X); const scalar& y = neiCellC[neiCelli].component(vector::Y); const scalar& z = neiCellC[neiCelli].component(vector::Z); - + label globalPointi = mesh.boundaryMesh()[patchi].meshPoints()[pointi]; - + //- this is the value of phi at the cell centre in the neighbour (i.e. across the interface) scalar phiCompi = phiNeiField[neiCelli].component(compi); @@ -264,7 +264,7 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); { //- each point must use at least 4 neighbouring locations otherwise A is singular //- and simpleMatrix will cannot invert it - //- therefore empty patches values are included to make sure A is not singular + //- therefore empty patches values are included to make sure A is not singular forAll(pointFaces, pointi) { forAll(pointFaces[pointi], pointFacei) @@ -274,7 +274,7 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); const scalar& x = faceCentres[facei].component(vector::X); const scalar& y = faceCentres[facei].component(vector::Y); const scalar& z = faceCentres[facei].component(vector::Z); - + label globalPointi = mesh.boundaryMesh()[patchi].meshPoints()[pointi]; scalar phiCompi = 0.0; @@ -297,9 +297,9 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); } } } //- end of forAll boundary - } //- end of for all components + } //- end of for all components } - + void leastSquaresVolPointInterpolation::interpolate ( @@ -337,19 +337,19 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); //- solve using Gauss elimination or LU decomposition with pivoting //Field leastSquaresSol = leastSquaresMatrix.solve(); Field leastSquaresSol = leastSquaresMatrix.LUsolve(); - + const scalar& x = mesh.points()[pointi].component(vector::X); const scalar& y = mesh.points()[pointi].component(vector::Y); const scalar& z = mesh.points()[pointi].component(vector::Z); - + //- calculate phi at vertex for (direction compi = 0; compi < 3; compi++) - { + { const scalar& a = leastSquaresSol[0].component(compi); const scalar& b = leastSquaresSol[1].component(compi); const scalar& c = leastSquaresSol[2].component(compi); const scalar& d = leastSquaresSol[3].component(compi); - + pf[pointi].component(compi) = a*x + b*y + c*z + d; } } @@ -358,9 +358,9 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); pf.correctBoundaryConditions(); } - + // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // - + leastSquaresVolPointInterpolation::leastSquaresVolPointInterpolation(const fvMesh& vm) : mesh_(vm) //, @@ -369,7 +369,7 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); { //calcA(); } - + // * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * // leastSquaresVolPointInterpolation::~leastSquaresVolPointInterpolation() diff --git a/applications/solvers/solidMechanics/solidModels/plasticityModel/plasticityModel.C b/applications/solvers/solidMechanics/solidModels/plasticityModel/plasticityModel.C index 8c21cff3e..600a3c9df 100644 --- a/applications/solvers/solidMechanics/solidModels/plasticityModel/plasticityModel.C +++ b/applications/solvers/solidMechanics/solidModels/plasticityModel/plasticityModel.C @@ -125,7 +125,7 @@ void plasticityModel::correct() // rheologyModel::correct(); Info << "\tCorrecting plasticity model ... " << flush; - const volSymmTensorField DEpsilon = + const volSymmTensorField DEpsilon = symm(gradDU_) + dimensioned ( @@ -135,7 +135,7 @@ void plasticityModel::correct() ); const volScalarField epsilonEq = - sqrt((2.0/3.0)*magSqr(dev(epsilon_ + DEpsilon))) + sqrt((2.0/3.0)*magSqr(dev(epsilon_ + DEpsilon))) + dimensionedScalar("SMALL", dimless, SMALL); scalarField& sigmaYI = sigmaY_.internalField(); @@ -164,7 +164,7 @@ void plasticityModel::correct() - sqrt((2.0/3.0)*magSqr(dev(epsilon_))) + dimensionedScalar("SMALL", dimless, SMALL); - const volSymmTensorField DSigma = + const volSymmTensorField DSigma = 2*mu_*(DEpsilon - DEpsilonP_) + I*(lambda_*tr(DEpsilon)); const volSymmTensorField& oldSigma = sigma(); @@ -173,7 +173,7 @@ void plasticityModel::correct() const volSymmTensorField sigma_ = sigma() + DSigma; - const volScalarField sigmaEq = + const volScalarField sigmaEq = sqrt(1.5*magSqr(dev(sigma_))) + dimensionedScalar("SMALL", dimPressure, SMALL); @@ -226,9 +226,9 @@ void plasticityModel::correct() { betaI[cellI] = 0.0; curDEpsEPred = DEpsilonI[cellI]; - + if - ( + ( (DEpsilonEqI[cellI] >= 0) && (sigmaEqEI[cellI] >= sigmaYI[cellI]) ) @@ -236,29 +236,29 @@ void plasticityModel::correct() scalar C = sqr(oldSigmaEqI[cellI]) - sqr(sigmaYI[cellI]); scalar B = 3.0*(dev(oldSigmaI[cellI]) && dev(DSigmaEI[cellI])); scalar A = sqr(DSigmaEqEI[cellI]); - + scalar alpha = (-B + ::sqrt(mag(B*B - 4*A*C)))/(2*A + SMALL); - // scalar alpha = (-B + ::sqrt((B*B - 4*A*C)))/(2*A + SMALL); + // scalar alpha = (-B + ::sqrt((B*B - 4*A*C)))/(2*A + SMALL); curDEpsEPred = alpha/(2.0*muI[cellI] + SMALL) *( - DSigmaEI[cellI] + DSigmaEI[cellI] - (lambdaI[cellI]/(2*muI[cellI] + 3*lambdaI[cellI] + SMALL)) *tr(DSigmaEI[cellI])*I ); - + betaI[cellI] = 1.0 - (devSigmaI[cellI] && curDEpsEPred) /((devSigmaI[cellI] && DEpsilonI[cellI]) + SMALL); } } - + betaI[cellI] = max(betaI[cellI], 0.0); betaI[cellI] = min(betaI[cellI], 1.0); } - + // Update beta at boundary forAll(beta_.boundaryField(), patchI) { @@ -269,40 +269,40 @@ void plasticityModel::correct() const scalarField& sigmaYPatch = sigmaY_.boundaryField()[patchI]; - const symmTensorField& DEpsilonPatch = + const symmTensorField& DEpsilonPatch = DEpsilon.boundaryField()[patchI]; - const scalarField DEpsilonEqPatch = + const scalarField DEpsilonEqPatch = DEpsilonEq.boundaryField()[patchI]; - const symmTensorField& oldSigmaPatch = + const symmTensorField& oldSigmaPatch = oldSigma.boundaryField()[patchI]; - const scalarField& oldSigmaEqPatch = + const scalarField& oldSigmaEqPatch = oldSigmaEq.boundaryField()[patchI]; - const symmTensorField& devSigmaPatch = + const symmTensorField& devSigmaPatch = devSigma.boundaryField()[patchI]; - const symmTensorField& DSigmaEPatch = DSigmaE.boundaryField()[patchI]; + const symmTensorField& DSigmaEPatch = DSigmaE.boundaryField()[patchI]; const scalarField& sigmaEqEPatch = sigmaEqE.boundaryField()[patchI]; const scalarField& DSigmaEqEPatch = DSigmaEqE.boundaryField()[patchI]; - const scalarField& oldBetaPatch = + const scalarField& oldBetaPatch = beta_.oldTime().boundaryField()[patchI]; scalarField& betaPatch = beta_.boundaryField()[patchI]; - + forAll(betaPatch, faceI) { tensor curDEpsEPred = tensor::zero; if - ( - (DEpsilonEqPatch[faceI] >= 0) - && (oldBetaPatch[faceI] > SMALL) + ( + (DEpsilonEqPatch[faceI] >= 0) + && (oldBetaPatch[faceI] > SMALL) ) { betaPatch[faceI] = 1; @@ -312,17 +312,17 @@ void plasticityModel::correct() { betaPatch[faceI] = 0; curDEpsEPred = DEpsilonPatch[faceI]; - + if - ( + ( (DEpsilonEqPatch[faceI] >= 0) - && (sigmaEqEPatch[faceI] >= sigmaYPatch[faceI]) + && (sigmaEqEPatch[faceI] >= sigmaYPatch[faceI]) ) { - scalar C = - sqr(oldSigmaEqPatch[faceI]) + scalar C = + sqr(oldSigmaEqPatch[faceI]) - sqr(sigmaYPatch[faceI]); - scalar B = + scalar B = 3.0 *( dev(oldSigmaPatch[faceI]) @@ -334,7 +334,7 @@ void plasticityModel::correct() //scalar alpha = (-B + ::sqrt((B*B-4*A*C)))/(2*A + SMALL); - curDEpsEPred = + curDEpsEPred = alpha/(2.0*muPatch[faceI] + SMALL) *( DSigmaEPatch[faceI] @@ -346,23 +346,23 @@ void plasticityModel::correct() ); betaPatch[faceI] = - 1.0 + 1.0 - (devSigmaPatch[faceI] && curDEpsEPred) /((devSigmaPatch[faceI] && DEpsilonPatch[faceI]) + SMALL); } } - - betaPatch[faceI] = max(betaPatch[faceI], 0.0); + + betaPatch[faceI] = max(betaPatch[faceI], 0.0); betaPatch[faceI] = min(betaPatch[faceI], 1.0); } } } - + // Update plastic strain increment - scalar rf = + scalar rf = readScalar(plasticityModelCoeffs_.lookup("relaxationFactor")); - volSymmTensorField newDEpsilonP = + volSymmTensorField newDEpsilonP = 4.5*beta_*mu_*(devSigma && DEpsilon)*devSigma /( (Ep_ + 3*mu_)*sqr(sigmaEq) @@ -409,9 +409,9 @@ void plasticityModel::updateYieldStress() { sigmaYI[cellI] = sigmaEqI[cellI]; - Info << " Internal cell " << cellI + Info << " Internal cell " << cellI << " Yield stress updated to Sy= " - << sigmaEqI[cellI] * 1.0E-06 << " MPa" + << sigmaEqI[cellI] * 1.0E-06 << " MPa" << endl; } } @@ -435,13 +435,13 @@ void plasticityModel::updateYieldStress() Info << "Boundary cell " << patchI << " " << faceI << " Yield stress updated to Sy= " - << sigmaEqPatch[faceI] * 1.0E-06 << " MPa" + << sigmaEqPatch[faceI] * 1.0E-06 << " MPa" << endl; - } + } } } } - } + } Info << "done" << endl; } diff --git a/applications/solvers/solidMechanics/solidModels/plasticityModel/plasticityModel.H b/applications/solvers/solidMechanics/solidModels/plasticityModel/plasticityModel.H index 266727264..f8deccbf5 100644 --- a/applications/solvers/solidMechanics/solidModels/plasticityModel/plasticityModel.H +++ b/applications/solvers/solidMechanics/solidModels/plasticityModel/plasticityModel.H @@ -111,17 +111,17 @@ public: { return DEpsilonP_; } - + const volScalarField& newMu() const { return mu_; } - + const volScalarField& newLambda() const { return lambda_; } - + //- Correct plastic strain increment virtual void correct(); diff --git a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C index ce08a4439..e7c08e118 100644 --- a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C +++ b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C @@ -107,7 +107,7 @@ Foam::tmp Foam::BurgersViscoelastic::E(scalar t) const + eta2_.value()/k2_.value(); scalar p2 = eta1_.value()*eta2_.value()/(k1_.value()*k2_.value()); - + scalar q1 = eta1_.value(); scalar q2 = eta1_.value()*eta2_.value()/k2_.value(); @@ -120,7 +120,7 @@ Foam::tmp Foam::BurgersViscoelastic::E(scalar t) const E = (q1 - q2*r1)*exp(-r1*t)/A - (q1 - q2*r2)*exp(-r2*t)/A; } - + tmp tresult ( @@ -178,7 +178,7 @@ Foam::tmp Foam::BurgersViscoelastic::J(scalar t) const if(t >= 0) { - J = 1.0/k1_.value() + J = 1.0/k1_.value() + (1 - exp(-k2_.value()*t/eta2_.value()))/k2_.value() + t/eta1_.value(); } diff --git a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C index ea312d8b3..d6d2a4526 100644 --- a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C +++ b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C @@ -102,14 +102,14 @@ Foam::tmp Foam::KelvinSLSViscoelastic::E(scalar t) const if(t>=0) { scalar p1 = eta2_.value()/(k1_.value() + k2_.value()); - + scalar q0 = k1_.value()*k2_.value()/(k1_.value() + k2_.value()); scalar q1 = k1_.value()*eta2_.value()/(k1_.value() + k2_.value()); E = q0 + (q1/p1 - q0)*exp(-t/p1); } - + tmp tresult ( @@ -168,7 +168,7 @@ Foam::tmp Foam::KelvinSLSViscoelastic::J(scalar t) const if(t >= 0) { scalar p1 = eta2_.value()/(k1_.value() + k2_.value()); - + scalar q0 = k1_.value()*k2_.value()/(k1_.value() + k2_.value()); scalar q1 = k1_.value()*eta2_.value()/(k1_.value() + k2_.value()); diff --git a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C index b604380ca..883c9f3b2 100644 --- a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C +++ b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C @@ -183,8 +183,8 @@ Foam::MaxwellElasticViscoelastic::J(scalar t) const mesh(), dimensionedScalar ( - "J", - dimless/k_.dimensions(), + "J", + dimless/k_.dimensions(), 1.0/k_.value() + t/eta_.value() ), zeroGradientFvPatchScalarField::typeName diff --git a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C index a660196ae..cc3b7d900 100644 --- a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C +++ b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C @@ -101,7 +101,7 @@ Foam::tmp Foam::MaxwellSLSViscoelastic::E(scalar t) const { E = k2_.value() + k1_.value()*exp(-k1_.value()*t/eta1_.value()); } - + tmp tresult ( diff --git a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C index 51973f000..228adcda8 100644 --- a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C +++ b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C @@ -169,8 +169,8 @@ Foam::tmp Foam::MaxwellViscoelastic::J(scalar t) const mesh(), dimensionedScalar ( - "J", - dimless/k_.dimensions(), + "J", + dimless/k_.dimensions(), 1.0/k_.value() + t/eta_.value() ), zeroGradientFvPatchScalarField::typeName diff --git a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C index 8bc490cdc..08d264129 100644 --- a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C +++ b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C @@ -105,7 +105,7 @@ Foam::tmp Foam::PronyViscoelastic::E(scalar t) const { E += k_[i]*exp(-t/tau_[i]); } - + if(t < 0) { E = 0; @@ -162,7 +162,7 @@ Foam::tmp Foam::PronyViscoelastic::nu(scalar t) const Foam::tmp Foam::PronyViscoelastic::J(scalar t) const { notImplemented(type() + "::J(scalar t)"); - + return 1.0/E(t); } diff --git a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/elasticNLPlastic/elasticNLPlastic.C b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/elasticNLPlastic/elasticNLPlastic.C index 66670d81c..81c3717a3 100755 --- a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/elasticNLPlastic/elasticNLPlastic.C +++ b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/elasticNLPlastic/elasticNLPlastic.C @@ -89,11 +89,11 @@ Foam::tmp Foam::elasticNLPlastic::rho() const Foam::tmp Foam::elasticNLPlastic::E() const { - // Correction of modulus of elasticity to account for + // Correction of modulus of elasticity to account for // stress-strain curve continuity! - // Done according to yield stress value - E = sigmaY/epsY! + // Done according to yield stress value - E = sigmaY/epsY! - dimensionedScalar Ecorr = + dimensionedScalar Ecorr = sigmaY_ /::exp ( @@ -103,7 +103,7 @@ Foam::tmp Foam::elasticNLPlastic::E() const /bCf_.value() ) /nCf_.value() - ); + ); return tmp ( @@ -217,7 +217,7 @@ Ep(const volScalarField& sigmaEq) const scalar epsY = exp ( log ( log(matStrength_/(matStrength_ - sigmaY_)).value() /bCf_.value() ) /nCf_.value() ); - dimensionedScalar Ecorr = sigmaY_ /epsY; + dimensionedScalar Ecorr = sigmaY_ /epsY; forAll(sigmaEqI, cellI) { @@ -227,7 +227,7 @@ Ep(const volScalarField& sigmaEq) const dimensionedScalar Ep = matStrength_*bCf_*nCf_ *pow(epsCurrI, nCf_ - 1.0) *exp(-bCf_*pow(epsCurrI, nCf_)); - tresult().internalField()[cellI] = + tresult().internalField()[cellI] = Ep.value()/(1.0 - Ep.value()/Ecorr.value()); } diff --git a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/nonLinearElasticPlastic/nonLinearElasticPlastic.C b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/nonLinearElasticPlastic/nonLinearElasticPlastic.C index 97cd68768..a79c5416a 100755 --- a/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/nonLinearElasticPlastic/nonLinearElasticPlastic.C +++ b/applications/solvers/solidMechanics/solidModels/rheologyModel/rheologyLaws/nonLinearElasticPlastic/nonLinearElasticPlastic.C @@ -129,7 +129,7 @@ E(const volScalarField& epsEq) const zeroGradientFvPatchScalarField::typeName ) ); - + scalar epsY = exp ( log ( log(matStrength_/(matStrength_ - sigmaY_)).value() /bCf_.value() ) /nCf_.value() ); @@ -141,7 +141,7 @@ E(const volScalarField& epsEq) const dimensionedScalar E = matStrength_*bCf_*nCf_ *pow(epsEqI[cellI], nCf_ - 1.0) *exp(-bCf_*pow(epsEqI[cellI], nCf_)); - // Correction of initial modulus to avoid infinity/GREAT + // Correction of initial modulus to avoid infinity/GREAT // for small strains and for unloading // strain of 0.1% might be wrong for some materials @@ -152,7 +152,7 @@ E(const volScalarField& epsEq) const } if(epsEqI[cellI] > epsY) - { + { E = matStrength_*bCf_*nCf_*pow(epsY, nCf_ - 1.0) *exp(-bCf_*pow(epsY, nCf_)); } @@ -269,7 +269,7 @@ Ep(const volScalarField& sigmaEq) const dimensionedScalar Ep = matStrength_*bCf_*nCf_ *pow(epsCurrI, nCf_ - 1.0) *exp(-bCf_*pow(epsCurrI, nCf_)); - tresult().internalField()[cellI] = + tresult().internalField()[cellI] = Ep.value()/(1.0 - Ep.value()/E.value()); } diff --git a/applications/solvers/solidMechanics/solidModels/solidInterface/solidInterface.C b/applications/solvers/solidMechanics/solidModels/solidInterface/solidInterface.C index cc00dfd15..ec189fa6f 100644 --- a/applications/solvers/solidMechanics/solidModels/solidInterface/solidInterface.C +++ b/applications/solvers/solidMechanics/solidModels/solidInterface/solidInterface.C @@ -66,8 +66,8 @@ void solidInterface::makeSubMesh() const << "sub-mesh already exist" << abort(FatalError); } - - const volScalarField& materials = + + const volScalarField& materials = mesh_.lookupObject("materials"); const scalarField& materialsI = materials.internalField(); @@ -79,9 +79,9 @@ void solidInterface::makeSubMesh() const forAll(neighbour, faceI) { - if + if ( - mag(materialsI[neighbour[faceI]] - materialsI[owner[faceI]]) + mag(materialsI[neighbour[faceI]] - materialsI[owner[faceI]]) > SMALL ) { @@ -141,10 +141,10 @@ void solidInterface::makeGlobalInterFaces() const << "global inter-faces addressing already exist" << abort(FatalError); } - + if (mesh_.foundObject("materials")) { - const volScalarField& materials = + const volScalarField& materials = mesh_.lookupObject("materials"); const scalarField& materialsI = materials.internalField(); @@ -153,19 +153,19 @@ void solidInterface::makeGlobalInterFaces() const const unallocLabelList& neighbour = mesh_.neighbour(); labelHashSet interFacesSet; - + forAll(neighbour, faceI) { - if + if ( - mag(materialsI[neighbour[faceI]] - materialsI[owner[faceI]]) + mag(materialsI[neighbour[faceI]] - materialsI[owner[faceI]]) > SMALL ) { interFacesSet.insert(faceI); } } - + globalInterFacesPtr_ = new labelList(interFacesSet.toc()); faceSet faMeshSet(mesh_, "faMeshSet", interFacesSet); @@ -195,8 +195,8 @@ void solidInterface::makeLocalInterFaces() const << "local inter-faces addressing already exist" << abort(FatalError); } - - const volScalarField& materials = + + const volScalarField& materials = mesh_.lookupObject("materials"); volScalarField subMaterials = subMesh().interpolate(materials); @@ -212,9 +212,9 @@ void solidInterface::makeLocalInterFaces() const forAll(neighbour, faceI) { - if + if ( - mag(materialsI[neighbour[faceI]] - materialsI[owner[faceI]]) + mag(materialsI[neighbour[faceI]] - materialsI[owner[faceI]]) > SMALL ) { @@ -243,7 +243,7 @@ void solidInterface::makeInterfaceDisplacement() const << "interface displacement field already exist" << abort(FatalError); } - + interfaceUPtr_ = new vectorField(globalInterFaces().size(), vector::zero); } @@ -268,7 +268,7 @@ void solidInterface::makeProcessorPatches() const if (mesh_.foundObject("materials")) { - const volScalarField& materials = + const volScalarField& materials = mesh_.lookupObject("materials"); labelHashSet processorPatches; @@ -277,7 +277,7 @@ void solidInterface::makeProcessorPatches() const { if (mesh_.boundary()[patchI].type() == processorFvPatch::typeName) { - scalarField ownMat = + scalarField ownMat = materials.boundaryField()[patchI].patchInternalField(); scalarField ngbMat = @@ -328,17 +328,17 @@ void solidInterface::makeProcessorPatchFaces() const forAll(procPatches, patchI) { - const volScalarField& materials = + const volScalarField& materials = mesh_.lookupObject("materials"); label curProcPatch = procPatches[patchI]; - scalarField ownMat = + scalarField ownMat = materials.boundaryField()[curProcPatch].patchInternalField(); scalarField ngbMat = materials.boundaryField()[curProcPatch].patchNeighbourField(); - + labelHashSet curProcPatchFaces; forAll(ownMat, faceI) @@ -346,7 +346,7 @@ void solidInterface::makeProcessorPatchFaces() const if (mag(ownMat[faceI] - ngbMat[faceI]) > SMALL) { curProcPatchFaces.insert(faceI); - } + } } processorPatchFaces[patchI] = labelList(curProcPatchFaces.toc()); @@ -372,7 +372,7 @@ void solidInterface::makeProcessorInterfaceDisplacement() const << abort(FatalError); } - processorInterfaceUPtr_ = + processorInterfaceUPtr_ = new FieldField(processorPatches().size()); FieldField& processorInterfaceU = *processorInterfaceUPtr_; @@ -380,7 +380,7 @@ void solidInterface::makeProcessorInterfaceDisplacement() const { processorInterfaceU.set ( - patchI, + patchI, new vectorField(processorPatchFaces()[patchI].size(), vector::zero) ); } @@ -405,17 +405,17 @@ void solidInterface::makeIndicator() const << abort(FatalError); } - indicatorPtr_ = + indicatorPtr_ = new List(globalInterFaces().size(), labelPair(0, 0)); - List& indicator = *indicatorPtr_; + List& indicator = *indicatorPtr_; const unallocLabelList& owner = mesh_.owner(); const unallocLabelList& neighbour = mesh_.neighbour(); if (mesh_.foundObject("materials")) { - const volScalarField& materials = + const volScalarField& materials = mesh_.lookupObject("materials"); forAll(globalInterFaces(), faceI) @@ -423,7 +423,7 @@ void solidInterface::makeIndicator() const label curFace = globalInterFaces()[faceI]; labelPair& curPair = indicator[faceI]; - + if (materials[owner[curFace]] < materials[neighbour[curFace]]) { curPair.first() = int(materials[owner[curFace]]); @@ -601,7 +601,7 @@ void solidInterface::correct(fvVectorMatrix& UEqn) const volVectorField& U = UEqn.psi(); const vectorField& UI = U.internalField(); - const volTensorField& gradU = + const volTensorField& gradU = mesh_.lookupObject("grad(" + U.name() + ')'); const tensorField& gradUI = gradU.internalField(); @@ -717,7 +717,7 @@ void solidInterface::correct(fvVectorMatrix& UEqn) // Interface displacement - vector curInterUt = + vector curInterUt = ( ownMu*ownUt*ngbDn + ngbMu*ngbUt*ownDn + ownDn*ngbDn*(ngbMu*ngbSGradUn - ownMu*ownSGradUn) @@ -759,12 +759,12 @@ void solidInterface::correct(fvVectorMatrix& UEqn) source[curOwner] += ( - ownK*ngbDn*ngbLambda*ngbTrSGradUt + ownK*ngbDn*ngbLambda*ngbTrSGradUt + ngbK*ownDn*ownLambda*ownTrSGradUt )*ownN*magS /(ownK*ngbDn + ngbK*ownDn) + ( - ownMu*ngbMu*ngbDn*ngbSGradUn + ownMu*ngbMu*ngbDn*ngbSGradUn + ownMu*ngbMu*ownDn*ownSGradUn )*magS /(ownMu*ngbDn + ngbMu*ownDn); @@ -778,12 +778,12 @@ void solidInterface::correct(fvVectorMatrix& UEqn) source[curNeighbour] -= ( - ownK*ngbDn*ngbLambda*ngbTrSGradUt + ownK*ngbDn*ngbLambda*ngbTrSGradUt + ngbK*ownDn*ownLambda*ownTrSGradUt )*ownN*magS /(ownK*ngbDn + ngbK*ownDn) + ( - ownMu*ngbMu*ngbDn*ngbSGradUn + ownMu*ngbMu*ngbDn*ngbSGradUn + ownMu*ngbMu*ownDn*ownSGradUn )*magS /(ownMu*ngbDn + ngbMu*ownDn); @@ -792,12 +792,12 @@ void solidInterface::correct(fvVectorMatrix& UEqn) // Processor faces - + forAll(processorPatchFaces(), patchI) { label curPatch = processorPatches()[patchI]; - vectorField& curProcInterU = + vectorField& curProcInterU = processorInterfaceDisplacement()[patchI]; const vectorField curProcOwnU = @@ -828,7 +828,7 @@ void solidInterface::correct(fvVectorMatrix& UEqn) lambda.boundaryField()[curPatch].patchInternalField(); const scalarField curProcNgbLambda = lambda.boundaryField()[curPatch].patchNeighbourField(); - + const unallocLabelList& curProcFaceCells = mesh_.boundary()[curPatch].faceCells(); @@ -868,7 +868,7 @@ void solidInterface::correct(fvVectorMatrix& UEqn) // Interface displacement - vector curInterUt = + vector curInterUt = ( ownMu*ownUt/ownDn + ngbMu*ngbUt/ngbDn - (ngbMu*ngbSGradUn + ownMu*ownSGradUn) @@ -889,13 +889,13 @@ void solidInterface::correct(fvVectorMatrix& UEqn) // Implicit coupling scalar wRevLin = 1.0 - curProcW[curFace]; - + scalar ownK = (2*ownMu + ownLambda); scalar ngbK = (2*ngbMu + ngbLambda); - + scalar Kf = 1.0/(wRevLin/ownK + (1.0-wRevLin)/ngbK); scalar muf = 1.0/(wRevLin/ownMu + (1.0-wRevLin)/ngbMu); - + scalar Dnf = 1.0/curProcDeltaCoeffs[curFace]; // Owner @@ -922,14 +922,14 @@ void solidInterface::correct(fvVectorMatrix& UEqn) void solidInterface::modifyProperties ( - surfaceScalarField& muf, + surfaceScalarField& muf, surfaceScalarField& lambdaf ) const { forAll(globalInterFaces(), faceI) { label curGlobalFace = globalInterFaces()[faceI]; - + muf.internalField()[curGlobalFace] = 0; lambdaf.internalField()[curGlobalFace] = 0; } @@ -964,7 +964,7 @@ tmp solidInterface::grad(volVectorField& U) const IOobject::NO_WRITE ), mesh_, - dimensionedTensor("zero", dimless, tensor::zero) + dimensionedTensor("zero", dimless, tensor::zero) ) ); volTensorField& gradU = tGradU(); @@ -978,10 +978,10 @@ tmp solidInterface::grad(volVectorField& U) const { const skewCorrectionVectors& scv = skewCorrectionVectors::New(mesh_); - const volTensorField& gradU = + const volTensorField& gradU = mesh_.lookupObject("grad(" + U.name() + ')'); - Uf += + Uf += ( scv() & linear(mesh_).interpolate @@ -990,7 +990,7 @@ tmp solidInterface::grad(volVectorField& U) const ) ); -// Uf += +// Uf += // ( // scv() // & linear(mesh_).interpolate @@ -1043,11 +1043,11 @@ tmp solidInterface::sigmaA() const const unallocLabelList& owner = mesh_.owner(); const unallocLabelList& neighbour = mesh_.neighbour(); - const volVectorField& U = + const volVectorField& U = mesh_.lookupObject("U"); const vectorField& UI = U.internalField(); - const volTensorField& gradU = + const volTensorField& gradU = mesh_.lookupObject("grad(" + U.name() + ')'); const tensorField& gradUI = gradU.internalField(); @@ -1069,7 +1069,7 @@ tmp solidInterface::sigmaA() const if (mesh_.foundObject("materials")) { - const volScalarField& materials = + const volScalarField& materials = mesh_.lookupObject("materials"); tensorField gradUA(sigmaA.size(), tensor::zero); @@ -1108,7 +1108,7 @@ tmp solidInterface::sigmaA() const // { // label curFace = globalInterFaces()[faceI]; // label index = findIndex(faceLabels, curFace); - + // Us.internalField()[index] = interU[faceI]; // } // Us.correctBoundaryConditions(); @@ -1118,7 +1118,7 @@ tmp solidInterface::sigmaA() const // { // label curFace = globalInterFaces()[faceI]; // label index = findIndex(faceLabels, curFace); - + // interSGradU[faceI] = sGradU[index]; // } // } @@ -1162,11 +1162,11 @@ tmp solidInterface::sigmaB() const const unallocLabelList& owner = mesh_.owner(); const unallocLabelList& neighbour = mesh_.neighbour(); - const volVectorField& U = + const volVectorField& U = mesh_.lookupObject("U"); const vectorField& UI = U.internalField(); - const volTensorField& gradU = + const volTensorField& gradU = mesh_.lookupObject("grad(" + U.name() + ')'); const tensorField& gradUI = gradU.internalField(); @@ -1188,13 +1188,13 @@ tmp solidInterface::sigmaB() const if (mesh_.foundObject("materials")) { - const volScalarField& materials = + const volScalarField& materials = mesh_.lookupObject("materials"); tensorField gradUB(sigmaB.size(), tensor::zero); scalarField muB(sigmaB.size(), 0); scalarField lambdaB(sigmaB.size(), 0); - + // // Calc surface gradient using FAM // tensorField interSGradU(interU.size(), tensor::zero); // { @@ -1227,7 +1227,7 @@ tmp solidInterface::sigmaB() const // { // label curFace = globalInterFaces()[faceI]; // label index = findIndex(faceLabels, curFace); - + // Us.internalField()[index] = interU[faceI]; // } // Us.correctBoundaryConditions(); @@ -1237,7 +1237,7 @@ tmp solidInterface::sigmaB() const // { // label curFace = globalInterFaces()[faceI]; // label index = findIndex(faceLabels, curFace); - + // interSGradU[faceI] = sGradU[index]; // } // } @@ -1289,7 +1289,7 @@ const List& solidInterface::indicator() const void solidInterface::correctGrad ( - const volVectorField& U, + const volVectorField& U, volTensorField& gradU ) const { @@ -1311,11 +1311,11 @@ void solidInterface::correctGrad Us.internalField()[curFace] = interU[faceI]; } - volTensorField gaussGradU = + volTensorField gaussGradU = fv::gaussGrad(sMesh).grad(Us); fv::gaussGrad(sMesh).correctBoundaryConditions ( - subU, + subU, gaussGradU ); @@ -1324,7 +1324,7 @@ void solidInterface::correctGrad label curFace = localInterFaces()[faceI]; gradU.internalField() - [subMesh().cellMap()[owner[curFace]]] = + [subMesh().cellMap()[owner[curFace]]] = gaussGradU.internalField()[owner[curFace]]; gradU.internalField() diff --git a/applications/solvers/solidMechanics/solidModels/solidInterface/solidInterface.H b/applications/solvers/solidMechanics/solidModels/solidInterface/solidInterface.H index 116b32072..ad08b821c 100644 --- a/applications/solvers/solidMechanics/solidModels/solidInterface/solidInterface.H +++ b/applications/solvers/solidMechanics/solidModels/solidInterface/solidInterface.H @@ -62,7 +62,7 @@ namespace Foam class solidInterface { // Private data - + const fvMesh& mesh_; const rheologyModel& rheology_; @@ -102,7 +102,7 @@ class solidInterface // Private Member Functions // Make demand-driven data - + //- Make sub-mesh void makeSubMesh() const; @@ -149,11 +149,11 @@ public: ); // Destructor - ~solidInterface(); + ~solidInterface(); // Member Functions - const fvMeshSubset& subMesh() const; + const fvMeshSubset& subMesh() const; const labelList& globalInterFaces() const; @@ -175,7 +175,7 @@ public: void modifyProperties ( - surfaceScalarField& muf, + surfaceScalarField& muf, surfaceScalarField& lambdaf ) const; diff --git a/applications/solvers/solidMechanics/tutorials/elasticContactIncrSolidFoam/slidingBallIncr/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticContactIncrSolidFoam/slidingBallIncr/system/decomposeParDict index fe6e21aa0..13533424b 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticContactIncrSolidFoam/slidingBallIncr/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticContactIncrSolidFoam/slidingBallIncr/system/decomposeParDict @@ -28,7 +28,7 @@ simpleCoeffs distributed no; -roots +roots ( ); diff --git a/applications/solvers/solidMechanics/tutorials/elasticContactNonLinULSolidFoam/slidingBallNonLin/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticContactNonLinULSolidFoam/slidingBallNonLin/system/decomposeParDict index 01c8b9f2f..530d12090 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticContactNonLinULSolidFoam/slidingBallNonLin/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticContactNonLinULSolidFoam/slidingBallNonLin/system/decomposeParDict @@ -77,7 +77,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/0/cellDist b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/0/cellDist index 07cf79429..cf38cc063 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/0/cellDist +++ b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/0/cellDist @@ -17,7 +17,7 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField nonuniform List +internalField nonuniform List 800 ( 0 diff --git a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/constant/contactProperties b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/constant/contactProperties index 252182aae..8edf044ec 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/constant/contactProperties +++ b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/constant/contactProperties @@ -27,19 +27,19 @@ contacts masterPatch bottomBrickUp; slavePatch topBrickDown; contactGapTol 5e-8; - + rigidMaster no; interpolationMethod patchToPatch; //interpolationMethod ggi;; - + penaltyScaleFactor 4e5; returnScaleFactor 1.5; - + projectionDir contactSphere; projectionAlgo visible; penetrationLimit -0.03; nContactSettleIterations 0; - + smoothContactPatches no; shearCorrection no; shearFactor 1e9; diff --git a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/system/decomposeParDict index dd2adf560..53e1e3c09 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/slidingBall/system/decomposeParDict @@ -28,7 +28,7 @@ simpleCoeffs distributed no; -roots +roots ( ); diff --git a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/decomposeParDict index e30c7c462..e33406cb5 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/decomposeParDict @@ -29,7 +29,7 @@ simpleCoeffs distributed no; -roots +roots ( ); diff --git a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/mapFieldsDict b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/mapFieldsDict index 3f2815f98..978065550 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/mapFieldsDict +++ b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/mapFieldsDict @@ -23,7 +23,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // List of pairs of source/target patches for mapping -patchMap +patchMap ( bottomBrickDown bottomBrickDown @@ -45,7 +45,7 @@ patchMap // List of target patches cutting the source domain (these need to be // handled specially e.g. interpolated from internal values) -cuttingPatches +cuttingPatches ( ); diff --git a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/sampleDict b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/sampleDict index 043224651..eb4606524 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/sampleDict +++ b/applications/solvers/solidMechanics/tutorials/elasticContactSolidFoam/sphereAndBrick/system/sampleDict @@ -61,7 +61,7 @@ writeFormat raw; // cloud specified points, uses findCell // // -// axis: how to write point coordinate. Choice of +// axis: how to write point coordinate. Choice of // - x/y/z: x/y/z coordinate only // - xyz: three columns // (probably does not make sense for anything but raw) diff --git a/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/constant/polyMesh/blockMeshDict b/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/constant/polyMesh/blockMeshDict index c73e5aa31..6bd1b417f 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/constant/polyMesh/blockMeshDict +++ b/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/constant/polyMesh/blockMeshDict @@ -24,7 +24,7 @@ FoamFile convertToMeters 1; -vertices +vertices ( (0 0 0) //0 (1 0 0) //1 @@ -36,41 +36,41 @@ vertices (0 1 1) //7 ); -blocks +blocks ( hex ( 0 1 2 3 4 5 6 7) (10 10 10) simpleGrading (1 1 1) ); -edges +edges ( ); -patches +patches ( - patch front + patch front ( ( 4 5 6 7) ) - - patch back + + patch back ( ( 0 3 2 1) ) - - patch left + + patch left ( (0 4 7 3) ) - + patch bottom ( (0 1 5 4) ) - + patch right ( (1 2 6 5) - ) + ) patch top ( diff --git a/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/system/sampleDict b/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/system/sampleDict index afac29e71..f86e4b1da 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/system/sampleDict +++ b/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/system/sampleDict @@ -62,7 +62,7 @@ surfaceFormat vtk; // cloud specified points, uses findCell // // -// axis: how to write point coordinate. Choice of +// axis: how to write point coordinate. Choice of // - x/y/z: x/y/z coordinate only // - xyz: three columns // (probably does not make sense for anything but raw) diff --git a/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/system/sampleDict.old b/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/system/sampleDict.old index c94903b2b..83fb2ee47 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/system/sampleDict.old +++ b/applications/solvers/solidMechanics/tutorials/elasticGravitySolidFoam/gravityBlock/system/sampleDict.old @@ -61,7 +61,7 @@ writeFormat raw; // cloud specified points, uses findCell // // -// axis: how to write point coordinate. Choice of +// axis: how to write point coordinate. Choice of // - x/y/z: x/y/z coordinate only // - xyz: three columns // (probably does not make sense for anything but raw) diff --git a/applications/solvers/solidMechanics/tutorials/elasticIncrSolidFoam/incrPlateHole/constant/timeVsRightTraction b/applications/solvers/solidMechanics/tutorials/elasticIncrSolidFoam/incrPlateHole/constant/timeVsRightTraction index 607889de9..fe06c78de 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticIncrSolidFoam/incrPlateHole/constant/timeVsRightTraction +++ b/applications/solvers/solidMechanics/tutorials/elasticIncrSolidFoam/incrPlateHole/constant/timeVsRightTraction @@ -2,5 +2,5 @@ (0 (0 0 0)) (1 (1e4 0 0)) (3 (2e4 0 0)) - (5 (1e3 0 0)) + (5 (1e3 0 0)) ) diff --git a/applications/solvers/solidMechanics/tutorials/elasticIncrSolidFoam/incrPlateHole/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticIncrSolidFoam/incrPlateHole/system/decomposeParDict index b7ed8d986..b009f144c 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticIncrSolidFoam/incrPlateHole/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticIncrSolidFoam/incrPlateHole/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/Allrun b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/Allrun index 4c1a4ab48..00348b2fb 100755 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/Allrun +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/Allrun @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh currDir=`pwd` application=`basename $currDir` diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/system/decomposeParDict index 9f40aa547..8a8e8c385 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/system/fvSolution b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/system/fvSolution index 93776a53f..dd22ac990 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/system/fvSolution +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/system/fvSolution @@ -23,11 +23,11 @@ solvers relTol 0.1; //minIter 0; //maxIter 1000; - + solver PCG; preconditioner DIC; - - /* + + /* solver GAMG; smoother GaussSeidel; nPreSweeps 0; @@ -39,7 +39,7 @@ solvers nCellsInCoarsestLevel 120; agglomerator faceAreaPair; mergeLevels 1; - */ + */ /* solver amgSolver; cycle W-cycle; diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/nonLinBlock/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/nonLinBlock/system/decomposeParDict index 9f40aa547..8a8e8c385 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/nonLinBlock/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/nonLinBlock/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/nonLinBlock/system/fvSolution b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/nonLinBlock/system/fvSolution index b49ad16d6..3a0e40180 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/nonLinBlock/system/fvSolution +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/nonLinBlock/system/fvSolution @@ -23,11 +23,11 @@ solvers relTol 0.1; //minIter 0; //maxIter 1000; - + solver PCG; preconditioner DIC; - - /* + + /* solver GAMG; smoother GaussSeidel; nPreSweeps 0; @@ -39,7 +39,7 @@ solvers nCellsInCoarsestLevel 120; agglomerator faceAreaPair; mergeLevels 1; - */ + */ /* solver amgSolver; cycle W-cycle; diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/rotateSphereTL/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/rotateSphereTL/system/decomposeParDict index 02e9221ee..bbbcf37f7 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/rotateSphereTL/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinTLSolidFoam/rotateSphereTL/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/rotateSphere/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/rotateSphere/system/decomposeParDict index 02e9221ee..bbbcf37f7 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/rotateSphere/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/rotateSphere/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/timeVaryingNonLinPlateHole/constant/polyMesh/blockMeshDict b/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/timeVaryingNonLinPlateHole/constant/polyMesh/blockMeshDict index ced7832be..00967e3bf 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/timeVaryingNonLinPlateHole/constant/polyMesh/blockMeshDict +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/timeVaryingNonLinPlateHole/constant/polyMesh/blockMeshDict @@ -2,13 +2,13 @@ /* ------------------------------------------------------------------------------- ========= | dictionary - \\ / | + \\ / | \\ / | Name: blockMeshDict \\ / | Family: FoamX configuration file - \\/ | + \\/ | F ield | FOAM version: 2.2 O peration | Product of Nabla Ltd. - A and | + A and | M anipulation | Email: Enquiries@Nabla.co.uk ------------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ FoamFile convertToMeters 1; -vertices +vertices ( (0.5 0 0) (1 0 0) @@ -58,7 +58,7 @@ vertices (0 0.5 0.5) ); -blocks +blocks ( hex (5 4 9 10 16 15 20 21) (10 10 1) simpleGrading (1 1 1) hex (0 1 4 5 11 12 15 16) (10 10 1) simpleGrading (1 1 1) @@ -67,7 +67,7 @@ blocks hex (9 4 7 8 20 15 18 19) (10 20 1) simpleGrading (1 1 1) ); -edges +edges ( arc 0 5 (0.469846 0.17101 0) arc 5 10 (0.17101 0.469846 0) @@ -79,34 +79,34 @@ edges arc 15 20 (0.34202 0.939693 0.5) ); -patches +patches ( - symmetryPlane left + symmetryPlane left ( (8 9 20 19) (9 10 21 20) ) - patch right + patch right ( (2 3 14 13) (3 6 17 14) ) - symmetryPlane down + symmetryPlane down ( (0 1 12 11) (1 2 13 12) ) - patch up + patch up ( (7 8 19 18) (6 7 18 17) ) - patch hole + patch hole ( (10 5 16 21) (5 0 11 16) ) - empty frontAndBack + empty frontAndBack ( (10 9 4 5) (5 4 1 0) diff --git a/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/timeVaryingNonLinPlateHole/constant/timeVsRightTraction b/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/timeVaryingNonLinPlateHole/constant/timeVsRightTraction index 607889de9..fe06c78de 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/timeVaryingNonLinPlateHole/constant/timeVsRightTraction +++ b/applications/solvers/solidMechanics/tutorials/elasticNonLinULSolidFoam/timeVaryingNonLinPlateHole/constant/timeVsRightTraction @@ -2,5 +2,5 @@ (0 (0 0 0)) (1 (1e4 0 0)) (3 (2e4 0 0)) - (5 (1e3 0 0)) + (5 (1e3 0 0)) ) diff --git a/applications/solvers/solidMechanics/tutorials/elasticPlasticNonLinULSolidFoam/timeVaryingPlasticNonLinPlateHole/constant/timeVsRightTraction b/applications/solvers/solidMechanics/tutorials/elasticPlasticNonLinULSolidFoam/timeVaryingPlasticNonLinPlateHole/constant/timeVsRightTraction index 607889de9..fe06c78de 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticPlasticNonLinULSolidFoam/timeVaryingPlasticNonLinPlateHole/constant/timeVsRightTraction +++ b/applications/solvers/solidMechanics/tutorials/elasticPlasticNonLinULSolidFoam/timeVaryingPlasticNonLinPlateHole/constant/timeVsRightTraction @@ -2,5 +2,5 @@ (0 (0 0 0)) (1 (1e4 0 0)) (3 (2e4 0 0)) - (5 (1e3 0 0)) + (5 (1e3 0 0)) ) diff --git a/applications/solvers/solidMechanics/tutorials/elasticPlasticNonLinULSolidFoam/timeVaryingPlasticNonLinPlateHole/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticPlasticNonLinULSolidFoam/timeVaryingPlasticNonLinPlateHole/system/decomposeParDict index b7ed8d986..b009f144c 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticPlasticNonLinULSolidFoam/timeVaryingPlasticNonLinPlateHole/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticPlasticNonLinULSolidFoam/timeVaryingPlasticNonLinPlateHole/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticPlasticSolidFoam/timeVaryingPlasticPlateHole/constant/timeVsRightTraction b/applications/solvers/solidMechanics/tutorials/elasticPlasticSolidFoam/timeVaryingPlasticPlateHole/constant/timeVsRightTraction index 607889de9..fe06c78de 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticPlasticSolidFoam/timeVaryingPlasticPlateHole/constant/timeVsRightTraction +++ b/applications/solvers/solidMechanics/tutorials/elasticPlasticSolidFoam/timeVaryingPlasticPlateHole/constant/timeVsRightTraction @@ -2,5 +2,5 @@ (0 (0 0 0)) (1 (1e4 0 0)) (3 (2e4 0 0)) - (5 (1e3 0 0)) + (5 (1e3 0 0)) ) diff --git a/applications/solvers/solidMechanics/tutorials/elasticPlasticSolidFoam/timeVaryingPlasticPlateHole/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticPlasticSolidFoam/timeVaryingPlasticPlateHole/system/decomposeParDict index b7ed8d986..b009f144c 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticPlasticSolidFoam/timeVaryingPlasticPlateHole/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticPlasticSolidFoam/timeVaryingPlasticPlateHole/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/0/materials b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/0/materials index c6685739b..4838a3ca6 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/0/materials +++ b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/0/materials @@ -17,7 +17,7 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField nonuniform List +internalField nonuniform List 10000 ( 1 diff --git a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/constant/polyMesh/blockMeshDict b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/constant/polyMesh/blockMeshDict index 5502e0a33..f83a1215b 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/constant/polyMesh/blockMeshDict +++ b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/constant/polyMesh/blockMeshDict @@ -24,7 +24,7 @@ FoamFile convertToMeters 1; -vertices +vertices ( (0 0 0) //0 (1 0 0) //1 @@ -46,52 +46,52 @@ vertices ); -blocks +blocks ( hex ( 0 1 3 2 8 9 11 10) (100 50 1) simpleGrading (1 1 1) hex ( 2 3 5 4 10 11 13 12) (100 1 1) simpleGrading (1 1 1) hex ( 4 5 7 6 12 13 15 14) (100 49 1) simpleGrading (1 1 1) ); -edges +edges ( ); -patches +patches ( - empty front + empty front ( ( 0 1 3 2) ( 2 3 5 4) ( 4 5 7 6) ) - - empty back + + empty back ( ( 8 9 11 10) (10 11 13 12) (12 13 15 14) ) - - patch left + + patch left ( ( 0 2 10 8) ( 2 4 12 10) ( 4 6 14 12) ) - + patch bottom ( ( 0 1 9 8) ) - + patch right ( ( 1 3 11 9) ( 3 5 13 11) ( 5 7 15 13) ) - + patch top ( ( 6 7 15 14) diff --git a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/system/sampleDict b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/system/sampleDict index afac29e71..f86e4b1da 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/system/sampleDict +++ b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/system/sampleDict @@ -62,7 +62,7 @@ surfaceFormat vtk; // cloud specified points, uses findCell // // -// axis: how to write point coordinate. Choice of +// axis: how to write point coordinate. Choice of // - x/y/z: x/y/z coordinate only // - xyz: three columns // (probably does not make sense for anything but raw) diff --git a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/system/sampleDict.old b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/system/sampleDict.old index c94903b2b..83fb2ee47 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/system/sampleDict.old +++ b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/bimaterialCase/system/sampleDict.old @@ -61,7 +61,7 @@ writeFormat raw; // cloud specified points, uses findCell // // -// axis: how to write point coordinate. Choice of +// axis: how to write point coordinate. Choice of // - x/y/z: x/y/z coordinate only // - xyz: three columns // (probably does not make sense for anything but raw) diff --git a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/plateHole/analyticalPlateHole/analyticalPlateHole.C b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/plateHole/analyticalPlateHole/analyticalPlateHole.C index 5df43c235..0d8269800 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/plateHole/analyticalPlateHole/analyticalPlateHole.C +++ b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/plateHole/analyticalPlateHole/analyticalPlateHole.C @@ -26,7 +26,7 @@ Description Generate analytical solution for a infinite plaste with a circular hole. Stress field sigma is generated. - Based on solution outlined in Timoshenko, Theory of Elasticity. + Based on solution outlined in Timoshenko, Theory of Elasticity. Author plateHoleSolution function by Z. Tukovic @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) << "\n\tradius = 0.5" << "\n\tdistant traction = (10,000 0 0 )" << nl << endl; - + volSymmTensorField sigma ( IOobject @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) sigma.write(); Info << nl << "End" << endl; - + return 0; } @@ -116,7 +116,7 @@ symmTensor plateHoleSolution(const vector& C) coordinateSystem cs("polarCS", C, vector(0, 0, 1), C/mag(C)); sigma.xx() = - T*(1 - sqr(a)/sqr(r))/2 + T*(1 - sqr(a)/sqr(r))/2 + T*(1 + 3*pow(a,4)/pow(r,4) - 4*sqr(a)/sqr(r))*::cos(2*theta)/2; sigma.xy() = @@ -125,7 +125,7 @@ symmTensor plateHoleSolution(const vector& C) sigma.yx() = sigma.xy(); sigma.yy() = - T*(1 + sqr(a)/sqr(r))/2 + T*(1 + sqr(a)/sqr(r))/2 - T*(1 + 3*pow(a,4)/pow(r,4))*::cos(2*theta)/2; @@ -137,6 +137,6 @@ symmTensor plateHoleSolution(const vector& C) S.xx() = sigma.xx(); S.xy() = sigma.xy(); S.yy() = sigma.yy(); - + return S; } diff --git a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/plateHole/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/plateHole/system/decomposeParDict index b7ed8d986..b009f144c 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/plateHole/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/plateHole/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/timeVaryingPlateHole/constant/timeVsRightTraction b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/timeVaryingPlateHole/constant/timeVsRightTraction index 607889de9..fe06c78de 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/timeVaryingPlateHole/constant/timeVsRightTraction +++ b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/timeVaryingPlateHole/constant/timeVsRightTraction @@ -2,5 +2,5 @@ (0 (0 0 0)) (1 (1e4 0 0)) (3 (2e4 0 0)) - (5 (1e3 0 0)) + (5 (1e3 0 0)) ) diff --git a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/timeVaryingPlateHole/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/timeVaryingPlateHole/system/decomposeParDict index b7ed8d986..b009f144c 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/timeVaryingPlateHole/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticSolidFoam/timeVaryingPlateHole/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/0/T b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/0/T index 3c041edaf..01fc42374 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/0/T +++ b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/0/T @@ -29,7 +29,7 @@ boundaryField { type symmetryPlane; } - + inside { type fixedValue; diff --git a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/0/U b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/0/U index c60404912..dec9e5cac 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/0/U +++ b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/0/U @@ -29,7 +29,7 @@ boundaryField { type symmetryPlane; } - + inside { type solidTraction; diff --git a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/analyticalHotCylinder.C b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/analyticalHotCylinder.C index a71efdfd1..67c6fe689 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/analyticalHotCylinder.C +++ b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/analyticalHotCylinder.C @@ -26,7 +26,7 @@ Description Generate analytical solution for a thick-walled cylinder with a temperature gradient. Temperature field T and stress field sigma and generated. - Based on solution outlined in Timoshenko, Theory of Elasticity. + Based on solution outlined in Timoshenko, Theory of Elasticity. Author philip.cardiff@ucd.ie @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) << "\n\tu = 0.3" << "\n\talpha = 1e-5" << nl << endl; - + //- inner and outer radii and temperatures scalar a = 0.5; scalar b = 0.7; @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) mesh, dimensionedScalar("zero", dimTemperature, 0.0) ); - + const volVectorField& C = mesh.C(); //- radial coordinate @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) forAll(sigmaR.boundaryField()[patchi], facei) { const scalar& r = radii.boundaryField()[patchi][facei]; - + sigmaR.boundaryField()[patchi][facei] = ( (alpha*E*(Ti-To))/(2*(1-nu)*Foam::log(b/a)) ) * ( -Foam::log(b/r) - ( a*a/(b*b - a*a))*(1 - (b*b)/(r*r))*Foam::log(b/a) ); @@ -195,7 +195,7 @@ int main(int argc, char *argv[]) forAll(sigmaTheta.boundaryField()[patchi], facei) { const scalar& r = radii.boundaryField()[patchi][facei]; - + sigmaTheta.boundaryField()[patchi][facei] = ( (alpha*E*(Ti-To))/(2*(1-nu)*Foam::log(b/a)) ) * (1 -Foam::log(b/r) - ( a*a/(b*b - a*a))*(1 + (b*b)/(r*r))*Foam::log(b/a) ); @@ -229,7 +229,7 @@ int main(int argc, char *argv[]) // ( (alpha*E*(Ti-To))/(2*(1-nu)*Foam::log(b/a)) ) * // (1 - 2*Foam::log(b/r) - ( 2*a*a/(b*b - a*a))*Foam::log(b/a)); - sigmaZ.internalField()[celli] = + sigmaZ.internalField()[celli] = 0.3*(sigmaR.internalField()[celli] + sigmaTheta.internalField()[celli]) - E*alpha*(T.internalField()[celli]); } @@ -245,7 +245,7 @@ int main(int argc, char *argv[]) //(1 - 2*Foam::log(b/r) - ( 2*a*a/(b*b - a*a))*Foam::log(b/a)); //-for general 2-D plain strain problems, the axial stress is given by this: - sigmaZ.boundaryField()[patchi][facei] = + sigmaZ.boundaryField()[patchi][facei] = nu*(sigmaR.boundaryField()[patchi][facei] + sigmaTheta.boundaryField()[patchi][facei]) - E*alpha*(T.boundaryField()[patchi][facei]); } @@ -287,7 +287,7 @@ int main(int argc, char *argv[]) { const scalar& x = mesh.C().boundaryField()[patchi][facei][vector::X]; const scalar& y = mesh.C().boundaryField()[patchi][facei][vector::Y]; - + theta.boundaryField()[patchi][facei] = Foam::atan(y/x); } } @@ -321,7 +321,7 @@ int main(int argc, char *argv[]) forAll(rotMat.boundaryField()[patchi], facei) { const scalar& t = theta.boundaryField()[patchi][facei]; - + rotMat.boundaryField()[patchi][facei] = tensor(::cos(t), ::sin(t), 0, -::sin(t), ::cos(t), 0, 0, 0, 1); @@ -359,7 +359,7 @@ int main(int argc, char *argv[]) //-for general 2-D plain strain problems, the axial stress is given by this: //- (which is not equal to the solution by Timoshenko... hmmmnn) -// sigma.internalField()[celli][symmTensor::ZZ] = +// sigma.internalField()[celli][symmTensor::ZZ] = // 0.3*(sigma.internalField()[celli][symmTensor::XX] + sigma.internalField()[celli][symmTensor::YY]) // - E*alpha*(T.internalField()[celli]); } @@ -388,7 +388,7 @@ int main(int argc, char *argv[]) sigma.write(); Info << nl << "End" << endl; - + return 0; } diff --git a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/system/decomposeParDict b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/system/decomposeParDict index b7ed8d986..b009f144c 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/system/decomposeParDict +++ b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/system/decomposeParDict @@ -84,7 +84,7 @@ manualCoeffs //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. -//roots +//roots //( // "/tmp" // "/tmp" diff --git a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/system/fvSolution b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/system/fvSolution index 13a105dc9..67159ecc2 100644 --- a/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/system/fvSolution +++ b/applications/solvers/solidMechanics/tutorials/elasticThermalSolidFoam/hotCylinder/system/fvSolution @@ -38,10 +38,10 @@ solvers relTol 0.1; minIter 0; maxIter 1000; - + //solver PCG; //preconditioner DIC; - + solver GAMG; smoother GaussSeidel; nPreSweeps 0; @@ -53,7 +53,7 @@ solvers nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; - + /* solver amgSolver; cycle W-cycle; diff --git a/applications/solvers/solidMechanics/tutorials/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/constant/dynamicMeshDict b/applications/solvers/solidMechanics/tutorials/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/constant/dynamicMeshDict index f4b57e24e..725e46727 100644 --- a/applications/solvers/solidMechanics/tutorials/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/constant/dynamicMeshDict +++ b/applications/solvers/solidMechanics/tutorials/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/constant/dynamicMeshDict @@ -34,7 +34,7 @@ diffusivity quadratic inverseDistance 1(plate); frozenDiffusion yes; -distancePatches +distancePatches ( plate ); diff --git a/applications/solvers/solidMechanics/tutorials/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/constant/polyMesh/faceZones b/applications/solvers/solidMechanics/tutorials/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/constant/polyMesh/faceZones index 789b10a45..8d9c3a480 100644 --- a/applications/solvers/solidMechanics/tutorials/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/constant/polyMesh/faceZones +++ b/applications/solvers/solidMechanics/tutorials/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/constant/polyMesh/faceZones @@ -20,7 +20,7 @@ FoamFile plateZone { type faceZone; - faceLabels List