diff --git a/Allwmake.firstInstall b/Allwmake.firstInstall index de8eaea35..0bf9939fe 100755 --- a/Allwmake.firstInstall +++ b/Allwmake.firstInstall @@ -7,19 +7,19 @@ then echo "Error: Current directory is not \$WM_PROJECT_DIR" echo " The environment variables are not consistent with the installation." echo " Please source configuration files." - echo + echo echo "Examples:" echo " bash: . etc/bashrc" echo " tcsh: source etc/cshrc" - echo - echo " If you sourced the configuration files, please check the 'foamInstall' entry." + echo + echo " If you sourced the configuration files, please check the 'foamInstall' entry." echo exit 1 fi if [ -z "$PARAVIEW_SYSTEM" ] && [ -z "$QT_BIN_DIR" ] then - echo + echo echo "\$QT_BIN_DIR not set. To compile Paraview from sources" echo "the command \$QT_BIN_DIR/qmake needs to be valid." echo @@ -27,13 +27,13 @@ then echo " Ubuntu: \"export QT_BIN_DIR=/usr/bin\"" echo " Fedora: \"export QT_BIN_DIR=/usr/lib64/qt4/bin\"" echo " openSuse: \"export QT_BIN_DIR=/usr/bin\"" - echo + echo read -r -p "Proceed without compiling ParaView [Y/n] " response if [[ $response =~ ^([nN][oO]|[nN])$ ]] then exit 0 fi -fi +fi # Check whether we will be compiling cudaSolvers if [ -f $CUDA_BIN_DIR/nvcc ] @@ -43,12 +43,12 @@ then echo "cudaSolvers will be compiled by default." echo - # If yes, check presence of $CUDA_ARCH + # If yes, check presence of $CUDA_ARCH if [ -z "$CUDA_ARCH" ] then echo echo "\$CUDA_ARCH is required by nvcc compiler but not set." - echo "Check section '-gpu-architecture' in 'man nvcc' for details." + echo "Check section '-gpu-architecture' in 'man nvcc' for details." echo read -r -p "Proceed without compiling cudaSolvers? [Y/n] " response if [[ $response =~ ^([nN][oO]|[nN])$ ]] diff --git a/ListOfContributors b/ListOfContributors index e033eaa81..9aafb1568 100644 --- a/ListOfContributors +++ b/ListOfContributors @@ -16,7 +16,7 @@ Contents: * List of Contributors - (If your name is missing in the list, please contact the maintainers at + (If your name is missing in the list, please contact the maintainers at and it will be added asap.) Henry Weller diff --git a/applications/solvers/compressible/steadyCompressibleFoam/Make/options b/applications/solvers/compressible/steadyCompressibleFoam/Make/options index e3af283fa..d1521d407 100644 --- a/applications/solvers/compressible/steadyCompressibleFoam/Make/options +++ b/applications/solvers/compressible/steadyCompressibleFoam/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \ - + EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/Make/options b/applications/solvers/compressible/steadyCompressibleMRFFoam/Make/options index e3af283fa..d1521d407 100644 --- a/applications/solvers/compressible/steadyCompressibleMRFFoam/Make/options +++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \ - + EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/Make/options b/applications/solvers/compressible/steadyCompressibleSRFFoam/Make/options index e3af283fa..d1521d407 100644 --- a/applications/solvers/compressible/steadyCompressibleSRFFoam/Make/options +++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \ - + EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/coupled/Allwmake b/applications/solvers/coupled/Allwmake index eb198d84b..82e54df8e 100755 --- a/applications/solvers/coupled/Allwmake +++ b/applications/solvers/coupled/Allwmake @@ -4,8 +4,8 @@ set -x wmake libso conjugateHeatTransfer -wmake blockCoupledScalarTransportFoam +wmake blockCoupledScalarTransportFoam wmake conjugateHeatFoam -wmake conjugateHeatSimpleFoam +wmake conjugateHeatSimpleFoam wmake pUCoupledFoam # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/coupled/conjugateHeatFoam/attachPatches.H b/applications/solvers/coupled/conjugateHeatFoam/attachPatches.H index 3a2f62f06..225f570e0 100644 --- a/applications/solvers/coupled/conjugateHeatFoam/attachPatches.H +++ b/applications/solvers/coupled/conjugateHeatFoam/attachPatches.H @@ -14,5 +14,5 @@ } // Force recalculation of weights - mesh.surfaceInterpolation::movePoints(); + mesh.surfaceInterpolation::movePoints(); } diff --git a/applications/solvers/coupled/conjugateHeatFoam/createSolidMesh.H b/applications/solvers/coupled/conjugateHeatFoam/createSolidMesh.H index 94e9a4eea..7c1bcdb77 100644 --- a/applications/solvers/coupled/conjugateHeatFoam/createSolidMesh.H +++ b/applications/solvers/coupled/conjugateHeatFoam/createSolidMesh.H @@ -25,6 +25,6 @@ } // Force recalculation of weights - solidMesh.surfaceInterpolation::movePoints(); + solidMesh.surfaceInterpolation::movePoints(); } diff --git a/applications/solvers/coupled/conjugateHeatFoam/detachPatches.H b/applications/solvers/coupled/conjugateHeatFoam/detachPatches.H index 30e3ebe30..3171a5173 100644 --- a/applications/solvers/coupled/conjugateHeatFoam/detachPatches.H +++ b/applications/solvers/coupled/conjugateHeatFoam/detachPatches.H @@ -14,5 +14,5 @@ } // Force recalculation of weights - mesh.surfaceInterpolation::movePoints(); + mesh.surfaceInterpolation::movePoints(); } diff --git a/applications/solvers/coupled/conjugateHeatFoam/readTransportProperties.H b/applications/solvers/coupled/conjugateHeatFoam/readTransportProperties.H index 297641a43..91f461e08 100644 --- a/applications/solvers/coupled/conjugateHeatFoam/readTransportProperties.H +++ b/applications/solvers/coupled/conjugateHeatFoam/readTransportProperties.H @@ -1,5 +1,5 @@ singlePhaseTransportModel laminarTransport(U, phi); - + // Density [kg/m^3] dimensionedScalar rho(laminarTransport.lookup("rho")); diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/Make/files b/applications/solvers/coupled/conjugateHeatSimpleFoam/Make/files index aabca7fed..69687c8f2 100644 --- a/applications/solvers/coupled/conjugateHeatSimpleFoam/Make/files +++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/Make/files @@ -1,3 +1,3 @@ -conjugateHeatSimpleFoam.C +conjugateHeatSimpleFoam.C EXE = $(FOAM_APPBIN)/conjugateHeatSimpleFoam diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/attachPatches.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/attachPatches.H index 3a2f62f06..225f570e0 100644 --- a/applications/solvers/coupled/conjugateHeatSimpleFoam/attachPatches.H +++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/attachPatches.H @@ -14,5 +14,5 @@ } // Force recalculation of weights - mesh.surfaceInterpolation::movePoints(); + mesh.surfaceInterpolation::movePoints(); } diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/createSolidMesh.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/createSolidMesh.H index 94e9a4eea..7c1bcdb77 100644 --- a/applications/solvers/coupled/conjugateHeatSimpleFoam/createSolidMesh.H +++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/createSolidMesh.H @@ -25,6 +25,6 @@ } // Force recalculation of weights - solidMesh.surfaceInterpolation::movePoints(); + solidMesh.surfaceInterpolation::movePoints(); } diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/detachPatches.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/detachPatches.H index 99ddc8e35..173912030 100644 --- a/applications/solvers/coupled/conjugateHeatSimpleFoam/detachPatches.H +++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/detachPatches.H @@ -14,7 +14,7 @@ } // Force recalculation of weights - mesh.surfaceInterpolation::movePoints(); + mesh.surfaceInterpolation::movePoints(); } /* { @@ -33,6 +33,6 @@ } // Force recalculation of weights - solidMesh.surfaceInterpolation::movePoints(); + solidMesh.surfaceInterpolation::movePoints(); } */ diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/readTransportProperties.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/readTransportProperties.H index 297641a43..91f461e08 100644 --- a/applications/solvers/coupled/conjugateHeatSimpleFoam/readTransportProperties.H +++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/readTransportProperties.H @@ -1,5 +1,5 @@ singlePhaseTransportModel laminarTransport(U, phi); - + // Density [kg/m^3] dimensionedScalar rho(laminarTransport.lookup("rho")); diff --git a/applications/solvers/coupled/conjugateHeatTransfer/Make/files b/applications/solvers/coupled/conjugateHeatTransfer/Make/files index 83341cec2..b52e6125b 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/Make/files +++ b/applications/solvers/coupled/conjugateHeatTransfer/Make/files @@ -1,7 +1,7 @@ thermalModel/thermalModel.C thermalLaws = thermalModel/thermalLaws -$(thermalLaws)/thermalLaw/thermalLaw.C +$(thermalLaws)/thermalLaw/thermalLaw.C $(thermalLaws)/thermalLaw/newThermalLaw.C $(thermalLaws)/constantThermal/constantThermal.C $(thermalLaws)/multiMaterialThermal/multiMaterialThermal.C @@ -9,7 +9,7 @@ $(thermalLaws)/multiMaterialZonesThermal/multiMaterialZonesThermal.C thermalGaps = thermalModel/thermalGaps -$(thermalGaps)/thermalGap/thermalGap.C +$(thermalGaps)/thermalGap/thermalGap.C $(thermalGaps)/thermalGap/newThermalGap.C $(thermalGaps)/constantThermalGap/constantThermalGap.C $(thermalGaps)/constantResistanceThermalGap/constantResistanceThermalGap.C diff --git a/applications/solvers/coupled/conjugateHeatTransfer/functionObjects/heatFlux/heatFlux/detachPatches.H b/applications/solvers/coupled/conjugateHeatTransfer/functionObjects/heatFlux/heatFlux/detachPatches.H index 30e3ebe30..3171a5173 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/functionObjects/heatFlux/heatFlux/detachPatches.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/functionObjects/heatFlux/heatFlux/detachPatches.H @@ -14,5 +14,5 @@ } // Force recalculation of weights - mesh.surfaceInterpolation::movePoints(); + mesh.surfaceInterpolation::movePoints(); } diff --git a/applications/solvers/coupled/conjugateHeatTransfer/functionObjects/heatFlux/heatFlux/heatFlux.C b/applications/solvers/coupled/conjugateHeatTransfer/functionObjects/heatFlux/heatFlux/heatFlux.C index 4f335c281..051670899 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/functionObjects/heatFlux/heatFlux/heatFlux.C +++ b/applications/solvers/coupled/conjugateHeatTransfer/functionObjects/heatFlux/heatFlux/heatFlux.C @@ -82,11 +82,11 @@ Foam::heatFlux::~heatFlux() void Foam::heatFlux::calcAndPrint() { - const volScalarField& T = + const volScalarField& T = obr_.lookupObject("T"); - const volScalarField& kappaEff = + const volScalarField& kappaEff = obr_.lookupObject(Kfluid_); - //const surfaceScalarField& kappaEff = + //const surfaceScalarField& kappaEff = // obr_.lookupObject(Kfluid_); scalar rho = 1.2; @@ -103,8 +103,8 @@ void Foam::heatFlux::calcAndPrint() //const surfaceScalarField::GeometricBoundaryField& patchHeatFluxD = // heatFluxC.boundaryField(); - //surfaceScalarField::GeometricBoundaryField patchHeatFluxC = - + //surfaceScalarField::GeometricBoundaryField patchHeatFluxC = + scalar sumConduction = 0.0; scalar sumConvection = 0.0; scalar sumRadiation = 0.0; @@ -143,7 +143,7 @@ void Foam::heatFlux::calcAndPrint() if(obr_.foundObject("phi")) { - const surfaceScalarField& phi = + const surfaceScalarField& phi = obr_.lookupObject("phi"); convection = gSum diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivity/chtRcThermalDiffusivityFvPatchScalarField.C b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivity/chtRcThermalDiffusivityFvPatchScalarField.C index 9c73dfa4a..3f40d6982 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivity/chtRcThermalDiffusivityFvPatchScalarField.C +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivity/chtRcThermalDiffusivityFvPatchScalarField.C @@ -213,9 +213,9 @@ chtRcThermalDiffusivityFvPatchScalarField::calcThermalDiffusivity //Info << "Qr = " << Qr << endl; //Info << "kOwn + kNei = " << (kOwn + kNei) << endl; - + //Info << "k = " << k << endl; - + k = kOwn*(TwOwn*(kNei*(TcNei - TcOwn) + Qr + fourQro) - TcOwn*fourQro); k /= stabilise((fourQro + TwOwn*(kOwn + kNei))*(TcNei - TcOwn), SMALL); k /= p.deltaCoeffs(); diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivityResistance/chtRcThermalDiffusivityResistanceFvPatchScalarField.C b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivityResistance/chtRcThermalDiffusivityResistanceFvPatchScalarField.C index 605ed1fb7..8f19a7be6 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivityResistance/chtRcThermalDiffusivityResistanceFvPatchScalarField.C +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivityResistance/chtRcThermalDiffusivityResistanceFvPatchScalarField.C @@ -260,7 +260,7 @@ chtRcThermalDiffusivityResistanceFvPatchScalarField::calcThermalDiffusivity k /= stabilise(TcOwn - TcNei, SMALL)*p.deltaCoeffs(); */ - // Expression is equivalent to the one above + // Expression is equivalent to the one above k = kOwn* ( TwOwn* diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivityResistance/chtRcThermalDiffusivityResistanceFvPatchScalarField.H b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivityResistance/chtRcThermalDiffusivityResistanceFvPatchScalarField.H index 8b675fd4e..3ee4a4e11 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivityResistance/chtRcThermalDiffusivityResistanceFvPatchScalarField.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/chtRcThermalDiffusivityResistance/chtRcThermalDiffusivityResistanceFvPatchScalarField.H @@ -25,7 +25,7 @@ Class regionCouplingResistanceFvPatchField Description - Region couple patch field jump resistance on the surface taking + Region couple patch field jump resistance on the surface taking radiation into account Author diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.C b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.C index ecf8cfead..7f307e10e 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.C +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.C @@ -85,7 +85,7 @@ controlledParabolicVelocityFvPatchVectorField::controlledParabolicVelocityFvPatc : fixedValueFvPatchVectorField(p, iF), Umean_(readScalar(dict.lookup("Umean"))), - n_(dict.lookup("n")), + n_(dict.lookup("n")), y_(dict.lookup("y")), target_(readScalar(dict.lookup("target"))), obsFieldName_(dict.lookup("obsFieldName")), @@ -168,7 +168,7 @@ void controlledParabolicVelocityFvPatchVectorField::updateCoeffs() const vectorField& c = patch().Cf(); // Calculate local 1-D coordinate for the parabolic profile - scalarField coord = + scalarField coord = 0.5 - ((c - ctr) & y_)/((bb.max() - bb.min()) & y_); operator==(n_*3/2*Umean_*(1.0 - sqr(coord))); diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.H b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.H index 14d202cb5..da2f92dc5 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.H @@ -58,7 +58,7 @@ class controlledParabolicVelocityFvPatchVectorField { // Private data - //- Volumetric flow rate + //- Volumetric flow rate scalar Umean_; //- Flow direction diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/extendedWallHeatTransfer/extendedWallHeatTransferFvPatchScalarField.C b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/extendedWallHeatTransfer/extendedWallHeatTransferFvPatchScalarField.C index 3eb04bc18..8d97b9ee2 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/extendedWallHeatTransfer/extendedWallHeatTransferFvPatchScalarField.C +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/extendedWallHeatTransfer/extendedWallHeatTransferFvPatchScalarField.C @@ -204,7 +204,7 @@ void Foam::extendedWallHeatTransferFvPatchScalarField::write(Ostream& os) const os << nl << indent << "radiationSources" << nl << indent << token::BEGIN_LIST << incrIndent << nl; - + forAll(radSources_, rsI) { os << indent << radSources_[rsI].name() << nl diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/extendedWallHeatTransfer/viewFactorRadiation.H b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/extendedWallHeatTransfer/viewFactorRadiation.H index c0976984e..8dd783438 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/extendedWallHeatTransfer/viewFactorRadiation.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/extendedWallHeatTransfer/viewFactorRadiation.H @@ -27,7 +27,7 @@ Class Description helper class to sum up external radiation sources - + SourceFiles viewFactorRadiation.C diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.H b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.H index 26a451aaf..c48243303 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.H @@ -27,7 +27,7 @@ Class Description helper class to sum up external radiation sources - + SourceFiles ersConstantFlux.C diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.H b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.H index 09c6543ef..cc5d67d25 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.H @@ -27,7 +27,7 @@ Class Description helper class to sum up external radiation sources - + SourceFiles ersPlaneToCylinder.C diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.H b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.H index 1a1c9644f..cdc2fafff 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.H @@ -27,7 +27,7 @@ Class Description helper class to sum up external radiation sources - + SourceFiles ersPointSource.C diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.H b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.H index 205bfec13..93e06bebf 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.H @@ -27,7 +27,7 @@ Class Description helper class to sum up external radiation sources - + SourceFiles ersViewFactor.C diff --git a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/externalRadiationSource/externalRadiationSource.H b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/externalRadiationSource/externalRadiationSource.H index 8df431444..2a248c440 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/externalRadiationSource/externalRadiationSource.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/fvPatchFields/externalRadiation/externalRadiationSource/externalRadiationSource.H @@ -27,7 +27,7 @@ Class Description Virtual base class for external radiation sources - + SourceFiles externalRadiationSource.C diff --git a/applications/solvers/coupled/conjugateHeatTransfer/thermalModel/thermalLaws/multiMaterialThermal/multiMaterialThermal.H b/applications/solvers/coupled/conjugateHeatTransfer/thermalModel/thermalLaws/multiMaterialThermal/multiMaterialThermal.H index c17a22621..8d42f3046 100644 --- a/applications/solvers/coupled/conjugateHeatTransfer/thermalModel/thermalLaws/multiMaterialThermal/multiMaterialThermal.H +++ b/applications/solvers/coupled/conjugateHeatTransfer/thermalModel/thermalLaws/multiMaterialThermal/multiMaterialThermal.H @@ -75,14 +75,14 @@ protected: // Protected member functions - //- Check that the laws and the material field are okay + //- Check that the laws and the material field are okay void readLaws ( const volScalarField& T, const dictionary& dict ); - //- Check that the laws and the material field are okay + //- Check that the laws and the material field are okay void checkLaws() const; diff --git a/applications/solvers/coupled/pUCoupledFoam/Make/files b/applications/solvers/coupled/pUCoupledFoam/Make/files index c2200751c..5e64f38b1 100644 --- a/applications/solvers/coupled/pUCoupledFoam/Make/files +++ b/applications/solvers/coupled/pUCoupledFoam/Make/files @@ -1,3 +1,3 @@ -pUCoupledFoam.C +pUCoupledFoam.C EXE = $(FOAM_APPBIN)/pUCoupledFoam diff --git a/applications/solvers/coupled/pUCoupledFoam/Make/options b/applications/solvers/coupled/pUCoupledFoam/Make/options index 63db9d04b..5775a4d11 100644 --- a/applications/solvers/coupled/pUCoupledFoam/Make/options +++ b/applications/solvers/coupled/pUCoupledFoam/Make/options @@ -12,4 +12,4 @@ EXE_LIBS = \ -lfiniteVolume \ -llduSolvers \ -lVectorN - + diff --git a/applications/solvers/equationReaderDemo/Make/files b/applications/solvers/equationReaderDemo/Make/files index 0f13a49a7..e27a623a6 100644 --- a/applications/solvers/equationReaderDemo/Make/files +++ b/applications/solvers/equationReaderDemo/Make/files @@ -1,3 +1,3 @@ -equationReaderDemo.C +equationReaderDemo.C EXE = $(FOAM_APPBIN)/equationReaderDemo diff --git a/applications/solvers/equationReaderDemo/loadEquationData.H b/applications/solvers/equationReaderDemo/loadEquationData.H index 27ff2ccb7..9c469cbe6 100644 --- a/applications/solvers/equationReaderDemo/loadEquationData.H +++ b/applications/solvers/equationReaderDemo/loadEquationData.H @@ -3,18 +3,18 @@ // We could try addSource(runTime), but since runTime.name() // constantly changes, we assign it our own name: eqns.scalarSources().addSource(runTime.value(), "t", dimTime); - + // Add mesh coordinates (cell centres) gives variable names: // C.x, C.y, C.z eqns.vectorSources().addSource(mesh.C()); - + // Add mesh volumes eqns.scalarSources().addSource(mesh.V()); - + // Add simpleFoam's existing variables eqns.scalarSources().addSource(p); eqns.vectorSources().addSource(U); - + // Adding a "derived" variable - one that exists only temporarily e.g.: // turbulence->R() - since it does not permanently exist, this won't // work: @@ -49,18 +49,18 @@ ); eqns.addSource(equationDict); - + // Generic sources for demo purposes: - + // Scalars scalar sA(1.0); scalar sB(2.0); scalar sC(3.0); - + eqns.scalarSources().addSource(sA, "sA"); eqns.scalarSources().addSource(sB, "sB"); eqns.scalarSources().addSource(sC, "sC"); - + // Dimensioned scalars dimensionedScalar dsA("dsA", dimless, 4.0); dimensionedScalar dsB("dsB", dimless, 5.0); @@ -131,7 +131,7 @@ eqns.vectorSources().addSource(vA, "vA"); eqns.vectorSources().addSource(vB, "vB"); eqns.vectorSources().addSource(vC, "vC"); - + dimensionedVector dvA("dvA", dimless, vector(400.0, 400.0, 400.0)); dimensionedVector dvB("dvB", dimless, vector(500.0, -500.0, 500.0)); dimensionedVector dvC("dvC", dimless, vector(600.0, 600.0, -600.0)); @@ -382,7 +382,7 @@ eqns.readEquation(equationDict, "dsOut"); eqns.readEquation(equationDict, "dsfOut"); eqns.readEquation(equationDict, "volSfOut"); - + // vector equations eqns.readEquation(equationDict, "vOut.x"); eqns.readEquation(equationDict, "vOut.y"); @@ -396,7 +396,7 @@ eqns.readEquation(equationDict, "volVfOut.x"); eqns.readEquation(equationDict, "volVfOut.y"); eqns.readEquation(equationDict, "volVfOut.z"); - + // tensor equations eqns.readEquation(equationDict, "tOut.xx"); eqns.readEquation(equationDict, "tOut.xy"); @@ -449,7 +449,7 @@ IOobject::AUTO_WRITE ) ); - + // scalars scalar scalarOut; dimensionedScalar dimensionedScalarOut diff --git a/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C b/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C index f07d102a0..19d9198b2 100644 --- a/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C +++ b/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) // Only necessary if we revisit the same solver domain twice in the same // superLoop (scalarTransportFoam, in this case) multiRun++; - + // * * * * * * * * * * * * * * * * icoFoam2 * * * * * * * * * * * * * * * * // Info << "*** Switching to icoFoam2 ***\n" << endl; diff --git a/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H b/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H index f62ba240e..1fedb60d0 100644 --- a/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H +++ b/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H @@ -31,7 +31,7 @@ volScalarField rUA = 1.0/UEqn.A(); U = rUA*UEqn.H(); - phi = (fvc::interpolate(U) & mesh.Sf()) + phi = (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, U, phi); adjustPhi(phi, U, p); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPair.C b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPair.C index fe10c18b5..4804383a1 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPair.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPair.C @@ -22,7 +22,7 @@ License along with foam-extend. If not, see . Description - + \*---------------------------------------------------------------------------*/ #include "error.H" diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPair.H b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPair.H index dc4b4d8cf..f7c2c4cd9 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPair.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPair.H @@ -25,7 +25,7 @@ Class contactPatchPair Description - + SourceFiles contactPatchPair.C contactPatchPairSlavePressure.C diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPairSlavePressure.C b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPairSlavePressure.C index 6d8b5b187..aa3e450a7 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPairSlavePressure.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPairSlavePressure.C @@ -22,7 +22,7 @@ License along with foam-extend. If not, see . Description - + \*---------------------------------------------------------------------------*/ #include "contactPatchPair.H" diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPairUpdateContact.C b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPairUpdateContact.C index 876f669a3..8d7d6e1aa 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPairUpdateContact.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactPatchPairUpdateContact.C @@ -22,7 +22,7 @@ License along with foam-extend. If not, see . Description - + \*---------------------------------------------------------------------------*/ #include "contactPatchPair.H" diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactStressFoam.C b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactStressFoam.C index 9a7d5307d..53867bcaf 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactStressFoam.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/contactStressFoam.C @@ -25,7 +25,7 @@ Application stressedFoam Description - Transient/steady-state solver of linear-elastic, small-strain deformation + Transient/steady-state solver of linear-elastic, small-strain deformation of solid bodies in contact. Simple linear elasticity structural analysis code. diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/Make/files b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/Make/files index f2512a37c..59ac9823b 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/Make/files +++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/Make/files @@ -1,4 +1,4 @@ tractionDisplacement/tractionDisplacementFvPatchVectorField.C -icoFsiFoam.C +icoFsiFoam.C EXE = $(FOAM_APPBIN)/icoFsiFoam diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/setMotion.H b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/setMotion.H index a626fcb88..e5d3ffe9e 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/setMotion.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/setMotion.H @@ -1,11 +1,11 @@ { // Setting mesh motion - pointVectorField solidPointsDispl = + pointVectorField solidPointsDispl = cpi.interpolate(Usolid - Usolid.oldTime()); vectorField newPoints = - stressMesh.points() + stressMesh.points() + solidPointsDispl.internalField(); stressMesh.movePoints(newPoints); @@ -28,8 +28,8 @@ # include "volContinuity.H" - Info << "Motion magnitude: mean = " + Info << "Motion magnitude: mean = " << average(mag(Usolid.boundaryField()[solidPatchID])) - << " max = " + << " max = " << max(mag(Usolid.boundaryField()[solidPatchID])) << endl; } diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/setPressure.H b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/setPressure.H index c9245732a..3bf180df0 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/setPressure.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/setPressure.H @@ -9,7 +9,7 @@ ); solidPatchPressure *= rhoFluid.value(); - + tForce.pressure() = solidPatchPressure; @@ -20,6 +20,6 @@ mesh.Sf().boundaryField()[fluidPatchID] ); - + Info << "Total pressure force = " << totalPressureForce << endl; } diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/Make/files b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/Make/files index 5b798f25b..63dde3fe5 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/Make/files +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/Make/files @@ -16,7 +16,7 @@ $(rheologyLaws)/PronyViscoelastic/PronyViscoelastic.C thermalModel/thermalModel.C thermalLaws = thermalModel/thermalLaws -$(thermalLaws)/thermalLaw/thermalLaw.C +$(thermalLaws)/thermalLaw/thermalLaw.C $(thermalLaws)/thermalLaw/newThermalLaw.C $(thermalLaws)/constantThermal/constantThermal.C $(thermalLaws)/multiMaterialThermal/multiMaterialThermal.C diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H index 5988f574d..e9eae4b80 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/Dugdale/DugdaleCohesiveLaw.H @@ -70,7 +70,7 @@ public: DugdaleCohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C index ea4f73fc0..125b3e86e 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C @@ -73,7 +73,7 @@ Foam::autoPtr Foam::cohesiveLaw::New Foam::cohesiveLaw::cohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ) : cohesiveLawCoeffs_(dict.subDict(cohesiveLawName + "Coeffs")), diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H index 301981e4c..a9927e8b0 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.H @@ -96,7 +96,7 @@ public: static autoPtr New ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); @@ -106,7 +106,7 @@ public: cohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy @@ -123,7 +123,7 @@ public: // Member Functions - + //- Return cohesive law coefficients const dictionary& cohesiveLawCoeffs() const { diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/linear/linearCohesiveLaw.H b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/linear/linearCohesiveLaw.H index 6f16ad1c4..f36becf4d 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/linear/linearCohesiveLaw.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/cohesiveLaws/linear/linearCohesiveLaw.H @@ -70,7 +70,7 @@ public: linearCohesiveLaw ( const word& cohesiveLawName, - const dictionary& dict + const dictionary& dict ); //- Construct as copy diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/componentReference/componentReference.H b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/componentReference/componentReference.H index 3fe0a3031..8ff3b9894 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/componentReference/componentReference.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/componentReference/componentReference.H @@ -170,7 +170,7 @@ public: { checkPatchFace(mesh); } - + //- Construct from dictionary componentReference diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C index 7b9f614fe..a9c3c0998 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveLaw/cohesiveLawFvPatchVectorField.C @@ -244,7 +244,7 @@ void cohesiveLawFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); traction_.writeEntry("traction", os); - os.writeKeyword("cohesiveLaw") << law().type() + os.writeKeyword("cohesiveLaw") << law().type() << token::END_STATEMENT << nl; os.writeKeyword("relaxationFactor") << relaxationFactor_ << token::END_STATEMENT << nl; diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C index 61931a6b6..4a1e3b0cd 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C @@ -98,7 +98,7 @@ cohesiveZoneFvPatchVectorField::cohesiveZoneFvPatchVectorField { this->refValue() = vector::zero; } - + if (dict.found("refGradient")) { this->refGrad() = vectorField("refGradient", dict, p.size()); @@ -110,7 +110,7 @@ cohesiveZoneFvPatchVectorField::cohesiveZoneFvPatchVectorField if (dict.found("valueFraction")) { - this->valueFraction() = + this->valueFraction() = symmTensorField("valueFraction", dict, p.size()); } else @@ -205,7 +205,7 @@ void cohesiveZoneFvPatchVectorField::updateCoeffs() const rheologyModel& rheology = this->db().objectRegistry::lookupObject(rheologyName_); - const scalarField mu = + const scalarField mu = rheology.mu()().boundaryField()[patch().index()]; const scalarField lambda = @@ -275,17 +275,17 @@ void cohesiveZoneFvPatchVectorField::updateCoeffs() if(magSqr(valueFraction()[faceI]) < SMALL) { - cohesiveTraction = - relaxationFactor_*cohesiveTraction + cohesiveTraction = + relaxationFactor_*cohesiveTraction + (1.0 - relaxationFactor_)*sigmaN[faceI]*n[faceI]; refGrad()[faceI] = ( cohesiveTraction - ( - n[faceI] + n[faceI] & ( - mu[faceI]*gradU[faceI].T() + mu[faceI]*gradU[faceI].T() - (mu[faceI] + lambda[faceI])*gradU[faceI] ) ) @@ -305,7 +305,7 @@ void cohesiveZoneFvPatchVectorField::write(Ostream& os) const directionMixedFvPatchVectorField::write(os); os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl; os.writeKeyword("rheology") << rheologyName_ << token::END_STATEMENT << nl; - os.writeKeyword("cohesiveLaw") << law().type() + os.writeKeyword("cohesiveLaw") << law().type() << token::END_STATEMENT << nl; os.writeKeyword("relaxationFactor") << relaxationFactor_ << token::END_STATEMENT << nl; diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H index e048953b0..86db2ee93 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.H @@ -173,7 +173,7 @@ public: //- Update the coefficients associated with the patch field virtual void updateCoeffs(); - + //- Write virtual void write(Ostream&) const; diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C index bf72442fd..9ad8be74e 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/BurgersViscoelastic/BurgersViscoelastic.C @@ -106,7 +106,7 @@ Foam::tmp Foam::BurgersViscoelastic::E(scalar t) const + eta2_.value()/k2_.value(); scalar p2 = eta1_.value()*eta2_.value()/(k1_.value()*k2_.value()); - + scalar q1 = eta1_.value(); scalar q2 = eta1_.value()*eta2_.value()/k2_.value(); @@ -119,7 +119,7 @@ Foam::tmp Foam::BurgersViscoelastic::E(scalar t) const E = (q1 - q2*r1)*exp(-r1*t)/A - (q1 - q2*r2)*exp(-r2*t)/A; } - + tmp tresult ( @@ -177,7 +177,7 @@ Foam::tmp Foam::BurgersViscoelastic::J(scalar t) const if(t >= 0) { - J = 1.0/k1_.value() + J = 1.0/k1_.value() + (1 - exp(-k2_.value()*t/eta2_.value()))/k2_.value() + t/eta1_.value(); } diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C index 0accb8723..79603f839 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/KelvinSLSViscoelastic/KelvinSLSViscoelastic.C @@ -101,14 +101,14 @@ Foam::tmp Foam::KelvinSLSViscoelastic::E(scalar t) const if(t>=0) { scalar p1 = eta2_.value()/(k1_.value() + k2_.value()); - + scalar q0 = k1_.value()*k2_.value()/(k1_.value() + k2_.value()); scalar q1 = k1_.value()*eta2_.value()/(k1_.value() + k2_.value()); E = q0 + (q1/p1 - q0)*exp(-t/p1); } - + tmp tresult ( @@ -167,7 +167,7 @@ Foam::tmp Foam::KelvinSLSViscoelastic::J(scalar t) const if(t >= 0) { scalar p1 = eta2_.value()/(k1_.value() + k2_.value()); - + scalar q0 = k1_.value()*k2_.value()/(k1_.value() + k2_.value()); scalar q1 = k1_.value()*eta2_.value()/(k1_.value() + k2_.value()); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C index 5e1cf935e..f99109fcd 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellElasticViscoelastic/MaxwellElasticViscoelastic.C @@ -182,8 +182,8 @@ Foam::MaxwellElasticViscoelastic::J(scalar t) const mesh(), dimensionedScalar ( - "J", - dimless/k_.dimensions(), + "J", + dimless/k_.dimensions(), 1.0/k_.value() + t/eta_.value() ), zeroGradientFvPatchScalarField::typeName diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C index a9a1e14ab..99faed1d0 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellSLSViscoelastic/MaxwellSLSViscoelastic.C @@ -100,7 +100,7 @@ Foam::tmp Foam::MaxwellSLSViscoelastic::E(scalar t) const { E = k2_.value() + k1_.value()*exp(-k1_.value()*t/eta1_.value()); } - + tmp tresult ( diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C index 731752000..bf7ba5cd3 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/MaxwellViscoelastic/MaxwellViscoelastic.C @@ -168,8 +168,8 @@ Foam::tmp Foam::MaxwellViscoelastic::J(scalar t) const mesh(), dimensionedScalar ( - "J", - dimless/k_.dimensions(), + "J", + dimless/k_.dimensions(), 1.0/k_.value() + t/eta_.value() ), zeroGradientFvPatchScalarField::typeName diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C index 2e99250bd..a0d300ba8 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/rheologyModel/rheologyLaws/PronyViscoelastic/PronyViscoelastic.C @@ -104,7 +104,7 @@ Foam::tmp Foam::PronyViscoelastic::E(scalar t) const { E += k_[i]*exp(-t/tau_[i]); } - + if(t < 0) { E = 0; @@ -161,7 +161,7 @@ Foam::tmp Foam::PronyViscoelastic::nu(scalar t) const Foam::tmp Foam::PronyViscoelastic::J(scalar t) const { notImplemented(type() + "::J(scalar t)"); - + return 1.0/E(t); } diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactPatchPair.C b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactPatchPair.C index 903d155db..9e5cf7992 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactPatchPair.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactPatchPair.C @@ -103,7 +103,7 @@ Foam::contactPatchPair::contactPatchPair cp.mesh().boundaryMesh()[slavePatch_.index()], // to patch intersection::algorithmNames_.read(dict.lookup("projectionAlgo")), intersection::directionNames_.read(dict.lookup("projectionDir")) - + ), slaveToMasterInterpolate_ ( @@ -111,7 +111,7 @@ Foam::contactPatchPair::contactPatchPair cp.mesh().boundaryMesh()[masterPatch_.index()], // to patch intersection::algorithmNames_.read(dict.lookup("projectionAlgo")), intersection::directionNames_.read(dict.lookup("projectionDir")) - + ) {} diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactPatchPair.H b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactPatchPair.H index 7b9867a1c..2ac68b0cf 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactPatchPair.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactPatchPair.H @@ -26,7 +26,7 @@ Class Description A pair of surfaces in contact. - + SourceFiles contactPatchPair.C diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactProblem.C b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactProblem.C index 39f7822e1..3719911ec 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactProblem.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/contactProblem.C @@ -240,7 +240,7 @@ void contactProblem::correct() ( lambdaPatches[patchI]*tr(gradUpatches[patchI]) ) - + )/(2.0*muPatches[patchI] + lambdaPatches[patchI]); // Set the value fractions diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C index bfa20952f..3206651ae 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C @@ -176,7 +176,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs() gradient() = ( (traction_ + pressure_*n)/rho.value() - + twoMuLambda*fvPatchField::snGrad() - (n & sigmaD) + + twoMuLambda*fvPatchField::snGrad() - (n & sigmaD) )/twoMuLambda; Switch thermalStress(thermalProperties.lookup("thermalStress")); @@ -186,7 +186,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs() dimensionedScalar alpha(thermalProperties.lookup("alpha")); dimensionedScalar threeKalpha = threeK*alpha; - const fvPatchField& T = + const fvPatchField& T = patch().lookupPatchField("T"); gradient() += n*threeKalpha.value()*T/twoMuLambda; diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C index 97025c4e5..cc6c59b0c 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) { volTensorField gradDcorr = fvc::grad(Dcorr); - sigmaExp = + sigmaExp = (lambda - mu)*gradDcorr + mu*gradDcorr.T() + (lambda*I)*tr(gradDcorr); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C index 8455433a0..57ff3619c 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C @@ -170,7 +170,7 @@ void tractionDisplacementCorrectionFvPatchVectorField::updateCoeffs() const fvPatchField& sigmaD = patch().lookupPatchField("sigmaD"); - const fvPatchField& sigmaExp = + const fvPatchField& sigmaExp = patch().lookupPatchField("sigmaExp"); gradient() = diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/stressedFoam.C b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/stressedFoam.C index 34928226d..5196cea88 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/stressedFoam.C +++ b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/stressedFoam.C @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nCalculating displacement field\n" << endl; - + for (runTime++; !runTime.end(); runTime++) { Info<< "Iteration: " << runTime.timeName() << nl << endl; diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/aitkenRelaxation.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/aitkenRelaxation.H index a9e829bf8..08888fc65 100644 --- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/aitkenRelaxation.H +++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/aitkenRelaxation.H @@ -1,4 +1,4 @@ -// aitken acceleration +// aitken acceleration aitkenDelta.storePrevIter(); // update delta diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/calculateDivSigmaExp.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/calculateDivSigmaExp.H index 4739c0925..90d04f3b8 100644 --- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/calculateDivSigmaExp.H +++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/calculateDivSigmaExp.H @@ -7,7 +7,7 @@ if(divSigmaExpMethod == "standard") ); } else if(divSigmaExpMethod == "surface") - { + { divSigmaExp = fvc::div ( muf*(mesh.Sf() & fvc::interpolate(gradU.T())) @@ -21,7 +21,7 @@ if(divSigmaExpMethod == "standard") surfaceTensorField shearGradU = ((I - n*n)&fvc::interpolate(gradU)); - + divSigmaExp = fvc::div ( mesh.magSf() diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/calculateTraction.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/calculateTraction.H index ff1d7f6db..a0fe5c56a 100644 --- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/calculateTraction.H +++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/calculateTraction.H @@ -3,7 +3,7 @@ // traction = (n&fvc::interpolate(sigma)); - // surfaceTensorField sGradU = + // surfaceTensorField sGradU = // ((I - n*n)&fvc::interpolate(gradU)); // traction = diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/checkCohesivePatchOrdering.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/checkCohesivePatchOrdering.H index 0bc3b3c70..e439e0276 100644 --- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/checkCohesivePatchOrdering.H +++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/checkCohesivePatchOrdering.H @@ -7,7 +7,7 @@ Cczm[i] -= Cczm[sizeByTwo + i]; Cczm[sizeByTwo + i] = Cczm[i]; } - + scalar error = sum(mag(Cczm)); if(error < SMALL) @@ -16,7 +16,7 @@ } else { - Info << "Cohesive patch face ordering: error (" << error << ")" + Info << "Cohesive patch face ordering: error (" << error << ")" << endl; } } diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/createCrack.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/createCrack.H index 2bbfe17eb..e2acd5409 100644 --- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/createCrack.H +++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/createCrack.H @@ -42,7 +42,7 @@ // ( // U.boundaryField()[cohesivePatchID] // ); - + // philipc: I have moved cohesive stuff to constitutiveModel // cohesiveZone is an index field @@ -67,18 +67,18 @@ { const dictionary& stressControl = mesh.solutionDict().subDict("solidMechanics"); - + List userBoxes(stressControl.lookup("crackLimitingBoxes")); const surfaceVectorField& Cf = mesh.Cf(); forAll(cohesiveZone.internalField(), faceI) { bool faceInsideBox = false; - + forAll(userBoxes, boxi) { if(userBoxes[boxi].contains(Cf.internalField()[faceI])) faceInsideBox = true; } - + if(faceInsideBox) { cohesiveZone.internalField()[faceI] = 1.0; @@ -93,12 +93,12 @@ forAll(cohesiveZone.boundaryField()[patchI], faceI) { bool faceInsideBox = false; - + forAll(userBoxes, boxi) { if(userBoxes[boxi].contains(Cf.boundaryField()[patchI][faceI])) faceInsideBox = true; } - + if(faceInsideBox) { cohesiveZone.boundaryField()[patchI][faceI] = 1.0; @@ -149,7 +149,7 @@ Switch initialiseSolution(false); - if + if ( mesh.solutionDict().subDict("solidMechanics") .found("initialiseSolution") @@ -168,7 +168,7 @@ Switch breakOnlyOneFacePerTopologyChange(true); - if + if ( mesh.solutionDict().subDict("solidMechanics") .found("breakOnlyOneFacePerTopologyChange") diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/createFields.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/createFields.H index cbe034894..7e758149c 100644 --- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/createFields.H +++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/createFields.H @@ -95,7 +95,7 @@ ); constitutiveModel rheology(sigma, U); - + surfaceVectorField traction ( IOobject diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/setReference.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/setReference.H index a8ac5d0d5..f9b9b9bd6 100644 --- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/setReference.H +++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/setReference.H @@ -4,10 +4,10 @@ { if (needRef[regI]) { - UEqn.source()[refCells[regI]] += + UEqn.source()[refCells[regI]] += UEqn.diag()[refCells[regI]]*vector::zero; - UEqn.diag()[refCells[regI]] += + UEqn.diag()[refCells[regI]] += UEqn.diag()[refCells[regI]]; } } diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H b/applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H index d6c7f017c..50bb49ddd 100644 --- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H +++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H @@ -3,7 +3,7 @@ nCoupledFacesToBreak = 0; { // Check internal faces - // scalarField effTraction = + // scalarField effTraction = // cohesiveZone.internalField() * // mag(traction.internalField()); scalarField normalTraction = @@ -13,7 +13,7 @@ nCoupledFacesToBreak = 0; scalarField shearTraction = cohesiveZone.internalField() * mag( (I - Foam::sqr(n.internalField())) & traction.internalField() ); - + // the traction fraction is monitored to decide which faces to break: // ie (tN/tNC)^2 + (tS/tSC)^2 >1 to crack a face @@ -25,7 +25,7 @@ nCoupledFacesToBreak = 0; //scalarField effTractionFraction = effTraction/sigmaMax; scalarField effTractionFraction(normalTraction.size(), 0.0); - + if(cohesivePatchUPtr) { effTractionFraction = @@ -74,7 +74,7 @@ nCoupledFacesToBreak = 0; } } - scalar gMaxEffTractionFraction = + scalar gMaxEffTractionFraction = returnReduce(faceToBreakEffTractionFraction, maxOp()); if (Pstream::parRun()) @@ -114,7 +114,7 @@ nCoupledFacesToBreak = 0; { if (mesh.boundary()[patchI].coupled()) { - // scalarField pEffTraction = + // scalarField pEffTraction = // cohesiveZone.boundaryField()[patchI] * // mag(traction.boundaryField()[patchI]); // scalarField pEffTractionFraction = pEffTraction/sigmaMax.boundaryField()[patchI]; @@ -126,12 +126,12 @@ nCoupledFacesToBreak = 0; scalarField pShearTraction = cohesiveZone.boundaryField()[patchI] * mag( (I - Foam::sqr(n.boundaryField()[patchI])) & traction.boundaryField()[patchI] ); - + // the traction fraction is monitored to decide which faces to break: // ie (tN/tNC)^2 + (tS/tSC)^2 >1 to crack a face const scalarField& pSigmaMax = sigmaMax.boundaryField()[patchI]; const scalarField& pTauMax = tauMax.boundaryField()[patchI]; - + scalarField pEffTractionFraction(pNormalTraction.size(), 0.0); if(cohesivePatchUPtr) { @@ -153,7 +153,7 @@ nCoupledFacesToBreak = 0; { maxEffTractionFraction = pEffTractionFraction[faceI]; } - + if (pEffTractionFraction[faceI] > 1.0) { coupledFacesToBreakList.insert(start + faceI); @@ -162,7 +162,7 @@ nCoupledFacesToBreak = 0; pEffTractionFraction[faceI] ); } - } + } } } @@ -185,19 +185,19 @@ nCoupledFacesToBreak = 0; scalar coupledFaceToBreakEffTractionFraction = 0; forAll(coupledFacesToBreakEffTractionFraction, faceI) { - if + if ( - coupledFacesToBreakEffTractionFraction[faceI] + coupledFacesToBreakEffTractionFraction[faceI] > coupledFaceToBreakEffTractionFraction ) { - coupledFaceToBreakEffTractionFraction = + coupledFaceToBreakEffTractionFraction = coupledFacesToBreakEffTractionFraction[faceI]; coupledFaceToBreakIndex = coupledFacesToBreak[faceI]; } } - scalar gMaxCoupledEffTractionFraction = + scalar gMaxCoupledEffTractionFraction = returnReduce(coupledFaceToBreakEffTractionFraction, maxOp()); if (Pstream::parRun()) @@ -208,8 +208,8 @@ nCoupledFacesToBreak = 0; { if ( - mag(gMaxCoupledEffTractionFraction - coupledFaceToBreakEffTractionFraction) - < SMALL + mag(gMaxCoupledEffTractionFraction - coupledFaceToBreakEffTractionFraction) + < SMALL ) { // Maximum traction fraction is on this processor @@ -226,11 +226,11 @@ nCoupledFacesToBreak = 0; label minProcID = returnReduce