From a224c64812ca926953033b0ed353ff0f7d0df95d Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Mon, 20 Jun 2016 16:50:07 +0200 Subject: [PATCH] Removing trailing whitespace, tabs and DOS CR & Fixing some indentation --- CMakeLists.txt | 28 +- README_RealGasBranch | 7 +- ReleaseNotes.txt | 8 +- .../fluidSolidInterface/fluidSolidInterface.C | 84 +-- .../elasticWallVelocityFvPatchVectorField.C | 2 +- .../movingWallVelocityFvPatchVectorField.C | 2 +- .../normalInletVelocityFvPatchVectorField.C | 2 +- .../icoFluid/setInterfacePressureGradient.H | 6 +- .../icoFluid/updateInterfaceNGradUn.H | 54 +- .../orthotropicElasticPlastic.H | 4 +- .../orthotropicLinearElastic.C | 299 ++++---- .../dirichletNeumannFriction_old.C | 649 +++++++++--------- .../FSI/solvers/ampFsiFoam/createSolidMesh.H | 58 +- .../FSI/solvers/fsiFoam/createSolidMesh.H | 58 +- .../FSI/solvers/weakFsiFoam/createSolidMesh.H | 58 +- .../combustion/engineFoam/engineFoam.C | 2 +- .../realFluidPisoFoam/Make/options | 2 +- .../steadyUniversalMRFFoam/createFields.H | 2 +- .../steadyUniversalMRFFoam/iEqn.H | 60 +- .../immersedBoundary/icoDyMIbFoam/Make/files | 2 +- .../ArchLinux/ArchLinux_Raspberry_Pi.txt | 14 +- .../Debian/Raspbian/Raspbian_Jessie.txt | 12 +- .../Windows/READMEBinaryPackage.txt | 2 +- etc/prefs.csh-EXAMPLE | 2 +- etc/prefs.sh-EXAMPLE | 2 +- etc/prefs.sh.mingw | 2 +- src/dbns/limiter/MDLimiter.H | 2 +- src/dbns/numericFlux/numericFluxBase.H | 2 +- .../decompositionMethod/decompositionMethod.C | 2 +- .../constantVelocity/constantVelocity.H | 2 +- .../solidBodyMotion/graphMotion/graphMotion.H | 2 +- .../graphVelocity/graphVelocity.H | 2 +- .../harmonicOscillation/harmonicOscillation.H | 2 +- .../rotatingOscillation/rotatingOscillation.H | 4 +- .../constraint/ggi/ggiFvPatchField.H | 10 +- .../constraint/jumpGgi/jumpGgiFvPatchField.C | 19 +- src/foam/db/dlLibraryTable/dlLibraryTable.C | 18 +- .../GGIInterpolationQuickRejectTests.C | 2 +- .../BlockMatrixAgglomeration.C | 2 +- .../MixingPlaneBlockLduInterfaceField.H | 2 +- .../BlockLduMatrix/BlockLduMatrix.C | 2 +- .../ggiAMGInterface/ggiAMGInterface.C | 2 +- .../mapPolyMesh/mapDistribute/mapDistribute.C | 2 +- .../polyPatches/constraint/ggi/ggiPolyPatch.C | 2 +- src/foam/primitives/Tensor/TensorTemplateI.H | 4 +- .../immersedBoundaryFvPatch.C | 2 +- .../immersedBoundaryFvPatch.H | 2 +- .../immersedBoundaryFvPatchTemplates.C | 4 +- ...ndaryOmegaWallFunctionFvPatchScalarField.C | 2 +- ...ryVelocityWallFunctionFvPatchVectorField.C | 20 +- ...immersedBoundaryWallFunctionFvPatchField.C | 12 +- .../octreeData/octreeDataTriSurface.H | 480 ++++++------- .../octreeData/octreeDataTriSurfaceTreeLeaf.C | 166 ++--- .../IAPWSThermo/IAPWS-IF97.C | 2 +- .../aungierRedlichKwong/aungierRedlichKwong.C | 2 +- .../aungierRedlichKwong/aungierRedlichKwong.H | 2 +- .../aungierRedlichKwongI.H | 2 +- .../pengRobinson/pengRobinson.C | 6 +- .../pengRobinson/pengRobinson.H | 8 +- .../pengRobinson/pengRobinsonI.H | 10 +- .../redlichKwong/redlichKwong.C | 2 +- .../redlichKwong/redlichKwong.H | 2 +- .../redlichKwong/redlichKwongI.H | 6 +- .../soaveRedlichKwong/soaveRedlichKwong.H | 2 +- .../soaveRedlichKwong/soaveRedlichKwongI.H | 2 +- .../constantHeatCapacity.C | 6 +- .../constantHeatCapacity.H | 28 +- .../constantHeatCapacityI.H | 49 +- .../nasaHeatCapacityPolynomial.C | 2 +- .../nasaHeatCapacityPolynomialI.H | 2 +- .../fluid/constant/polyMesh/blockMeshDict | 349 +++++----- .../constant/polyMesh/blockMeshDict.first | 349 +++++----- .../solid/constant/polyMesh/blockMeshDict | 47 +- .../constant/thermophysicalProperties | 22 +- .../ras/backStep/system/fvSolution | 10 +- .../constant/thermophysicalProperties | 2 +- .../ras/backStep_IAPWS97/system/fvSolution | 10 +- .../constant/thermophysicalProperties | 2 +- .../ras/cavity_IAPWS97/system/fvSolution | 4 +- .../constant/polyMesh/blockMeshDict | 4 +- .../constant/thermophysicalProperties | 22 +- .../ras/t-junction/system/fvSolution | 10 +- .../constant/polyMesh/blockMeshDict | 192 +++--- .../axialTurbineGgiJump/0/T | 22 +- .../axialTurbineGgiJump/0/U | 8 +- .../constant/polyMesh/blockMeshDict | 80 +-- .../axialTurbineGgiJump/save/T | 22 +- .../axialTurbineGgiJump/save/U | 8 +- .../axialTurbineGgiJump/system/fvSchemes | 12 +- .../axialTurbineGgiJump/system/fvSolution | 18 +- .../axialTurbineMixingPlane/0/U | 8 +- .../axialTurbineMixingPlane/0/i | 28 +- .../constant/polyMesh/blockMeshDict | 80 +-- .../constant/polyMesh/boundary | 8 +- .../axialTurbineMixingPlane/save/U | 8 +- .../axialTurbineMixingPlane/save/i | 28 +- .../axialTurbineMixingPlane/system/fvSchemes | 12 +- .../system/fvSchemes_old | 76 -- .../axialTurbineMixingPlane/system/fvSolution | 18 +- .../system/controlDict | 4 +- .../immersedBoundary/pitchingPlate/0_org/p | 3 +- .../pitchingPlate/constant/dynamicMeshDict | 7 +- .../constant/polyMesh/blockMeshDict | 156 ++--- .../pitchingPlate/system/controlDict | 4 +- .../system/controlDict | 2 +- .../pisoFoam/ras/cavity/system/controlDict | 2 +- .../tetMesh/socketOctree/system/meshDict | 28 +- .../circCylinder3d/system/controlDict | 2 +- .../damBreak4phaseFine/system/controlDict | 2 +- .../Leonov/system/controlDict | 2 +- 110 files changed, 1957 insertions(+), 2039 deletions(-) delete mode 100644 tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes_old diff --git a/CMakeLists.txt b/CMakeLists.txt index 44be18567..98ffedf3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,9 +104,9 @@ function(GetGitBranchName var) foreach(branch ${listOfGitBranches}) string(REGEX MATCH "\\* .*$" matchString ${branch}) string(LENGTH "${matchString}" lengthMatchString) - if(lengthMatchString GREATER 0) - # We have match. Cleanup and set retValue - string(REPLACE "* " "" retValue ${matchString}) + if(lengthMatchString GREATER 0) + # We have match. Cleanup and set retValue + string(REPLACE "* " "" retValue ${matchString}) endif() endforeach() @@ -122,7 +122,7 @@ function(GetGitRevNumber var) set( retValue "unknown") execute_process( - COMMAND git rev-parse --short=12 HEAD + COMMAND git rev-parse --short=12 HEAD WORKING_DIRECTORY ${FOAM_ROOT} OUTPUT_VARIABLE git_rev_number ) @@ -259,11 +259,11 @@ elseif(GIT_FOUND) if(NOT GIT_ECODE) # We have a valid git repository. - # Grab the branch and revision info. Add to the build name - GetGitBranchName(GIT_BRANCH_NAME) + # Grab the branch and revision info. Add to the build name + GetGitBranchName(GIT_BRANCH_NAME) message("Git branch: ${GIT_BRANCH_NAME}") - GetGitRevNumber(GIT_REV_NUMBER) + GetGitRevNumber(GIT_REV_NUMBER) message("Git revision: ${GIT_REV_NUMBER}") SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}") @@ -301,8 +301,8 @@ elseif(GIT_FOUND) SET(BUILDNAME "${BUILDNAME}-hg-rev=${GIT_REV_NUMBER}") else() # Not a git or mercurial repository: no branch nor revision information available - SET(BUILDNAME "${BUILDNAME}-git-branch=unknown") - SET(BUILDNAME "${BUILDNAME}-git-rev=unknown") + SET(BUILDNAME "${BUILDNAME}-git-branch=unknown") + SET(BUILDNAME "${BUILDNAME}-git-rev=unknown") endif() endif() else() @@ -379,18 +379,18 @@ IF(BUILD_TESTING) IF(RUN_FROM_ONE_TIMESTEP) # Modify the cases controlDict file in order to run for only one time step MESSAGE("${testRunTimeDirectory}: Modifying the controlDict files for running only one time step in directory: ${TEST_CASE_DIR}") - if(CMAKE_HOST_WIN32) + if(CMAKE_HOST_WIN32) # Need to supply a bash shell to run the script under Windows EXECUTE_PROCESS( COMMAND bash -c "$ENV{FOAM_TEST_HARNESS_DIR}/scripts/prepareCasesForOneTimeStep.sh ${TEST_CASE_DIR}" WORKING_DIRECTORY . - ) - else() + ) + else() EXECUTE_PROCESS( COMMAND $ENV{FOAM_TEST_HARNESS_DIR}/scripts/prepareCasesForOneTimeStep.sh ${TEST_CASE_DIR} WORKING_DIRECTORY . - ) - endif() + ) + endif() ENDIF(RUN_FROM_ONE_TIMESTEP) ENDIF(BUILD_TESTING) diff --git a/README_RealGasBranch b/README_RealGasBranch index d97432011..de6f56c0c 100644 --- a/README_RealGasBranch +++ b/README_RealGasBranch @@ -38,8 +38,8 @@ Features --> classes = externalMedia/IAPWS_Waterproperties /*************************************Solver**************************************************/ - -1. Changed pressure equation of rhoPisoFoam. Orginal pressure equation assumes perfect gas + +1. Changed pressure equation of rhoPisoFoam. Orginal pressure equation assumes perfect gas (linear relationship between pressure and density) --> new solver = realFluidPisoFoam @@ -58,6 +58,3 @@ Features git commit: "add branch ReadMe file" --> added this file - - - diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 5e3e43eb3..b3beef162 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,10 +1,10 @@ - _____________________________________ + _____________________________________ - *RELEASE NOTES FOR FOAM-EXTEND-3.2* - _____________________________________ + *RELEASE NOTES FOR FOAM-EXTEND-3.2* + _____________________________________ - August 2015 + August 2015 Table of Contents diff --git a/applications/solvers/FSI/fluidSolidInteraction/fluidSolidInterface/fluidSolidInterface.C b/applications/solvers/FSI/fluidSolidInteraction/fluidSolidInterface/fluidSolidInterface.C index 3cdac189f..51e8cbe23 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/fluidSolidInterface/fluidSolidInterface.C +++ b/applications/solvers/FSI/fluidSolidInteraction/fluidSolidInterface/fluidSolidInterface.C @@ -113,14 +113,14 @@ void Foam::fluidSolidInterface::calcFluidToSolidInterpolator() const } std::shared_ptr rbfFunction; - rbfFunction = std::shared_ptr( new TPSFunction() ); + rbfFunction = std::shared_ptr(new TPSFunction()); // std::shared_ptr rbf; fluidToSolidPtr_ = std::shared_ptr ( - new RBFInterpolation( rbfFunction ) - // new RBFInterpolation( rbfFunctionPtr_ ) + new RBFInterpolation(rbfFunction) + // new RBFInterpolation(rbfFunctionPtr_) ); vectorField solidZoneFaceCentres = @@ -146,7 +146,7 @@ void Foam::fluidSolidInterface::calcFluidToSolidInterpolator() const solidX(faceI, 2) = solidZoneFaceCentres[faceI].z(); } - fluidToSolidPtr_->compute( fluidX, solidX ); + fluidToSolidPtr_->compute(fluidX, solidX); Info << "Checking fluid-to-solid interpolator" << endl; { @@ -186,39 +186,39 @@ void Foam::fluidSolidInterface::calcFluidToSolidInterpolator() const solidMesh().boundaryMesh()[solidPatchIndex_].faceCentres() ); - matrix fluidX(fluidZoneFaceCentres.size(), 3); - // matrix solidX(solidPatchFaceCentres.size(), 3); - matrix fluidXsolid(solidPatchFaceCentres.size(), 3); + matrix fluidX(fluidZoneFaceCentres.size(), 3); + // matrix solidX(solidPatchFaceCentres.size(), 3); + matrix fluidXsolid(solidPatchFaceCentres.size(), 3); - forAll(fluidZoneFaceCentres, faceI) + forAll(fluidZoneFaceCentres, faceI) { fluidX(faceI, 0) = fluidZoneFaceCentres[faceI].x(); fluidX(faceI, 1) = fluidZoneFaceCentres[faceI].y(); fluidX(faceI, 2) = fluidZoneFaceCentres[faceI].z(); } - // forAll(solidPatchFaceCentres, faceI) + // forAll(solidPatchFaceCentres, faceI) // { // solidX(faceI, 0) = solidPatchFaceCentres[faceI].x(); // solidX(faceI, 1) = solidPatchFaceCentres[faceI].y(); // solidX(faceI, 2) = solidPatchFaceCentres[faceI].z(); // } - // fluidToSolidPtr_->compute( fluidX, solidX ); - fluidToSolidPtr_->interpolate( fluidX, fluidXsolid ); + // fluidToSolidPtr_->compute(fluidX, solidX); + fluidToSolidPtr_->interpolate(fluidX, fluidXsolid); - vectorField fluidPatchFaceCentresAtSolid + vectorField fluidPatchFaceCentresAtSolid ( solidPatchFaceCentres.size(), vector::zero ); - forAll(fluidPatchFaceCentresAtSolid, faceI) - { + forAll(fluidPatchFaceCentresAtSolid, faceI) + { fluidPatchFaceCentresAtSolid[faceI].x() = fluidXsolid(faceI, 0); fluidPatchFaceCentresAtSolid[faceI].y() = fluidXsolid(faceI, 1); fluidPatchFaceCentresAtSolid[faceI].z() = fluidXsolid(faceI, 2); - } + } scalar maxDist = gMax ( @@ -515,14 +515,14 @@ void Foam::fluidSolidInterface::calcSolidToFluidInterpolator() const } std::shared_ptr rbfFunction; - rbfFunction = std::shared_ptr( new TPSFunction() ); + rbfFunction = std::shared_ptr(new TPSFunction()); // std::shared_ptr rbf; solidToFluidPtr_ = std::shared_ptr ( - new RBFInterpolation( rbfFunction ) - // new RBFInterpolation( rbfFunctionPtr_ ) + new RBFInterpolation(rbfFunction) + // new RBFInterpolation(rbfFunctionPtr_) ); vectorField solidZonePoints = @@ -548,7 +548,7 @@ void Foam::fluidSolidInterface::calcSolidToFluidInterpolator() const solidX(faceI, 2) = solidZonePoints[faceI].z(); } - solidToFluidPtr_->compute( solidX, fluidX ); + solidToFluidPtr_->compute(solidX, fluidX); Info << "Checking solid-to-fluid interpolator" << endl; { @@ -564,14 +564,14 @@ void Foam::fluidSolidInterface::calcSolidToFluidInterpolator() const solidPoints(faceI, 2) = solidZonePoints[faceI].z(); } - solidToFluidPtr_->interpolate( solidPoints, fluidPoints ); + solidToFluidPtr_->interpolate(solidPoints, fluidPoints); - forAll(fluidZonePoints, faceI) - { + forAll(fluidZonePoints, faceI) + { fluidZonePointsInterp[faceI].x() = fluidPoints(faceI, 0); fluidZonePointsInterp[faceI].y() = fluidPoints(faceI, 1); fluidZonePointsInterp[faceI].z() = fluidPoints(faceI, 2); - } + } scalar maxDist = gMax ( @@ -2026,24 +2026,24 @@ void Foam::fluidSolidInterface::updateForce() { Info << "... using RBF interpolation" << endl; - matrix fluidForce(fluidZoneTotalTraction.size(), 3); - matrix solidForce(solidZoneTotalTraction.size(), 3); + matrix fluidForce(fluidZoneTotalTraction.size(), 3); + matrix solidForce(solidZoneTotalTraction.size(), 3); - forAll(fluidZoneTotalTraction, faceI) + forAll(fluidZoneTotalTraction, faceI) { fluidForce(faceI, 0) = fluidZoneTotalTraction[faceI].x(); fluidForce(faceI, 1) = fluidZoneTotalTraction[faceI].y(); fluidForce(faceI, 2) = fluidZoneTotalTraction[faceI].z(); } - fluidToSolid()->interpolate( fluidForce, solidForce ); + fluidToSolid()->interpolate(fluidForce, solidForce); - forAll(solidZoneTotalTraction, faceI) - { + forAll(solidZoneTotalTraction, faceI) + { solidZoneTotalTraction[faceI].x() = -solidForce(faceI, 0); solidZoneTotalTraction[faceI].y() = -solidForce(faceI, 1); solidZoneTotalTraction[faceI].z() = -solidForce(faceI, 2); - } + } } else { @@ -2723,41 +2723,41 @@ Foam::scalar Foam::fluidSolidInterface::updateResidual() { Info << "Displacement interpolation using RBF interpolation" << endl; - matrix fluidDispl(solidZonePointsDispl().size(), 3); - matrix solidDispl(solidZonePointsDisplAtSolid.size(), 3); + matrix fluidDispl(solidZonePointsDispl().size(), 3); + matrix solidDispl(solidZonePointsDisplAtSolid.size(), 3); - forAll(solidZonePointsDisplAtSolid, pointI) + forAll(solidZonePointsDisplAtSolid, pointI) { solidDispl(pointI, 0) = solidZonePointsDisplAtSolid[pointI].x(); solidDispl(pointI, 1) = solidZonePointsDisplAtSolid[pointI].y(); solidDispl(pointI, 2) = solidZonePointsDisplAtSolid[pointI].z(); } - solidToFluid()->interpolate( solidDispl, fluidDispl ); + solidToFluid()->interpolate(solidDispl, fluidDispl); - forAll(solidZonePointsDispl(), pointI) - { + forAll(solidZonePointsDispl(), pointI) + { solidZonePointsDispl()[pointI].x() = fluidDispl(pointI, 0); solidZonePointsDispl()[pointI].y() = fluidDispl(pointI, 1); solidZonePointsDispl()[pointI].z() = fluidDispl(pointI, 2); - } + } // Total displacement - forAll(solidZonePointsTotDisplAtSolid, pointI) + forAll(solidZonePointsTotDisplAtSolid, pointI) { solidDispl(pointI, 0) = solidZonePointsTotDisplAtSolid[pointI].x(); solidDispl(pointI, 1) = solidZonePointsTotDisplAtSolid[pointI].y(); solidDispl(pointI, 2) = solidZonePointsTotDisplAtSolid[pointI].z(); } - solidToFluid()->interpolate( solidDispl, fluidDispl ); + solidToFluid()->interpolate(solidDispl, fluidDispl); - forAll(solidZonePointsTotDispl, pointI) - { + forAll(solidZonePointsTotDispl, pointI) + { solidZonePointsTotDispl[pointI].x() = fluidDispl(pointI, 0); solidZonePointsTotDispl[pointI].y() = fluidDispl(pointI, 1); solidZonePointsTotDispl[pointI].z() = fluidDispl(pointI, 2); - } + } } else { diff --git a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/elasticWallVelocity/elasticWallVelocityFvPatchVectorField.C b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/elasticWallVelocity/elasticWallVelocityFvPatchVectorField.C index 914f2b4cc..b81fc80e3 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/elasticWallVelocity/elasticWallVelocityFvPatchVectorField.C +++ b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/elasticWallVelocity/elasticWallVelocityFvPatchVectorField.C @@ -376,7 +376,7 @@ gradientBoundaryCoeffs() const vectorField nGradU = 2 *( - *this + *this - (patchInternalField() + dUP) )*this->patch().deltaCoeffs() - nGradUP; diff --git a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/movingWallVelocity/movingWallVelocityFvPatchVectorField.C index 75cd81516..e51be8c6c 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/movingWallVelocity/movingWallVelocityFvPatchVectorField.C +++ b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/movingWallVelocity/movingWallVelocityFvPatchVectorField.C @@ -339,7 +339,7 @@ gradientBoundaryCoeffs() const vectorField nGradU = 2 *( - *this + *this - (patchInternalField() + dUP) )*this->patch().deltaCoeffs() - nGradUP; diff --git a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/normalInletVelocity/normalInletVelocityFvPatchVectorField.C b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/normalInletVelocity/normalInletVelocityFvPatchVectorField.C index f1231d43d..c20a4100f 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/normalInletVelocity/normalInletVelocityFvPatchVectorField.C +++ b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/fvPatchFields/normalInletVelocity/normalInletVelocityFvPatchVectorField.C @@ -326,7 +326,7 @@ gradientBoundaryCoeffs() const // vectorField nGradU = // 2 // *( -// *this +// *this // - (patchInternalField() + dUP) // )*this->patch().deltaCoeffs() // - nGradUP; diff --git a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/icoFluid/setInterfacePressureGradient.H b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/icoFluid/setInterfacePressureGradient.H index 6238d55f2..b32b58b8b 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/icoFluid/setInterfacePressureGradient.H +++ b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/icoFluid/setInterfacePressureGradient.H @@ -20,7 +20,7 @@ forAll(p_.boundaryField(), patchI) (n&U_.boundaryField()[patchI]) /rUA.boundaryField()[patchI] - phi_.boundaryField()[patchI] - /mesh.magSf().boundaryField()[patchI] + /mesh.magSf().boundaryField()[patchI] /rUA.boundaryField()[patchI] + nGradUn_ /mesh.deltaCoeffs().boundaryField()[patchI] @@ -28,7 +28,7 @@ forAll(p_.boundaryField(), patchI) phi_.boundaryField()[patchI] += pInterface.gradient() - *rUA.boundaryField()[patchI] - *mesh.magSf().boundaryField()[patchI]; + *rUA.boundaryField()[patchI] + *mesh.magSf().boundaryField()[patchI]; } } diff --git a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/icoFluid/updateInterfaceNGradUn.H b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/icoFluid/updateInterfaceNGradUn.H index 2d7e93d10..ebdb7b20d 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/icoFluid/updateInterfaceNGradUn.H +++ b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/icoFluid/updateInterfaceNGradUn.H @@ -17,36 +17,34 @@ *mesh.deltaCoeffs().boundaryField()[fsi.fluidPatchIndex()]; Info << "nGradUn, max: " << gMax(nGradUn_) << ", min: " - << gMin(nGradUn_) << ", avg: " << gAverage(nGradUn_) << endl; + << gMin(nGradUn_) << ", avg: " << gAverage(nGradUn_) << endl; -// bool secondOrderCorrection = true; +// bool secondOrderCorrection = true; -// if (secondOrderCorrection) -// { -// // Correct normal component of phiU -// // befor gradient calculation -// forAll(phiU.boundaryField(), patchI) -// { -// vectorField n = -// mesh().Sf().boundaryField()[patchI] -// /mesh().magSf().boundaryField()[patchI]; +// if (secondOrderCorrection) +// { +// // Correct normal component of phiU +// // befor gradient calculation +// forAll(phiU.boundaryField(), patchI) +// { +// vectorField n = +// mesh().Sf().boundaryField()[patchI] +// /mesh().magSf().boundaryField()[patchI]; -// phiU.boundaryField()[patchI] += -// n -// *( -// ( -// phi_.boundaryField()[patchI] -// /mesh().magSf().boundaryField()[patchI] -// ) -// - (n&phiU.boundaryField()[patchI]) -// ); -// } +// phiU.boundaryField()[patchI] += +// n +// *( +// ( +// phi_.boundaryField()[patchI] +// /mesh().magSf().boundaryField()[patchI] +// ) +// - (n&phiU.boundaryField()[patchI]) +// ); +// } -// // Calc gradient -// tensorField gradPhiUp = -// fvc::grad(phiU)().boundaryField()[aPatchID()] -// .patchInternalField(); - -// nGradUn() = 2*nGradUn() - (nA&(gradPhiUp&nA)); -// } +// // Calc gradient +// tensorField gradPhiUp = +// fvc::grad(phiU)().boundaryField()[aPatchID()].patchInternalField(); +// nGradUn() = 2*nGradUn() - (nA&(gradPhiUp&nA)); +// } } diff --git a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/constitutiveModel/rheologyLaws/orthotropicElasticPlastic/orthotropicElasticPlastic.H b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/constitutiveModel/rheologyLaws/orthotropicElasticPlastic/orthotropicElasticPlastic.H index 67c31e260..4bcb7db95 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/constitutiveModel/rheologyLaws/orthotropicElasticPlastic/orthotropicElasticPlastic.H +++ b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/constitutiveModel/rheologyLaws/orthotropicElasticPlastic/orthotropicElasticPlastic.H @@ -199,8 +199,8 @@ public: //- If the rheologyLaw needs plasticity procedures virtual bool plasticityModelNeeded() const { - return true; - }; + return true; + }; //- Return modulus of plasticity virtual tmp Ep() const; diff --git a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/constitutiveModel/rheologyLaws/orthotropicLinearElastic/orthotropicLinearElastic.C b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/constitutiveModel/rheologyLaws/orthotropicLinearElastic/orthotropicLinearElastic.C index 259c88360..45328bf68 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/constitutiveModel/rheologyLaws/orthotropicLinearElastic/orthotropicLinearElastic.C +++ b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/constitutiveModel/rheologyLaws/orthotropicLinearElastic/orthotropicLinearElastic.C @@ -81,147 +81,156 @@ Foam::orthotropicLinearElastic::orthotropicLinearElastic A44_( 2*Gxy_ ), A55_( 2*Gyz_ ), A66_( 2*Gzx_ ), - C_( - IOobject - ( - "rheologyLawStoredC", - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh(), - dimensionedSymmTensor4thOrder("zero", dimForce/dimArea, - symmTensor4thOrder(A11_.value(), A12_.value(), A31_.value(), - A22_.value(), A23_.value(), - A33_.value(), - A44_.value(), - A55_.value(), - A66_.value()) - ), - zeroGradientFvPatchSymmTensor4thOrderField::typeName - ), - matDir_( - IOobject - ( - "materialDirections", - mesh().time().timeName(), - mesh(), - IOobject::MUST_READ, - IOobject::NO_WRITE - ), - mesh() - ) -{ - //- check material properties lie within physical constraints - //- ref Abaqus analysis user's manual orthotropic material - Info << "\tChecking physical constraints on the orthotropic material properties" << endl; - - //- E and G should be greater than zero - if(Ex_.value() < 0.0 || Ey_.value() < 0.0 || Ez_.value() < 0.0 - || Gxy_.value() < 0.0 || Gyz_.value() < 0.0 || Gzx_.value() < 0.0) - { - FatalError << "Ex, Ey, Ez, Gxy, Gyz, Gzx should all be greater than zero!" - << exit(FatalError); - } - - //- restriction on Poisson's ratio - if(mag(nuxy_.value()) >= sqrt(Ex_.value()/Ey_.value()) - || mag(nuyz_.value()) >= sqrt(Ey_.value()/Ez_.value()) - || mag(nuzx_.value()) >= sqrt(Ez_.value()/Ex_.value())) - { - FatalError << "mag(nuij) should be less sqrt(Ei/Ej)" - << exit(FatalError); - } - - if( dimensionedScalar(1 - nuxy_*nuyx_ - nuyz_*nuzy_ - nuzx_*nuxz_ - 2*nuyx_*nuzy_*nuxz_).value() <= 0 ) - { - FatalError << "(1 - nuxy*nuyx - nuyz*nuzy - nuzx*nuxz - 2*nuyx*nuzy*nuxz) should be greater than zero!" - << exit(FatalError); - } - - - Info << "\tRotating local material properties to global coordinate system" << endl; - //- rotate tensors - volTensorField R + C_ ( - IOobject - ( - "R", - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh(), - dimensionedTensor("zero", dimless, tensor::zero), - zeroGradientFvPatchTensorField::typeName - ); + IOobject + ( + "rheologyLawStoredC", + mesh().time().timeName(), + mesh(), + IOobject::NO_READ, + IOobject::NO_WRITE + ), + mesh(), + dimensionedSymmTensor4thOrder("zero", dimForce/dimArea, + symmTensor4thOrder + ( + A11_.value(), A12_.value(), A31_.value(), + A22_.value(), A23_.value(), + A33_.value(), + A44_.value(), + A55_.value(), + A66_.value()) + ), + zeroGradientFvPatchSymmTensor4thOrderField::typeName + ), + matDir_ + ( + IOobject + ( + "materialDirections", + mesh().time().timeName(), + mesh(), + IOobject::MUST_READ, + IOobject::NO_WRITE + ), + mesh() + ) +{ + //- check material properties lie within physical constraints + //- ref Abaqus analysis user's manual orthotropic material + Info << "\tChecking physical constraints on the orthotropic material properties" << endl; - //- make sure matDir_ are unit directions - forAll(matDir_, celli) + //- E and G should be greater than zero + if + ( + Ex_.value() < 0.0 || Ey_.value() < 0.0 || Ez_.value() < 0.0 + || Gxy_.value() < 0.0 || Gyz_.value() < 0.0 || Gzx_.value() < 0.0 + ) { - { - scalar magVec = - mag(vector(matDir_[celli][0], matDir_[celli][1], matDir_[celli][2])); - matDir_[celli][0] /= magVec; - matDir_[celli][1] /= magVec; - matDir_[celli][2] /= magVec; - } - { - scalar magVec = - mag(vector(matDir_[celli][3], matDir_[celli][4], matDir_[celli][5])); - matDir_[celli][3] /= magVec; - matDir_[celli][4] /= magVec; - matDir_[celli][5] /= magVec; - } - { - scalar magVec = - mag(vector(matDir_[celli][6], matDir_[celli][7], matDir_[celli][8])); - matDir_[celli][6] /= magVec; - matDir_[celli][7] /= magVec; - matDir_[celli][8] /= magVec; - } + FatalError << "Ex, Ey, Ez, Gxy, Gyz, Gzx should all be greater than zero!" + << exit(FatalError); } - //- global axes - vector e0(1,0,0); - vector e1(0,1,0); - vector e2(0,0,1); - - forAll(R, celli) + //- restriction on Poisson's ratio + if + ( + mag(nuxy_.value()) >= sqrt(Ex_.value()/Ey_.value()) + || mag(nuyz_.value()) >= sqrt(Ey_.value()/Ez_.value()) + || mag(nuzx_.value()) >= sqrt(Ez_.value()/Ex_.value()) + ) { - // R_ij = xold_i & xnew_i; - { - vector mD(matDir_[celli][0], matDir_[celli][1], matDir_[celli][2]); - R[celli][0] = e0 & mD; - R[celli][1] = e1 & mD; - R[celli][2] = e2 & mD; - } - { - vector mD(matDir_[celli][3], matDir_[celli][4], matDir_[celli][5]); - R[celli][3] = e0 & mD; - R[celli][4] = e1 & mD; - R[celli][5] = e2 & mD; - } - { - vector mD(matDir_[celli][6], matDir_[celli][7], matDir_[celli][8]); - R[celli][6] = e0 & mD; - R[celli][7] = e1 & mD; - R[celli][8] = e2 & mD; - } + FatalError << "mag(nuij) should be less sqrt(Ei/Ej)" + << exit(FatalError); } - //Info << "R is " << R.internalField() << endl; - R.correctBoundaryConditions(); - //R.write(); + if( dimensionedScalar(1 - nuxy_*nuyx_ - nuyz_*nuzy_ - nuzx_*nuxz_ - 2*nuyx_*nuzy_*nuxz_).value() <= 0 ) + { + FatalError << "(1 - nuxy*nuyx - nuyz*nuzy - nuzx*nuxz - 2*nuyx*nuzy*nuxz) should be greater than zero!" + << exit(FatalError); + } - //- rotate C to global corrdinate system - //Info << "C_ local is " << C_.internalField() << endl; - C_.correctBoundaryConditions(); - C_ = transform(R, C_); - C_.correctBoundaryConditions(); - //Info << "C_ global is " << C_.internalField() << endl; + Info << "\tRotating local material properties to global coordinate system" << endl; + //- rotate tensors + volTensorField R + ( + IOobject + ( + "R", + mesh().time().timeName(), + mesh(), + IOobject::NO_READ, + IOobject::NO_WRITE + ), + mesh(), + dimensionedTensor("zero", dimless, tensor::zero), + zeroGradientFvPatchTensorField::typeName + ); + + //- make sure matDir_ are unit directions + forAll(matDir_, celli) + { + { + scalar magVec = + mag(vector(matDir_[celli][0], matDir_[celli][1], matDir_[celli][2])); + matDir_[celli][0] /= magVec; + matDir_[celli][1] /= magVec; + matDir_[celli][2] /= magVec; + } + { + scalar magVec = + mag(vector(matDir_[celli][3], matDir_[celli][4], matDir_[celli][5])); + matDir_[celli][3] /= magVec; + matDir_[celli][4] /= magVec; + matDir_[celli][5] /= magVec; + } + { + scalar magVec = + mag(vector(matDir_[celli][6], matDir_[celli][7], matDir_[celli][8])); + matDir_[celli][6] /= magVec; + matDir_[celli][7] /= magVec; + matDir_[celli][8] /= magVec; + } + } + + //- global axes + vector e0(1,0,0); + vector e1(0,1,0); + vector e2(0,0,1); + + forAll(R, celli) + { + // R_ij = xold_i & xnew_i; + { + vector mD(matDir_[celli][0], matDir_[celli][1], matDir_[celli][2]); + R[celli][0] = e0 & mD; + R[celli][1] = e1 & mD; + R[celli][2] = e2 & mD; + } + { + vector mD(matDir_[celli][3], matDir_[celli][4], matDir_[celli][5]); + R[celli][3] = e0 & mD; + R[celli][4] = e1 & mD; + R[celli][5] = e2 & mD; + } + { + vector mD(matDir_[celli][6], matDir_[celli][7], matDir_[celli][8]); + R[celli][6] = e0 & mD; + R[celli][7] = e1 & mD; + R[celli][8] = e2 & mD; + } + } + + //Info << "R is " << R.internalField() << endl; + R.correctBoundaryConditions(); + //R.write(); + + //- rotate C to global corrdinate system + //Info << "C_ local is " << C_.internalField() << endl; + C_.correctBoundaryConditions(); + C_ = transform(R, C_); + C_.correctBoundaryConditions(); + //Info << "C_ global is " << C_.internalField() << endl; } @@ -362,7 +371,7 @@ Foam::scalar Foam::orthotropicLinearElastic::sigmaY const label cellID ) const { - return GREAT; + return GREAT; } Foam::scalar Foam::orthotropicLinearElastic::dSigmaY @@ -371,13 +380,13 @@ Foam::scalar Foam::orthotropicLinearElastic::dSigmaY const label cellID ) const { - return 0; + return 0; } //Foam::tmp Foam::orthotropicLinearElastic::K() const Foam::tmp Foam::orthotropicLinearElastic::K() const { - tmp tresult + tmp tresult ( new volDiagTensorField ( @@ -395,34 +404,34 @@ Foam::tmp Foam::orthotropicLinearElastic::K() const ) ); - volDiagTensorField& K = tresult(); + volDiagTensorField& K = tresult(); - forAll(K, celli) + forAll(K, celli) { K[celli].xx() = C_[celli].xxxx(); K[celli].yy() = C_[celli].yyyy(); K[celli].zz() = C_[celli].zzzz(); } - tresult().correctBoundaryConditions(); + tresult().correctBoundaryConditions(); - return tresult; + return tresult; } Foam::tmp Foam::orthotropicLinearElastic::C() const { - tmp tresult + tmp tresult ( new volSymmTensor4thOrderField ( - C_ - ) + C_ + ) ); - volSymmTensor4thOrderField& result = tresult(); + volSymmTensor4thOrderField& result = tresult(); - result.correctBoundaryConditions(); + result.correctBoundaryConditions(); - return tresult; + return tresult; } // ************************************************************************* // diff --git a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/fvPatchFields/solidContact/contactModels/frictionContactModels/dirichletNeumannFriction/dirichletNeumannFriction_old.C b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/fvPatchFields/solidContact/contactModels/frictionContactModels/dirichletNeumannFriction/dirichletNeumannFriction_old.C index 3ae1eaf44..bee436b34 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/fvPatchFields/solidContact/contactModels/frictionContactModels/dirichletNeumannFriction/dirichletNeumannFriction_old.C +++ b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/solidModels/fvPatchFields/solidContact/contactModels/frictionContactModels/dirichletNeumannFriction/dirichletNeumannFriction_old.C @@ -59,66 +59,67 @@ Foam::dirichletNeumannFriction::dirichletNeumannFriction const label slaveFaceZoneID ) : - frictionContactModel(name, patch, dict, masterPatchID, slavePatchID, masterFaceZoneID, slaveFaceZoneID), - frictionContactModelDict_(dict.subDict(name+"FrictionModelDict")), - frictionLawPtr_(NULL), - mesh_(patch.boundaryMesh().mesh()), - slaveDisp_(mesh().boundaryMesh()[slavePatchID].size(), vector::zero), - slaveTraction_(mesh().boundaryMesh()[slavePatchID].size(), vector::zero), - slaveValueFrac_(mesh_.boundaryMesh()[slavePatchID].size(), symmTensor::zero), - //oldSlaveValueFrac_(mesh_.boundaryMesh()[slavePatchID].size(), symmTensor::zero), - relaxationFactor_(readScalar(frictionContactModelDict_.lookup("relaxationFactor"))), - contactIterNum_(0), - infoFreq_(readInt(frictionContactModelDict_.lookup("infoFrequency"))), - oscillationCorr_(frictionContactModelDict_.lookup("oscillationCorrection")), - oscillationCorrFac_(readScalar(frictionContactModelDict_.lookup("oscillationCorrectionFactor"))), - contactFilePtr_(NULL) + frictionContactModel(name, patch, dict, masterPatchID, slavePatchID, masterFaceZoneID, slaveFaceZoneID), + frictionContactModelDict_(dict.subDict(name+"FrictionModelDict")), + frictionLawPtr_(NULL), + mesh_(patch.boundaryMesh().mesh()), + slaveDisp_(mesh().boundaryMesh()[slavePatchID].size(), vector::zero), + slaveTraction_(mesh().boundaryMesh()[slavePatchID].size(), vector::zero), + slaveValueFrac_(mesh_.boundaryMesh()[slavePatchID].size(), symmTensor::zero), + //oldSlaveValueFrac_(mesh_.boundaryMesh()[slavePatchID].size(), symmTensor::zero), + relaxationFactor_(readScalar(frictionContactModelDict_.lookup("relaxationFactor"))), + contactIterNum_(0), + infoFreq_(readInt(frictionContactModelDict_.lookup("infoFrequency"))), + oscillationCorr_(frictionContactModelDict_.lookup("oscillationCorrection")), + oscillationCorrFac_(readScalar(frictionContactModelDict_.lookup("oscillationCorrectionFactor"))), + contactFilePtr_(NULL) { - // create friction law - frictionLawPtr_ = frictionLaw::New( - frictionContactModelDict_.lookup("frictionLaw"), - frictionContactModelDict_ - ).ptr(); + // create friction law + frictionLawPtr_ = frictionLaw::New + ( + frictionContactModelDict_.lookup("frictionLaw"), + frictionContactModelDict_ + ).ptr(); - // master proc open contact info file - if(Pstream::master()) + // master proc open contact info file + if(Pstream::master()) { - word masterName = mesh_.boundary()[masterPatchID].name(); - word slaveName = mesh_.boundary()[slavePatchID].name(); - contactFilePtr_ = new OFstream(fileName("frictionContact_"+masterName+"_"+slaveName+".txt")); - OFstream& contactFile = *contactFilePtr_; - int width = 20; - contactFile << "time"; - contactFile.width(width); - contactFile << "iterNum"; - contactFile.width(width); - contactFile << "relaxationFactor"; - contactFile.width(width); - contactFile << "slipFaces"; - contactFile.width(width); - contactFile << "stickFaces"; - contactFile.width(width); - contactFile << "maxMagSlaveTraction" << endl; + word masterName = mesh_.boundary()[masterPatchID].name(); + word slaveName = mesh_.boundary()[slavePatchID].name(); + contactFilePtr_ = new OFstream(fileName("frictionContact_"+masterName+"_"+slaveName+".txt")); + OFstream& contactFile = *contactFilePtr_; + int width = 20; + contactFile << "time"; + contactFile.width(width); + contactFile << "iterNum"; + contactFile.width(width); + contactFile << "relaxationFactor"; + contactFile.width(width); + contactFile << "slipFaces"; + contactFile.width(width); + contactFile << "stickFaces"; + contactFile.width(width); + contactFile << "maxMagSlaveTraction" << endl; } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - void Foam::dirichletNeumannFriction::correct - ( - const vectorField& slavePressure, - const PrimitivePatch& masterFaceZonePatch, - const PrimitivePatch& slaveFaceZonePatch, - const intersection::algorithm alg, - const intersection::direction dir, - const word interpolationMethod, - const word fieldName, - const Switch orthotropic, - const word nonLinear, - const vectorField& slaveFaceNormals - ) - { +void Foam::dirichletNeumannFriction::correct +( + const vectorField& slavePressure, + const PrimitivePatch& masterFaceZonePatch, + const PrimitivePatch& slaveFaceZonePatch, + const intersection::algorithm alg, + const intersection::direction dir, + const word interpolationMethod, + const word fieldName, + const Switch orthotropic, + const word nonLinear, + const vectorField& slaveFaceNormals +) +{ const fvMesh& mesh = mesh_; const label slavePatchIndex = slavePatchID(); const label masterPatchIndex = masterPatchID(); @@ -145,30 +146,30 @@ Foam::dirichletNeumannFriction::dirichletNeumannFriction vectorField slaveDU = dispField.boundaryField()[slavePatchIndex]; if(fieldName == "U") - { - // lookup old U - const volVectorField& dispOldField = - mesh.objectRegistry::lookupObject(fieldName+"_0"); + { + // lookup old U + const volVectorField& dispOldField = + mesh.objectRegistry::lookupObject(fieldName+"_0"); - // subtract old U - masterDU -= dispOldField.boundaryField()[masterPatchIndex]; - slaveDU -= dispOldField.boundaryField()[slavePatchIndex]; - } + // subtract old U + masterDU -= dispOldField.boundaryField()[masterPatchIndex]; + slaveDU -= dispOldField.boundaryField()[slavePatchIndex]; + } else if(fieldName != "DU") - { - FatalError << "iterativePenaltyFunction::correct()\n" - " The displacement field must be called U or DU" - << exit(FatalError); - } + { + FatalError << "iterativePenaltyFunction::correct()\n" + " The displacement field must be called U or DU" + << exit(FatalError); + } // put local masterDU into globalMasterDU - const label masterPatchStart - = mesh.boundaryMesh()[masterPatchIndex].start(); + const label masterPatchStart = + mesh.boundaryMesh()[masterPatchIndex].start(); forAll(masterDU, i) - { - globalMasterDU[mesh.faceZones()[masterFaceZoneID()].whichFace(masterPatchStart + i)] = - masterDU[i]; - } + { + globalMasterDU[mesh.faceZones()[masterFaceZoneID()].whichFace(masterPatchStart + i)] = + masterDU[i]; + } //- exchange parallel data reduce(globalMasterDU, sumOp()); // sum because each face is only on one proc @@ -177,82 +178,83 @@ Foam::dirichletNeumannFriction::dirichletNeumannFriction // interpolate DU from master to slave using inverse distance or ggi if(interpolationMethod == "patchToPatch") - { - PatchToPatchInterpolation< - PrimitivePatch, PrimitivePatch - > masterToSlavePatchToPatchInterpolator - ( - masterFaceZonePatch, // from zone - slaveFaceZonePatch, // to zone - alg, - dir - ); - globalMasterDUInterpToSlave = - masterToSlavePatchToPatchInterpolator.faceInterpolate - ( - globalMasterDU - ); - } + { + PatchToPatchInterpolation + < + PrimitivePatch, PrimitivePatch + > masterToSlavePatchToPatchInterpolator + ( + masterFaceZonePatch, // from zone + slaveFaceZonePatch, // to zone + alg, + dir + ); + globalMasterDUInterpToSlave = + masterToSlavePatchToPatchInterpolator.faceInterpolate + ( + globalMasterDU + ); + } else if(interpolationMethod == "ggi") - { - GGIInterpolation< - PrimitivePatch< face, List, pointField >, PrimitivePatch< face, List, pointField > - > masterToSlaveGgiInterpolator - ( - masterFaceZonePatch, // master zone - slaveFaceZonePatch, // slave zone - tensorField(0), - tensorField(0), - vectorField(0), - 0.0, - 0.0, - true, - ggiInterpolation::AABB - ); - globalMasterDUInterpToSlave = - masterToSlaveGgiInterpolator.masterToSlave - ( - globalMasterDU - ); - } + { + GGIInterpolation + < + PrimitivePatch< face, List, pointField >, PrimitivePatch< face, List, pointField > + > masterToSlaveGgiInterpolator + ( + masterFaceZonePatch, // master zone + slaveFaceZonePatch, // slave zone + tensorField(0), + tensorField(0), + vectorField(0), + 0.0, + 0.0, + true, + ggiInterpolation::AABB + ); + globalMasterDUInterpToSlave = + masterToSlaveGgiInterpolator.masterToSlave + ( + globalMasterDU + ); + } else - { - FatalError << "iterativePenaltyFunction::correct()\n" - "interpolationMethod " << interpolationMethod << " not known\n" - "interpolationMethod must be patchToPatch or ggi" - << exit(FatalError); - } + { + FatalError << "iterativePenaltyFunction::correct()\n" + "interpolationMethod " << interpolationMethod << " not known\n" + "interpolationMethod must be patchToPatch or ggi" + << exit(FatalError); + } // now put global back into local - const label slavePatchStart - = mesh.boundaryMesh()[slavePatchIndex].start(); + const label slavePatchStart = + mesh.boundaryMesh()[slavePatchIndex].start(); forAll(masterDUInterpToSlave, i) - { - masterDUInterpToSlave[i] = - globalMasterDUInterpToSlave - [ - mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + i) - ]; - } + { + masterDUInterpToSlave[i] = + globalMasterDUInterpToSlave + [ + mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + i) + ]; + } // Now masterDUInterpToSlave should have masterDU interpolated to the slave - // calculate current slave shear traction + // calculate current slave shear traction const fvPatch& slavePatch = mesh.boundary()[slavePatchIndex]; const fvPatchField& gradField = - slavePatch.lookupPatchField("grad("+fieldName+")"); + slavePatch.lookupPatchField("grad("+fieldName+")"); vectorField slaveShearTraction = - (I - sqr(slaveFaceNormals)) - & - tractionBoundaryGradient().traction - ( - gradField, - fieldName, - slavePatch, - orthotropic, - nonLinear - ); + (I - sqr(slaveFaceNormals)) + & tractionBoundaryGradient().traction + ( + gradField, + fieldName, + slavePatch, + orthotropic, + nonLinear + ); // calculate slave shear displacement increments @@ -280,123 +282,122 @@ Foam::dirichletNeumannFriction::dirichletNeumannFriction // so we make it a sticking face const scalar maxMagSlavePressure = gMax(magSlavePressure); forAll(magSlavePressure, faceI) - { - // there can only be a frictional tangential force when there is - // a positive pressure - // if(magSlavePressure[faceI] > SMALL) - if(magSlavePressure[faceI] > 1e-3*maxMagSlavePressure) - { - //scalar slipTrac = frictionCoeff_*magSlavePressure[faceI]; - scalar slipTrac = frictionLawPtr_->slipTraction(magSlavePressure[faceI]); + { + // there can only be a frictional tangential force when there is + // a positive pressure + // if(magSlavePressure[faceI] > SMALL) + if(magSlavePressure[faceI] > 1e-3*maxMagSlavePressure) + { + //scalar slipTrac = frictionCoeff_*magSlavePressure[faceI]; + scalar slipTrac = frictionLawPtr_->slipTraction(magSlavePressure[faceI]); - // slipping faces - if(mag(slaveShearTraction[faceI]) > (0.99*slipTrac) ) - { - // direction of shear traction - vector tracDir = slaveShearTraction[faceI] / mag(slaveShearTraction[faceI]); + // slipping faces + if(mag(slaveShearTraction[faceI]) > (0.99*slipTrac) ) + { + // direction of shear traction + vector tracDir = slaveShearTraction[faceI] / mag(slaveShearTraction[faceI]); - // slip is the difference between the master tangential DU and slave tangential DU - vector slip = - (I - sqr(slaveFaceNormals[faceI])) & - ( slaveDU[faceI] - masterDUInterpToSlave[faceI]); + // slip is the difference between the master tangential DU and slave tangential DU + vector slip = + (I - sqr(slaveFaceNormals[faceI])) + & ( slaveDU[faceI] - masterDUInterpToSlave[faceI]); - // if the slip and dir are in the same direction then we will make this a - // sticking face - if((tracDir & slip) > SMALL) - { - //Info << "face " << faceI << " flipping direction" << endl; - numStickFaces++; - stickSlip[faceI] = 2; + // if the slip and dir are in the same direction then we will make this a + // sticking face + if((tracDir & slip) > SMALL) + { + //Info << "face " << faceI << " flipping direction" << endl; + numStickFaces++; + stickSlip[faceI] = 2; - // increment the slave shear displacement - // we add an increment of shear disp to the slave faces until there is no - // more slip - slaveDisp_[faceI] = - -1*relaxationFactor_ * slip; + // increment the slave shear displacement + // we add an increment of shear disp to the slave faces until there is no + // more slip + slaveDisp_[faceI] = -1*relaxationFactor_*slip; - // slaveDisp_[faceI] is the correction to the disp so we - // add on the original disp - slaveDisp_[faceI] += oldSlaveDisp[faceI]; - // remove normal component - slaveDisp_[faceI] = (I-sqr(slaveFaceNormals[faceI])) & slaveDisp_[faceI]; + // slaveDisp_[faceI] is the correction to the disp so we + // add on the original disp + slaveDisp_[faceI] += oldSlaveDisp[faceI]; + // remove normal component + slaveDisp_[faceI] = (I-sqr(slaveFaceNormals[faceI])) & slaveDisp_[faceI]; - // set slave valueFraction - slaveValueFrac_[faceI] = - relaxationFactor_*(I - sqr(slaveFaceNormals[faceI])) - + (1.0 - relaxationFactor_)*slaveValueFrac_[faceI]; + // set slave valueFraction + slaveValueFrac_[faceI] = + relaxationFactor_*(I - sqr(slaveFaceNormals[faceI])) + + (1.0 - relaxationFactor_)*slaveValueFrac_[faceI]; - // update traction as it is passed to the master - slaveTraction_[faceI] = - relaxationFactor_*slaveShearTraction[faceI] - + (1-relaxationFactor_)*slaveTraction_[faceI]; - } - // else we will limit the shear traction to slipTrac - else - { - numSlipFaces++; - stickSlip[faceI] = 1; + // update traction as it is passed to the master + slaveTraction_[faceI] = + relaxationFactor_*slaveShearTraction[faceI] + + (1-relaxationFactor_)*slaveTraction_[faceI]; + } + // else we will limit the shear traction to slipTrac + else + { + numSlipFaces++; + stickSlip[faceI] = 1; - // limit shear traction - slaveTraction_[faceI] = - relaxationFactor_*slipTrac*tracDir - + (1-relaxationFactor_)*slaveTraction_[faceI]; + // limit shear traction + slaveTraction_[faceI] = + relaxationFactor_*slipTrac*tracDir + + (1-relaxationFactor_)*slaveTraction_[faceI]; - // update slave disp although it is not used for this face - // while slipping - slaveDisp_[faceI] = (I-sqr(slaveFaceNormals[faceI])) & oldSlaveDisp[faceI]; + // update slave disp although it is not used for this face + // while slipping + slaveDisp_[faceI] = (I-sqr(slaveFaceNormals[faceI])) & oldSlaveDisp[faceI]; - // relax the slave valueFraction to zero - //slaveValueFrac_[faceI] = (1.0 - relaxationFactor_)*slaveValueFrac_[faceI]; - slaveValueFrac_[faceI] = symmTensor::zero; - } - } - // sticking faces - else - { - numStickFaces++; - stickSlip[faceI] = 2; + // relax the slave valueFraction to zero + //slaveValueFrac_[faceI] = (1.0 - relaxationFactor_)*slaveValueFrac_[faceI]; + slaveValueFrac_[faceI] = symmTensor::zero; + } + } + // sticking faces + else + { + numStickFaces++; + stickSlip[faceI] = 2; - // slip is the difference of the tangential DU between the master and slave - vector slip = - (I - sqr(slaveFaceNormals[faceI])) & - (slaveDU[faceI] - masterDUInterpToSlave[faceI]); + // slip is the difference of the tangential DU between the master and slave + vector slip = + (I - sqr(slaveFaceNormals[faceI])) + & (slaveDU[faceI] - masterDUInterpToSlave[faceI]); - // increment the slave shear displacement - // we add an increment of shear disp to the slave faces until there is no - // more slip - slaveDisp_[faceI] = -1*relaxationFactor_*slip; - // slaveDisp_[faceI] is the correction to the disp so we - // add on the original disp - slaveDisp_[faceI] += oldSlaveDisp[faceI]; - // remove normal component - slaveDisp_[faceI] = (I-sqr(slaveFaceNormals[faceI])) & slaveDisp_[faceI]; + // increment the slave shear displacement + // we add an increment of shear disp to the slave faces until there is no + // more slip + slaveDisp_[faceI] = -1*relaxationFactor_*slip; + // slaveDisp_[faceI] is the correction to the disp so we + // add on the original disp + slaveDisp_[faceI] += oldSlaveDisp[faceI]; + // remove normal component + slaveDisp_[faceI] = (I-sqr(slaveFaceNormals[faceI])) & slaveDisp_[faceI]; - // set slave valueFraction - slaveValueFrac_[faceI] = - relaxationFactor_*(I - sqr(slaveFaceNormals[faceI])) - + (1.0 - relaxationFactor_)*slaveValueFrac_[faceI]; + // set slave valueFraction + slaveValueFrac_[faceI] = + relaxationFactor_*(I - sqr(slaveFaceNormals[faceI])) + + (1.0 - relaxationFactor_)*slaveValueFrac_[faceI]; - // update traction as it is passed to the master - slaveTraction_[faceI] = - relaxationFactor_*slaveShearTraction[faceI] - + (1-relaxationFactor_)*slaveTraction_[faceI]; - } - } - // no friction if pressure is negative or zero - else - { - stickSlip[faceI] = 0; - // relax to zero - slaveTraction_[faceI] = (1.0 - relaxationFactor_)*slaveTraction_[faceI]; - slaveValueFrac_[faceI] = (1.0 - relaxationFactor_)*slaveValueFrac_[faceI]; - } - } + // update traction as it is passed to the master + slaveTraction_[faceI] = + relaxationFactor_*slaveShearTraction[faceI] + + (1-relaxationFactor_)*slaveTraction_[faceI]; + } + } + // no friction if pressure is negative or zero + else + { + stickSlip[faceI] = 0; + // relax to zero + slaveTraction_[faceI] = (1.0 - relaxationFactor_)*slaveTraction_[faceI]; + slaveValueFrac_[faceI] = (1.0 - relaxationFactor_)*slaveValueFrac_[faceI]; + } + } // correct oscillations if(oscillationCorr_) - { - correctOscillations(slaveFaceZonePatch); - } + { + correctOscillations(slaveFaceZonePatch); + } // get global values // in parallel, the log is poluted with warnings that @@ -412,28 +413,28 @@ Foam::dirichletNeumannFriction::dirichletNeumannFriction // master writes to contact info file if(Pstream::master() && (contactIterNum_ % infoFreq_ == 0)) - { - OFstream& contactFile = *contactFilePtr_; - int width = 20; - contactFile << mesh.time().value(); - contactFile.width(width); - contactFile << contactIterNum_; - contactFile.width(width); - contactFile << relaxationFactor_; - contactFile.width(width); - contactFile << numSlipFaces; - contactFile.width(width); - contactFile << numStickFaces; - contactFile.width(width); - contactFile << maxMagMasterTraction << endl; - } - } + { + OFstream& contactFile = *contactFilePtr_; + int width = 20; + contactFile << mesh.time().value(); + contactFile.width(width); + contactFile << contactIterNum_; + contactFile.width(width); + contactFile << relaxationFactor_; + contactFile.width(width); + contactFile << numSlipFaces; + contactFile.width(width); + contactFile << numStickFaces; + contactFile.width(width); + contactFile << maxMagMasterTraction << endl; + } +} - void Foam::dirichletNeumannFriction::correctOscillations - ( - const PrimitivePatch& slaveFaceZonePatch - ) - { +void Foam::dirichletNeumannFriction::correctOscillations +( + const PrimitivePatch& slaveFaceZonePatch +) +{ // oscillations sometimes appear in contact shear displacements/tractions // so we will try to limit them here // we will weight the current face slaveDisp/Traction with the average of the @@ -451,17 +452,17 @@ Foam::dirichletNeumannFriction::dirichletNeumannFriction vectorField globalSlaveDisp(slaveFaceZonePatch.size(), vector::zero); // symmTensorField globalSlaveValueFrac(slaveFaceZonePatch.size(), symmTensor::zero); scalarField globalStickSlip(slaveFaceZonePatch.size(), 0.0); - const label slavePatchStart - = mesh.boundaryMesh()[slavePatchIndex].start(); + const label slavePatchStart = + mesh.boundaryMesh()[slavePatchIndex].start(); forAll(slaveTraction_, i) - { - // globalSlaveTraction[mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + i)] = - // slaveTraction_[i]; - globalSlaveDisp[mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + i)] = - slaveDisp_[i]; - globalStickSlip[mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + i)] = - stickSlip[i]; - } + { + // globalSlaveTraction[mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + i)] = + // slaveTraction_[i]; + globalSlaveDisp[mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + i)] = + slaveDisp_[i]; + globalStickSlip[mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + i)] = + stickSlip[i]; + } // sum because each face is only on one proc //reduce(globalSlaveTraction, sumOp()); reduce(globalSlaveDisp, sumOp()); @@ -469,78 +470,78 @@ Foam::dirichletNeumannFriction::dirichletNeumannFriction // smooth mag of slaveTraction with face face disps forAll(faceFaces, facei) - { - // only smooth sticking faces - //if(mag(globalSlaveValueFrac[facei]) > SMALL) - if(mag(globalStickSlip[facei] - 2.0) < SMALL) - { - //vector avTrac = vector::zero; - vector avDisp = vector::zero; - int numNei = 0; - forAll(faceFaces[facei], ffi) - { - label faceFace = faceFaces[facei][ffi]; + { + // only smooth sticking faces + //if(mag(globalSlaveValueFrac[facei]) > SMALL) + if(mag(globalStickSlip[facei] - 2.0) < SMALL) + { + //vector avTrac = vector::zero; + vector avDisp = vector::zero; + int numNei = 0; + forAll(faceFaces[facei], ffi) + { + label faceFace = faceFaces[facei][ffi]; - // only include other sticking faces - if( mag(globalStickSlip[faceFace] - 2.0) < SMALL ) - { - avDisp += globalSlaveDisp[faceFace]; - numNei++; - } - } + // only include other sticking faces + if( mag(globalStickSlip[faceFace] - 2.0) < SMALL ) + { + avDisp += globalSlaveDisp[faceFace]; + numNei++; + } + } - // avTracMag /= numNei; - //avTrac /= numNei; - // if(numNei > 0) - if(numNei > 1) - { - avDisp /= numNei; - } - else - { - avDisp = globalSlaveDisp[facei]; - } + // avTracMag /= numNei; + //avTrac /= numNei; + // if(numNei > 0) + if(numNei > 1) + { + avDisp /= numNei; + } + else + { + avDisp = globalSlaveDisp[facei]; + } - // if(numFaceFaces == 1) - // { - // // for corner/end faces, decrease the weight of the neighbours - // avTracMag += globalSlaveTraction[facei]; - // avTracMag /= 2; - // } + // if(numFaceFaces == 1) + // { + // // for corner/end faces, decrease the weight of the neighbours + // avTracMag += globalSlaveTraction[facei]; + // avTracMag /= 2; + // } - // weighted-average with face-faces - // globalSlaveTraction[facei] = - // oscillationCorrFac_*globalSlaveTraction[facei] + (1.0-oscillationCorrFac_)*avTrac; - globalSlaveDisp[facei] = - oscillationCorrFac_*globalSlaveDisp[facei] + (1.0-oscillationCorrFac_)*avDisp; - } - } + // weighted-average with face-faces + // globalSlaveTraction[facei] = + // oscillationCorrFac_*globalSlaveTraction[facei] + (1.0-oscillationCorrFac_)*avTrac; + globalSlaveDisp[facei] = + oscillationCorrFac_*globalSlaveDisp[facei] + (1.0-oscillationCorrFac_)*avDisp; + } + } // convert global back to local forAll(slaveTraction_, facei) - { - // slaveTraction_[facei] = - // globalSlaveTraction - // [ - // mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + facei) - // ]; - slaveDisp_[facei] = - globalSlaveDisp - [ - mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + facei) - ]; - } + { + // slaveTraction_[facei] = + // globalSlaveTraction + // [ + // mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + facei) + // ]; + slaveDisp_[facei] = + globalSlaveDisp + [ + mesh.faceZones()[slaveFaceZoneID()].whichFace(slavePatchStart + facei) + ]; + } //Pout << "\tdone" << endl; - } +} - void Foam::dirichletNeumannFriction::writeDict(Ostream& os) const - { +void Foam::dirichletNeumannFriction::writeDict(Ostream& os) const +{ word keyword(name()+"FrictionModelDict"); os.writeKeyword(keyword) - << frictionContactModelDict_; - } + << frictionContactModelDict_; +} // ************************************************************************* // diff --git a/applications/solvers/FSI/solvers/ampFsiFoam/createSolidMesh.H b/applications/solvers/FSI/solvers/ampFsiFoam/createSolidMesh.H index 453ac81ef..260afde4d 100644 --- a/applications/solvers/FSI/solvers/ampFsiFoam/createSolidMesh.H +++ b/applications/solvers/FSI/solvers/ampFsiFoam/createSolidMesh.H @@ -24,40 +24,40 @@ fvMesh solidMesh // if (isA(solidMesh.boundaryMesh()[patchI])) // { // const labelList& meshPoints = -// solidMesh.boundaryMesh()[patchI].meshPoints(); +// solidMesh.boundaryMesh()[patchI].meshPoints(); -// vector avgN = -// gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); +// vector avgN = +// gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); -// vector i(1, 0, 0); -// vector j(0, 1, 0); -// vector k(0, 0, 1); +// vector i(1, 0, 0); +// vector j(0, 1, 0); +// vector k(0, 0, 1); -// if (mag(avgN&i) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].x() = 0; -// } -// } -// else if (mag(avgN&j) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].y() = 0; -// } -// } -// else if (mag(avgN&k) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].z() = 0; -// } -// } +// if (mag(avgN&i) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].x() = 0; +// } +// } +// else if (mag(avgN&j) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].y() = 0; +// } +// } +// else if (mag(avgN&k) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].z() = 0; +// } +// } -// avgN = gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); +// avgN = gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); -// Pout << "avgN = " << avgN << endl; +// Pout << "avgN = " << avgN << endl; // } // } diff --git a/applications/solvers/FSI/solvers/fsiFoam/createSolidMesh.H b/applications/solvers/FSI/solvers/fsiFoam/createSolidMesh.H index 453ac81ef..260afde4d 100644 --- a/applications/solvers/FSI/solvers/fsiFoam/createSolidMesh.H +++ b/applications/solvers/FSI/solvers/fsiFoam/createSolidMesh.H @@ -24,40 +24,40 @@ fvMesh solidMesh // if (isA(solidMesh.boundaryMesh()[patchI])) // { // const labelList& meshPoints = -// solidMesh.boundaryMesh()[patchI].meshPoints(); +// solidMesh.boundaryMesh()[patchI].meshPoints(); -// vector avgN = -// gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); +// vector avgN = +// gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); -// vector i(1, 0, 0); -// vector j(0, 1, 0); -// vector k(0, 0, 1); +// vector i(1, 0, 0); +// vector j(0, 1, 0); +// vector k(0, 0, 1); -// if (mag(avgN&i) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].x() = 0; -// } -// } -// else if (mag(avgN&j) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].y() = 0; -// } -// } -// else if (mag(avgN&k) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].z() = 0; -// } -// } +// if (mag(avgN&i) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].x() = 0; +// } +// } +// else if (mag(avgN&j) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].y() = 0; +// } +// } +// else if (mag(avgN&k) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].z() = 0; +// } +// } -// avgN = gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); +// avgN = gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); -// Pout << "avgN = " << avgN << endl; +// Pout << "avgN = " << avgN << endl; // } // } diff --git a/applications/solvers/FSI/solvers/weakFsiFoam/createSolidMesh.H b/applications/solvers/FSI/solvers/weakFsiFoam/createSolidMesh.H index 6268eabb3..40fae9654 100644 --- a/applications/solvers/FSI/solvers/weakFsiFoam/createSolidMesh.H +++ b/applications/solvers/FSI/solvers/weakFsiFoam/createSolidMesh.H @@ -22,40 +22,40 @@ fvMesh solidMesh // if (isA(solidMesh.boundaryMesh()[patchI])) // { // const labelList& meshPoints = -// solidMesh.boundaryMesh()[patchI].meshPoints(); +// solidMesh.boundaryMesh()[patchI].meshPoints(); -// vector avgN = -// gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); +// vector avgN = +// gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); -// vector i(1, 0, 0); -// vector j(0, 1, 0); -// vector k(0, 0, 1); +// vector i(1, 0, 0); +// vector j(0, 1, 0); +// vector k(0, 0, 1); -// if (mag(avgN&i) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].x() = 0; -// } -// } -// else if (mag(avgN&j) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].y() = 0; -// } -// } -// else if (mag(avgN&k) > 0.95) -// { -// forAll(meshPoints, pI) -// { -// newPoints[meshPoints[pI]].z() = 0; -// } -// } +// if (mag(avgN&i) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].x() = 0; +// } +// } +// else if (mag(avgN&j) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].y() = 0; +// } +// } +// else if (mag(avgN&k) > 0.95) +// { +// forAll(meshPoints, pI) +// { +// newPoints[meshPoints[pI]].z() = 0; +// } +// } -// avgN = gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); +// avgN = gAverage(solidMesh.boundaryMesh()[patchI].pointNormals()); -// Pout << "avgN = " << avgN << endl; +// Pout << "avgN = " << avgN << endl; // } // } diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C index 0b55614b1..71be379db 100644 --- a/applications/solvers/combustion/engineFoam/engineFoam.C +++ b/applications/solvers/combustion/engineFoam/engineFoam.C @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) # include "UEqn.H" // --- PISO loop - while (piso.correct()) + while (piso.correct()) { # include "ftEqn.H" # include "bEqn.H" diff --git a/applications/solvers/compressible/realFluidPisoFoam/Make/options b/applications/solvers/compressible/realFluidPisoFoam/Make/options index 3ae0c0cb7..8ef0951d5 100644 --- a/applications/solvers/compressible/realFluidPisoFoam/Make/options +++ b/applications/solvers/compressible/realFluidPisoFoam/Make/options @@ -11,4 +11,4 @@ EXE_LIBS = \ -lspecie \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ - -lcompressibleLESModels + -lcompressibleLESModels diff --git a/applications/solvers/compressible/steadyUniversalMRFFoam/createFields.H b/applications/solvers/compressible/steadyUniversalMRFFoam/createFields.H index 42753a251..56b148408 100644 --- a/applications/solvers/compressible/steadyUniversalMRFFoam/createFields.H +++ b/applications/solvers/compressible/steadyUniversalMRFFoam/createFields.H @@ -77,7 +77,7 @@ IOobject::MUST_READ, IOobject::AUTO_WRITE ), - mesh + mesh ); i == h - 0.5*(magSqr(Urot) - magSqr(Urel)); diff --git a/applications/solvers/compressible/steadyUniversalMRFFoam/iEqn.H b/applications/solvers/compressible/steadyUniversalMRFFoam/iEqn.H index 5a59595f4..915787b4b 100644 --- a/applications/solvers/compressible/steadyUniversalMRFFoam/iEqn.H +++ b/applications/solvers/compressible/steadyUniversalMRFFoam/iEqn.H @@ -1,30 +1,30 @@ -{ - // Create relative velocity - Urel == U; - mrfZones.relativeVelocity(Urel); - - // Create rotational velocity (= omega x r) - Urot == U - Urel; - - fvScalarMatrix iEqn - ( - fvm::ddt(rho, i) - + fvm::div(phi, i) - - fvm::laplacian(turbulence->alphaEff(), i) - == - // Viscous heating: note sign (devRhoReff has a minus in it) - - (turbulence->devRhoReff() && fvc::grad(U)) - ); - - iEqn.relax(); - - iEqn.solve(); - - // From rothalpy, calculate enthalpy after solution of rothalpy equation - h = i + 0.5*(magSqr(Urot) - magSqr(Urel)); - h.correctBoundaryConditions(); - // Update thermo for new h - thermo.correct(); - psis = thermo.psi()/thermo.Cp()*thermo.Cv(); -} - +{ + // Create relative velocity + Urel == U; + mrfZones.relativeVelocity(Urel); + + // Create rotational velocity (= omega x r) + Urot == U - Urel; + + fvScalarMatrix iEqn + ( + fvm::ddt(rho, i) + + fvm::div(phi, i) + - fvm::laplacian(turbulence->alphaEff(), i) + == + // Viscous heating: note sign (devRhoReff has a minus in it) + - (turbulence->devRhoReff() && fvc::grad(U)) + ); + + iEqn.relax(); + + iEqn.solve(); + + // From rothalpy, calculate enthalpy after solution of rothalpy equation + h = i + 0.5*(magSqr(Urot) - magSqr(Urel)); + h.correctBoundaryConditions(); + // Update thermo for new h + thermo.correct(); + psis = thermo.psi()/thermo.Cp()*thermo.Cv(); +} + diff --git a/applications/solvers/immersedBoundary/icoDyMIbFoam/Make/files b/applications/solvers/immersedBoundary/icoDyMIbFoam/Make/files index 4244bed5d..5785f9fea 100644 --- a/applications/solvers/immersedBoundary/icoDyMIbFoam/Make/files +++ b/applications/solvers/immersedBoundary/icoDyMIbFoam/Make/files @@ -1,3 +1,3 @@ -icoDyMIbFoam.C +icoDyMIbFoam.C EXE = $(FOAM_APPBIN)/icoDyMIbFoam diff --git a/doc/buildInstructions/ArchLinux/ArchLinux_Raspberry_Pi.txt b/doc/buildInstructions/ArchLinux/ArchLinux_Raspberry_Pi.txt index 2ca018ac0..3731c9214 100644 --- a/doc/buildInstructions/ArchLinux/ArchLinux_Raspberry_Pi.txt +++ b/doc/buildInstructions/ArchLinux/ArchLinux_Raspberry_Pi.txt @@ -13,7 +13,7 @@ https://wiki.archlinux.org/index.php/Raspberry_Pi * Install required packages: - pacman -S git gcc cmake bison flex make openmpi --needed base-devel + pacman -S git gcc cmake bison flex make openmpi --needed base-devel * Create the foam-extend installation directory: @@ -51,13 +51,13 @@ cat <<'EOF' >> patch.txt --- etc/prefs.sh-EXAMPLE 2015-11-23 22:54:50.341631348 -0500 +++ etc/prefs.sh 2015-12-05 13:31:02.967676779 -0500 @@ -36,7 +36,7 @@ - + # Specify system compiler # ~~~~~~~~~~~~~~~~~~~~~~~ -#compilerInstall=System +compilerInstall=System #compilerInstall=FOAM - + # Specify system openmpi @@ -46,14 +46,14 @@ # The other openmpi related variables will be initialized using @@ -79,7 +79,7 @@ cat <<'EOF' >> patch.txt +export OPENMPI_INCLUDE_DIR="`$OPENMPI_BIN_DIR/mpicc --showme:incdirs`" +export OPENMPI_COMPILE_FLAGS="`$OPENMPI_BIN_DIR/mpicc --showme:compile`" +export OPENMPI_LINK_FLAGS="`$OPENMPI_BIN_DIR/mpicc --showme:link`" - + # Specify system installed ThirdParty packages/libraries # NB: The packages installed under $WM_THIRD_PARTY_DIR @@ -201,7 +201,6 @@ @@ -97,12 +97,12 @@ cat <<'EOF' >> patch.txt -export WM_THIRD_PARTY_USE_CMAKE_322=1 +#export WM_THIRD_PARTY_USE_CMAKE_322=1 +unset WM_THIRD_PARTY_USE_CMAKE_322 - + # # For AllMake.stage2 EOF - # Patch the file prefs.sh + # Patch the file prefs.sh patch -p0 < patch.txt # Cleanup @@ -128,7 +128,7 @@ services on your Raspberry Pi, you might even ran out of memory completely. So it is recommended not to compile foam-extend in parallel unless you keep an eye regularly on the compilation process and adjust your environment variable WM_NCOMPPROCS accordingly so you can compile some libraries/applications in -parallel and some others using just 1 core. +parallel and some others using just 1 core. export WM_NCOMPPROCS=1 # or maybe 2 diff --git a/doc/buildInstructions/Debian/Raspbian/Raspbian_Jessie.txt b/doc/buildInstructions/Debian/Raspbian/Raspbian_Jessie.txt index 503de0225..28c90d662 100644 --- a/doc/buildInstructions/Debian/Raspbian/Raspbian_Jessie.txt +++ b/doc/buildInstructions/Debian/Raspbian/Raspbian_Jessie.txt @@ -54,14 +54,14 @@ cat <<'EOF' >> patch.txt --- etc/prefs.sh-EXAMPLE 2015-11-26 05:01:05.676022832 +0000 +++ etc/prefs.sh 2015-12-05 17:27:58.100579669 +0000 @@ -36,8 +36,9 @@ - + # Specify system compiler # ~~~~~~~~~~~~~~~~~~~~~~~ -#compilerInstall=System +compilerInstall=System #compilerInstall=FOAM +#WM_COMPILER=Gcc49 - + # Specify system openmpi # ~~~~~~~~~~~~~~~~~~~~~~ @@ -46,14 +47,14 @@ @@ -84,7 +84,7 @@ cat <<'EOF' >> patch.txt +export OPENMPI_INCLUDE_DIR="`$OPENMPI_BIN_DIR/mpicc --showme:incdirs`" +export OPENMPI_COMPILE_FLAGS="`$OPENMPI_BIN_DIR/mpicc --showme:compile`" +export OPENMPI_LINK_FLAGS="`$OPENMPI_BIN_DIR/mpicc --showme:link`" - + # Specify system installed ThirdParty packages/libraries # NB: The packages installed under $WM_THIRD_PARTY_DIR @@ -201,7 +202,6 @@ @@ -102,12 +102,12 @@ cat <<'EOF' >> patch.txt -export WM_THIRD_PARTY_USE_CMAKE_322=1 +#export WM_THIRD_PARTY_USE_CMAKE_322=1 +unset WM_THIRD_PARTY_USE_CMAKE_322 - + # # For AllMake.stage2 EOF - # Patch the file prefs.sh + # Patch the file prefs.sh patch -p0 < patch.txt # Cleanup @@ -133,7 +133,7 @@ services on your Raspberry Pi, you might even ran out of memory completely. So it is recommended not to compile foam-extend in parallel unless you keep an eye regularly on the compilation process and adjust your environment variable WM_NCOMPPROCS accordingly so you can compile some libraries/applications in -parallel and some others using just 1 core. +parallel and some others using just 1 core. export WM_NCOMPPROCS=1 # or maybe 2 diff --git a/doc/buildInstructions/Windows/READMEBinaryPackage.txt b/doc/buildInstructions/Windows/READMEBinaryPackage.txt index 4c9b765a1..39d86da88 100644 --- a/doc/buildInstructions/Windows/READMEBinaryPackage.txt +++ b/doc/buildInstructions/Windows/READMEBinaryPackage.txt @@ -49,7 +49,7 @@ INSTRUCTIONS ON HOW TO INSTALL AND RUN THE WINDOWS VERSION OF FOAM-EXTEND http://www.open-mpi.org/software/ompi/v1.6/downloads/OpenMPI_v1.6.1-1_win64.exe http://www.paraview.org/download It is strongly recommended to install these in directories with no white spaces. - Once installed, create new environment variables called MPI_ROOTDIR and PARAVIEW_HOME + Once installed, create new environment variables called MPI_ROOTDIR and PARAVIEW_HOME to point to the installation directory where you installed them. This can be done by editing the user-editable settings in the environment configuration: call \etc\foamWindowsEnvironment.bat diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index dd7702e4a..f6dffa807 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -170,7 +170,7 @@ # You can override your identifier using this environment variable #setenv CDASH_SUBMIT_LOCAL_HOST_ID choose_your_CDash_system_identifer -# Buildname suffix for the FOAM CDash test harness on foam-extend +# Buildname suffix for the FOAM CDash test harness on foam-extend # By default, the git branch name and git revision number will be # appended to the CDash build name. # Otherwise, for users not using git, or wanting to provide additionnal diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index 0dc37ab33..7541d517b 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -180,7 +180,7 @@ export FOAM_VERBOSE=1 # You can override your identifier using this environment variable #export CDASH_SUBMIT_LOCAL_HOST_ID=choose_your_CDash_system_identifer -# Buildname suffix for the FOAM CDash test harness on foam-extend +# Buildname suffix for the FOAM CDash test harness on foam-extend # By default, the git branch name and git revision number will be # appended to the CDash build name. # Otherwise, for users not using git, or wanting to provide additionnal diff --git a/etc/prefs.sh.mingw b/etc/prefs.sh.mingw index 2190e1933..ad4f89acc 100644 --- a/etc/prefs.sh.mingw +++ b/etc/prefs.sh.mingw @@ -179,7 +179,7 @@ export PARAVIEW_BIN_DIR=$PARAVIEW_DIR/bin # You can override your identifier using this environment variable #export CDASH_SUBMIT_LOCAL_HOST_ID=choose_your_CDash_system_identifer -# Buildname suffix for the FOAM CDash test harness on foam-extend +# Buildname suffix for the FOAM CDash test harness on foam-extend # By default, the git branch name and git revision number will be # appended to the CDash build name. # Otherwise, for users not using git, or wanting to provide additionnal diff --git a/src/dbns/limiter/MDLimiter.H b/src/dbns/limiter/MDLimiter.H index 98858ca49..c16b184d1 100644 --- a/src/dbns/limiter/MDLimiter.H +++ b/src/dbns/limiter/MDLimiter.H @@ -218,7 +218,7 @@ public: cellVolume[nei], phiMaxIn[nei] - phi_[nei], phiMinIn[nei] - phi_[nei], - (deltaRRight & gradPhiIn[nei]) + (deltaRRight & gradPhiIn[nei]) ); } diff --git a/src/dbns/numericFlux/numericFluxBase.H b/src/dbns/numericFlux/numericFluxBase.H index fd11de882..dbe0a9c67 100644 --- a/src/dbns/numericFlux/numericFluxBase.H +++ b/src/dbns/numericFlux/numericFluxBase.H @@ -66,7 +66,7 @@ public: //- Construct from mesh numericFluxBase(const fvMesh& mesh) : - basicNumericFlux(mesh) + basicNumericFlux(mesh) {} diff --git a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C index 8b1d0c8f2..291b01c25 100644 --- a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C +++ b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C @@ -420,7 +420,7 @@ void Foam::decompositionMethod::fixCyclics ) << "Fixed " << nFixedCyclics << " disconnected cyclic faces"; } } - while (nFixedCyclics > 0); + while (nFixedCyclics > 0); } diff --git a/src/dynamicMesh/meshMotion/solidBodyMotion/constantVelocity/constantVelocity.H b/src/dynamicMesh/meshMotion/solidBodyMotion/constantVelocity/constantVelocity.H index cb18609f3..c91cfa56d 100644 --- a/src/dynamicMesh/meshMotion/solidBodyMotion/constantVelocity/constantVelocity.H +++ b/src/dynamicMesh/meshMotion/solidBodyMotion/constantVelocity/constantVelocity.H @@ -114,7 +114,7 @@ public: //- Return the solid-body motion transformation septernion virtual septernion transformation() const; - //- Return the solid-body motion velocity + //- Return the solid-body motion velocity virtual septernion velocity() const; //- Update properties from given dictionary diff --git a/src/dynamicMesh/meshMotion/solidBodyMotion/graphMotion/graphMotion.H b/src/dynamicMesh/meshMotion/solidBodyMotion/graphMotion/graphMotion.H index 6bc076f2e..0463161c9 100644 --- a/src/dynamicMesh/meshMotion/solidBodyMotion/graphMotion/graphMotion.H +++ b/src/dynamicMesh/meshMotion/solidBodyMotion/graphMotion/graphMotion.H @@ -125,7 +125,7 @@ public: //- Return the solid-body motion transformation septernion virtual septernion transformation() const; - //- Return the solid-body motion velocity + //- Return the solid-body motion velocity virtual septernion velocity() const; //- Update properties from given dictionary diff --git a/src/dynamicMesh/meshMotion/solidBodyMotion/graphVelocity/graphVelocity.H b/src/dynamicMesh/meshMotion/solidBodyMotion/graphVelocity/graphVelocity.H index b05e331c6..ead5758a1 100644 --- a/src/dynamicMesh/meshMotion/solidBodyMotion/graphVelocity/graphVelocity.H +++ b/src/dynamicMesh/meshMotion/solidBodyMotion/graphVelocity/graphVelocity.H @@ -148,7 +148,7 @@ public: //- Return the solid-body motion transformation septernion virtual septernion transformation() const; - //- Return the solid-body motion velocity + //- Return the solid-body motion velocity virtual septernion velocity() const; //- Update properties from given dictionary diff --git a/src/dynamicMesh/meshMotion/solidBodyMotion/harmonicOscillation/harmonicOscillation.H b/src/dynamicMesh/meshMotion/solidBodyMotion/harmonicOscillation/harmonicOscillation.H index 8c1109e7a..0c388a073 100644 --- a/src/dynamicMesh/meshMotion/solidBodyMotion/harmonicOscillation/harmonicOscillation.H +++ b/src/dynamicMesh/meshMotion/solidBodyMotion/harmonicOscillation/harmonicOscillation.H @@ -131,7 +131,7 @@ public: //- Return the solid-body motion transformation septernion virtual septernion transformation() const; - //- Return the solid-body motion velocity + //- Return the solid-body motion velocity virtual septernion velocity() const; //- Update properties from given dictionary diff --git a/src/dynamicMesh/meshMotion/solidBodyMotion/rotatingOscillation/rotatingOscillation.H b/src/dynamicMesh/meshMotion/solidBodyMotion/rotatingOscillation/rotatingOscillation.H index 736e65bc3..02d7795d4 100644 --- a/src/dynamicMesh/meshMotion/solidBodyMotion/rotatingOscillation/rotatingOscillation.H +++ b/src/dynamicMesh/meshMotion/solidBodyMotion/rotatingOscillation/rotatingOscillation.H @@ -106,8 +106,8 @@ public: //- Return the solid-body motion transformation septernion virtual septernion transformation() const; - - //- Return the solid-body motion velocity + + //- Return the solid-body motion velocity virtual septernion velocity() const; //- Update properties from given dictionary diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/ggi/ggiFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/ggi/ggiFvPatchField.H index 5c5c0939c..02e8b7afc 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/ggi/ggiFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/ggi/ggiFvPatchField.H @@ -128,11 +128,11 @@ public: // Access - //- Return reference to GGI patch - const ggiFvPatch& ggiPatch() const - { - return ggiPatch_; - } + //- Return reference to GGI patch + const ggiFvPatch& ggiPatch() const + { + return ggiPatch_; + } //- Return shadow patch field const ggiFvPatchField& shadowPatchField() const; diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpGgi/jumpGgiFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpGgi/jumpGgiFvPatchField.C index d495c853f..65904086a 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpGgi/jumpGgiFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpGgi/jumpGgiFvPatchField.C @@ -124,28 +124,27 @@ void jumpGgiFvPatchField::initInterfaceMatrixUpdate scalarField sField(sfc.size()); if ( - reinterpret_cast(&psiInternal) + reinterpret_cast(&psiInternal) == reinterpret_cast(&this->internalField()) ) { - const scalarField jf = jump()().component(cmpt); + const scalarField jf = jump()().component(cmpt); - forAll (sField, i) - { + forAll (sField, i) + { sField[i] = psiInternal[sfc[i]] + jf[i]; - } + } } else { - - forAll (sField, i) - { + forAll (sField, i) + { sField[i] = psiInternal[sfc[i]]; - } + } } scalarField pnf = this->ggiPatch().interpolate(sField); - + // Multiply the field by coefficients and add into the result const unallocLabelList& fc = this->ggiPatch().faceCells(); diff --git a/src/foam/db/dlLibraryTable/dlLibraryTable.C b/src/foam/db/dlLibraryTable/dlLibraryTable.C index 493bf9a00..daa312034 100644 --- a/src/foam/db/dlLibraryTable/dlLibraryTable.C +++ b/src/foam/db/dlLibraryTable/dlLibraryTable.C @@ -88,27 +88,27 @@ bool Foam::dlLibraryTable::open(const fileName& functionLibName) // Capitan) with System Integrity Protection (SIP) enabled, let's try // building a full path using well-known environment variables. This is // the last resort, unless you provide the full pathname yourself. - if (!functionLibPtr) - { + if (!functionLibPtr) + { fileName l_LIBBIN_Name = getEnv("FOAM_LIBBIN")/osxFileName; functionLibPtr = dlopen(l_LIBBIN_Name.c_str(), RTLD_LAZY|RTLD_GLOBAL); - } - if (!functionLibPtr) - { + } + if (!functionLibPtr) + { fileName l_SITE_LIBBIN_Name = getEnv("FOAM_SITE_LIBBIN")/osxFileName; functionLibPtr = dlopen(l_SITE_LIBBIN_Name.c_str(), RTLD_LAZY|RTLD_GLOBAL); - } - if (!functionLibPtr) - { + } + if (!functionLibPtr) + { fileName l_USER_LIBBIN_Name = getEnv("FOAM_USER_LIBBIN")/osxFileName; functionLibPtr = dlopen(l_USER_LIBBIN_Name.c_str(), RTLD_LAZY|RTLD_GLOBAL); - } + } #elif defined mingw if(!functionLibPtr && functionLibName.ext()=="so") { fileName lName=functionLibName.lessExt()+".dll"; diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C index ae8b0ae4d..1b1b5ed56 100644 --- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C +++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C @@ -318,7 +318,7 @@ void GGIInterpolation::findNeighboursAABB ) // forAll (masterPatch_, faceMi) { - masterPatchBB[faceMi - pmStart] = boundBox + masterPatchBB[faceMi - pmStart] = boundBox ( masterPatch_[faceMi].points(masterPatch_.points()), false diff --git a/src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixAgglomeration/BlockMatrixAgglomeration.C b/src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixAgglomeration/BlockMatrixAgglomeration.C index bf9a88d67..0272f2879 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixAgglomeration/BlockMatrixAgglomeration.C +++ b/src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixAgglomeration/BlockMatrixAgglomeration.C @@ -997,7 +997,7 @@ Foam::BlockMatrixAgglomeration::restrictMatrix() const // of block coefficients must be done by a FIELD (not interface) // via a new set of virtual functions // HJ, 16/Mar/2016 - + // Note: in the scalar AMG, agglomeration is done by the interface // (always scalar) but in the block matrix it is done by a // templated block interface field diff --git a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduInterfaceFields/MixingPlaneBlockLduInterfaceField/MixingPlaneBlockLduInterfaceField.H b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduInterfaceFields/MixingPlaneBlockLduInterfaceField/MixingPlaneBlockLduInterfaceField.H index c39ac53f8..e0eb96975 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduInterfaceFields/MixingPlaneBlockLduInterfaceField/MixingPlaneBlockLduInterfaceField.H +++ b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduInterfaceFields/MixingPlaneBlockLduInterfaceField/MixingPlaneBlockLduInterfaceField.H @@ -21,7 +21,7 @@ License You should have received a copy of the GNU General Public License along with foam-extend. If not, see . -ClassMixing +ClassMixing Foam::MixingPlaneBlockLduInterfaceField Description diff --git a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.C b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.C index dae967255..327489722 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.C @@ -314,7 +314,7 @@ bool Foam::BlockLduMatrix::symmetric() const // pattern, but asymmetric because the diagonal or upper coefficients are // square and asymmetric within the coefficients. // In such cases, the symmetric check in this function will falsely claim - // the matrix is symmetries whereas in its flattened nature it is not + // the matrix is symmetries whereas in its flattened nature it is not // For the moment, symmetric check is used to see if the lower() is // allocated or not. // Please reconsider, especially related to matrix structure in diff --git a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/ggiAMGInterface/ggiAMGInterface.C b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/ggiAMGInterface/ggiAMGInterface.C index 911e28110..502cf1b3e 100644 --- a/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/ggiAMGInterface/ggiAMGInterface.C +++ b/src/foam/matrices/lduMatrix/solvers/AMG/interfaces/ggiAMGInterface/ggiAMGInterface.C @@ -136,7 +136,7 @@ void Foam::ggiAMGInterface::initFastReduce() const // Now local zone indices contain the index of a local face that will // provide the data. For faces that are not local, the index will be -1 - + // Find out where my zone data is going to // Make a sending sub-map diff --git a/src/foam/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/foam/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C index 79e408376..8cb577edb 100644 --- a/src/foam/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C +++ b/src/foam/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C @@ -134,7 +134,7 @@ Foam::List Foam::mapDistribute::schedule // const labelPair& twoProcs = comms[i]; // label sendProc = twoProcs[0]; // label recvProc = twoProcs[1]; - + // if (recvProc == Pstream::myProcNo()) // { // Pout<< " receive from " << sendProc << endl; diff --git a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C index e4b92722e..8bb26dbb6 100644 --- a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C +++ b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C @@ -458,7 +458,7 @@ void Foam::ggiPolyPatch::calcSendReceive() const // Now local zone indices contain the index of a local face that will // provide the data. For faces that are not local, the index will be -1 - + // Find out where my zone data is going to // Make a sending sub-map diff --git a/src/foam/primitives/Tensor/TensorTemplateI.H b/src/foam/primitives/Tensor/TensorTemplateI.H index 7b1050f89..c3c9df605 100644 --- a/src/foam/primitives/Tensor/TensorTemplateI.H +++ b/src/foam/primitives/Tensor/TensorTemplateI.H @@ -640,8 +640,8 @@ inline Tensor scaleRow(const Tensor& t, const Vector& v) { return Tensor ( - t.xx()*v.x(), t.xy()*v.y(), t.xz()*v.z(), - t.yx()*v.x(), t.yy()*v.y(), t.yz()*v.z(), + t.xx()*v.x(), t.xy()*v.y(), t.xz()*v.z(), + t.yx()*v.x(), t.yy()*v.y(), t.yz()*v.z(), t.zx()*v.x(), t.zy()*v.y(), t.zz()*v.z() ); } diff --git a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.C b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.C index a189ae83c..2c0136e85 100644 --- a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.C +++ b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.C @@ -2582,7 +2582,7 @@ Foam::immersedBoundaryFvPatch::triFacesInMesh() const triFacesInMesh_.clear(); triFacesInMesh_.setCapacity(triCf.size()/2); - + // Find tri faces with centre inside the processor mesh forAll(triCf, fI) { diff --git a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.H b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.H index 9b198511c..69f07fd74 100644 --- a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.H +++ b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.H @@ -562,7 +562,7 @@ public: // Helper functions - + //- Renumber Field to corespond to triangular faces contained // inside the mesh template diff --git a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatchTemplates.C b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatchTemplates.C index fdc4977eb..be27e2946 100644 --- a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatchTemplates.C +++ b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatchTemplates.C @@ -321,14 +321,14 @@ Foam::immersedBoundaryFvPatch::toSamplingPoints template -const Foam::tmp > +const Foam::tmp > Foam::immersedBoundaryFvPatch::renumberField ( const Field& f ) const { const dynamicLabelList& triFInM = this->triFacesInMesh(); - + tmp > trf(new Field(triFInM.size())); Field& rf = trf(); diff --git a/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C b/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C index 152454f8d..a2af0be2a 100644 --- a/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C +++ b/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C @@ -324,7 +324,7 @@ void immersedBoundaryOmegaWallFunctionFvPatchScalarField::updateCoeffs() // Compute omega at the IB cell omegaNew[ibCellI] = 6.0*nu[ibCellI]/(beta1_*sqr(y[ibCellI])); - // Bugfix - set zeroGradient bc for large omega values at ib boundary + // Bugfix - set zeroGradient bc for large omega values at ib boundary // to avoid k unboundedness (IG 30/OCT/2015), not // sure if this is a good criteria if(omegaNew[ibCellI] > 10.0) diff --git a/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryVelocityWallFunctions/immersedBoundaryVelocityWallFunctionFvPatchVectorField.C b/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryVelocityWallFunctions/immersedBoundaryVelocityWallFunctionFvPatchVectorField.C index 637c5026a..281ce3182 100644 --- a/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryVelocityWallFunctions/immersedBoundaryVelocityWallFunctionFvPatchVectorField.C +++ b/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryVelocityWallFunctions/immersedBoundaryVelocityWallFunctionFvPatchVectorField.C @@ -212,19 +212,19 @@ immersedBoundaryVelocityWallFunctionFvPatchVectorField::wallTangentialValue() co const immersedBoundaryFvPatch& ibFvP = immersedBoundaryFvPatchVectorField::ibPatch(); - if + if ( - wallTangentialValue_.empty() + wallTangentialValue_.empty() || (ibFvP.movingIb() || ibFvP.boundaryMesh().mesh().moving()) ) { wallTangentialValue_.setSize ( this->ibPatch().ibCells().size(), - 0 + 0 ); } - + return wallTangentialValue_; } @@ -236,9 +236,9 @@ immersedBoundaryVelocityWallFunctionFvPatchVectorField::tauWall() const const immersedBoundaryFvPatch& ibFvP = immersedBoundaryFvPatchVectorField::ibPatch(); - if + if ( - tauWall_.empty() + tauWall_.empty() || (ibFvP.movingIb() || ibFvP.boundaryMesh().mesh().moving()) ) { @@ -248,7 +248,7 @@ immersedBoundaryVelocityWallFunctionFvPatchVectorField::tauWall() const vector::zero ); } - + return tauWall_; } @@ -260,9 +260,9 @@ immersedBoundaryVelocityWallFunctionFvPatchVectorField::wallMask() const const immersedBoundaryFvPatch& ibFvP = immersedBoundaryFvPatchVectorField::ibPatch(); - if + if ( - wallMask_.empty() + wallMask_.empty() || (ibFvP.movingIb() || ibFvP.boundaryMesh().mesh().moving()) ) { @@ -272,7 +272,7 @@ immersedBoundaryVelocityWallFunctionFvPatchVectorField::wallMask() const false ); } - + return wallMask_; } diff --git a/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryWallFunctions/immersedBoundaryWallFunctionFvPatchField.C b/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryWallFunctions/immersedBoundaryWallFunctionFvPatchField.C index d54f025b6..fd480d146 100644 --- a/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryWallFunctions/immersedBoundaryWallFunctionFvPatchField.C +++ b/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryWallFunctions/immersedBoundaryWallFunctionFvPatchField.C @@ -179,9 +179,9 @@ Foam::Field& immersedBoundaryWallFunctionFvPatchField::wallValue() c const immersedBoundaryFvPatch& ibFvP = immersedBoundaryFvPatchField::ibPatch(); - if + if ( - wallValue_.empty() + wallValue_.empty() || (ibFvP.movingIb() || ibFvP.boundaryMesh().mesh().moving()) ) { @@ -191,7 +191,7 @@ Foam::Field& immersedBoundaryWallFunctionFvPatchField::wallValue() c pTraits::zero ); } - + return wallValue_; } @@ -207,9 +207,9 @@ Foam::boolList& immersedBoundaryWallFunctionFvPatchField::wallMask() const const immersedBoundaryFvPatch& ibFvP = immersedBoundaryFvPatchField::ibPatch(); - if + if ( - wallMask_.empty() + wallMask_.empty() || (ibFvP.movingIb() || ibFvP.boundaryMesh().mesh().moving()) ) { @@ -219,7 +219,7 @@ Foam::boolList& immersedBoundaryWallFunctionFvPatchField::wallMask() const false ); } - + return wallMask_; } diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurface.H b/src/meshTools/triSurface/octreeData/octreeDataTriSurface.H index 896ec77db..dac7f6d0b 100644 --- a/src/meshTools/triSurface/octreeData/octreeDataTriSurface.H +++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurface.H @@ -1,240 +1,240 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | foam-extend: Open Source CFD - \\ / O peration | Version: 3.2 - \\ / A nd | Web: http://www.foam-extend.org - \\/ M anipulation | For copyright notice see file Copyright -------------------------------------------------------------------------------- -License - This file is part of foam-extend. - - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . - -Class - Foam::octreeDataTriSurface - -Description - Encapsulates data for octree searches on triSurface. - -SourceFiles - octreeDataTriSurface.C - -\*---------------------------------------------------------------------------*/ - -#ifndef octreeDataTriSurface_H -#define octreeDataTriSurface_H - -#include "treeBoundBoxList.H" -#include "labelList.H" -#include "point.H" -#include "triSurface.H" -#include "linePointRef.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Forward declaration of classes -template class octree; - -/*---------------------------------------------------------------------------*\ - Class octreeDataTriSurface Declaration -\*---------------------------------------------------------------------------*/ - -class octreeDataTriSurface -{ - // Static data - - //- tolerance on linear dimensions - static scalar tol; - - // Private data - - const triSurface& surface_; - - const treeBoundBoxList allBb_; - - // Extra data to speed up distance searches. - // Triangles expressed as base + spanning vectors - pointField base_; - pointField E0_; - pointField E1_; - scalarList a_; - scalarList b_; - scalarList c_; - - - // Private Static Functions - - //- fast triangle nearest point calculation. Returns point in E0, E1 - // coordinate system: base + s*E0 + t*E1 - static void nearestCoords - ( - const point& base, - const point& E0, - const point& E1, - const scalar a, - const scalar b, - const scalar c, - const point& P, - scalar& s, - scalar& t - ); - - //- Calculate bounding boxes for triangles - static treeBoundBoxList calcBb(const triSurface&); - - - // Private Member Functions - - //- nearest point in xyz coord system - point nearestPoint(const label index, const point& P) const; - - -public: - - // Declare name of the class and its debug switch - ClassName("octreeDataTriSurface"); - - - // Constructors - - //- Construct from triSurface. Holds reference. Bounding box - // calculated from triangle points. - octreeDataTriSurface(const triSurface&); - - //- Construct from triSurface and bounding box. - // Holds references. - octreeDataTriSurface(const triSurface&, const treeBoundBoxList&); - - - // Member Functions - - // Access - - const triSurface& surface() const - { - return surface_; - } - - const treeBoundBoxList& allBb() const - { - return allBb_; - } - - label size() const - { - return allBb_.size(); - } - - - // Search - - //- Get type of sample - label getSampleType - ( - const octree&, - const point& - ) const; - - //- Does (bb of) shape at index overlap bb - bool overlaps - ( - const label index, - const treeBoundBox& sampleBb - ) const; - - //- Does shape at index contain sample - bool contains - ( - const label index, - const point& sample - ) const; - - //- Segment (from start to end) intersection with shape - // at index. If intersects returns true and sets intersectionPoint - bool intersects - ( - const label index, - const point& start, - const point& end, - point& intersectionPoint - ) const; - - //- Sets newTightest to bounding box (and returns true) if - // nearer to sample than tightest bounding box. Otherwise - // returns false. - bool findTightest - ( - const label index, - const point& sample, - treeBoundBox& tightest - ) const; - - //- Given index get unit normal and calculate (numerical) sign - // of sample. - // Used to determine accuracy of calcNearest or inside/outside. - scalar calcSign - ( - const label index, - const point& sample, - vector& n - ) const; - - //- Calculates nearest (to sample) point in shape. - // Returns point and mag(nearest - sample) - scalar calcNearest - ( - const label index, - const point& sample, - point& nearest - ) const; - - //- Calculates nearest (to line segment) point in shape. - // Returns distance and both point. - scalar calcNearest - ( - const label index, - const linePointRef& ln, - point& linePt, // nearest point on line - point& shapePt // nearest point on shape - ) const; - - - // Write - - // Write shape at index - void write(Ostream& os, const label index) const; - - - // IOstream Operators - - friend Istream& operator>>(Istream&, octreeDataTriSurface&); - friend Ostream& operator<<(Ostream&, const octreeDataTriSurface&); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -#include "octreeDataTriSurfaceTreeLeaf.H" - -#endif - -// ************************************************************************* // +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 3.2 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + foam-extend is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with foam-extend. If not, see . + +Class + Foam::octreeDataTriSurface + +Description + Encapsulates data for octree searches on triSurface. + +SourceFiles + octreeDataTriSurface.C + +\*---------------------------------------------------------------------------*/ + +#ifndef octreeDataTriSurface_H +#define octreeDataTriSurface_H + +#include "treeBoundBoxList.H" +#include "labelList.H" +#include "point.H" +#include "triSurface.H" +#include "linePointRef.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of classes +template class octree; + +/*---------------------------------------------------------------------------*\ + Class octreeDataTriSurface Declaration +\*---------------------------------------------------------------------------*/ + +class octreeDataTriSurface +{ + // Static data + + //- tolerance on linear dimensions + static scalar tol; + + // Private data + + const triSurface& surface_; + + const treeBoundBoxList allBb_; + + // Extra data to speed up distance searches. + // Triangles expressed as base + spanning vectors + pointField base_; + pointField E0_; + pointField E1_; + scalarList a_; + scalarList b_; + scalarList c_; + + + // Private Static Functions + + //- fast triangle nearest point calculation. Returns point in E0, E1 + // coordinate system: base + s*E0 + t*E1 + static void nearestCoords + ( + const point& base, + const point& E0, + const point& E1, + const scalar a, + const scalar b, + const scalar c, + const point& P, + scalar& s, + scalar& t + ); + + //- Calculate bounding boxes for triangles + static treeBoundBoxList calcBb(const triSurface&); + + + // Private Member Functions + + //- nearest point in xyz coord system + point nearestPoint(const label index, const point& P) const; + + +public: + + // Declare name of the class and its debug switch + ClassName("octreeDataTriSurface"); + + + // Constructors + + //- Construct from triSurface. Holds reference. Bounding box + // calculated from triangle points. + octreeDataTriSurface(const triSurface&); + + //- Construct from triSurface and bounding box. + // Holds references. + octreeDataTriSurface(const triSurface&, const treeBoundBoxList&); + + + // Member Functions + + // Access + + const triSurface& surface() const + { + return surface_; + } + + const treeBoundBoxList& allBb() const + { + return allBb_; + } + + label size() const + { + return allBb_.size(); + } + + + // Search + + //- Get type of sample + label getSampleType + ( + const octree&, + const point& + ) const; + + //- Does (bb of) shape at index overlap bb + bool overlaps + ( + const label index, + const treeBoundBox& sampleBb + ) const; + + //- Does shape at index contain sample + bool contains + ( + const label index, + const point& sample + ) const; + + //- Segment (from start to end) intersection with shape + // at index. If intersects returns true and sets intersectionPoint + bool intersects + ( + const label index, + const point& start, + const point& end, + point& intersectionPoint + ) const; + + //- Sets newTightest to bounding box (and returns true) if + // nearer to sample than tightest bounding box. Otherwise + // returns false. + bool findTightest + ( + const label index, + const point& sample, + treeBoundBox& tightest + ) const; + + //- Given index get unit normal and calculate (numerical) sign + // of sample. + // Used to determine accuracy of calcNearest or inside/outside. + scalar calcSign + ( + const label index, + const point& sample, + vector& n + ) const; + + //- Calculates nearest (to sample) point in shape. + // Returns point and mag(nearest - sample) + scalar calcNearest + ( + const label index, + const point& sample, + point& nearest + ) const; + + //- Calculates nearest (to line segment) point in shape. + // Returns distance and both point. + scalar calcNearest + ( + const label index, + const linePointRef& ln, + point& linePt, // nearest point on line + point& shapePt // nearest point on shape + ) const; + + + // Write + + // Write shape at index + void write(Ostream& os, const label index) const; + + + // IOstream Operators + + friend Istream& operator>>(Istream&, octreeDataTriSurface&); + friend Ostream& operator<<(Ostream&, const octreeDataTriSurface&); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +#include "octreeDataTriSurfaceTreeLeaf.H" + +#endif + +// ************************************************************************* // diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C index 96e7722f8..d3ec19b32 100644 --- a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C +++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C @@ -1,83 +1,83 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | foam-extend: Open Source CFD - \\ / O peration | Version: 3.2 - \\ / A nd | Web: http://www.foam-extend.org - \\/ M anipulation | For copyright notice see file Copyright -------------------------------------------------------------------------------- -License - This file is part of foam-extend. - - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . - -Description - -\*---------------------------------------------------------------------------*/ - -#include "octreeDataTriSurface.H" -#include "octreeDataTriSurfaceTreeLeaf.H" - -// * * * * * * * * * * * * * Template Specialisations * * * * * * * * * * * // - -template<> -bool Foam::treeLeaf::findNearest -( - const octreeDataTriSurface& shapes, - const point& sample, - treeBoundBox& tightest, - label& tightestI, - scalar& tightestDist -) const -{ - // Some aliases - const treeBoundBoxList& allBb = shapes.allBb(); - point& min = tightest.min(); - point& max = tightest.max(); - - point nearest; - - bool changed = false; - forAll(indices_, i) - { - label faceI = indices_[i]; - - // Quick rejection test. - if (tightest.overlaps(allBb[faceI])) - { - // Full calculation - scalar dist = shapes.calcNearest(faceI, sample, nearest); - - if (dist < tightestDist) - { - // Update bb (centered around sample, span is dist) - min.x() = sample.x() - dist; - min.y() = sample.y() - dist; - min.z() = sample.z() - dist; - - max.x() = sample.x() + dist; - max.y() = sample.y() + dist; - max.z() = sample.z() + dist; - - tightestI = faceI; - tightestDist = dist; - - changed = true; - } - } - } - return changed; -} - - -// ************************************************************************* // +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 3.2 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + foam-extend is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with foam-extend. If not, see . + +Description + +\*---------------------------------------------------------------------------*/ + +#include "octreeDataTriSurface.H" +#include "octreeDataTriSurfaceTreeLeaf.H" + +// * * * * * * * * * * * * * Template Specialisations * * * * * * * * * * * // + +template<> +bool Foam::treeLeaf::findNearest +( + const octreeDataTriSurface& shapes, + const point& sample, + treeBoundBox& tightest, + label& tightestI, + scalar& tightestDist +) const +{ + // Some aliases + const treeBoundBoxList& allBb = shapes.allBb(); + point& min = tightest.min(); + point& max = tightest.max(); + + point nearest; + + bool changed = false; + forAll(indices_, i) + { + label faceI = indices_[i]; + + // Quick rejection test. + if (tightest.overlaps(allBb[faceI])) + { + // Full calculation + scalar dist = shapes.calcNearest(faceI, sample, nearest); + + if (dist < tightestDist) + { + // Update bb (centered around sample, span is dist) + min.x() = sample.x() - dist; + min.y() = sample.y() - dist; + min.z() = sample.z() - dist; + + max.x() = sample.x() + dist; + max.y() = sample.y() + dist; + max.z() = sample.z() + dist; + + tightestI = faceI; + tightestDist = dist; + + changed = true; + } + } + } + return changed; +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/IAPWS_Waterproperties/IAPWSThermo/IAPWS-IF97.C b/src/thermophysicalModels/basic/IAPWS_Waterproperties/IAPWSThermo/IAPWS-IF97.C index 415a8e555..f0e21fec8 100644 --- a/src/thermophysicalModels/basic/IAPWS_Waterproperties/IAPWSThermo/IAPWS-IF97.C +++ b/src/thermophysicalModels/basic/IAPWS_Waterproperties/IAPWSThermo/IAPWS-IF97.C @@ -588,7 +588,7 @@ Foam::scalar Foam::drhodh(SteamState S) else { Info<<"IAPWS-IF97.C error, outside the regions 1-4"<dpdv(rho, T)*this->dpdv(rho, T); scalar dpdv3=dpdv2*this->dpdv(rho, T); - return + return -( dpdT2*this->d2pdv2(rho, T) + dpdv2*this->d2pdT2(rho, T) diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.C b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.C index 1050f777b..93ad19eea 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.C +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.C @@ -27,7 +27,7 @@ Description Author Christian Lucas Institut für Thermodynamik -Technische Universität Braunschweig +Technische Universität Braunschweig Germany \*---------------------------------------------------------------------------*/ @@ -44,7 +44,7 @@ Foam::pengRobinson::pengRobinson(Istream& is) Tcrit_(readScalar(is)), azentricFactor_(readScalar(is)), a0_(0.457235*pow(this->RR(), 2)*pow(Tcrit_, 2)/pcrit_), - b_(0.077796*this->RR()*Tcrit_/pcrit_), + b_(0.077796*this->RR()*Tcrit_/pcrit_), n_(0.37464 + 1.54226*azentricFactor_ - 0.26992*pow(azentricFactor_, 2)), b2_(b_*b_), b3_(b2_*b_), @@ -117,7 +117,7 @@ void Foam::pengRobinson::write(Ostream& os) const Foam::Ostream& Foam::operator<<(Ostream& os, const pengRobinson& pr) { - os << static_cast(pr)<< token::SPACE + os << static_cast(pr)<< token::SPACE << pr.pcrit_ << tab<< pr.Tcrit_<< tab << pr.azentricFactor_; os.check("Ostream& operator<<(Ostream& os, const pengRobinson& st)"); diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.H index 90739c075..105c327f3 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinson.H @@ -41,7 +41,7 @@ SourceFiles Author Christian Lucas Institut für Thermodynamik -Technische Universität Braunschweig +Technische Universität Braunschweig Germany \*---------------------------------------------------------------------------*/ @@ -69,7 +69,7 @@ class pengRobinson // private data //CL: data at critical point scalar pcrit_; - scalar Tcrit_; + scalar Tcrit_; scalar azentricFactor_; //-Peng Robinson factors @@ -111,8 +111,8 @@ public: //- Construct from components inline pengRobinson ( - const specie& sp - ); + const specie& sp + ); //- Construct from Istream pengRobinson(Istream&); diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinsonI.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinsonI.H index 92ec2f30b..3ebd84e0d 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinsonI.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/pengRobinson/pengRobinsonI.H @@ -68,8 +68,8 @@ inline pengRobinson::pengRobinson(const word& name, const pengRobinson& pr) rhoMin_(pr.rhoMin_), rhoMax_(pr.rhoMax_), rhostd_(pr.rhostd_), - aSave(0.0), - daSave(0.0), + aSave(0.0), + daSave(0.0), d2aSave(0.0), TSave(0.0) {} @@ -199,7 +199,7 @@ inline scalar pengRobinson::n() const inline scalar pengRobinson::p(const scalar rho, const scalar T) const { scalar Vm = this->W()/rho; - scalar Vm2 = Vm*Vm; + scalar Vm2 = Vm*Vm; return this->RR()*T/(Vm - b_) - a(T)/(Vm2 + 2*b_*Vm - b2_); } @@ -336,7 +336,7 @@ inline scalar pengRobinson::d2vdT2 scalar dpdv2=this->dpdv(rho, T)*this->dpdv(rho, T); scalar dpdv3=dpdv2*this->dpdv(rho, T); - return + return -( dpdT2*this->d2pdv2(rho, T) + dpdv2*this->d2pdT2(rho, T) @@ -357,7 +357,7 @@ inline scalar pengRobinson::d2pdvdT scalar Vm2 = Vm*Vm; scalar Vm3 = Vm2*Vm; scalar Vm4 = Vm3*Vm; - + return ( 2*dadT(T)*(b3_ - b2_*Vm - b_*Vm2 + Vm3) diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.C b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.C index bb623d6e1..1e178f3aa 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.C +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.C @@ -78,7 +78,7 @@ Foam::redlichKwong::redlichKwong(const dictionary& dict) rhoMax_(dict.subDict("equationOfState").lookupOrDefault("rhoMax",1500)), // Starting GUESS for the density by ideal gas law rhostd_(this->rho(this->Pstd(), this->Tstd(), this->Pstd()/(this->Tstd()*this->R()))) -{ +{ is.check("redlichKwong::redlichKwong(Istream& is)"); } diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.H index 6bd3cd3b7..7f6c11c7e 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwong.H @@ -62,7 +62,7 @@ class redlichKwong // private data //CL: data at critical point scalar pcrit_; - scalar Tcrit_; + scalar Tcrit_; //CL: Redlich Kwong factors scalar a_; diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwongI.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwongI.H index 253b1fb00..6269ff77b 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwongI.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/redlichKwong/redlichKwongI.H @@ -126,7 +126,7 @@ inline scalar redlichKwong::p(const scalar rho, const scalar T) const } -//Real deviative dp/dv at constant temperature +//Real deviative dp/dv at constant temperature //(molar values) inline scalar redlichKwong::dpdv(const scalar rho, const scalar T) const { @@ -233,7 +233,7 @@ inline scalar redlichKwong::d2vdT2(const scalar rho, const scalar T) const scalar dpdv2=this->dpdv(rho, T)*this->dpdv(rho, T); scalar dpdv3=dpdv2*this->dpdv(rho, T); - return + return -( dpdT2*this->d2pdv2(rho, T) + dpdv2*this->d2pdT2(rho, T) @@ -250,7 +250,7 @@ inline scalar redlichKwong::d2pdvdT(const scalar rho, const scalar T) const scalar Vm2 = Vm*Vm; scalar Vm3 = Vm2*Vm; scalar T15_ = pow(T, 1.5); - + return -( 0.5* diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwong.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwong.H index 4114abfb0..890345796 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwong.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwong.H @@ -67,7 +67,7 @@ class soaveRedlichKwong // private data //CL: data at critical point scalar pcrit_; - scalar Tcrit_; + scalar Tcrit_; scalar azentricFactor_; //-Soave Redlich Kwong diff --git a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwongI.H b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwongI.H index 58bd76efc..61bffa5e7 100755 --- a/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwongI.H +++ b/src/thermophysicalModels/specie/equationOfState/cubicEquationOfState/soaveRedlichKwong/soaveRedlichKwongI.H @@ -310,7 +310,7 @@ inline scalar soaveRedlichKwong::d2vdT2 scalar dpdv2=this->dpdv(rho, T)*this->dpdv(rho, T); scalar dpdv3=dpdv2*this->dpdv(rho, T); - return + return -( dpdT2*this->d2pdv2(rho, T) + dpdv2*this->d2pdT2(rho, T) diff --git a/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacity.C b/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacity.C index a9d178362..296aea049 100755 --- a/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacity.C +++ b/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacity.C @@ -24,7 +24,7 @@ License Author Christian Lucas Institut für Thermodynamik -Technische Universität Braunschweig +Technische Universität Braunschweig Germany \*---------------------------------------------------------------------------*/ @@ -46,9 +46,9 @@ Foam::constantHeatCapacity::constantHeatCapacity(Istream& is) integral_p_dv_std(this->integral_p_dv(this->rhostd(),this->Tstd())), integral_dpdT_dv_std(this->integral_dpdT_dv(this->rhostd(),this->Tstd())), // cp @ STD (needed to limit cp for stability - cp_std(this->cp_nonLimited(this->rhostd(),this->Tstd())) + cp_std(this->cp_nonLimited(this->rhostd(),this->Tstd())) { - is.check("constantHeatCapacity::constantHeatCapacity(Istream& is)"); + is.check("constantHeatCapacity::constantHeatCapacity(Istream& is)"); } diff --git a/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacity.H b/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacity.H index 438b386f2..415636e5c 100755 --- a/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacity.H +++ b/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacity.H @@ -31,8 +31,8 @@ Description templated into the equationOfState -> uses the equation of state to calculate all real Gas properties like Enthalpy, Entropy ... -> can not be used with the perfectGas equation of state - - Equations for the real gas correction: Have a look at thermodnamics books e.g. Thermodynamics: + + Equations for the real gas correction: Have a look at thermodnamics books e.g. Thermodynamics: An Engineering Approch, 5 Edition, Chapter 12 SourceFiles @@ -42,7 +42,7 @@ SourceFiles Author Christian Lucas Institut für Thermodynamik -Technische Universität Braunschweig +Technische Universität Braunschweig Germany \*---------------------------------------------------------------------------*/ @@ -112,11 +112,11 @@ class constantHeatCapacity scalar Cp0_; //CL: molar values scalar cp0_; - scalar e0_std; - scalar s0_std; - scalar integral_p_dv_std; - scalar integral_dpdT_dv_std; - scalar cp_std; + scalar e0_std; + scalar s0_std; + scalar integral_p_dv_std; + scalar integral_dpdT_dv_std; + scalar cp_std; // Private member functions @@ -126,7 +126,7 @@ class constantHeatCapacity ( const equationOfState& st, const scalar cp0_ - ); + ); //- Construct from components //CL: used for the operator* @@ -159,10 +159,10 @@ public: inline static autoPtr New(Istream& is); // Member Functions - - //- perfect Gas Enthalpy [J/kmol] + + //- perfect Gas Enthalpy [J/kmol] inline scalar h0(const scalar T) const; - + //- perfect Gas Entropy [J/(kmol K)] inline scalar s0(const scalar T) const; @@ -179,7 +179,7 @@ public: inline scalar cp(const scalar rho, const scalar T) const; //- non Limited Heat capacity at constant pressure [J/(kmol K)] - inline scalar cp_nonLimited(const scalar rho, const scalar T) const; + inline scalar cp_nonLimited(const scalar rho, const scalar T) const; //- Heat capacity at constant pressure [J/(kmol K)] inline scalar cv(const scalar rho, const scalar T) const; @@ -189,7 +189,7 @@ public: //- Entropy [J/(kmol K)] inline scalar s(const scalar rho,const scalar T) const; - + //- Internal Energy [J/kmol] inline scalar e(const scalar rho, const scalar T) const; diff --git a/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacityI.H b/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacityI.H index f851be3ef..cc884555e 100755 --- a/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacityI.H +++ b/src/thermophysicalModels/specie/thermo/realGasThermo/constantHeatCapacity/constantHeatCapacityI.H @@ -24,7 +24,7 @@ License Author Christian Lucas Institut für Thermodynamik -Technische Universität Braunschweig +Technische Universität Braunschweig Germany \*---------------------------------------------------------------------------*/ @@ -46,7 +46,7 @@ inline Foam::constantHeatCapacity::constantHeatCapacity s0_std(s0(this->Tstd)), integral_p_dv_std(this->integral_p_dv(this->rhostd(),this->Tstd)), integral_dpdT_dv_std(this->integral_dpdT_dv(this->rhostd(),this->Tstd)), - cp_std(this->cp_nonLimited(this->rhostd(),this->Tstd)) + cp_std(this->cp_nonLimited(this->rhostd(),this->Tstd)) {} @@ -70,7 +70,7 @@ inline Foam::constantHeatCapacity::constantHeatCapacity s0_std(s0_std_), integral_p_dv_std(integral_p_dv_std_), integral_dpdT_dv_std(integral_dpdT_dv_std_), - cp_std(cp_std_) + cp_std(cp_std_) {} @@ -116,7 +116,7 @@ Foam::constantHeatCapacity::New(Istream& is) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // //used to calculate the internal energy -//perfect gas enthalpy +//perfect gas enthalpy template inline Foam::scalar Foam::constantHeatCapacity::h0 ( @@ -128,7 +128,7 @@ inline Foam::scalar Foam::constantHeatCapacity::h0 //used to calculate the internal energy -//perfect gas internal energy +//perfect gas internal energy template inline Foam::scalar Foam::constantHeatCapacity::e0 ( @@ -137,10 +137,10 @@ inline Foam::scalar Foam::constantHeatCapacity::e0 { return this->h0(T) - this->RR()*T; } - - + + // used to calculate the entropy -// perfect gas entropy +// perfect gas entropy template inline Foam::scalar Foam::constantHeatCapacity::s0 ( @@ -180,14 +180,14 @@ template inline Foam::scalar Foam::constantHeatCapacity::cp ( const scalar rho, - const scalar T + const scalar T ) const { - // Problem --> dpdv(rho,T) is =0 at some points within the vapour dome. To increase stability, (dp/dv) has to be limited + // Problem --> dpdv(rho,T) is =0 at some points within the vapour dome. To increase stability, (dp/dv) has to be limited // cp can be negative within the vapor dome. To avoid this nonphysical result, the absolute value is used. - // within the vapourdome and at the critical point, cp increases to very high values --> infinity, - // this would decrease the stability, so cp will be limited to 20 times the cp @ STD - return + // within the vapourdome and at the critical point, cp increases to very high values --> infinity, + // this would decrease the stability, so cp will be limited to 20 times the cp @ STD + return min ( cp_std*20, @@ -196,7 +196,7 @@ inline Foam::scalar Foam::constantHeatCapacity::cp this->cv(rho,T) - T*pow((this->dpdT(rho, T)), 2)/min(this->dpdv(rho, T), -1) ) - ); + ); } @@ -206,10 +206,10 @@ template inline Foam::scalar Foam::constantHeatCapacity::cp_nonLimited ( const scalar rho, - const scalar T + const scalar T ) const { - return + return fabs(this->cv(rho, T) - T*pow((this->dpdT(rho, T)), 2)/min(this->dpdv(rho, T), -1)); } @@ -222,7 +222,6 @@ inline Foam::scalar Foam::constantHeatCapacity::cv ( const scalar rho, const scalar T - ) const { return this->cv0(T) + T*this->integral_d2pdT2_dv(rho, T); @@ -232,9 +231,9 @@ inline Foam::scalar Foam::constantHeatCapacity::cv //function to calculate real gas enthalpy template inline Foam::scalar Foam::constantHeatCapacity::h -( +( const scalar rho, - const scalar T + const scalar T ) const { return @@ -249,12 +248,12 @@ inline Foam::scalar Foam::constantHeatCapacity::h // equation: du= cv0 dT +[T*dp/dT -p]dv template inline Foam::scalar Foam::constantHeatCapacity::e -( +( const scalar rho, - const scalar T + const scalar T ) const { - return + return - this->Tstd()*integral_dpdT_dv_std + integral_p_dv_std + this->e0(T) @@ -273,7 +272,6 @@ inline Foam::scalar Foam::constantHeatCapacity::s ( const scalar rho, const scalar T - ) const { return @@ -293,7 +291,6 @@ inline void Foam::constantHeatCapacity::operator+= const constantHeatCapacity& np ) { - scalar molr1 = this->nMoles(); equationOfState::operator+=(np); @@ -378,8 +375,8 @@ inline Foam::constantHeatCapacity Foam::operator* const constantHeatCapacity& np ) { - //CL: values at STD don't need to be recalculated, - //CL: therefore, providing the values in the constructor + //CL: values at STD don't need to be recalculated, + //CL: therefore, providing the values in the constructor return constantHeatCapacity ( s*static_cast(np), diff --git a/src/thermophysicalModels/specie/thermo/realGasThermo/nasaHeatCapacityPolynomial/nasaHeatCapacityPolynomial.C b/src/thermophysicalModels/specie/thermo/realGasThermo/nasaHeatCapacityPolynomial/nasaHeatCapacityPolynomial.C index 20af3b65d..5ea74f0ef 100755 --- a/src/thermophysicalModels/specie/thermo/realGasThermo/nasaHeatCapacityPolynomial/nasaHeatCapacityPolynomial.C +++ b/src/thermophysicalModels/specie/thermo/realGasThermo/nasaHeatCapacityPolynomial/nasaHeatCapacityPolynomial.C @@ -54,7 +54,7 @@ Foam::nasaHeatCapacityPolynomial::nasaHeatCapacityPolynomial(Is //cp @ STD (needed to limit cp for stability cp_std(this->cp_nonLimited(this->rhostd(),this->Tstd())) { - is.check("nasaHeatCapacityPolynomial::nasaHeatCapacityPolynomial(Istream& is)"); + is.check("nasaHeatCapacityPolynomial::nasaHeatCapacityPolynomial(Istream& is)"); } diff --git a/src/thermophysicalModels/specie/thermo/realGasThermo/nasaHeatCapacityPolynomial/nasaHeatCapacityPolynomialI.H b/src/thermophysicalModels/specie/thermo/realGasThermo/nasaHeatCapacityPolynomial/nasaHeatCapacityPolynomialI.H index dbdd3016c..99a6ce19a 100755 --- a/src/thermophysicalModels/specie/thermo/realGasThermo/nasaHeatCapacityPolynomial/nasaHeatCapacityPolynomialI.H +++ b/src/thermophysicalModels/specie/thermo/realGasThermo/nasaHeatCapacityPolynomial/nasaHeatCapacityPolynomialI.H @@ -97,7 +97,7 @@ inline Foam::nasaHeatCapacityPolynomial::nasaHeatCapacityPolyno s0_std(s0_std_), integral_p_dv_std(integral_p_dv_std_), integral_dpdT_dv_std(integral_dpdT_dv_std_), - cp_std(cp_std_) + cp_std(cp_std_) {} diff --git a/tutorials/FSI/fsiFoam/HronTurekFsi3/fluid/constant/polyMesh/blockMeshDict b/tutorials/FSI/fsiFoam/HronTurekFsi3/fluid/constant/polyMesh/blockMeshDict index a816c8a45..39c0383f3 100644 --- a/tutorials/FSI/fsiFoam/HronTurekFsi3/fluid/constant/polyMesh/blockMeshDict +++ b/tutorials/FSI/fsiFoam/HronTurekFsi3/fluid/constant/polyMesh/blockMeshDict @@ -18,86 +18,85 @@ convertToMeters 0.001; vertices ( - (0 0 0) //0 - (120 0 0) //1 - (280 0 0) //2 - (600 0 0) //3 - (2500 0 0) //4 - (0 120 0) //5 - (120 120 0) //6 - (280 120 0)//7 - (600 120 0) //8 - (2500 120 0) //9 - (164.6447 164.6447 0)//10 - (235.3553 164.6447 0)//11 - (248.9898 190 0) //12 - (299.5733 190 0) //13 - (600 190 0) //14 - (2500 190 0) //15 - (164.6447 235.355 0) //16 - (235.3553 235.355 0) //17 - (248.9898 210 0) //18 - (299.5733 210 0) //19 - (600 210 0) //20 - (2500 210 0) //21 - (0 280 0) //22 - (120 280 0) //23 - (280 280 0)//24 - (600 280 0) //25 - (2500 280 0) //26 - (0 410 0) //27 - (120 410 0) //28 - (280 410 0) //29 - (600 410 0) //30 - (2500 410 0) //31 + (0 0 0) //0 + (120 0 0) //1 + (280 0 0) //2 + (600 0 0) //3 + (2500 0 0) //4 + (0 120 0) //5 + (120 120 0) //6 + (280 120 0)//7 + (600 120 0) //8 + (2500 120 0) //9 + (164.6447 164.6447 0)//10 + (235.3553 164.6447 0)//11 + (248.9898 190 0) //12 + (299.5733 190 0) //13 + (600 190 0) //14 + (2500 190 0) //15 + (164.6447 235.355 0) //16 + (235.3553 235.355 0) //17 + (248.9898 210 0) //18 + (299.5733 210 0) //19 + (600 210 0) //20 + (2500 210 0) //21 + (0 280 0) //22 + (120 280 0) //23 + (280 280 0)//24 + (600 280 0) //25 + (2500 280 0) //26 + (0 410 0) //27 + (120 410 0) //28 + (280 410 0) //29 + (600 410 0) //30 + (2500 410 0) //31 - (0 0 15) //32 - (120 0 15) //33 - (280 0 15) //34 - (600 0 15) //35 - (2500 0 15) //36 - (0 120 15) //37 - (120 120 15) //38 - (280 120 15)//39 - (600 120 15) //40 - (2500 120 15) //41 - (164.6447 164.6447 15)//42 - (235.3553 164.6447 15)//43 - (248.9898 190 15) //44 - (299.5733 190 15) //45 - (600 190 15) //46 - (2500 190 15) //47 - (164.6447 235.355 15) //48 - (235.3553 235.355 15) //49 - (248.9898 210 15) //50 - (299.5733 210 15) //51 - (600 210 15) //52 - (2500 210 15) //53 - (0 280 15) //54 - (120 280 15) //55 - (280 280 15)//56 - (600 280 15) //57 - (2500 280 15) //58 - (0 410 15) //59 - (120 410 15) //60 - (280 410 15) //61 - (600 410 15) //62 - (2500 410 15) //63 + (0 0 15) //32 + (120 0 15) //33 + (280 0 15) //34 + (600 0 15) //35 + (2500 0 15) //36 + (0 120 15) //37 + (120 120 15) //38 + (280 120 15)//39 + (600 120 15) //40 + (2500 120 15) //41 + (164.6447 164.6447 15)//42 + (235.3553 164.6447 15)//43 + (248.9898 190 15) //44 + (299.5733 190 15) //45 + (600 190 15) //46 + (2500 190 15) //47 + (164.6447 235.355 15) //48 + (235.3553 235.355 15) //49 + (248.9898 210 15) //50 + (299.5733 210 15) //51 + (600 210 15) //52 + (2500 210 15) //53 + (0 280 15) //54 + (120 280 15) //55 + (280 280 15)//56 + (600 280 15) //57 + (2500 280 15) //58 + (0 410 15) //59 + (120 410 15) //60 + (280 410 15) //61 + (600 410 15) //62 + (2500 410 15) //63 - (1000 0 0) //64 - (1000 120 0) //65 - (1000 190 0) //66 - (1000 210 0) //67 - (1000 280 0) //68 - (1000 410 0) //69 - - (1000 0 15) //70 - (1000 120 15) //71 - (1000 190 15) //72 - (1000 210 15) //73 - (1000 280 15) //74 - (1000 410 15) //75 + (1000 0 0) //64 + (1000 120 0) //65 + (1000 190 0) //66 + (1000 210 0) //67 + (1000 280 0) //68 + (1000 410 0) //69 + (1000 0 15) //70 + (1000 120 15) //71 + (1000 190 15) //72 + (1000 210 15) //73 + (1000 280 15) //74 + (1000 410 15) //75 ); blocks @@ -159,116 +158,114 @@ edges arc 13 7 (288.2725 141.3043 0) arc 45 39 (288.2725 141.3043 15) - ); patches ( - patch plate - ( - (19 18 50 51) - (20 19 51 52) - (20 52 46 14) - (13 14 46 45) - (12 13 45 44) - ) + patch plate + ( + (19 18 50 51) + (20 19 51 52) + (20 52 46 14) + (13 14 46 45) + (12 13 45 44) + ) - patch outlet - ( - (63 31 26 58) - (58 26 21 53) - (53 21 15 47) - (47 15 9 41) - (41 9 4 36) - ) + patch outlet + ( + (63 31 26 58) + (58 26 21 53) + (53 21 15 47) + (47 15 9 41) + (41 9 4 36) + ) - patch inlet - ( - (27 59 54 22) - (22 54 37 5) - (5 37 32 0) - ) + patch inlet + ( + (27 59 54 22) + (22 54 37 5) + (5 37 32 0) + ) - patch cylinder - ( - (16 48 49 17) - (17 49 50 18) - (10 42 48 16) - (11 43 42 10) - (12 44 43 11) - ) + patch cylinder + ( + (16 48 49 17) + (17 49 50 18) + (10 42 48 16) + (11 43 42 10) + (12 44 43 11) + ) - patch bottom - ( - (1 0 32 33) - (2 1 33 34) - (3 2 34 35) - (64 3 35 70) - (4 64 70 36) - ) + patch bottom + ( + (1 0 32 33) + (2 1 33 34) + (3 2 34 35) + (64 3 35 70) + (4 64 70 36) + ) - patch top - ( - (27 28 60 59) - (28 29 61 60) - (29 30 62 61) - (30 69 75 62) - (69 31 63 75) - ) + patch top + ( + (27 28 60 59) + (28 29 61 60) + (29 30 62 61) + (30 69 75 62) + (69 31 63 75) + ) - empty frontAndBackPlanes - ( - (22 23 28 27) - (23 24 29 28) - (24 25 30 29) - (25 68 69 30) - (68 26 31 69) - (5 6 23 22) - (6 10 16 23) - (16 17 24 23) - (18 19 24 17) - (19 20 25 24) - (20 67 68 25) - (67 21 26 68) - (6 7 11 10) - (7 13 12 11) - (7 8 14 13) - (8 65 66 14) - (65 9 15 66) - (0 1 6 5) - (1 2 7 6) - (2 3 8 7) - (3 64 65 8) - (64 4 9 65) - (14 66 67 20) - (66 15 21 67) - - (33 32 37 38) - (34 33 38 39) - (35 34 39 40) - (70 35 40 71) - (36 70 71 41) - (38 37 54 55) - (42 38 55 48) - (39 38 42 43) - (45 39 43 44) - (40 39 45 46) - (71 40 46 72) - (41 71 72 47) - (49 48 55 56) - (51 50 49 56) - (52 51 56 57) - (73 52 57 74) - (53 73 74 58) - (55 54 59 60) - (56 55 60 61) - (57 56 61 62) - (74 57 62 75) - (58 74 75 63) - (72 46 52 73) - (47 72 73 53) - ) + empty frontAndBackPlanes + ( + (22 23 28 27) + (23 24 29 28) + (24 25 30 29) + (25 68 69 30) + (68 26 31 69) + (5 6 23 22) + (6 10 16 23) + (16 17 24 23) + (18 19 24 17) + (19 20 25 24) + (20 67 68 25) + (67 21 26 68) + (6 7 11 10) + (7 13 12 11) + (7 8 14 13) + (8 65 66 14) + (65 9 15 66) + (0 1 6 5) + (1 2 7 6) + (2 3 8 7) + (3 64 65 8) + (64 4 9 65) + (14 66 67 20) + (66 15 21 67) + (33 32 37 38) + (34 33 38 39) + (35 34 39 40) + (70 35 40 71) + (36 70 71 41) + (38 37 54 55) + (42 38 55 48) + (39 38 42 43) + (45 39 43 44) + (40 39 45 46) + (71 40 46 72) + (41 71 72 47) + (49 48 55 56) + (51 50 49 56) + (52 51 56 57) + (73 52 57 74) + (53 73 74 58) + (55 54 59 60) + (56 55 60 61) + (57 56 61 62) + (74 57 62 75) + (58 74 75 63) + (72 46 52 73) + (47 72 73 53) + ) ); mergePatchPairs diff --git a/tutorials/FSI/fsiFoam/HronTurekFsi3/fluid/constant/polyMesh/blockMeshDict.first b/tutorials/FSI/fsiFoam/HronTurekFsi3/fluid/constant/polyMesh/blockMeshDict.first index 775a0f382..d2cfd40a2 100644 --- a/tutorials/FSI/fsiFoam/HronTurekFsi3/fluid/constant/polyMesh/blockMeshDict.first +++ b/tutorials/FSI/fsiFoam/HronTurekFsi3/fluid/constant/polyMesh/blockMeshDict.first @@ -18,86 +18,85 @@ convertToMeters 0.001; vertices ( - (0 0 0) //0 - (129.289 0 0) //1 - (270.7106 0 0) //2 - (600 0 0) //3 - (2500 0 0) //4 - (0 129.289 0) //5 - (129.289 129.289 0) //6 - (270.7106 129.289 0)//7 - (600 129.289 0) //8 - (2500 129.289 0) //9 - (164.6447 164.6447 0)//10 - (235.3553 164.6447 0)//11 - (248.9898 190 0) //12 - (299.4987 190 0) //13 - (600 190 0) //14 - (2500 190 0) //15 - (164.6447 235.355 0) //16 - (235.3553 235.355 0) //17 - (248.9898 210 0) //18 - (299.4987 210 0) //19 - (600 210 0) //20 - (2500 210 0) //21 - (0 270.7107 0) //22 - (129.289 270.7107 0) //23 - (270.7106 270.7107 0)//24 - (600 270.7107 0) //25 - (2500 270.7107 0) //26 - (0 410 0) //27 - (129.289 410 0) //28 - (270.7106 410 0) //29 - (600 410 0) //30 - (2500 410 0) //31 + (0 0 0) //0 + (129.289 0 0) //1 + (270.7106 0 0) //2 + (600 0 0) //3 + (2500 0 0) //4 + (0 129.289 0) //5 + (129.289 129.289 0) //6 + (270.7106 129.289 0)//7 + (600 129.289 0) //8 + (2500 129.289 0) //9 + (164.6447 164.6447 0)//10 + (235.3553 164.6447 0)//11 + (248.9898 190 0) //12 + (299.4987 190 0) //13 + (600 190 0) //14 + (2500 190 0) //15 + (164.6447 235.355 0) //16 + (235.3553 235.355 0) //17 + (248.9898 210 0) //18 + (299.4987 210 0) //19 + (600 210 0) //20 + (2500 210 0) //21 + (0 270.7107 0) //22 + (129.289 270.7107 0) //23 + (270.7106 270.7107 0)//24 + (600 270.7107 0) //25 + (2500 270.7107 0) //26 + (0 410 0) //27 + (129.289 410 0) //28 + (270.7106 410 0) //29 + (600 410 0) //30 + (2500 410 0) //31 - (0 0 0.05067) //32 - (129.289 0 0.05067) //33 - (270.7106 0 0.05067) //34 - (600 0 0.05067) //35 - (2500 0 0.05067) //36 - (0 129.289 0.05067) //37 - (129.289 129.289 0.05067) //38 - (270.7106 129.289 0.05067)//39 - (600 129.289 0.05067) //40 - (2500 129.289 0.05067) //41 - (164.6447 164.6447 0.05067)//42 - (235.3553 164.6447 0.05067)//43 - (248.9898 190 0.05067) //44 - (299.4987 190 0.05067) //45 - (600 190 0.05067) //46 - (2500 190 0.05067) //47 - (164.6447 235.355 0.05067) //48 - (235.3553 235.355 0.05067) //49 - (248.9898 210 0.05067) //50 - (299.4987 210 0.05067) //51 - (600 210 0.05067) //52 - (2500 210 0.05067) //53 - (0 270.7107 0.05067) //54 - (129.289 270.7107 0.05067) //55 - (270.7106 270.7107 0.05067)//56 - (600 270.7107 0.05067) //57 - (2500 270.7107 0.05067) //58 - (0 410 0.05067) //59 - (129.289 410 0.05067) //60 - (270.7106 410 0.05067) //61 - (600 410 0.05067) //62 - (2500 410 0.05067) //63 + (0 0 0.05067) //32 + (129.289 0 0.05067) //33 + (270.7106 0 0.05067) //34 + (600 0 0.05067) //35 + (2500 0 0.05067) //36 + (0 129.289 0.05067) //37 + (129.289 129.289 0.05067) //38 + (270.7106 129.289 0.05067)//39 + (600 129.289 0.05067) //40 + (2500 129.289 0.05067) //41 + (164.6447 164.6447 0.05067)//42 + (235.3553 164.6447 0.05067)//43 + (248.9898 190 0.05067) //44 + (299.4987 190 0.05067) //45 + (600 190 0.05067) //46 + (2500 190 0.05067) //47 + (164.6447 235.355 0.05067) //48 + (235.3553 235.355 0.05067) //49 + (248.9898 210 0.05067) //50 + (299.4987 210 0.05067) //51 + (600 210 0.05067) //52 + (2500 210 0.05067) //53 + (0 270.7107 0.05067) //54 + (129.289 270.7107 0.05067) //55 + (270.7106 270.7107 0.05067)//56 + (600 270.7107 0.05067) //57 + (2500 270.7107 0.05067) //58 + (0 410 0.05067) //59 + (129.289 410 0.05067) //60 + (270.7106 410 0.05067) //61 + (600 410 0.05067) //62 + (2500 410 0.05067) //63 - (1000 0 0) //64 - (1000 129.289 0) //65 - (1000 190 0) //66 - (1000 210 0) //67 - (1000 270.7107 0) //68 - (1000 410 0) //69 - - (1000 0 0.05067) //70 - (1000 129.289 0.05067) //71 - (1000 190 0.05067) //72 - (1000 210 0.05067) //73 - (1000 270.7107 0.05067) //74 - (1000 410 0.05067) //75 + (1000 0 0) //64 + (1000 129.289 0) //65 + (1000 190 0) //66 + (1000 210 0) //67 + (1000 270.7107 0) //68 + (1000 410 0) //69 + (1000 0 0.05067) //70 + (1000 129.289 0.05067) //71 + (1000 190 0.05067) //72 + (1000 210 0.05067) //73 + (1000 270.7107 0.05067) //74 + (1000 410 0.05067) //75 ); blocks @@ -159,116 +158,114 @@ edges arc 13 7 (286.6025 150 0) arc 45 39 (286.6025 150 0.05067) - ); patches ( - patch plate - ( - (19 18 50 51) - (12 13 45 44) - (20 19 51 52) - (13 14 46 45) - (20 52 46 14) - ) + patch plate + ( + (19 18 50 51) + (12 13 45 44) + (20 19 51 52) + (13 14 46 45) + (20 52 46 14) + ) - patch outlet - ( - (63 31 26 58) - (58 26 21 53) - (53 21 15 47) - (47 15 9 41) - (41 9 4 36) - ) + patch outlet + ( + (63 31 26 58) + (58 26 21 53) + (53 21 15 47) + (47 15 9 41) + (41 9 4 36) + ) - patch inlet - ( - (27 59 54 22) - (22 54 37 5) - (5 37 32 0) - ) + patch inlet + ( + (27 59 54 22) + (22 54 37 5) + (5 37 32 0) + ) - patch cylinder - ( - (16 48 49 17) - (17 49 50 18) - (10 42 48 16) - (11 43 42 10) - (12 44 43 11) - ) + patch cylinder + ( + (16 48 49 17) + (17 49 50 18) + (10 42 48 16) + (11 43 42 10) + (12 44 43 11) + ) - patch bottom - ( - (1 0 32 33) - (2 1 33 34) - (3 2 34 35) - (64 3 35 70) - (4 64 70 36) - ) + patch bottom + ( + (1 0 32 33) + (2 1 33 34) + (3 2 34 35) + (64 3 35 70) + (4 64 70 36) + ) - patch top - ( - (27 28 60 59) - (28 29 61 60) - (29 30 62 61) - (30 69 75 62) - (69 31 63 75) - ) + patch top + ( + (27 28 60 59) + (28 29 61 60) + (29 30 62 61) + (30 69 75 62) + (69 31 63 75) + ) - empty frontAndBackPlanes - ( - (22 23 28 27) - (23 24 29 28) - (24 25 30 29) - (25 68 69 30) - (68 26 31 69) - (5 6 23 22) - (6 10 16 23) - (16 17 24 23) - (18 19 24 17) - (19 20 25 24) - (20 67 68 25) - (67 21 26 68) - (6 7 11 10) - (7 13 12 11) - (7 8 14 13) - (8 65 66 14) - (65 9 15 66) - (0 1 6 5) - (1 2 7 6) - (2 3 8 7) - (3 64 65 8) - (64 4 9 65) - (14 66 67 20) - (66 15 21 67) - - (33 32 37 38) - (34 33 38 39) - (35 34 39 40) - (70 35 40 71) - (36 70 71 41) - (38 37 54 55) - (42 38 55 48) - (39 38 42 43) - (45 39 43 44) - (40 39 45 46) - (71 40 46 72) - (41 71 72 47) - (49 48 55 56) - (51 50 49 56) - (52 51 56 57) - (73 52 57 74) - (53 73 74 58) - (55 54 59 60) - (56 55 60 61) - (57 56 61 62) - (74 57 62 75) - (58 74 75 63) - (72 46 52 73) - (47 72 73 53) - ) + empty frontAndBackPlanes + ( + (22 23 28 27) + (23 24 29 28) + (24 25 30 29) + (25 68 69 30) + (68 26 31 69) + (5 6 23 22) + (6 10 16 23) + (16 17 24 23) + (18 19 24 17) + (19 20 25 24) + (20 67 68 25) + (67 21 26 68) + (6 7 11 10) + (7 13 12 11) + (7 8 14 13) + (8 65 66 14) + (65 9 15 66) + (0 1 6 5) + (1 2 7 6) + (2 3 8 7) + (3 64 65 8) + (64 4 9 65) + (14 66 67 20) + (66 15 21 67) + (33 32 37 38) + (34 33 38 39) + (35 34 39 40) + (70 35 40 71) + (36 70 71 41) + (38 37 54 55) + (42 38 55 48) + (39 38 42 43) + (45 39 43 44) + (40 39 45 46) + (71 40 46 72) + (41 71 72 47) + (49 48 55 56) + (51 50 49 56) + (52 51 56 57) + (73 52 57 74) + (53 73 74 58) + (55 54 59 60) + (56 55 60 61) + (57 56 61 62) + (74 57 62 75) + (58 74 75 63) + (72 46 52 73) + (47 72 73 53) + ) ); mergePatchPairs diff --git a/tutorials/FSI/fsiFoam/HronTurekFsi3/solid/constant/polyMesh/blockMeshDict b/tutorials/FSI/fsiFoam/HronTurekFsi3/solid/constant/polyMesh/blockMeshDict index af2705cdb..2e55a24bc 100644 --- a/tutorials/FSI/fsiFoam/HronTurekFsi3/solid/constant/polyMesh/blockMeshDict +++ b/tutorials/FSI/fsiFoam/HronTurekFsi3/solid/constant/polyMesh/blockMeshDict @@ -18,15 +18,15 @@ convertToMeters 0.001; vertices ( - (248.9898 190 0) //0=12 - (600 190 0) //1=14 - (600 210 0) //2=20 - (248.9898 210 0) //3=18 + (248.9898 190 0) //0=12 + (600 190 0) //1=14 + (600 210 0) //2=20 + (248.9898 210 0) //3=18 - (248.9898 190 15) //4=44 - (600 190 15) //5=46 - (600 210 15) //6=52 - (248.9898 210 15) //7=50 + (248.9898 190 15) //4=44 + (600 190 15) //5=46 + (600 210 15) //6=52 + (248.9898 210 15) //7=50 ); blocks @@ -40,24 +40,23 @@ edges patches ( - patch plateFix - ( - (3 7 4 0) - ) + patch plateFix + ( + (3 7 4 0) + ) - patch plate - ( - (3 2 6 7) - (6 2 1 5) - (1 0 4 5) - ) - - empty frontAndBackPlanes - ( - (0 1 2 3) - (7 6 5 4) - ) + patch plate + ( + (3 2 6 7) + (6 2 1 5) + (1 0 4 5) + ) + empty frontAndBackPlanes + ( + (0 1 2 3) + (7 6 5 4) + ) ); mergePatchPairs diff --git a/tutorials/compressible/realFluidPisoFoam/ras/backStep/constant/thermophysicalProperties b/tutorials/compressible/realFluidPisoFoam/ras/backStep/constant/thermophysicalProperties index cc2797e09..21b0b7b5a 100755 --- a/tutorials/compressible/realFluidPisoFoam/ras/backStep/constant/thermophysicalProperties +++ b/tutorials/compressible/realFluidPisoFoam/ras/backStep/constant/thermophysicalProperties @@ -16,7 +16,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//CL: List of possible real gas models +//CL: List of possible real gas models thermoType realGasHThermo>>>>; mixture CO2 1 44.01 73.773e5 304.13 49436.5054 -626.411601 5.30172524 0.002503813816 -0.0000002127308728 -0.000000000768998878 2.849677801e-13 1.4792e-06 116; @@ -53,16 +53,16 @@ mixture CO2 1 44.01 73.773e5 304.13 49436.5054 -626.411601 5.30172524 0. //CL: description of coefficients // *********************************************************************************************************************** // -// Coefficient: -// CO2 --> Name +// Coefficient: +// CO2 --> Name // 1 -// 44.01 --> Molar Volume -// 77.773e5 --> critical pressure -// 304.13 --> critical temperatur -// 0.22394 --> acentric factor (not needed for redlich kwong) -// 467.6 --> critical density (only for aungier redlich kwong) -// 49436.5054 --> 2.849677801e-13 --> 7 heat capacity polynomial coefficent's -// .... --> two coefficent's for sutherlandTransport or for the constRealGasTransport model -// 839 --> perfect gas heat capacity Cp0 (J/kgK), needed for constantHeatCapacity +// 44.01 --> Molar Volume +// 77.773e5 --> critical pressure +// 304.13 --> critical temperatur +// 0.22394 --> acentric factor (not needed for redlich kwong) +// 467.6 --> critical density (only for aungier redlich kwong) +// 49436.5054 --> 2.849677801e-13 --> 7 heat capacity polynomial coefficent's +// .... --> two coefficent's for sutherlandTransport or for the constRealGasTransport model +// 839 --> perfect gas heat capacity Cp0 (J/kgK), needed for constantHeatCapacity // *********************************************************************************************************************** // diff --git a/tutorials/compressible/realFluidPisoFoam/ras/backStep/system/fvSolution b/tutorials/compressible/realFluidPisoFoam/ras/backStep/system/fvSolution index 0ceb8e5ea..e7a77bc1c 100755 --- a/tutorials/compressible/realFluidPisoFoam/ras/backStep/system/fvSolution +++ b/tutorials/compressible/realFluidPisoFoam/ras/backStep/system/fvSolution @@ -23,12 +23,12 @@ solvers tolerance 1e-14; relTol 0.001; smoother GaussSeidel; - minIter 4; - //maxIter 100; + minIter 4; + //maxIter 100; cacheAgglomeration true; - nPreSweeps 1; - nPostSweeps 3; - nFinestSweeps 3; + nPreSweeps 1; + nPostSweeps 3; + nFinestSweeps 3; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/constant/thermophysicalProperties b/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/constant/thermophysicalProperties index 09ade9ab7..ffd96543c 100755 --- a/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/constant/thermophysicalProperties +++ b/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // //CL: this is all -thermoType IAPWSThermo; +thermoType IAPWSThermo; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/system/fvSolution b/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/system/fvSolution index 0ceb8e5ea..e7a77bc1c 100755 --- a/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/system/fvSolution +++ b/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/system/fvSolution @@ -23,12 +23,12 @@ solvers tolerance 1e-14; relTol 0.001; smoother GaussSeidel; - minIter 4; - //maxIter 100; + minIter 4; + //maxIter 100; cacheAgglomeration true; - nPreSweeps 1; - nPostSweeps 3; - nFinestSweeps 3; + nPreSweeps 1; + nPostSweeps 3; + nFinestSweeps 3; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/constant/thermophysicalProperties b/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/constant/thermophysicalProperties index 09ade9ab7..ffd96543c 100755 --- a/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/constant/thermophysicalProperties +++ b/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/constant/thermophysicalProperties @@ -17,7 +17,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // //CL: this is all -thermoType IAPWSThermo; +thermoType IAPWSThermo; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/system/fvSolution b/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/system/fvSolution index 006929ca2..f248d61a4 100755 --- a/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/system/fvSolution +++ b/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/system/fvSolution @@ -23,8 +23,8 @@ solvers tolerance 1e-14; relTol 0.001; smoother GaussSeidel; - minIter 4; - //maxIter 100; + minIter 4; + //maxIter 100; cacheAgglomeration true; nPreSweeps 1; nPostSweeps 3; diff --git a/tutorials/compressible/realFluidPisoFoam/ras/t-junction/constant/polyMesh/blockMeshDict b/tutorials/compressible/realFluidPisoFoam/ras/t-junction/constant/polyMesh/blockMeshDict index ec058b9c8..60bacf967 100644 --- a/tutorials/compressible/realFluidPisoFoam/ras/t-junction/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/realFluidPisoFoam/ras/t-junction/constant/polyMesh/blockMeshDict @@ -119,11 +119,11 @@ boundary faces ( (0 1 2 3) - (10 11 12 13) + (10 11 12 13) (8 2 5 9) (18 12 15 19) (1 4 5 2) - (11 14 15 12) + (11 14 15 12) (1 6 7 4) (11 16 17 14) (6 16 11 1) diff --git a/tutorials/compressible/realFluidPisoFoam/ras/t-junction/constant/thermophysicalProperties b/tutorials/compressible/realFluidPisoFoam/ras/t-junction/constant/thermophysicalProperties index d284c4cc8..4515b64b3 100755 --- a/tutorials/compressible/realFluidPisoFoam/ras/t-junction/constant/thermophysicalProperties +++ b/tutorials/compressible/realFluidPisoFoam/ras/t-junction/constant/thermophysicalProperties @@ -16,7 +16,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//CL: List of possible real gas models +//CL: List of possible real gas models thermoType realGasHThermo>>>>; mixture CO2 1 44.01 73.773e5 304.13 49436.5054 -626.411601 5.30172524 0.002503813816 -0.0000002127308728 -0.000000000768998878 2.849677801e-13 1.4792e-06 116; @@ -53,16 +53,16 @@ mixture CO2 1 44.01 73.773e5 304.13 49436.5054 -626.411601 5.30172524 0. //CL: description of coefficients // *********************************************************************************************************************** // -// Coefficient: -// CO2 --> Name +// Coefficient: +// CO2 --> Name // 1 -// 44.01 --> Molar Volume -// 77.773e5 --> critical pressure -// 304.13 --> critical temperatur -// 0.22394 --> acentric factor (not needed for redlich kwong) -// 467.6 --> critical density (only for aungier redlich kwong) -// 49436.5054 --> 2.849677801e-13 --> 7 heat capacity polynomial coefficent's -// .... --> two coefficent's for sutherlandRealGasTransport or for the constRealGasTransport model -// 839 --> perfect gas heat capacity Cp0 (J/kgK), needed for constantHeatCapacity +// 44.01 --> Molar Volume +// 77.773e5 --> critical pressure +// 304.13 --> critical temperatur +// 0.22394 --> acentric factor (not needed for redlich kwong) +// 467.6 --> critical density (only for aungier redlich kwong) +// 49436.5054 --> 2.849677801e-13 --> 7 heat capacity polynomial coefficent's +// .... --> two coefficent's for sutherlandRealGasTransport or for the constRealGasTransport model +// 839 --> perfect gas heat capacity Cp0 (J/kgK), needed for constantHeatCapacity // *********************************************************************************************************************** // diff --git a/tutorials/compressible/realFluidPisoFoam/ras/t-junction/system/fvSolution b/tutorials/compressible/realFluidPisoFoam/ras/t-junction/system/fvSolution index 59898dbc3..229946ffe 100755 --- a/tutorials/compressible/realFluidPisoFoam/ras/t-junction/system/fvSolution +++ b/tutorials/compressible/realFluidPisoFoam/ras/t-junction/system/fvSolution @@ -24,12 +24,12 @@ p tolerance 1e-14; relTol 0.001; smoother GaussSeidel; - minIter 4; - //maxIter 100; + minIter 4; + //maxIter 100; cacheAgglomeration true; - nPreSweeps 1; - nPostSweeps 3; - nFinestSweeps 3; + nPreSweeps 1; + nPostSweeps 3; + nFinestSweeps 3; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict index 9664dc64d..ed06a85d8 100644 --- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict @@ -313,111 +313,111 @@ convertToMeters 0.1; vertices ( - (0.2 0 0) // Vertex r0b = 0 - (0.2 0 0) // Vertex r0sb = 1 - (0.141421356364228 -0.141421356110391 0) // Vertex r1b = 2 - (3.58979347393082e-10 -0.2 0) // Vertex r2b = 3 - (3.58979347393082e-10 -0.2 0) // Vertex r2sb = 4 - (-0.141421355856554 -0.141421356618065 0) // Vertex r3b = 5 - (-0.2 7.17958694786164e-10 0) // Vertex r4b = 6 - (-0.2 7.17958694786164e-10 0) // Vertex r4sb = 7 - (-0.141421355856554 0.141421356618065 0) // Vertex r5b = 8 - (3.58979347393082e-10 0.2 0) // Vertex r6b = 9 - (3.58979347393082e-10 0.2 0) // Vertex r6sb = 10 - (0.141421356364228 0.141421356110391 0) // Vertex r7b = 11 + (0.2 0 0) // Vertex r0b = 0 + (0.2 0 0) // Vertex r0sb = 1 + (0.141421356364228 -0.141421356110391 0) // Vertex r1b = 2 + (3.58979347393082e-10 -0.2 0) // Vertex r2b = 3 + (3.58979347393082e-10 -0.2 0) // Vertex r2sb = 4 + (-0.141421355856554 -0.141421356618065 0) // Vertex r3b = 5 + (-0.2 7.17958694786164e-10 0) // Vertex r4b = 6 + (-0.2 7.17958694786164e-10 0) // Vertex r4sb = 7 + (-0.141421355856554 0.141421356618065 0) // Vertex r5b = 8 + (3.58979347393082e-10 0.2 0) // Vertex r6b = 9 + (3.58979347393082e-10 0.2 0) // Vertex r6sb = 10 + (0.141421356364228 0.141421356110391 0) // Vertex r7b = 11 - (0.5 0 0) // Vertex rb0b = 12 - (0.353553390910569 -0.353553390275978 0) // Vertex rb1b = 13 - (8.97448368482705e-10 -0.5 0) // Vertex rb2b = 14 - (-0.353553389641386 -0.353553391545162 0) // Vertex rb3b = 15 - (-0.5 1.79489673696541e-09 0) // Vertex rb4b = 16 - (-0.353553389641386 0.353553391545162 0) // Vertex rb5b = 17 - (8.97448368482705e-10 0.5 0) // Vertex rb6b = 18 - (0.353553390910569 0.353553390275978 0) // Vertex rb7b = 19 + (0.5 0 0) // Vertex rb0b = 12 + (0.353553390910569 -0.353553390275978 0) // Vertex rb1b = 13 + (8.97448368482705e-10 -0.5 0) // Vertex rb2b = 14 + (-0.353553389641386 -0.353553391545162 0) // Vertex rb3b = 15 + (-0.5 1.79489673696541e-09 0) // Vertex rb4b = 16 + (-0.353553389641386 0.353553391545162 0) // Vertex rb5b = 17 + (8.97448368482705e-10 0.5 0) // Vertex rb6b = 18 + (0.353553390910569 0.353553390275978 0) // Vertex rb7b = 19 - (0.6 0 0) // Vertex ri0b = 20 - (0.424264069092683 -0.424264068331174 0) // Vertex ri1b = 21 - (1.07693804217925e-09 -0.6 0) // Vertex ri2b = 22 - (-0.424264067569663 -0.424264069854194 0) // Vertex ri3b = 23 - (-0.6 2.15387608435849e-09 0) // Vertex ri4b = 24 - (-0.424264067569663 0.424264069854194 0) // Vertex ri5b = 25 - (1.07693804217925e-09 0.6 0) // Vertex ri6b = 26 - (0.424264069092683 0.424264068331174 0) // Vertex ri7b = 27 + (0.6 0 0) // Vertex ri0b = 20 + (0.424264069092683 -0.424264068331174 0) // Vertex ri1b = 21 + (1.07693804217925e-09 -0.6 0) // Vertex ri2b = 22 + (-0.424264067569663 -0.424264069854194 0) // Vertex ri3b = 23 + (-0.6 2.15387608435849e-09 0) // Vertex ri4b = 24 + (-0.424264067569663 0.424264069854194 0) // Vertex ri5b = 25 + (1.07693804217925e-09 0.6 0) // Vertex ri6b = 26 + (0.424264069092683 0.424264068331174 0) // Vertex ri7b = 27 - (0.7 0 0) // Vertex Rb0b = 28 - (0.494974747274797 -0.494974746386369 0) // Vertex Rb1b = 29 - (1.25642771587579e-09 -0.7 0) // Vertex Rb2b = 30 - (-0.49497474549794 -0.494974748163226 0) // Vertex Rb3b = 31 - (-0.7 2.51285543175157e-09 0) // Vertex Rb4b = 32 - (-0.49497474549794 0.494974748163226 0) // Vertex Rb5b = 33 - (1.25642771587579e-09 0.7 0) // Vertex Rb6b = 34 - (0.494974747274797 0.494974746386369 0) // Vertex Rb7b = 35 + (0.7 0 0) // Vertex Rb0b = 28 + (0.494974747274797 -0.494974746386369 0) // Vertex Rb1b = 29 + (1.25642771587579e-09 -0.7 0) // Vertex Rb2b = 30 + (-0.49497474549794 -0.494974748163226 0) // Vertex Rb3b = 31 + (-0.7 2.51285543175157e-09 0) // Vertex Rb4b = 32 + (-0.49497474549794 0.494974748163226 0) // Vertex Rb5b = 33 + (1.25642771587579e-09 0.7 0) // Vertex Rb6b = 34 + (0.494974747274797 0.494974746386369 0) // Vertex Rb7b = 35 - (1 0 0) // Vertex R0b = 36 - (0.707106781821139 -0.707106780551956 0) // Vertex R1b = 37 - (0.707106781821139 -0.707106780551956 0) // Vertex R1sb = 38 - (1.79489673696541e-09 -1 0) // Vertex R2b = 39 - (-0.707106779282772 -0.707106783090323 0) // Vertex R3b = 40 - (-0.707106779282772 -0.707106783090323 0) // Vertex R3sb = 41 - (-1 3.58979347393082e-09 0) // Vertex R4b = 42 - (-0.707106779282772 0.707106783090323 0) // Vertex R5b = 43 - (-0.707106779282772 0.707106783090323 0) // Vertex R5sb = 44 - (1.79489673696541e-09 1 0) // Vertex R6b = 45 - (0.707106781821139 0.707106780551956 0) // Vertex R7b = 46 - (0.707106781821139 0.707106780551956 0) // Vertex R7sb = 47 + (1 0 0) // Vertex R0b = 36 + (0.707106781821139 -0.707106780551956 0) // Vertex R1b = 37 + (0.707106781821139 -0.707106780551956 0) // Vertex R1sb = 38 + (1.79489673696541e-09 -1 0) // Vertex R2b = 39 + (-0.707106779282772 -0.707106783090323 0) // Vertex R3b = 40 + (-0.707106779282772 -0.707106783090323 0) // Vertex R3sb = 41 + (-1 3.58979347393082e-09 0) // Vertex R4b = 42 + (-0.707106779282772 0.707106783090323 0) // Vertex R5b = 43 + (-0.707106779282772 0.707106783090323 0) // Vertex R5sb = 44 + (1.79489673696541e-09 1 0) // Vertex R6b = 45 + (0.707106781821139 0.707106780551956 0) // Vertex R7b = 46 + (0.707106781821139 0.707106780551956 0) // Vertex R7sb = 47 - (0.2 0 0.1) // Vertex r0t = 48 - (0.2 0 0.1) // Vertex r0st = 49 - (0.141421356364228 -0.141421356110391 0.1) // Vertex r1t = 50 - (3.58979347393082e-10 -0.2 0.1) // Vertex r2t = 51 - (3.58979347393082e-10 -0.2 0.1) // Vertex r2st = 52 - (-0.141421355856554 -0.141421356618065 0.1) // Vertex r3t = 53 - (-0.2 7.17958694786164e-10 0.1) // Vertex r4t = 54 - (-0.2 7.17958694786164e-10 0.1) // Vertex r4st = 55 - (-0.141421355856554 0.141421356618065 0.1) // Vertex r5t = 56 - (3.58979347393082e-10 0.2 0.1) // Vertex r6t = 57 - (3.58979347393082e-10 0.2 0.1) // Vertex r6st = 58 - (0.141421356364228 0.141421356110391 0.1) // Vertex r7t = 59 + (0.2 0 0.1) // Vertex r0t = 48 + (0.2 0 0.1) // Vertex r0st = 49 + (0.141421356364228 -0.141421356110391 0.1) // Vertex r1t = 50 + (3.58979347393082e-10 -0.2 0.1) // Vertex r2t = 51 + (3.58979347393082e-10 -0.2 0.1) // Vertex r2st = 52 + (-0.141421355856554 -0.141421356618065 0.1) // Vertex r3t = 53 + (-0.2 7.17958694786164e-10 0.1) // Vertex r4t = 54 + (-0.2 7.17958694786164e-10 0.1) // Vertex r4st = 55 + (-0.141421355856554 0.141421356618065 0.1) // Vertex r5t = 56 + (3.58979347393082e-10 0.2 0.1) // Vertex r6t = 57 + (3.58979347393082e-10 0.2 0.1) // Vertex r6st = 58 + (0.141421356364228 0.141421356110391 0.1) // Vertex r7t = 59 - (0.5 0 0.1) // Vertex rb0t = 60 - (0.353553390910569 -0.353553390275978 0.1) // Vertex rb1t = 61 - (8.97448368482705e-10 -0.5 0.1) // Vertex rb2t = 62 - (-0.353553389641386 -0.353553391545162 0.1) // Vertex rb3t = 63 - (-0.5 1.79489673696541e-09 0.1) // Vertex rb4t = 64 - (-0.353553389641386 0.353553391545162 0.1) // Vertex rb5t = 65 - (8.97448368482705e-10 0.5 0.1) // Vertex rb6t = 66 - (0.353553390910569 0.353553390275978 0.1) // Vertex rb7t = 67 + (0.5 0 0.1) // Vertex rb0t = 60 + (0.353553390910569 -0.353553390275978 0.1) // Vertex rb1t = 61 + (8.97448368482705e-10 -0.5 0.1) // Vertex rb2t = 62 + (-0.353553389641386 -0.353553391545162 0.1) // Vertex rb3t = 63 + (-0.5 1.79489673696541e-09 0.1) // Vertex rb4t = 64 + (-0.353553389641386 0.353553391545162 0.1) // Vertex rb5t = 65 + (8.97448368482705e-10 0.5 0.1) // Vertex rb6t = 66 + (0.353553390910569 0.353553390275978 0.1) // Vertex rb7t = 67 - (0.6 0 0.1) // Vertex ri0t = 68 - (0.424264069092683 -0.424264068331174 0.1) // Vertex ri1t = 69 - (1.07693804217925e-09 -0.6 0.1) // Vertex ri2t = 70 - (-0.424264067569663 -0.424264069854194 0.1) // Vertex ri3t = 71 - (-0.6 2.15387608435849e-09 0.1) // Vertex ri4t = 72 - (-0.424264067569663 0.424264069854194 0.1) // Vertex ri5t = 73 - (1.07693804217925e-09 0.6 0.1) // Vertex ri6t = 74 - (0.424264069092683 0.424264068331174 0.1) // Vertex ri7t = 75 + (0.6 0 0.1) // Vertex ri0t = 68 + (0.424264069092683 -0.424264068331174 0.1) // Vertex ri1t = 69 + (1.07693804217925e-09 -0.6 0.1) // Vertex ri2t = 70 + (-0.424264067569663 -0.424264069854194 0.1) // Vertex ri3t = 71 + (-0.6 2.15387608435849e-09 0.1) // Vertex ri4t = 72 + (-0.424264067569663 0.424264069854194 0.1) // Vertex ri5t = 73 + (1.07693804217925e-09 0.6 0.1) // Vertex ri6t = 74 + (0.424264069092683 0.424264068331174 0.1) // Vertex ri7t = 75 - (0.7 0 0.1) // Vertex Rb0t = 76 - (0.494974747274797 -0.494974746386369 0.1) // Vertex Rb1t = 77 - (1.25642771587579e-09 -0.7 0.1) // Vertex Rb2t = 78 - (-0.49497474549794 -0.494974748163226 0.1) // Vertex Rb3t = 79 - (-0.7 2.51285543175157e-09 0.1) // Vertex Rb4t = 80 - (-0.49497474549794 0.494974748163226 0.1) // Vertex Rb5t = 81 - (1.25642771587579e-09 0.7 0.1) // Vertex Rb6t = 82 - (0.494974747274797 0.494974746386369 0.1) // Vertex Rb7t = 83 + (0.7 0 0.1) // Vertex Rb0t = 76 + (0.494974747274797 -0.494974746386369 0.1) // Vertex Rb1t = 77 + (1.25642771587579e-09 -0.7 0.1) // Vertex Rb2t = 78 + (-0.49497474549794 -0.494974748163226 0.1) // Vertex Rb3t = 79 + (-0.7 2.51285543175157e-09 0.1) // Vertex Rb4t = 80 + (-0.49497474549794 0.494974748163226 0.1) // Vertex Rb5t = 81 + (1.25642771587579e-09 0.7 0.1) // Vertex Rb6t = 82 + (0.494974747274797 0.494974746386369 0.1) // Vertex Rb7t = 83 - (1 0 0.1) // Vertex R0t = 84 - (0.707106781821139 -0.707106780551956 0.1) // Vertex R1t = 85 - (0.707106781821139 -0.707106780551956 0.1) // Vertex R1st = 86 - (1.79489673696541e-09 -1 0.1) // Vertex R2t = 87 - (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3t = 88 - (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3st = 89 - (-1 3.58979347393082e-09 0.1) // Vertex R4t = 90 - (-0.707106779282772 0.707106783090323 0.1) // Vertex R5t = 91 - (-0.707106779282772 0.707106783090323 0.1) // Vertex R5st = 92 - (1.79489673696541e-09 1 0.1) // Vertex R6t = 93 - (0.707106781821139 0.707106780551956 0.1) // Vertex R7t = 94 - (0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95 + (1 0 0.1) // Vertex R0t = 84 + (0.707106781821139 -0.707106780551956 0.1) // Vertex R1t = 85 + (0.707106781821139 -0.707106780551956 0.1) // Vertex R1st = 86 + (1.79489673696541e-09 -1 0.1) // Vertex R2t = 87 + (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3t = 88 + (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3st = 89 + (-1 3.58979347393082e-09 0.1) // Vertex R4t = 90 + (-0.707106779282772 0.707106783090323 0.1) // Vertex R5t = 91 + (-0.707106779282772 0.707106783090323 0.1) // Vertex R5st = 92 + (1.79489673696541e-09 1 0.1) // Vertex R6t = 93 + (0.707106781821139 0.707106780551956 0.1) // Vertex R7t = 94 + (0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95 ); blocks diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/0/T b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/0/T index eef62944d..337da26d4 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/0/T +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/0/T @@ -24,14 +24,14 @@ boundaryField GVINLET { type fixedValue; - value uniform 305.66; + value uniform 305.66; } GVOUTLET { type ggiEnthalpyJump; - patchType ggi; + patchType ggi; rotating false; - value uniform 305.66; + value uniform 305.66; } GVCYCLIC { @@ -52,16 +52,16 @@ boundaryField RUINLET { type ggiEnthalpyJump; - patchType ggi; - rotating true; - value uniform 305.66; + patchType ggi; + rotating true; + value uniform 305.66; } RUOUTLET { type ggiEnthalpyJump; - patchType ggi; - rotating true; - value uniform 305.66; + patchType ggi; + rotating true; + value uniform 305.66; } RUCYCLIC1 { @@ -86,9 +86,9 @@ boundaryField DTINLET { type ggiEnthalpyJump; - patchType ggi; + patchType ggi; rotating false; - value uniform 305.66; + value uniform 305.66; } DTOUTLET { diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/0/U b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/0/U index 4d6db263c..31495a512 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/0/U +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/0/U @@ -28,7 +28,7 @@ boundaryField GVOUTLET { type ggi; - value uniform (0 0 -1); + value uniform (0 0 -1); } GVCYCLIC { @@ -52,12 +52,12 @@ boundaryField RUINLET { type ggi; - value uniform (0 0 -1); + value uniform (0 0 -1); } RUOUTLET { type ggi; - value uniform (0 0 -1); + value uniform (0 0 -1); } RUCYCLIC1 { @@ -85,7 +85,7 @@ boundaryField DTINLET { type ggi; - value uniform (0 0 -1); + value uniform (0 0 -1); } DTOUTLET { diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/constant/polyMesh/blockMeshDict b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/constant/polyMesh/blockMeshDict index f91ab2f8b..0ef21fd61 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/constant/polyMesh/blockMeshDict @@ -139,56 +139,56 @@ convertToMeters 1; vertices //(radial [m], tangential [radians], axial [m]) ( //Guide vane hub: - (0.05 -0.0691150383 0.07) // Vertex GV0lb = 0 - (0.05 -0.00628318530000001 0.07) // Vertex GV0rb = 1 - (0.05 -0.062831853 0.09) // Vertex GV1lb = 2 - (0.05 0 0.09) // Vertex GV1rb = 3 - (0.05 -0.0314159265 0.19) // Vertex GV2lb = 4 - (0.05 0.0314159265 0.19) // Vertex GV2rb = 5 - (0.05 -0.0314159265 0.29) // Vertex GV3lb = 6 - (0.05 0.0314159265 0.29) // Vertex GV3rb = 7 + (0.05 -0.0691150383 0.07) // Vertex GV0lb = 0 + (0.05 -0.00628318530000001 0.07) // Vertex GV0rb = 1 + (0.05 -0.062831853 0.09) // Vertex GV1lb = 2 + (0.05 0 0.09) // Vertex GV1rb = 3 + (0.05 -0.0314159265 0.19) // Vertex GV2lb = 4 + (0.05 0.0314159265 0.19) // Vertex GV2rb = 5 + (0.05 -0.0314159265 0.29) // Vertex GV3lb = 6 + (0.05 0.0314159265 0.29) // Vertex GV3rb = 7 //Guide vane shroud: - (0.1 -0.0691150383 0.07) // Vertex GV0lt = 8 - (0.1 -0.00628318530000001 0.07) // Vertex GV0rt = 9 - (0.1 -0.062831853 0.09) // Vertex GV1lt = 10 - (0.1 0 0.09) // Vertex GV1rt = 11 - (0.1 -0.0314159265 0.19) // Vertex GV2lt = 12 - (0.1 0.0314159265 0.19) // Vertex GV2rt = 13 - (0.1 -0.0314159265 0.29) // Vertex GV3lt = 14 - (0.1 0.0314159265 0.29) // Vertex GV3rt = 15 + (0.1 -0.0691150383 0.07) // Vertex GV0lt = 8 + (0.1 -0.00628318530000001 0.07) // Vertex GV0rt = 9 + (0.1 -0.062831853 0.09) // Vertex GV1lt = 10 + (0.1 0 0.09) // Vertex GV1rt = 11 + (0.1 -0.0314159265 0.19) // Vertex GV2lt = 12 + (0.1 0.0314159265 0.19) // Vertex GV2rt = 13 + (0.1 -0.0314159265 0.29) // Vertex GV3lt = 14 + (0.1 0.0314159265 0.29) // Vertex GV3rt = 15 //Runner hub: - (0.05 -0.0062831853 -0.07) // Vertex RU0lb = 16 - (0.05 0.0565486677 -0.07) // Vertex RU0rb = 17 - (0.05 -0.0125663706 -0.05) // Vertex RU1lb = 18 - (0.05 0.0502654824 -0.05) // Vertex RU1rb = 19 - (0.05 -0.062831853 0.05) // Vertex RU2lb = 20 - (0.05 0 0.05) // Vertex RU2rb = 21 - (0.05 -0.0691150383 0.07) // Vertex RU3lb = 22 - (0.05 -0.00628318530000001 0.07) // Vertex RU3rb = 23 + (0.05 -0.0062831853 -0.07) // Vertex RU0lb = 16 + (0.05 0.0565486677 -0.07) // Vertex RU0rb = 17 + (0.05 -0.0125663706 -0.05) // Vertex RU1lb = 18 + (0.05 0.0502654824 -0.05) // Vertex RU1rb = 19 + (0.05 -0.062831853 0.05) // Vertex RU2lb = 20 + (0.05 0 0.05) // Vertex RU2rb = 21 + (0.05 -0.0691150383 0.07) // Vertex RU3lb = 22 + (0.05 -0.00628318530000001 0.07) // Vertex RU3rb = 23 //Runner shroud: - (0.1 -0.0062831853 -0.07) // Vertex RU0lt = 24 - (0.1 0.0565486677 -0.07) // Vertex RU0rt = 25 - (0.1 -0.0125663706 -0.05) // Vertex RU1lt = 26 - (0.1 0.0502654824 -0.05) // Vertex RU1rt = 27 - (0.1 -0.062831853 0.05) // Vertex RU2lt = 28 - (0.1 0 0.05) // Vertex RU2rt = 29 - (0.1 -0.0691150383 0.07) // Vertex RU3lt = 30 - (0.1 -0.00628318530000001 0.07) // Vertex RU3rt = 31 + (0.1 -0.0062831853 -0.07) // Vertex RU0lt = 24 + (0.1 0.0565486677 -0.07) // Vertex RU0rt = 25 + (0.1 -0.0125663706 -0.05) // Vertex RU1lt = 26 + (0.1 0.0502654824 -0.05) // Vertex RU1rt = 27 + (0.1 -0.062831853 0.05) // Vertex RU2lt = 28 + (0.1 0 0.05) // Vertex RU2rt = 29 + (0.1 -0.0691150383 0.07) // Vertex RU3lt = 30 + (0.1 -0.00628318530000001 0.07) // Vertex RU3rt = 31 //Draft tube hub: - (0.05 -0.0062831853 -0.14) // Vertex DT0lb = 32 - (0.05 0.0565486677 -0.14) // Vertex DT0rb = 33 - (0.05 -0.0062831853 -0.07) // Vertex DT1lb = 34 - (0.05 0.0565486677 -0.07) // Vertex DT1rb = 35 + (0.05 -0.0062831853 -0.14) // Vertex DT0lb = 32 + (0.05 0.0565486677 -0.14) // Vertex DT0rb = 33 + (0.05 -0.0062831853 -0.07) // Vertex DT1lb = 34 + (0.05 0.0565486677 -0.07) // Vertex DT1rb = 35 //Draft tube shroud: - (0.1 -0.0062831853 -0.14) // Vertex DT0lt = 36 - (0.1 0.0565486677 -0.14) // Vertex DT0rt = 37 - (0.1 -0.0062831853 -0.07) // Vertex DT1lt = 38 - (0.1 0.0565486677 -0.07) // Vertex DT1rt = 39 + (0.1 -0.0062831853 -0.14) // Vertex DT0lt = 36 + (0.1 0.0565486677 -0.14) // Vertex DT0rt = 37 + (0.1 -0.0062831853 -0.07) // Vertex DT1lt = 38 + (0.1 0.0565486677 -0.07) // Vertex DT1rt = 39 ); blocks diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/save/T b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/save/T index eef62944d..e3fe7f1ab 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/save/T +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/save/T @@ -24,14 +24,14 @@ boundaryField GVINLET { type fixedValue; - value uniform 305.66; + value uniform 305.66; } GVOUTLET { type ggiEnthalpyJump; - patchType ggi; + patchType ggi; rotating false; - value uniform 305.66; + value uniform 305.66; } GVCYCLIC { @@ -52,16 +52,16 @@ boundaryField RUINLET { type ggiEnthalpyJump; - patchType ggi; - rotating true; - value uniform 305.66; + patchType ggi; + rotating true; + value uniform 305.66; } RUOUTLET { type ggiEnthalpyJump; - patchType ggi; - rotating true; - value uniform 305.66; + patchType ggi; + rotating true; + value uniform 305.66; } RUCYCLIC1 { @@ -86,9 +86,9 @@ boundaryField DTINLET { type ggiEnthalpyJump; - patchType ggi; + patchType ggi; rotating false; - value uniform 305.66; + value uniform 305.66; } DTOUTLET { diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/save/U b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/save/U index 4d6db263c..31495a512 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/save/U +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/save/U @@ -28,7 +28,7 @@ boundaryField GVOUTLET { type ggi; - value uniform (0 0 -1); + value uniform (0 0 -1); } GVCYCLIC { @@ -52,12 +52,12 @@ boundaryField RUINLET { type ggi; - value uniform (0 0 -1); + value uniform (0 0 -1); } RUOUTLET { type ggi; - value uniform (0 0 -1); + value uniform (0 0 -1); } RUCYCLIC1 { @@ -85,7 +85,7 @@ boundaryField DTINLET { type ggi; - value uniform (0 0 -1); + value uniform (0 0 -1); } DTOUTLET { diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSchemes b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSchemes index ea3d83e12..dd6fd7b6e 100755 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSchemes +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSchemes @@ -22,7 +22,7 @@ ddtSchemes // ddt(rho,U) steadyInertial phi rho 0.25; ddt(rho,h) steadyState; - ddt(rho,i) steadyState; + ddt(rho,i) steadyState; // ddt(rho,h) steadyInertial phi rho 0.25; ddt(psi,p) steadyInertial phi rho 1; // ddt(psi,p) steadyState; @@ -44,7 +44,7 @@ divSchemes default none; div(phi,U) Gauss upwind; div(phi,h) Gauss upwind; - div(phi,i) Gauss upwind; + div(phi,i) Gauss upwind; div(phid,p) Gauss upwind; div(phi,k) Gauss upwind; @@ -74,10 +74,10 @@ snGradSchemes mixingPlane { - default areaAveraging; - U areaAveraging; - k fluxAveraging; - omega areaAveraging; + default areaAveraging; + U areaAveraging; + k fluxAveraging; + omega areaAveraging; } // ************************************************************************* // diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSolution b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSolution index db7e86343..c772479d4 100755 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSolution +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSolution @@ -57,7 +57,8 @@ solvers tolerance 1e-7; relTol 0.1; } - T + + T { solver smoothSolver; smoother GaussSeidel; @@ -65,7 +66,8 @@ solvers tolerance 1e-7; relTol 0.1; } - i + + i { solver smoothSolver; smoother GaussSeidel; @@ -97,9 +99,9 @@ relaxationFactors U 0.1; p 0.1; h 0.1; - i 0.1; + i 0.1; rho 0.1; - T 0.1; + T 0.1; k 0.1; epsilon 0.1; @@ -107,10 +109,10 @@ relaxationFactors fieldBounds { - p 50 1e8; - T 100 1000; - U 1000; - epsilon 0 1e6; + p 50 1e8; + T 100 1000; + U 1000; + epsilon 0 1e6; } diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/0/U b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/0/U index 9b2d2f485..59fc13844 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/0/U +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/0/U @@ -28,7 +28,7 @@ boundaryField GVOUTLET { type mixingPlane; - value uniform (0 0 -1); + value uniform (0 0 -1); } GVCYCLIC { @@ -52,12 +52,12 @@ boundaryField RUINLET { type mixingPlane; - value uniform (0 0 -1); + value uniform (0 0 -1); } RUOUTLET { type mixingPlane; - value uniform (0 0 -1); + value uniform (0 0 -1); } RUCYCLIC1 { @@ -85,7 +85,7 @@ boundaryField DTINLET { type mixingPlane; - value uniform (0 0 -1); + value uniform (0 0 -1); } DTOUTLET { diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/0/i b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/0/i index 793c5fc5e..cab40f79a 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/0/i +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/0/i @@ -48,13 +48,13 @@ boundaryField { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } GVSHROUD { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } RUINLET { @@ -68,32 +68,32 @@ boundaryField type mixingPlaneEnthalpyJump; patchType mixingPlane; rotating true; - value uniform 307494; + value uniform 307494; } RUCYCLIC1 { type cyclicGgi; - value uniform 307494; + value uniform 307494; } RUCYCLIC2 { type cyclicGgi; - value uniform 307494; + value uniform 307494; } RUBLADE { type gradientEnthalpy; - gradient uniform 307494; + gradient uniform 307494; } RUHUB { - type gradientEnthalpy; - gradient uniform 307494; + type gradientEnthalpy; + gradient uniform 307494; } RUSHROUD { type gradientEnthalpy; - gradient uniform 307494; + gradient uniform 307494; } DTINLET @@ -107,30 +107,30 @@ boundaryField { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } DTCYCLIC1 { type cyclicGgi; - value uniform 307494; + value uniform 307494; } DTCYCLIC2 { type cyclicGgi; - value uniform 307494; + value uniform 307494; } DTHUB { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } DTSHROUD { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } } diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/constant/polyMesh/blockMeshDict b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/constant/polyMesh/blockMeshDict index 19b82a106..c582b4841 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/constant/polyMesh/blockMeshDict @@ -139,56 +139,56 @@ convertToMeters 1; vertices //(radial [m], tangential [radians], axial [m]) ( //Guide vane hub: - (0.05 -0.0691150383 0.07) // Vertex GV0lb = 0 - (0.05 -0.00628318530000001 0.07) // Vertex GV0rb = 1 - (0.05 -0.062831853 0.09) // Vertex GV1lb = 2 - (0.05 0 0.09) // Vertex GV1rb = 3 - (0.05 -0.0314159265 0.19) // Vertex GV2lb = 4 - (0.05 0.0314159265 0.19) // Vertex GV2rb = 5 - (0.05 -0.0314159265 0.29) // Vertex GV3lb = 6 - (0.05 0.0314159265 0.29) // Vertex GV3rb = 7 + (0.05 -0.0691150383 0.07) // Vertex GV0lb = 0 + (0.05 -0.00628318530000001 0.07) // Vertex GV0rb = 1 + (0.05 -0.062831853 0.09) // Vertex GV1lb = 2 + (0.05 0 0.09) // Vertex GV1rb = 3 + (0.05 -0.0314159265 0.19) // Vertex GV2lb = 4 + (0.05 0.0314159265 0.19) // Vertex GV2rb = 5 + (0.05 -0.0314159265 0.29) // Vertex GV3lb = 6 + (0.05 0.0314159265 0.29) // Vertex GV3rb = 7 //Guide vane shroud: - (0.1 -0.0691150383 0.07) // Vertex GV0lt = 8 - (0.1 -0.00628318530000001 0.07) // Vertex GV0rt = 9 - (0.1 -0.062831853 0.09) // Vertex GV1lt = 10 - (0.1 0 0.09) // Vertex GV1rt = 11 - (0.1 -0.0314159265 0.19) // Vertex GV2lt = 12 - (0.1 0.0314159265 0.19) // Vertex GV2rt = 13 - (0.1 -0.0314159265 0.29) // Vertex GV3lt = 14 - (0.1 0.0314159265 0.29) // Vertex GV3rt = 15 + (0.1 -0.0691150383 0.07) // Vertex GV0lt = 8 + (0.1 -0.00628318530000001 0.07) // Vertex GV0rt = 9 + (0.1 -0.062831853 0.09) // Vertex GV1lt = 10 + (0.1 0 0.09) // Vertex GV1rt = 11 + (0.1 -0.0314159265 0.19) // Vertex GV2lt = 12 + (0.1 0.0314159265 0.19) // Vertex GV2rt = 13 + (0.1 -0.0314159265 0.29) // Vertex GV3lt = 14 + (0.1 0.0314159265 0.29) // Vertex GV3rt = 15 //Runner hub: - (0.05 -0.0062831853 -0.07) // Vertex RU0lb = 16 - (0.05 0.0565486677 -0.07) // Vertex RU0rb = 17 - (0.05 -0.0125663706 -0.05) // Vertex RU1lb = 18 - (0.05 0.0502654824 -0.05) // Vertex RU1rb = 19 - (0.05 -0.062831853 0.05) // Vertex RU2lb = 20 - (0.05 0 0.05) // Vertex RU2rb = 21 - (0.05 -0.0691150383 0.07) // Vertex RU3lb = 22 - (0.05 -0.00628318530000001 0.07) // Vertex RU3rb = 23 + (0.05 -0.0062831853 -0.07) // Vertex RU0lb = 16 + (0.05 0.0565486677 -0.07) // Vertex RU0rb = 17 + (0.05 -0.0125663706 -0.05) // Vertex RU1lb = 18 + (0.05 0.0502654824 -0.05) // Vertex RU1rb = 19 + (0.05 -0.062831853 0.05) // Vertex RU2lb = 20 + (0.05 0 0.05) // Vertex RU2rb = 21 + (0.05 -0.0691150383 0.07) // Vertex RU3lb = 22 + (0.05 -0.00628318530000001 0.07) // Vertex RU3rb = 23 //Runner shroud: - (0.1 -0.0062831853 -0.07) // Vertex RU0lt = 24 - (0.1 0.0565486677 -0.07) // Vertex RU0rt = 25 - (0.1 -0.0125663706 -0.05) // Vertex RU1lt = 26 - (0.1 0.0502654824 -0.05) // Vertex RU1rt = 27 - (0.1 -0.062831853 0.05) // Vertex RU2lt = 28 - (0.1 0 0.05) // Vertex RU2rt = 29 - (0.1 -0.0691150383 0.07) // Vertex RU3lt = 30 - (0.1 -0.00628318530000001 0.07) // Vertex RU3rt = 31 + (0.1 -0.0062831853 -0.07) // Vertex RU0lt = 24 + (0.1 0.0565486677 -0.07) // Vertex RU0rt = 25 + (0.1 -0.0125663706 -0.05) // Vertex RU1lt = 26 + (0.1 0.0502654824 -0.05) // Vertex RU1rt = 27 + (0.1 -0.062831853 0.05) // Vertex RU2lt = 28 + (0.1 0 0.05) // Vertex RU2rt = 29 + (0.1 -0.0691150383 0.07) // Vertex RU3lt = 30 + (0.1 -0.00628318530000001 0.07) // Vertex RU3rt = 31 //Draft tube hub: - (0.05 -0.0062831853 -0.14) // Vertex DT0lb = 32 - (0.05 0.0565486677 -0.14) // Vertex DT0rb = 33 - (0.05 -0.0062831853 -0.07) // Vertex DT1lb = 34 - (0.05 0.0565486677 -0.07) // Vertex DT1rb = 35 + (0.05 -0.0062831853 -0.14) // Vertex DT0lb = 32 + (0.05 0.0565486677 -0.14) // Vertex DT0rb = 33 + (0.05 -0.0062831853 -0.07) // Vertex DT1lb = 34 + (0.05 0.0565486677 -0.07) // Vertex DT1rb = 35 //Draft tube shroud: - (0.1 -0.0062831853 -0.14) // Vertex DT0lt = 36 - (0.1 0.0565486677 -0.14) // Vertex DT0rt = 37 - (0.1 -0.0062831853 -0.07) // Vertex DT1lt = 38 - (0.1 0.0565486677 -0.07) // Vertex DT1rt = 39 + (0.1 -0.0062831853 -0.14) // Vertex DT0lt = 36 + (0.1 0.0565486677 -0.14) // Vertex DT0rt = 37 + (0.1 -0.0062831853 -0.07) // Vertex DT1lt = 38 + (0.1 0.0565486677 -0.07) // Vertex DT1rt = 39 ); blocks diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/constant/polyMesh/boundary b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/constant/polyMesh/boundary index 5f07b38a0..6a75171cc 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/constant/polyMesh/boundary +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/constant/polyMesh/boundary @@ -30,7 +30,7 @@ FoamFile startFace 11840; shadowPatch RUINLET; zone GVOUTLETZone; - coordinateSystem + coordinateSystem { type cylindrical; name mixingCS; @@ -39,7 +39,7 @@ FoamFile e3 (0 0 1); inDegrees true; } - ribbonPatch + ribbonPatch { sweepAxis Theta; stackAxis R; @@ -91,7 +91,7 @@ FoamFile startFace 12920; shadowPatch DTINLET; zone RUOUTLETZone; - coordinateSystem + coordinateSystem { type cylindrical; name mixingCS; @@ -100,7 +100,7 @@ FoamFile e3 (0 0 1); inDegrees true; } - ribbonPatch + ribbonPatch { sweepAxis Theta; stackAxis R; diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/save/U b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/save/U index 9b2d2f485..59fc13844 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/save/U +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/save/U @@ -28,7 +28,7 @@ boundaryField GVOUTLET { type mixingPlane; - value uniform (0 0 -1); + value uniform (0 0 -1); } GVCYCLIC { @@ -52,12 +52,12 @@ boundaryField RUINLET { type mixingPlane; - value uniform (0 0 -1); + value uniform (0 0 -1); } RUOUTLET { type mixingPlane; - value uniform (0 0 -1); + value uniform (0 0 -1); } RUCYCLIC1 { @@ -85,7 +85,7 @@ boundaryField DTINLET { type mixingPlane; - value uniform (0 0 -1); + value uniform (0 0 -1); } DTOUTLET { diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/save/i b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/save/i index 793c5fc5e..cab40f79a 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/save/i +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/save/i @@ -48,13 +48,13 @@ boundaryField { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } GVSHROUD { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } RUINLET { @@ -68,32 +68,32 @@ boundaryField type mixingPlaneEnthalpyJump; patchType mixingPlane; rotating true; - value uniform 307494; + value uniform 307494; } RUCYCLIC1 { type cyclicGgi; - value uniform 307494; + value uniform 307494; } RUCYCLIC2 { type cyclicGgi; - value uniform 307494; + value uniform 307494; } RUBLADE { type gradientEnthalpy; - gradient uniform 307494; + gradient uniform 307494; } RUHUB { - type gradientEnthalpy; - gradient uniform 307494; + type gradientEnthalpy; + gradient uniform 307494; } RUSHROUD { type gradientEnthalpy; - gradient uniform 307494; + gradient uniform 307494; } DTINLET @@ -107,30 +107,30 @@ boundaryField { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } DTCYCLIC1 { type cyclicGgi; - value uniform 307494; + value uniform 307494; } DTCYCLIC2 { type cyclicGgi; - value uniform 307494; + value uniform 307494; } DTHUB { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } DTSHROUD { type gradientEnthalpy; gradient uniform 0; - value uniform 307494; + value uniform 307494; } } diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes index 49b4c21d3..b745eba29 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes @@ -22,7 +22,7 @@ ddtSchemes // ddt(rho,U) steadyInertial phi rho 0.25; ddt(rho,h) steadyState; - ddt(rho,i) steadyState; + ddt(rho,i) steadyState; // ddt(rho,h) steadyInertial phi rho 0.25; ddt(psi,p) steadyInertial phi rho 1; // ddt(psi,p) steadyState; @@ -44,7 +44,7 @@ divSchemes default none; div(phi,U) Gauss upwind; div(phi,h) Gauss upwind; - div(phi,i) Gauss upwind; + div(phi,i) Gauss upwind; div(phid,p) Gauss upwind; div(phi,k) Gauss upwind; @@ -74,10 +74,10 @@ snGradSchemes mixingPlane { - default areaAveraging; - U areaAveraging; - k fluxAveraging; - omega areaAveraging; + default areaAveraging; + U areaAveraging; + k fluxAveraging; + omega areaAveraging; } diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes_old b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes_old deleted file mode 100644 index 82a1b4cd4..000000000 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes_old +++ /dev/null @@ -1,76 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | -| \\ / A nd | Web: http://www.foam-extend.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default steadyState; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss limitedLinearV 1; - div(phi,k) Gauss limitedLinear 1; - div(phi,i) Gauss limitedLinear 1; - div(phid,p) Gauss limitedLinear 1; - div(phi,epsilon) Gauss limitedLinear 1; - div((nuEff*dev(grad(U).T()))) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(muEff,U) Gauss linear corrected; - laplacian(alphaEff,i) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(U) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - -mixingPlane -{ - default areaAveraging; - //U fluxAveragingAdjustMassFlow; - //p zeroGradientAreaAveragingMix; -} - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSolution b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSolution index 3a3b832ae..53284ef53 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSolution +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSolution @@ -47,7 +47,8 @@ solvers tolerance 1e-7; relTol 0.1; } - T + + T { solver smoothSolver; smoother GaussSeidel; @@ -55,7 +56,8 @@ solvers tolerance 1e-7; relTol 0.1; } - i + + i { solver smoothSolver; smoother GaussSeidel; @@ -87,9 +89,9 @@ relaxationFactors U 0.1; p 0.1; h 0.1; - i 0.1; + i 0.1; rho 0.1; - T 0.1; + T 0.1; k 0.1; epsilon 0.1; @@ -97,10 +99,10 @@ relaxationFactors fieldBounds { - p 50 1e8; - T 100 1000; - U 1000; - epsilon 0 1e6; + p 50 1e8; + T 100 1000; + U 1000; + epsilon 0 1e6; } diff --git a/tutorials/immersedBoundary/movingCylinderInChannelIco/system/controlDict b/tutorials/immersedBoundary/movingCylinderInChannelIco/system/controlDict index e3487e2cc..7c14852ae 100644 --- a/tutorials/immersedBoundary/movingCylinderInChannelIco/system/controlDict +++ b/tutorials/immersedBoundary/movingCylinderInChannelIco/system/controlDict @@ -53,8 +53,8 @@ maxCo 0.2; libs ( "liblduSolvers.so" - "libimmersedBoundary.so" - "libimmersedBoundaryDynamicFvMesh.so" + "libimmersedBoundary.so" + "libimmersedBoundaryDynamicFvMesh.so" ); functions diff --git a/tutorials/immersedBoundary/pitchingPlate/0_org/p b/tutorials/immersedBoundary/pitchingPlate/0_org/p index ece06ca10..b9d60a62e 100644 --- a/tutorials/immersedBoundary/pitchingPlate/0_org/p +++ b/tutorials/immersedBoundary/pitchingPlate/0_org/p @@ -40,7 +40,6 @@ boundaryField deadCellValue 0; value uniform 0; - } input @@ -60,7 +59,7 @@ boundaryField type zeroGradient; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/immersedBoundary/pitchingPlate/constant/dynamicMeshDict b/tutorials/immersedBoundary/pitchingPlate/constant/dynamicMeshDict index 634cd7e30..727bf1c65 100644 --- a/tutorials/immersedBoundary/pitchingPlate/constant/dynamicMeshDict +++ b/tutorials/immersedBoundary/pitchingPlate/constant/dynamicMeshDict @@ -23,13 +23,12 @@ immersedBoundarySolidBodyMotionFvMeshCoeffs ( ibCylinder { - solidBodyMotionFunction rotatingOscillation; rotatingOscillationCoeffs { - origin (0 0 0); - amplitude (0 0 14); - period 0.5; + origin (0 0 0); + amplitude (0 0 14); + period 0.5; } } ); diff --git a/tutorials/immersedBoundary/pitchingPlate/constant/polyMesh/blockMeshDict b/tutorials/immersedBoundary/pitchingPlate/constant/polyMesh/blockMeshDict index c4350c860..eb3c1c78d 100644 --- a/tutorials/immersedBoundary/pitchingPlate/constant/polyMesh/blockMeshDict +++ b/tutorials/immersedBoundary/pitchingPlate/constant/polyMesh/blockMeshDict @@ -19,39 +19,39 @@ convertToMeters 1; vertices ( -( -0.1 -0.2 0 ) -( -0.015 -0.2 0 ) -( 0.4 -0.2 0 ) -( 0.5 -0.2 0 ) -( -0.1 -0.05 0 ) -( -0.015 -0.05 0 ) -( 0.4 -0.05 0 ) -( 0.5 -0.05 0 ) -( -0.1 0.05 0 ) -( -0.015 0.05 0 ) -( 0.4 0.05 0 ) -( 0.5 0.05 0 ) -( -0.1 0.2 0 ) -( -0.015 0.2 0 ) -( 0.4 0.2 0 ) -( 0.5 0.2 0 ) - -( -0.1 -0.2 0.001 ) -( -0.015 -0.2 0.001 ) -( 0.4 -0.2 0.001 ) -( 0.5 -0.2 0.001 ) -( -0.1 -0.05 0.001 ) -( -0.015 -0.05 0.001 ) -( 0.4 -0.05 0.001 ) -( 0.5 -0.05 0.001 ) -( -0.1 0.05 0.001 ) -( -0.015 0.05 0.001 ) -( 0.4 0.05 0.001 ) -( 0.5 0.05 0.001 ) -( -0.1 0.2 0.001 ) -( -0.015 0.2 0.001 ) -( 0.4 0.2 0.001 ) -( 0.5 0.2 0.001 ) +( -0.1 -0.2 0 ) +( -0.015 -0.2 0 ) +( 0.4 -0.2 0 ) +( 0.5 -0.2 0 ) +( -0.1 -0.05 0 ) +( -0.015 -0.05 0 ) +( 0.4 -0.05 0 ) +( 0.5 -0.05 0 ) +( -0.1 0.05 0 ) +( -0.015 0.05 0 ) +( 0.4 0.05 0 ) +( 0.5 0.05 0 ) +( -0.1 0.2 0 ) +( -0.015 0.2 0 ) +( 0.4 0.2 0 ) +( 0.5 0.2 0 ) + +( -0.1 -0.2 0.001 ) +( -0.015 -0.2 0.001 ) +( 0.4 -0.2 0.001 ) +( 0.5 -0.2 0.001 ) +( -0.1 -0.05 0.001 ) +( -0.015 -0.05 0.001 ) +( 0.4 -0.05 0.001 ) +( 0.5 -0.05 0.001 ) +( -0.1 0.05 0.001 ) +( -0.015 0.05 0.001 ) +( 0.4 0.05 0.001 ) +( 0.5 0.05 0.001 ) +( -0.1 0.2 0.001 ) +( -0.015 0.2 0.001 ) +( 0.4 0.2 0.001 ) +( 0.5 0.2 0.001 ) @@ -61,15 +61,15 @@ vertices blocks ( -hex ( 8 9 13 12 24 25 29 28 ) ( 44 54 1 ) simpleGrading ( 0.1111111111 14 1 ) -hex ( 9 10 14 13 25 26 30 29 ) ( 830 54 1 ) simpleGrading ( 1 14 1 ) -hex ( 10 11 15 14 26 27 31 30 ) ( 47 54 1 ) simpleGrading ( 10 14 1 ) -hex ( 4 5 9 8 20 21 25 24 ) ( 44 200 1 ) simpleGrading ( 0.1111111111 1 1 ) -hex ( 5 6 10 9 21 22 26 25 ) ( 830 200 1 ) simpleGrading ( 1 1 1 ) -hex ( 6 7 11 10 22 23 27 26 ) ( 47 200 1 ) simpleGrading ( 10 1 1 ) -hex ( 0 1 5 4 16 17 21 20 ) ( 44 76 1 ) simpleGrading ( 0.1111111111 0.1111111111 1 ) -hex ( 1 2 6 5 17 18 22 21 ) ( 830 76 1 ) simpleGrading ( 1 0.1111111111 1 ) -hex ( 2 3 7 6 18 19 23 22 ) ( 47 76 1 ) simpleGrading ( 10 0.1111111111 1 ) +hex ( 8 9 13 12 24 25 29 28 ) ( 44 54 1 ) simpleGrading ( 0.1111111111 14 1 ) +hex ( 9 10 14 13 25 26 30 29 ) ( 830 54 1 ) simpleGrading ( 1 14 1 ) +hex ( 10 11 15 14 26 27 31 30 ) ( 47 54 1 ) simpleGrading ( 10 14 1 ) +hex ( 4 5 9 8 20 21 25 24 ) ( 44 200 1 ) simpleGrading ( 0.1111111111 1 1 ) +hex ( 5 6 10 9 21 22 26 25 ) ( 830 200 1 ) simpleGrading ( 1 1 1 ) +hex ( 6 7 11 10 22 23 27 26 ) ( 47 200 1 ) simpleGrading ( 10 1 1 ) +hex ( 0 1 5 4 16 17 21 20 ) ( 44 76 1 ) simpleGrading ( 0.1111111111 0.1111111111 1 ) +hex ( 1 2 6 5 17 18 22 21 ) ( 830 76 1 ) simpleGrading ( 1 0.1111111111 1 ) +hex ( 2 3 7 6 18 19 23 22 ) ( 47 76 1 ) simpleGrading ( 10 0.1111111111 1 ) ); @@ -82,65 +82,65 @@ patches ( patch input ( - -( 0 16 20 4 ) -( 4 20 24 8 ) -( 8 24 28 12 ) + +( 0 16 20 4 ) +( 4 20 24 8 ) +( 8 24 28 12 ) ) patch output ( -( 19 3 7 23 ) -( 23 7 11 27 ) -( 27 11 15 31 ) +( 19 3 7 23 ) +( 23 7 11 27 ) +( 27 11 15 31 ) ) wall fixedWalls ( - -( 12 28 29 13 ) -( 13 29 30 14 ) -( 14 30 31 15 ) -( 0 1 17 16 ) -( 1 2 18 17 ) -( 2 3 19 18 ) +( 12 28 29 13 ) +( 13 29 30 14 ) +( 14 30 31 15 ) + +( 0 1 17 16 ) +( 1 2 18 17 ) +( 2 3 19 18 ) ) empty frontAndBack ( - -( 0 4 5 1 ) -( 1 5 6 2 ) -( 2 6 7 3 ) -( 4 8 9 5 ) -( 5 9 10 6 ) -( 6 10 11 7 ) -( 8 12 13 9 ) -( 9 13 14 10 ) -( 10 14 15 11 ) -( 16 17 21 20 ) -( 17 18 22 21 ) -( 18 19 23 22 ) -( 20 21 25 24 ) -( 21 22 26 25 ) -( 22 23 27 26 ) -( 24 25 29 28 ) -( 25 26 30 29 ) -( 26 27 31 30 ) +( 0 4 5 1 ) +( 1 5 6 2 ) +( 2 6 7 3 ) +( 4 8 9 5 ) +( 5 9 10 6 ) +( 6 10 11 7 ) +( 8 12 13 9 ) +( 9 13 14 10 ) +( 10 14 15 11 ) + +( 16 17 21 20 ) +( 17 18 22 21 ) +( 18 19 23 22 ) +( 20 21 25 24 ) +( 21 22 26 25 ) +( 22 23 27 26 ) +( 24 25 29 28 ) +( 25 26 30 29 ) +( 26 27 31 30 ) + - ) ); mergePatchPairs ( - //(0 4 7 3) - //(1 5 6 2) + //(0 4 7 3) + //(1 5 6 2) ); // ************************************************************************* // diff --git a/tutorials/immersedBoundary/pitchingPlate/system/controlDict b/tutorials/immersedBoundary/pitchingPlate/system/controlDict index 3260687c0..3c5dcc40c 100644 --- a/tutorials/immersedBoundary/pitchingPlate/system/controlDict +++ b/tutorials/immersedBoundary/pitchingPlate/system/controlDict @@ -52,8 +52,8 @@ maxCo 0.2; libs ( "libdynamicFvMesh.so" - "libimmersedBoundary.so" - "libimmersedBoundaryDynamicFvMesh.so" + "libimmersedBoundary.so" + "libimmersedBoundaryDynamicFvMesh.so" ); diff --git a/tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/controlDict b/tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/controlDict index f5200b7f8..7bba67307 100644 --- a/tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/controlDict +++ b/tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/controlDict @@ -16,7 +16,7 @@ FoamFile libs ( - "liblduSolvers.so" + "liblduSolvers.so" ) application MRFSimpleFoam; diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict index 8194bb33a..9f37bcd94 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict +++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict @@ -19,7 +19,7 @@ libs ( "libincompressibleRASModels.so" ) - + application pisoFoam; startFrom startTime; diff --git a/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/meshDict b/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/meshDict index db7da96eb..115b7b187 100644 --- a/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/meshDict +++ b/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/meshDict @@ -17,38 +17,36 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -boundaryCellSize 4.5; -//keepCellsIntersectingBoundary 1; -maxCellSize 9; -//minCellSize 0.375; +boundaryCellSize 4.5; +//keepCellsIntersectingBoundary 1; +maxCellSize 9; +//minCellSize 0.375; -surfaceFile "socket.fms"; +surfaceFile "socket.fms"; boundaryLayers { - maxFirstLayerThickness 2.0; - nLayers 1; - thicknessRatio 1.2; + maxFirstLayerThickness 2.0; + nLayers 1; + thicknessRatio 1.2; patchBoundaryLayers { - patch7 { - allowDiscontinuity 0; - maxFirstLayerThickness 1.0; - nLayers 2; - thicknessRatio 1.1; + allowDiscontinuity 0; + maxFirstLayerThickness 1.0; + nLayers 2; + thicknessRatio 1.1; } } } localRefinement { - patch15 { - additionalRefinementLevels 1; + additionalRefinementLevels 1; } subset1 diff --git a/tutorials/mesh/moveDynamicMesh/circCylinder3d/system/controlDict b/tutorials/mesh/moveDynamicMesh/circCylinder3d/system/controlDict index dddabcf2f..cf2f45e92 100644 --- a/tutorials/mesh/moveDynamicMesh/circCylinder3d/system/controlDict +++ b/tutorials/mesh/moveDynamicMesh/circCylinder3d/system/controlDict @@ -17,7 +17,7 @@ FoamFile libs ( - "libfvMotionSolver.so" + "libfvMotionSolver.so" ) application moveDynamicMesh; diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict index c1010db8a..92958bbde 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict @@ -19,7 +19,7 @@ libs ( "libinterfaceProperties.so" ) - + application multiphaseInterFoam; startFrom latestTime; diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/controlDict b/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/controlDict index 659d9fcfb..905f18b27 100644 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/controlDict +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/controlDict @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // libs -( +( "liblduSolvers.so" )