diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index 50ddc1ed3..5bdb44fad 100644 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -75,13 +75,13 @@ runParallel () echo "$APP_NAME already run on $PWD: remove log file to run" else echo "Running $APP_NAME in parallel on $PWD using $1 processes" - if [ -z "$WM_MPIRUN_PROG" ] - then - mpirunProg=mpirun - else - # Allow exceentric systems to override the hardcoded mpirun - mpirunProg=$WM_MPIRUN_PROG - fi + if [ -z "$WM_MPIRUN_PROG" ] + then + mpirunProg=mpirun + else + # Allow exceentric systems to override the hardcoded mpirun + mpirunProg=$WM_MPIRUN_PROG + fi ( $mpirunProg -np $1 $APP_RUN -parallel < /dev/null > $LOG_NAME 2>&1 ) fi } diff --git a/etc/bashrc b/etc/bashrc index 4f951fc28..4bce165b1 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -258,102 +258,102 @@ Darwin) which -s port >/dev/null if [ $? -eq "0" -a -d '/opt/local/etc/macports' ] then - if [ "$FOAM_VERBOSE" -a "$PS1" ] - then - echo "Using Macports binaries" - fi + if [ "$FOAM_VERBOSE" -a "$PS1" ] + then + echo "Using Macports binaries" + fi - export WM_USE_MACPORT=1 - export WM_BASE_COMPILER=`echo $WM_COMPILER | tr -d "[:digit:]"` - export WM_MACPORT_MPI_VERSION=`echo $WM_COMPILER | tr "[:upper:]" "[:lower:]"` - export WM_MACPORT_VERSION=`echo $WM_MACPORT_MPI_VERSION | tr -d "[:alpha:]" | sed -e "s/\(.\)\(.\)/\1\.\2/"` + export WM_USE_MACPORT=1 + export WM_BASE_COMPILER=`echo $WM_COMPILER | tr -d "[:digit:]"` + export WM_MACPORT_MPI_VERSION=`echo $WM_COMPILER | tr "[:upper:]" "[:lower:]"` + export WM_MACPORT_VERSION=`echo $WM_MACPORT_MPI_VERSION | tr -d "[:alpha:]" | sed -e "s/\(.\)\(.\)/\1\.\2/"` - if [ -z "$WM_CHOSEN_MAC_MPI" ] - then - if [ -e '/opt/local/bin/mpicc' ] - then - readlink /opt/local/bin/mpicc | grep openmpi >/dev/null - if [ $? -eq "0" ] - then - export WM_MPLIB=MACPORTOPENMPI - if [ "$FOAM_VERBOSE" -a "$PS1" ] - then - echo "Using OpenMPI from MacPorts" - fi - else - readlink /opt/local/bin/mpicc | grep mpich >/dev/null - if [ $? -eq "0" ] - then - export WM_MPLIB=MACPORTMPICH - if [ "$FOAM_VERBOSE" -a "$PS1" ] - then - echo "Using MPICH from MacPorts" - fi - else - echo "/opt/local/bin/mpicc neither OpenMPI nor MPICH. Confused. Defaulting to OPENMPI" - export WM_MPLIB=OPENMPI - fi - fi - fi - else - export WM_MPLIB=$WM_CHOSEN_MAC_MPI - if [ "$FOAM_VERBOSE" -a "$PS1" ] - then - echo "User chose WM_CHOSEN_MAC_MPI=$WM_CHOSEN_MAC_MPI" - fi - fi + if [ -z "$WM_CHOSEN_MAC_MPI" ] + then + if [ -e '/opt/local/bin/mpicc' ] + then + readlink /opt/local/bin/mpicc | grep openmpi >/dev/null + if [ $? -eq "0" ] + then + export WM_MPLIB=MACPORTOPENMPI + if [ "$FOAM_VERBOSE" -a "$PS1" ] + then + echo "Using OpenMPI from MacPorts" + fi + else + readlink /opt/local/bin/mpicc | grep mpich >/dev/null + if [ $? -eq "0" ] + then + export WM_MPLIB=MACPORTMPICH + if [ "$FOAM_VERBOSE" -a "$PS1" ] + then + echo "Using MPICH from MacPorts" + fi + else + echo "/opt/local/bin/mpicc neither OpenMPI nor MPICH. Confused. Defaulting to OPENMPI" + export WM_MPLIB=OPENMPI + fi + fi + fi + else + export WM_MPLIB=$WM_CHOSEN_MAC_MPI + if [ "$FOAM_VERBOSE" -a "$PS1" ] + then + echo "User chose WM_CHOSEN_MAC_MPI=$WM_CHOSEN_MAC_MPI" + fi + fi - if [ "$WM_MPLIB" == "MACPORTOPENMPI" ] - then - if [ ! -e "/opt/local/lib/openmpi-$WM_MACPORT_MPI_VERSION" ] - then - export WM_MACPORT_MPI_VERSION=mp - if [ ! -e "/opt/local/lib/openmpi-$WM_MACPORT_MPI_VERSION" ] - then - echo "Proper OpenMPI not installed. Either do 'port install openmpi-$WM_MACPORT_MPI_VERSION' or 'port install openmpi-default'" - fi - fi - else - if [ "$WM_MPLIB" == "MACPORTMPICH" ] - then - if [ ! -e "/opt/local/lib/mpich-$WM_MACPORT_MPI_VERSION" ] - then - echo "MPICH wants the same version as the used compiler. Do 'port install mpich-$WM_MACPORT_MPI_VERSION'" - fi - fi - fi + if [ "$WM_MPLIB" == "MACPORTOPENMPI" ] + then + if [ ! -e "/opt/local/lib/openmpi-$WM_MACPORT_MPI_VERSION" ] + then + export WM_MACPORT_MPI_VERSION=mp + if [ ! -e "/opt/local/lib/openmpi-$WM_MACPORT_MPI_VERSION" ] + then + echo "Proper OpenMPI not installed. Either do 'port install openmpi-$WM_MACPORT_MPI_VERSION' or 'port install openmpi-default'" + fi + fi + else + if [ "$WM_MPLIB" == "MACPORTMPICH" ] + then + if [ ! -e "/opt/local/lib/mpich-$WM_MACPORT_MPI_VERSION" ] + then + echo "MPICH wants the same version as the used compiler. Do 'port install mpich-$WM_MACPORT_MPI_VERSION'" + fi + fi + fi - if [ "$WM_COMPILER" != "Gcc" ] - then - if [ "$WM_BASE_COMPILER" == "Gcc" ] - then - export WM_CC="gcc-mp-$WM_MACPORT_VERSION" - export WM_CXX="g++-mp-$WM_MACPORT_VERSION" - export WM_FC="gfortran-mp-$WM_MACPORT_VERSION" - elif [ "$WM_BASE_COMPILER" == "Clang" ] - then - export WM_CC="clang-mp-$WM_MACPORT_VERSION" - export WM_CXX="clang++-mp-$WM_MACPORT_VERSION" - # Seems like there is no Fortran-frontend for LLVM at thistime - elif [ "$WM_BASE_COMPILER" == "Dragonegg" ] - then - export WM_CC="dragonegg-$WM_MACPORT_VERSION-gcc" - export WM_CXX="dragonegg-$WM_MACPORT_VERSION-g++" - export WM_CXX="dragonegg-$WM_MACPORT_VERSION-gfortran" - else - echo "Unknown base compiler $WM_BASE_COMPILER" - fi + if [ "$WM_COMPILER" != "Gcc" ] + then + if [ "$WM_BASE_COMPILER" == "Gcc" ] + then + export WM_CC="gcc-mp-$WM_MACPORT_VERSION" + export WM_CXX="g++-mp-$WM_MACPORT_VERSION" + export WM_FC="gfortran-mp-$WM_MACPORT_VERSION" + elif [ "$WM_BASE_COMPILER" == "Clang" ] + then + export WM_CC="clang-mp-$WM_MACPORT_VERSION" + export WM_CXX="clang++-mp-$WM_MACPORT_VERSION" + # Seems like there is no Fortran-frontend for LLVM at thistime + elif [ "$WM_BASE_COMPILER" == "Dragonegg" ] + then + export WM_CC="dragonegg-$WM_MACPORT_VERSION-gcc" + export WM_CXX="dragonegg-$WM_MACPORT_VERSION-g++" + export WM_CXX="dragonegg-$WM_MACPORT_VERSION-gfortran" + else + echo "Unknown base compiler $WM_BASE_COMPILER" + fi - ruleDirBase=$WM_PROJECT_DIR/wmake/rules/$WM_ARCH - ruleDirTarget=$ruleDirBase$WM_BASE_COMPILER - ruleDir=$ruleDirBase$WM_COMPILER - if [ ! -e $ruleDir ] - then - echo "Rule directory $ruleDir not existing. Linking to $ruleDirTarget" - ln -s $ruleDirTarget $ruleDir - fi - unset ruleDir ruleDirBase - fi + ruleDirBase=$WM_PROJECT_DIR/wmake/rules/$WM_ARCH + ruleDirTarget=$ruleDirBase$WM_BASE_COMPILER + ruleDir=$ruleDirBase$WM_COMPILER + if [ ! -e $ruleDir ] + then + echo "Rule directory $ruleDir not existing. Linking to $ruleDirTarget" + ln -s $ruleDirTarget $ruleDir + fi + unset ruleDir ruleDirBase + fi else export WM_COMPILER=Gcc export WM_MPLIB=OPENMPI @@ -446,8 +446,8 @@ fi # then # if [[ `ulimit -n` == "unlimited" || `ulimit -n` < 8192 ]] # then -# # higher limit needed for wmkdeps -# ulimit -n 8192 +# # higher limit needed for wmkdeps +# ulimit -n 8192 # fi # fi diff --git a/etc/settings.sh b/etc/settings.sh index 499cef069..c4a6f3208 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -194,14 +194,14 @@ unset compilerBin compilerLib compilerInstall if [ -z "$WM_CC" ] then case "$WM_COMPILER" in - Gcc*) - export WM_CC='gcc' - export WM_CXX='g++' - ;; - Icc) - export WM_CC='icc' - export WM_CXX='icpc' - ;; + Gcc*) + export WM_CC='gcc' + export WM_CXX='g++' + ;; + Icc) + export WM_CC='icc' + export WM_CXX='icpc' + ;; esac fi @@ -245,24 +245,24 @@ OPENMPI) ;; MACPORTOPENMPI) - unset OPAL_PREFIX + unset OPAL_PREFIX - export FOAM_MPI=openmpi-macport-$WM_MACPORT_MPI_VERSION + export FOAM_MPI=openmpi-macport-$WM_MACPORT_MPI_VERSION - # Currently not correctly working on MacPorts - # libDir=`mpicc-openmpi-$WM_MACPORT_MPI_VERSION --showme:libdirs` - libDir=/opt/local/lib/openmpi-$WM_MACPORT_MPI_VERSION + # Currently not correctly working on MacPorts + # libDir=`mpicc-openmpi-$WM_MACPORT_MPI_VERSION --showme:libdirs` + libDir=/opt/local/lib/openmpi-$WM_MACPORT_MPI_VERSION - export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$FOAM_MPI - _foamAddLib $libDir - unset libDir + export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$FOAM_MPI + _foamAddLib $libDir + unset libDir - which mpirun >/dev/null - if [ $? -ne 0 ] - then - export WM_MPIRUN_PROG=mpirun-openmpi-$WM_MACPORT_MPI_VERSION - fi - ;; + which mpirun >/dev/null + if [ $? -ne 0 ] + then + export WM_MPIRUN_PROG=mpirun-openmpi-$WM_MACPORT_MPI_VERSION + fi + ;; MACPORTMPICH) export FOAM_MPI=mpich-macports-$WM_MACPORT_MPI_VERSION @@ -277,7 +277,7 @@ MACPORTMPICH) which mpirun >/dev/null if [ $? -ne 0 ] then - export WM_MPIRUN_PROG=mpirun-mpich-$WM_MACPORT_MPI_VERSION + export WM_MPIRUN_PROG=mpirun-mpich-$WM_MACPORT_MPI_VERSION fi ;; diff --git a/etc/tcshrc b/etc/tcshrc index 1559b2666..74b83e26e 100755 --- a/etc/tcshrc +++ b/etc/tcshrc @@ -49,10 +49,10 @@ else # regular sourcing set sourced=($_) if ( $#sourced == 0 ) then - echo "Seems you sourced this script (etc/tcshrc from your foam-extend-installation) from .tcshrc." - echo "In that case tcsh has no way of telling where this script is located and is not able to set up the environment correctly" - echo "So before sourcing it set the location with 'setenv FOAM_SOURCED_FROM_ALIAS '" - echo "Or consider using a different shell" + echo "Seems you sourced this script (etc/tcshrc from your foam-extend-installation) from .tcshrc." + echo "In that case tcsh has no way of telling where this script is located and is not able to set up the environment correctly" + echo "So before sourcing it set the location with 'setenv FOAM_SOURCED_FROM_ALIAS '" + echo "Or consider using a different shell" endif set thisScript=($sourced[2]) diff --git a/extend-bazaar/Allwmake b/extend-bazaar/Allwmake index c1aa0e9ed..2d452ee38 100755 --- a/extend-bazaar/Allwmake +++ b/extend-bazaar/Allwmake @@ -13,11 +13,11 @@ setDestination() { pkg=$1 if [ ! -z "$EXTEND_BAZAAR_TO_SITE" ]; then - dst="SITE" - wrong="USER" + dst="SITE" + wrong="USER" else - dst="USER" - wrong="SITE" + dst="USER" + wrong="SITE" fi # remove installation to general binaries diff --git a/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C b/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C index ba99c6252..6ea52dff8 100644 --- a/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C +++ b/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C @@ -136,7 +136,7 @@ coupledSolverPerformance coupledFvMatrix::solve //HR 17.2.2013: Clear references to internal field without deleting the objects forAll (matrices, rowI) { - psi.set(rowI, NULL).ptr(); + psi.set(rowI, NULL).ptr(); } return solverPerf; diff --git a/src/cudaSolvers/cudaBiCGStab/bicgAinv.cu b/src/cudaSolvers/cudaBiCGStab/bicgAinv.cu index 028966234..f140f59f8 100644 --- a/src/cudaSolvers/cudaBiCGStab/bicgAinv.cu +++ b/src/cudaSolvers/cudaBiCGStab/bicgAinv.cu @@ -147,7 +147,7 @@ extern "C" void bicgAinv while ( - normR > (solverPerf->tol) + normR > (solverPerf->tol) && count < (solverPerf->maxIter) && normR/normR0 >= (solverPerf->relTol) || count < solverPerf->minIter diff --git a/src/cudaSolvers/cudaBiCGStab/bicgDiag.cu b/src/cudaSolvers/cudaBiCGStab/bicgDiag.cu index bfea700e5..bea5e43d9 100644 --- a/src/cudaSolvers/cudaBiCGStab/bicgDiag.cu +++ b/src/cudaSolvers/cudaBiCGStab/bicgDiag.cu @@ -136,7 +136,7 @@ extern "C" void bicgDiag while ( - normR > (solverPerf->tol) + normR > (solverPerf->tol) && count < (solverPerf->maxIter) && normR/normR0 >= (solverPerf->relTol) || count < solverPerf->minIter diff --git a/src/cudaSolvers/cudaBiCGStab/cudaBiCGStab.C b/src/cudaSolvers/cudaBiCGStab/cudaBiCGStab.C index 634b6fc24..47c6d5da2 100644 --- a/src/cudaSolvers/cudaBiCGStab/cudaBiCGStab.C +++ b/src/cudaSolvers/cudaBiCGStab/cudaBiCGStab.C @@ -147,7 +147,7 @@ Foam::lduSolverPerformance Foam::cudaBiCGStab::solve } // copy the x vector back to Openfoam - thrust::copy(ces.X.begin(), ces.X.end(), x.begin()); + thrust::copy(ces.X.begin(), ces.X.end(), x.begin()); // Return solver output return lduSolverPerformance diff --git a/src/cudaSolvers/cudaBiCGStab/cudaBiCGStab.H b/src/cudaSolvers/cudaBiCGStab/cudaBiCGStab.H index 98238e038..f8c1a13c8 100644 --- a/src/cudaSolvers/cudaBiCGStab/cudaBiCGStab.H +++ b/src/cudaSolvers/cudaBiCGStab/cudaBiCGStab.H @@ -48,7 +48,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class cudaBiCGStab Declaration + Class cudaBiCGStab Declaration \*---------------------------------------------------------------------------*/ class cudaBiCGStab @@ -57,11 +57,11 @@ class cudaBiCGStab { // Private Member Functions - //- Disallow default bitwise copy construct - cudaBiCGStab(const cudaBiCGStab&); + //- Disallow default bitwise copy construct + cudaBiCGStab(const cudaBiCGStab&); - //- Disallow default bitwise assignment - void operator=(const cudaBiCGStab&); + //- Disallow default bitwise assignment + void operator=(const cudaBiCGStab&); public: @@ -72,33 +72,33 @@ public: // Constructors - //- Construct from matrix components and solver data stream - cudaBiCGStab - ( - const word& fieldName, - const lduMatrix& matrix, - const FieldField& coupleBouCoeffs, - const FieldField& coupleIntCoeffs, - const lduInterfaceFieldPtrsList& interfaces, - const dictionary& dict - ); + //- Construct from matrix components and solver data stream + cudaBiCGStab + ( + const word& fieldName, + const lduMatrix& matrix, + const FieldField& coupleBouCoeffs, + const FieldField& coupleIntCoeffs, + const lduInterfaceFieldPtrsList& interfaces, + const dictionary& dict + ); // Destructor - virtual ~cudaBiCGStab() - {} + virtual ~cudaBiCGStab() + {} // Member Functions - //- Solve the matrix with this solver - virtual lduSolverPerformance solve - ( - scalarField& x, - const scalarField& b, - const direction cmpt = 0 - ) const; + //- Solve the matrix with this solver + virtual lduSolverPerformance solve + ( + scalarField& x, + const scalarField& b, + const direction cmpt = 0 + ) const; }; diff --git a/src/cudaSolvers/cudaCG/cudaCG.H b/src/cudaSolvers/cudaCG/cudaCG.H index 6028a5991..fbf5f6c23 100644 --- a/src/cudaSolvers/cudaCG/cudaCG.H +++ b/src/cudaSolvers/cudaCG/cudaCG.H @@ -48,7 +48,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class cudaCG Declaration + Class cudaCG Declaration \*---------------------------------------------------------------------------*/ class cudaCG @@ -57,11 +57,11 @@ class cudaCG { // Private Member Functions - //- Disallow default bitwise copy construct - cudaCG(const cudaCG&); + //- Disallow default bitwise copy construct + cudaCG(const cudaCG&); - //- Disallow default bitwise assignment - void operator=(const cudaCG&); + //- Disallow default bitwise assignment + void operator=(const cudaCG&); public: @@ -72,33 +72,33 @@ public: // Constructors - //- Construct from matrix components and solver data stream - cudaCG - ( - const word& fieldName, - const lduMatrix& matrix, - const FieldField& coupleBouCoeffs, - const FieldField& coupleIntCoeffs, - const lduInterfaceFieldPtrsList& interfaces, - const dictionary& dict - ); + //- Construct from matrix components and solver data stream + cudaCG + ( + const word& fieldName, + const lduMatrix& matrix, + const FieldField& coupleBouCoeffs, + const FieldField& coupleIntCoeffs, + const lduInterfaceFieldPtrsList& interfaces, + const dictionary& dict + ); // Destructor - virtual ~cudaCG() - {} + virtual ~cudaCG() + {} // Member Functions - //- Solve the matrix with this solver - virtual lduSolverPerformance solve - ( - scalarField& x, - const scalarField& b, - const direction cmpt = 0 - ) const; + //- Solve the matrix with this solver + virtual lduSolverPerformance solve + ( + scalarField& x, + const scalarField& b, + const direction cmpt = 0 + ) const; }; diff --git a/src/cudaSolvers/include/fillCOOMatrix.H b/src/cudaSolvers/include/fillCOOMatrix.H index 93f694fdc..66e1b9b89 100644 --- a/src/cudaSolvers/include/fillCOOMatrix.H +++ b/src/cudaSolvers/include/fillCOOMatrix.H @@ -64,8 +64,8 @@ thrust::sequence thrust::copy ( A.values.begin() + ces->nCells, - A.values.begin() + ces->nCells + ces->nFaces, - A.values.begin() + ces->nCells + ces->nFaces + A.values.begin() + ces->nCells + ces->nFaces, + A.values.begin() + ces->nCells + ces->nFaces ); // Copy row indices of lower to columns of upper into A COO matrix diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/coupleSlidingInterface.C index 2b9b27671..be9ce03b5 100644 --- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/coupleSlidingInterface.C +++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/coupleSlidingInterface.C @@ -638,7 +638,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const if ( cutOnMaster > edgeEndCutoffTol_() - && cutOnMaster < 1.0 - edgeEndCutoffTol_() + && cutOnMaster < 1.0 - edgeEndCutoffTol_() ) { // Master is cut, check the slave @@ -678,7 +678,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const if ( cutOnSlave > edgeEndCutoffTol_() - && cutOnSlave < 1.0 - edgeEndCutoffTol_() + && cutOnSlave < 1.0 - edgeEndCutoffTol_() && slaveCut.distance() < mergeTol ) { diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterface.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterface.C index 778800e78..3c1b634a6 100644 --- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterface.C +++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterface.C @@ -632,7 +632,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const if ( cutOnMaster > edgeEndCutoffTol_() - && cutOnMaster < 1.0 - edgeEndCutoffTol_() + && cutOnMaster < 1.0 - edgeEndCutoffTol_() ) { // Master is cut, check the slave @@ -663,7 +663,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const if ( cutOnSlave > edgeEndCutoffTol_() - && cutOnSlave < 1.0 - edgeEndCutoffTol_() + && cutOnSlave < 1.0 - edgeEndCutoffTol_() && slaveCut.distance() < mergeTol ) { diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterfaceProjectPoints.C index 18eeeca41..e8937f76c 100644 --- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterfaceProjectPoints.C +++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/slidingInterface/slidingInterfaceProjectPoints.C @@ -116,11 +116,11 @@ bool Foam::slidingInterface::projectPoints() const << name() << " : " << "Projecting slave points onto master surface using "; - const Foam::debug::optimisationSwitch nSquaredProjection - ( - "nSquaredProjection", - 0 - ); + const Foam::debug::optimisationSwitch nSquaredProjection + ( + "nSquaredProjection", + 0 + ); if (nSquaredProjection() > 0) { @@ -1165,8 +1165,8 @@ bool Foam::slidingInterface::projectPoints() const if ( cutOnSlave > edgeEndCutoffTol_() - && cutOnSlave < 1.0 - edgeEndCutoffTol_() // check edge cut - && distInEdgePlane < edgeMergeTol_()*edgeMag // merge plane + && cutOnSlave < 1.0 - edgeEndCutoffTol_() // check edge cut + && distInEdgePlane < edgeMergeTol_()*edgeMag // merge plane && edgeLineHit.distance() < min ( diff --git a/src/engine/derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchFields.C b/src/engine/derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchFields.C index c970098cf..65f6ec9cc 100644 --- a/src/engine/derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchFields.C +++ b/src/engine/derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchFields.C @@ -140,16 +140,22 @@ void engineTimeVaryingUniformFixedValueFvPatchField::updateCoeffs() template<> void engineTimeVaryingUniformFixedValueFvPatchField::updateCoeffs() { - notImplemented("engineTimeVaryingUniformFixedValueFvPatchField" - "::updateCoeffs()"); + notImplemented + ( + "engineTimeVaryingUniformFixedValueFvPatchField" + "::updateCoeffs()" + ); } template<> void engineTimeVaryingUniformFixedValueFvPatchField::updateCoeffs() { - notImplemented("engineTimeVaryingUniformFixedValueFvPatchField" - "::updateCoeffs()"); + notImplemented + ( + "engineTimeVaryingUniformFixedValueFvPatchField" + "::updateCoeffs()" + ); } diff --git a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C index 805f9cccc..aa3835c60 100644 --- a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C +++ b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C @@ -84,11 +84,7 @@ void Foam::cyclicFaPatch::calcTransforms() half0Normals[edgei] = point(1, 0, 0); half1Normals[edgei] = half0Normals[edgei]; } - else if - ( - mag(magLe - nbrMagLe)/avLe - > matchTol_() - ) + else if(mag(magLe - nbrMagLe)/avLe > matchTol_()) { // Error in area matching. Find largest error maxMatchError = @@ -176,7 +172,7 @@ void cyclicFaPatch::makeWeights(scalarField& w) const if ( mag(magL[edgei] - magL[edgei + sizeby2])/avL - > matchTol_() + > matchTol_() ) { // Found error. Look for largest matching error diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C index fa2d6ec69..f94cec061 100644 --- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C +++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C @@ -40,7 +40,7 @@ Foam::debug::debugSwitch \ faPatchTypeField::disallowDefaultFaPatchField \ ( \ "disallowDefaultFaPatchField", \ - 0 \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(faPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(faPatchTypeField, patchMapper); \ diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C index 68dfb6df6..b4f0e7fe5 100644 --- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C @@ -40,10 +40,10 @@ namespace Foam defineNamedTemplateTypeNameAndDebug(faePatchTypeField, 0); \ template<> \ Foam::debug::debugSwitch \ -faePatchTypeField::disallowDefaultFaePatchField \ +faePatchTypeField::disallowDefaultFaePatchField \ ( \ "disallowDefaultFaePatchField", \ - 0 \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(faePatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(faePatchTypeField, patchMapper); \ diff --git a/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.C index 674ec2776..85cc6b649 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.C @@ -513,34 +513,34 @@ Foam::genericFvPatchField::genericFvPatchField } for - ( - HashPtrTable::const_iterator iter = - ptf.symmTensor4thOrderFields_.begin(); - iter != ptf.symmTensor4thOrderFields_.end(); + ( + HashPtrTable::const_iterator iter = + ptf.symmTensor4thOrderFields_.begin(); + iter != ptf.symmTensor4thOrderFields_.end(); ++iter - ) - { + ) + { symmTensor4thOrderFields_.insert - ( - iter.key(), - new symmTensor4thOrderField(*iter(), mapper) - ); - } + ( + iter.key(), + new symmTensor4thOrderField(*iter(), mapper) + ); + } for - ( - HashPtrTable::const_iterator iter = - ptf.diagTensorFields_.begin(); - iter != ptf.diagTensorFields_.end(); + ( + HashPtrTable::const_iterator iter = + ptf.diagTensorFields_.begin(); + iter != ptf.diagTensorFields_.end(); ++iter - ) - { + ) + { diagTensorFields_.insert - ( - iter.key(), - new diagTensorField(*iter(), mapper) - ); - } + ( + iter.key(), + new diagTensorField(*iter(), mapper) + ); + } for ( diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C index ed67338bc..9dd8cb9cd 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C @@ -40,7 +40,7 @@ Foam::debug::debugSwitch \ fvPatchTypeField::disallowGenericFvPatchField \ ( \ "disallowGenericFvPatchField", \ - 0 \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(fvPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(fvPatchTypeField, patchMapper); \ diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchVectorNFields/fvPatchVectorNFields.C b/src/finiteVolume/fields/fvPatchFields/fvPatchVectorNFields/fvPatchVectorNFields.C index 077fa9435..d65e24086 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchVectorNFields/fvPatchVectorNFields.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchVectorNFields/fvPatchVectorNFields.C @@ -40,7 +40,7 @@ debug::debugSwitch \ fvPatchTypeField::disallowGenericFvPatchField \ ( \ "disallowGenericFvPatchField", \ - 0 \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(fvPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(fvPatchTypeField, patchMapper); \ diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C index 5c45f7731..57028e656 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C @@ -40,7 +40,7 @@ Foam::debug::debugSwitch \ fvsPatchTypeField::disallowDefaultFvsPatchField \ ( \ "disallowDefaultFvsPatchField", \ - 0 \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper); \ diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/fvsPatchVectorNFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/fvsPatchVectorNFields.C index 2467fbdb2..b8cdb2365 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/fvsPatchVectorNFields.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/fvsPatchVectorNFields.C @@ -40,7 +40,7 @@ Foam::debug::debugSwitch \ fvsPatchTypeField::disallowDefaultFvsPatchField \ ( \ "disallowDefaultFvsPatchField", \ - 0 \ + 0 \ ); \ defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch); \ defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper); \ diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/backwardD2dt2Scheme/backwardD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/backwardD2dt2Scheme/backwardD2dt2Scheme.C index 1d89f63ce..2c5860c68 100644 --- a/src/finiteVolume/finiteVolume/d2dt2Schemes/backwardD2dt2Scheme/backwardD2dt2Scheme.C +++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/backwardD2dt2Scheme/backwardD2dt2Scheme.C @@ -268,10 +268,10 @@ backwardD2dt2Scheme::fvmD2dt2 ( coefft0 *backwardDdtScheme(mesh()).fvcDdt(vf.oldTime()) - ().internalField() + ().internalField() - coefft00 *backwardDdtScheme(mesh()).fvcDdt(vf.oldTime().oldTime()) - ().internalField() + ().internalField() ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H index 2471d9f04..c81e0f3fb 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H +++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H @@ -257,7 +257,7 @@ makeFvDdtTypeScheme(SS, sphericalTensor) \ makeFvDdtTypeScheme(SS, symmTensor) \ makeFvDdtTypeScheme(SS, symmTensor4thOrder) \ makeFvDdtTypeScheme(SS, diagTensor) \ -makeFvDdtTypeScheme(SS, tensor) \ +makeFvDdtTypeScheme(SS, tensor) \ \ template<> \ tmp SS::fvcDdtPhiCorr \ diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/skewCorrectedSnGrad/skewCorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/skewCorrectedSnGrad/skewCorrectedSnGrad.C index 083089d41..8e0e3651b 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/skewCorrectedSnGrad/skewCorrectedSnGrad.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/skewCorrectedSnGrad/skewCorrectedSnGrad.C @@ -234,17 +234,17 @@ skewCorrectedSnGrad::correction ( min ( - limitCoeff_ - *mag + limitCoeff_* + mag ( - uncorrectedSnGrad::snGrad - ( - vf, - this->deltaCoeffs(vf), - "orthSnGrad" - ) - + ssf - ) + uncorrectedSnGrad::snGrad + ( + vf, + this->deltaCoeffs(vf), + "orthSnGrad" + ) + + ssf + ) /( (1 - limitCoeff_)*mag(ssf) + dimensionedScalar("small", ssf.dimensions(), SMALL) diff --git a/src/finiteVolume/interpolation/volPointInterpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C index 95a476213..2a2c107d2 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C +++ b/src/finiteVolume/interpolation/volPointInterpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C @@ -37,8 +37,11 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - void leastSquaresVolPointInterpolation::calcA(List& A) const - { +void leastSquaresVolPointInterpolation::calcA +( + List& A +) const +{ //Info << "leastSquaresVolPointInterpolation calcA" << endl; const fvMesh& mesh = mesh_; @@ -49,262 +52,293 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); //- populate A matrix forAll(points, pointi) - { - const labelList& pointCells = mesh.pointCells()[pointi]; + { + const labelList& pointCells = mesh.pointCells()[pointi]; - //- this component of matrix does not depend on coordinates - A[pointi][3][3] = pointCells.size(); + //- this component of matrix does not depend on coordinates + A[pointi][3][3] = pointCells.size(); - //- fill the A matrices - forAll(pointCells, pointCelli) - { - const label& celli = pointCells[pointCelli]; + //- fill the A matrices + forAll(pointCells, pointCelli) + { + const label& celli = pointCells[pointCelli]; - const scalar& x = mesh.C()[celli].component(vector::X); - const scalar& y = mesh.C()[celli].component(vector::Y); - const scalar& z = mesh.C()[celli].component(vector::Z); + const scalar& x = mesh.C()[celli].component(vector::X); + const scalar& y = mesh.C()[celli].component(vector::Y); + const scalar& z = mesh.C()[celli].component(vector::Z); - A[pointi][0][0] += x*x; - A[pointi][0][1] += x*y; - A[pointi][0][2] += x*z; - A[pointi][0][3] += x; + A[pointi][0][0] += x*x; + A[pointi][0][1] += x*y; + A[pointi][0][2] += x*z; + A[pointi][0][3] += x; - A[pointi][1][0] += x*y; - A[pointi][1][1] += y*y; - A[pointi][1][2] += y*z; - A[pointi][1][3] += y; + A[pointi][1][0] += x*y; + A[pointi][1][1] += y*y; + A[pointi][1][2] += y*z; + A[pointi][1][3] += y; - A[pointi][2][0] += x*z; - A[pointi][2][1] += y*z; - A[pointi][2][2] += z*z; - A[pointi][2][3] += z; + A[pointi][2][0] += x*z; + A[pointi][2][1] += y*z; + A[pointi][2][2] += z*z; + A[pointi][2][3] += z; - A[pointi][3][0] += x; - A[pointi][3][1] += y; - A[pointi][3][2] += z; - //A[pointi][3][3] = pointCells.size(); // set above - } - } + A[pointi][3][0] += x; + A[pointi][3][1] += y; + A[pointi][3][2] += z; + //A[pointi][3][3] = pointCells.size(); // set above + } + } //- for boundary points we will include the surrounding face centres forAll(mesh.boundary(), patchi) - { - const vectorField& faceCentres = mesh.boundaryMesh()[patchi].faceCentres(); - const labelListList& pointFaces = mesh.boundaryMesh()[patchi].pointFaces(); + { + const vectorField& faceCentres = + mesh.boundaryMesh()[patchi].faceCentres(); + const labelListList& pointFaces = + mesh.boundaryMesh()[patchi].pointFaces(); - if(mesh.boundary()[patchi].coupled()) //- for proc boundaries - { - //- for coupled patches we will use the values at the neighbourField cell centres and we will - //- not use the boundary face values - //- neighbour cell centre are equal to the faceCell centres plus the delta vector - vectorField pDelta = mesh.boundary()[patchi].delta(); - vectorField faceCellC(faceCentres.size(), vector::zero); - forAll(faceCentres, facei) - { - label celli = mesh.boundaryMesh()[patchi].faceCells()[facei]; - faceCellC[facei] = mesh.C()[celli]; - } - vectorField neiCellC = faceCellC + pDelta; + if(mesh.boundary()[patchi].coupled()) //- for proc boundaries + { + //- for coupled patches we will use the values at the + //- neighbourField cell centres and we will not use the boundary + //- face values neighbour cell centre are equal to the faceCell + //- centres plus the delta vector + vectorField pDelta = mesh.boundary()[patchi].delta(); + vectorField faceCellC(faceCentres.size(), vector::zero); + forAll(faceCentres, facei) + { + label celli = mesh.boundaryMesh()[patchi].faceCells()[facei]; + faceCellC[facei] = mesh.C()[celli]; + } + vectorField neiCellC = faceCellC + pDelta; - forAll(pointFaces, pointi) - { - forAll(pointFaces[pointi], pointFacei) - { - label neiCelli = pointFaces[pointi][pointFacei]; - const scalar& x = neiCellC[neiCelli].component(vector::X); - const scalar& y = neiCellC[neiCelli].component(vector::Y); - const scalar& z = neiCellC[neiCelli].component(vector::Z); + forAll(pointFaces, pointi) + { + forAll(pointFaces[pointi], pointFacei) + { + label neiCelli = pointFaces[pointi][pointFacei]; + const scalar& x = neiCellC[neiCelli].component(vector::X); + const scalar& y = neiCellC[neiCelli].component(vector::Y); + const scalar& z = neiCellC[neiCelli].component(vector::Z); - label globalPointi = mesh.boundaryMesh()[patchi].meshPoints()[pointi]; + label globalPointi = + mesh.boundaryMesh()[patchi].meshPoints()[pointi]; - A[globalPointi][0][0] += x*x; - A[globalPointi][0][1] += x*y; - A[globalPointi][0][2] += x*z; - A[globalPointi][0][3] += x; + A[globalPointi][0][0] += x*x; + A[globalPointi][0][1] += x*y; + A[globalPointi][0][2] += x*z; + A[globalPointi][0][3] += x; - A[globalPointi][1][0] += x*y; - A[globalPointi][1][1] += y*y; - A[globalPointi][1][2] += y*z; - A[globalPointi][1][3] += y; + A[globalPointi][1][0] += x*y; + A[globalPointi][1][1] += y*y; + A[globalPointi][1][2] += y*z; + A[globalPointi][1][3] += y; - A[globalPointi][2][0] += x*z; - A[globalPointi][2][1] += y*z; - A[globalPointi][2][2] += z*z; - A[globalPointi][2][3] += z; + A[globalPointi][2][0] += x*z; + A[globalPointi][2][1] += y*z; + A[globalPointi][2][2] += z*z; + A[globalPointi][2][3] += z; - A[globalPointi][3][0] += x; - A[globalPointi][3][1] += y; - A[globalPointi][3][2] += z; - A[globalPointi][3][3] += 1; // = pointCells.size(); - } - } - } - else - { - //- each point must use at least 4 neighbouring locations otherwise A is singular - //- and simpleMatrix will cannot invert it - //- therefore empty patches values are included to make sure A is not singular - forAll(pointFaces, pointi) - { - label globalPointi = mesh.boundaryMesh()[patchi].meshPoints()[pointi]; + A[globalPointi][3][0] += x; + A[globalPointi][3][1] += y; + A[globalPointi][3][2] += z; + A[globalPointi][3][3] += 1; // = pointCells.size(); + } + } + } + else + { + //- each point must use at least 4 neighbouring locations otherwise + //- A is singular and simpleMatrix will cannot invert it therefore + //- empty patches values are included to make sure A is not + //- singular + forAll(pointFaces, pointi) + { + label globalPointi = + mesh.boundaryMesh()[patchi].meshPoints()[pointi]; - forAll(pointFaces[pointi], pointFacei) - { - //- fix: use pointFace not face philipc - label facei = pointFaces[pointi][pointFacei]; - const scalar& x = faceCentres[facei].component(vector::X); - const scalar& y = faceCentres[facei].component(vector::Y); - const scalar& z = faceCentres[facei].component(vector::Z); + forAll(pointFaces[pointi], pointFacei) + { + //- fix: use pointFace not face philipc + label facei = pointFaces[pointi][pointFacei]; + const scalar& x = faceCentres[facei].component(vector::X); + const scalar& y = faceCentres[facei].component(vector::Y); + const scalar& z = faceCentres[facei].component(vector::Z); - A[globalPointi][0][0] += x*x; - A[globalPointi][0][1] += x*y; - A[globalPointi][0][2] += x*z; - A[globalPointi][0][3] += x; + A[globalPointi][0][0] += x*x; + A[globalPointi][0][1] += x*y; + A[globalPointi][0][2] += x*z; + A[globalPointi][0][3] += x; - A[globalPointi][1][0] += x*y; - A[globalPointi][1][1] += y*y; - A[globalPointi][1][2] += y*z; - A[globalPointi][1][3] += y; + A[globalPointi][1][0] += x*y; + A[globalPointi][1][1] += y*y; + A[globalPointi][1][2] += y*z; + A[globalPointi][1][3] += y; - A[globalPointi][2][0] += x*z; - A[globalPointi][2][1] += y*z; - A[globalPointi][2][2] += z*z; - A[globalPointi][2][3] += z; + A[globalPointi][2][0] += x*z; + A[globalPointi][2][1] += y*z; + A[globalPointi][2][2] += z*z; + A[globalPointi][2][3] += z; - A[globalPointi][3][0] += x; - A[globalPointi][3][1] += y; - A[globalPointi][3][2] += z; - A[globalPointi][3][3] += 1; // = pointCells.size(); - } - } - } //- end of else - } //- end of forAll boundary - } + A[globalPointi][3][0] += x; + A[globalPointi][3][1] += y; + A[globalPointi][3][2] += z; + A[globalPointi][3][3] += 1; // = pointCells.size(); + } + } + } //- end of else + } //- end of forAll boundary +} - void leastSquaresVolPointInterpolation::calcB(List >& B, const GeometricField& vf) const - { +void leastSquaresVolPointInterpolation::calcB +( + List >& B, + const GeometricField& vf +) const +{ //Info << "leastSquaresVolPointInterpolation calcB" << endl; const fvMesh& mesh = mesh_; const pointField& points = mesh.points(); for (direction compi = 0; compi < 3; compi++) - { - forAll(points, pointi) - { - const labelList& pointCells = mesh.pointCells()[pointi]; - //Info << "\npointCells " << pointCells << endl; - forAll(pointCells, pointCelli) - { - const label& celli = pointCells[pointCelli]; - //Info << "celli " << celli << ", C is " << mesh.C()[celli] << ", mesh.C().size() " << mesh.C().size() << endl; - //Info << "mesh.C() is " << mesh.C().internalField() << endl; - const scalar& x = mesh.C()[celli].component(vector::X); - const scalar& y = mesh.C()[celli].component(vector::Y); - const scalar& z = mesh.C()[celli].component(vector::Z); + { + forAll(points, pointi) + { + const labelList& pointCells = mesh.pointCells()[pointi]; + //Info << "\npointCells " << pointCells << endl; + forAll(pointCells, pointCelli) + { + const label& celli = pointCells[pointCelli]; + //Info << "celli " << celli << ", C is " << mesh.C()[celli] << ", mesh.C().size() " << mesh.C().size() << endl; + //Info << "mesh.C() is " << mesh.C().internalField() << endl; + const scalar& x = mesh.C()[celli].component(vector::X); + const scalar& y = mesh.C()[celli].component(vector::Y); + const scalar& z = mesh.C()[celli].component(vector::Z); - const scalar& phiCompi = vf.internalField()[celli].component(compi); + const scalar& phiCompi = + vf.internalField()[celli].component(compi); - B[pointi][0].component(compi) += phiCompi*x; - B[pointi][1].component(compi) += phiCompi*y; - B[pointi][2].component(compi) += phiCompi*z; - B[pointi][3].component(compi) += phiCompi; - } - } + B[pointi][0].component(compi) += phiCompi*x; + B[pointi][1].component(compi) += phiCompi*y; + B[pointi][2].component(compi) += phiCompi*z; + B[pointi][3].component(compi) += phiCompi; + } + } - //- for boundary points we will include the surrounding face centres - forAll(mesh.boundary(), patchi) - { - const vectorField& faceCentres = mesh.boundaryMesh()[patchi].faceCentres(); - const labelListList& pointFaces = mesh.boundaryMesh()[patchi].pointFaces(); - const labelList& faceCells = mesh.boundaryMesh()[patchi].faceCells(); + //- for boundary points we will include the surrounding face centres + forAll(mesh.boundary(), patchi) + { + const vectorField& faceCentres = + mesh.boundaryMesh()[patchi].faceCentres(); + const labelListList& pointFaces = + mesh.boundaryMesh()[patchi].pointFaces(); + const labelList& faceCells = + mesh.boundaryMesh()[patchi].faceCells(); - //- fix: do not calculate B for empty patches - philipc - if(mesh.boundary()[patchi].coupled()) - { - //- for coupled patches we will use the values at the neighbourField cell centres and we will - //- not use the boundary face values - //- neighbour cell centre are equal to the faceCell centres plus the delta vector - vectorField pDelta = mesh.boundary()[patchi].delta(); - vectorField faceCellC(faceCentres.size(), vector::zero); - forAll(faceCentres, facei) - { - label celli = mesh.boundaryMesh()[patchi].faceCells()[facei]; - faceCellC[facei] = mesh.C()[celli]; - } - vectorField neiCellC = faceCellC + pDelta; + //- fix: do not calculate B for empty patches - philipc + if(mesh.boundary()[patchi].coupled()) + { + //- for coupled patches we will use the values at the + //- neighbourField cell centres and we will not use the + //- boundary face values neighbour cell centre are equal to + //- the faceCell centres plus the delta vector + vectorField pDelta = mesh.boundary()[patchi].delta(); + vectorField faceCellC(faceCentres.size(), vector::zero); + forAll(faceCentres, facei) + { + label celli = + mesh.boundaryMesh()[patchi].faceCells()[facei]; + faceCellC[facei] = mesh.C()[celli]; + } + vectorField neiCellC = faceCellC + pDelta; - vectorField phiNeiField = vf.boundaryField()[patchi].patchNeighbourField(); + vectorField phiNeiField = + vf.boundaryField()[patchi].patchNeighbourField(); - forAll(pointFaces, pointi) - { - forAll(pointFaces[pointi], pointFacei) - { - label neiCelli = pointFaces[pointi][pointFacei]; - const scalar& x = neiCellC[neiCelli].component(vector::X); - const scalar& y = neiCellC[neiCelli].component(vector::Y); - const scalar& z = neiCellC[neiCelli].component(vector::Z); + forAll(pointFaces, pointi) + { + forAll(pointFaces[pointi], pointFacei) + { + label neiCelli = pointFaces[pointi][pointFacei]; + const scalar& x = + neiCellC[neiCelli].component(vector::X); + const scalar& y = + neiCellC[neiCelli].component(vector::Y); + const scalar& z = + neiCellC[neiCelli].component(vector::Z); - label globalPointi = mesh.boundaryMesh()[patchi].meshPoints()[pointi]; + label globalPointi = + mesh.boundaryMesh()[patchi].meshPoints()[pointi]; - //- this is the value of phi at the cell centre in the neighbour (i.e. across the interface) - scalar phiCompi = phiNeiField[neiCelli].component(compi); + //- this is the value of phi at the cell centre in the + //- neighbour (i.e. across the interface) + scalar phiCompi = + phiNeiField[neiCelli].component(compi); - B[globalPointi][0].component(compi) += phiCompi*x; - B[globalPointi][1].component(compi) += phiCompi*y; - B[globalPointi][2].component(compi) += phiCompi*z; - B[globalPointi][3].component(compi) += phiCompi; - } - } - } - else - { - //- each point must use at least 4 neighbouring locations otherwise A is singular - //- and simpleMatrix will cannot invert it - //- therefore empty patches values are included to make sure A is not singular - forAll(pointFaces, pointi) - { - forAll(pointFaces[pointi], pointFacei) - { - //- fix: use pointFace not face philipc - label facei = pointFaces[pointi][pointFacei]; - const scalar& x = faceCentres[facei].component(vector::X); - const scalar& y = faceCentres[facei].component(vector::Y); - const scalar& z = faceCentres[facei].component(vector::Z); + B[globalPointi][0].component(compi) += phiCompi*x; + B[globalPointi][1].component(compi) += phiCompi*y; + B[globalPointi][2].component(compi) += phiCompi*z; + B[globalPointi][3].component(compi) += phiCompi; + } + } + } + else + { + //- each point must use at least 4 neighbouring locations + //- otherwise A is singular and simpleMatrix will cannot + //- make sure A is not singular invert it therefore empty + //- patches values are included to + forAll(pointFaces, pointi) + { + forAll(pointFaces[pointi], pointFacei) + { + //- fix: use pointFace not face philipc + label facei = pointFaces[pointi][pointFacei]; + const scalar& x = + faceCentres[facei].component(vector::X); + const scalar& y = + faceCentres[facei].component(vector::Y); + const scalar& z = + faceCentres[facei].component(vector::Z); - label globalPointi = mesh.boundaryMesh()[patchi].meshPoints()[pointi]; + label globalPointi = + mesh.boundaryMesh()[patchi].meshPoints()[pointi]; - scalar phiCompi = 0.0; - if(mesh.boundary()[patchi].type() == "empty") - { - //- use faceCell value for empty because empty patches do not store any values - const label& ci = faceCells[facei]; - phiCompi = vf.internalField()[ci].component(compi); - } - else - { - phiCompi = vf.boundaryField()[patchi][facei].component(compi); - } + scalar phiCompi = 0.0; + if(mesh.boundary()[patchi].type() == "empty") + { + //- use faceCell value for empty because empty + //- patches do not store any values + const label& ci = faceCells[facei]; + phiCompi = + vf.internalField()[ci].component(compi); + } + else + { + phiCompi = + vf.boundaryField()[patchi][facei].component(compi); + } - B[globalPointi][0].component(compi) += phiCompi*x; - B[globalPointi][1].component(compi) += phiCompi*y; - B[globalPointi][2].component(compi) += phiCompi*z; - B[globalPointi][3].component(compi) += phiCompi; - } - } - } - } //- end of forAll boundary - } //- end of for all components - } + B[globalPointi][0].component(compi) += phiCompi*x; + B[globalPointi][1].component(compi) += phiCompi*y; + B[globalPointi][2].component(compi) += phiCompi*z; + B[globalPointi][3].component(compi) += phiCompi; + } + } + } + } //- end of forAll boundary + } //- end of for all components +} - void leastSquaresVolPointInterpolation::interpolate - ( - const GeometricField& vf, - GeometricField& pf //Field& pf - ) const - { +void leastSquaresVolPointInterpolation::interpolate +( + const GeometricField& vf, + GeometricField& pf //Field& pf +) const +{ //Info << "Interpolating cell to point using leastSquaresVolPointInterpolation" << endl; const fvMesh& mesh = mesh_; @@ -312,10 +346,10 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); //- first check that point field is the correct size if(pf.size() != points.size()) - { - FatalError << "pointfield should be equal to the number of points in the fvMesh" - << abort(FatalError); - } + { + FatalError << "pointfield should be equal to the number of points in the fvMesh" + << abort(FatalError); + } //- calculate A and B vector List A(mesh.points().size(), scalarSquareMatrix(4, 0.0)); @@ -326,52 +360,55 @@ defineTypeNameAndDebug(leastSquaresVolPointInterpolation, 0); //- solve equations for each component of each point forAll(points, pointi) - { - Field& source = B[pointi]; - simpleMatrix leastSquaresMatrix(A[pointi], source); - //Info << "solving equation for point " << pointi << endl; - //Info << "A[pointi] is " << A[pointi] << ", source is " << source << endl; - //- solve using Gauss elimination or LU decomposition with pivoting - //Field leastSquaresSol = leastSquaresMatrix.solve(); - Field leastSquaresSol = leastSquaresMatrix.LUsolve(); + { + Field& source = B[pointi]; + simpleMatrix leastSquaresMatrix(A[pointi], source); + //Info << "solving equation for point " << pointi << endl; + //Info << "A[pointi] is " << A[pointi] << ", source is " << source << endl; + //- solve using Gauss elimination or LU decomposition with pivoting + //Field leastSquaresSol = leastSquaresMatrix.solve(); + Field leastSquaresSol = leastSquaresMatrix.LUsolve(); - const scalar& x = mesh.points()[pointi].component(vector::X); - const scalar& y = mesh.points()[pointi].component(vector::Y); - const scalar& z = mesh.points()[pointi].component(vector::Z); + const scalar& x = mesh.points()[pointi].component(vector::X); + const scalar& y = mesh.points()[pointi].component(vector::Y); + const scalar& z = mesh.points()[pointi].component(vector::Z); - //- calculate phi at vertex - for (direction compi = 0; compi < 3; compi++) - { - const scalar& a = leastSquaresSol[0].component(compi); - const scalar& b = leastSquaresSol[1].component(compi); - const scalar& c = leastSquaresSol[2].component(compi); - const scalar& d = leastSquaresSol[3].component(compi); + //- calculate phi at vertex + for (direction compi = 0; compi < 3; compi++) + { + const scalar& a = leastSquaresSol[0].component(compi); + const scalar& b = leastSquaresSol[1].component(compi); + const scalar& c = leastSquaresSol[2].component(compi); + const scalar& d = leastSquaresSol[3].component(compi); - pf[pointi].component(compi) = a*x + b*y + c*z + d; - } - } + pf[pointi].component(compi) = a*x + b*y + c*z + d; + } + } //- proc patches are synchronised pf.correctBoundaryConditions(); - } +} // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // - leastSquaresVolPointInterpolation::leastSquaresVolPointInterpolation(const fvMesh& vm) - : +leastSquaresVolPointInterpolation::leastSquaresVolPointInterpolation +( + const fvMesh& vm +) +: MeshObject(vm), mesh_(vm) //, //A_(vm.points().size(), scalarSquareMatrix(4, 0.0)), //B_(vm.points().size(), Field(4, vector::zero)) - { +{ //calcA(); - } +} // * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * // - leastSquaresVolPointInterpolation::~leastSquaresVolPointInterpolation() - {} +leastSquaresVolPointInterpolation::~leastSquaresVolPointInterpolation() +{} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // diff --git a/src/finiteVolume/interpolation/volPointInterpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.H index 48fe02a14..168eee960 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.H +++ b/src/finiteVolume/interpolation/volPointInterpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.H @@ -86,10 +86,17 @@ class leastSquaresVolPointInterpolation void calcA(List& A) const; //- calc B source for each point - void calcB(List >& B, const GeometricField&) const; + void calcB + ( + List >& B, + const GeometricField& + ) const; //- Disallow default bitwise copy construct - leastSquaresVolPointInterpolation(const leastSquaresVolPointInterpolation&); + leastSquaresVolPointInterpolation + ( + const leastSquaresVolPointInterpolation& + ); //- Disallow default bitwise assignment void operator=(const leastSquaresVolPointInterpolation&); @@ -121,13 +128,13 @@ public: virtual bool movePoints() const { - return true; - } + return true; + } virtual bool updateMesh(const mapPolyMesh&) const { - return true; - } + return true; + } // Interpolation functions @@ -137,7 +144,7 @@ public: void interpolate ( const GeometricField& vf, - GeometricField& pf + GeometricField& pf ) const; }; diff --git a/src/foam/db/Time/TimeIO.C b/src/foam/db/Time/TimeIO.C index db8bdee22..94e06ca7c 100644 --- a/src/foam/db/Time/TimeIO.C +++ b/src/foam/db/Time/TimeIO.C @@ -34,7 +34,7 @@ License void Foam::Time::readDict() { if (debug) - Info << "Time::readDict(): reading " << controlDict_.name() << endl; + Info << "Time::readDict(): reading " << controlDict_.name() << endl; if (!deltaTchanged_) { diff --git a/src/foam/fields/PointPatchFields/basic/generic/GenericPointPatchField.C b/src/foam/fields/PointPatchFields/basic/generic/GenericPointPatchField.C index 23ae69285..3e6fa3100 100644 --- a/src/foam/fields/PointPatchFields/basic/generic/GenericPointPatchField.C +++ b/src/foam/fields/PointPatchFields/basic/generic/GenericPointPatchField.C @@ -340,87 +340,87 @@ GenericPointPatchField tensorFields_.insert(iter().keyword(), fPtr); } else if - ( - fieldToken.compoundToken().type() - == token::Compound >::typeName - ) - { + ( + fieldToken.compoundToken().type() + == token::Compound >::typeName + ) + { symmTensor4thOrderField* fPtr = new symmTensor4thOrderField; fPtr->transfer - ( + ( dynamicCast < - token::Compound > + token::Compound > > - ( - fieldToken.transferCompoundToken() - ) - ); + ( + fieldToken.transferCompoundToken() + ) + ); if (fPtr->size() != this->size()) - { + { FatalIOErrorIn - ( + ( "GenericPointPatchField::" "GenericPointPatchField" "(const pointPatch&, const Field&, " "const dictionary&)", dict - ) << "\n size of field " << iter().keyword() - << " (" << fPtr->size() << ')' - << " is not the same size as the patch (" - << this->size() << ')' - << "\n on patch " << this->patch().name() - << " of field " - << this->dimensionedInternalField().name() - << " in file " - << this->dimensionedInternalField().objectPath() - << exit(FatalIOError); - } + ) << "\n size of field " << iter().keyword() + << " (" << fPtr->size() << ')' + << " is not the same size as the patch (" + << this->size() << ')' + << "\n on patch " << this->patch().name() + << " of field " + << this->dimensionedInternalField().name() + << " in file " + << this->dimensionedInternalField().objectPath() + << exit(FatalIOError); + } symmTensor4thOrderFields_.insert(iter().keyword(), fPtr); - } + } else if - ( - fieldToken.compoundToken().type() - == token::Compound >::typeName - ) - { + ( + fieldToken.compoundToken().type() + == token::Compound >::typeName + ) + { diagTensorField* fPtr = new diagTensorField; fPtr->transfer - ( + ( dynamicCast < - token::Compound > + token::Compound > > - ( - fieldToken.transferCompoundToken() - ) - ); + ( + fieldToken.transferCompoundToken() + ) + ); if (fPtr->size() != this->size()) - { + { FatalIOErrorIn - ( + ( "GenericPointPatchField::" "GenericPointPatchField" "(const pointPatch&, const Field&, " "const dictionary&)", dict - ) << "\n size of field " << iter().keyword() - << " (" << fPtr->size() << ')' - << " is not the same size as the patch (" - << this->size() << ')' - << "\n on patch " << this->patch().name() - << " of field " - << this->dimensionedInternalField().name() - << " in file " - << this->dimensionedInternalField().objectPath() - << exit(FatalIOError); - } + ) << "\n size of field " << iter().keyword() + << " (" << fPtr->size() << ')' + << " is not the same size as the patch (" + << this->size() << ')' + << "\n on patch " << this->patch().name() + << " of field " + << this->dimensionedInternalField().name() + << " in file " + << this->dimensionedInternalField().objectPath() + << exit(FatalIOError); + } diagTensorFields_.insert(iter().keyword(), fPtr); - } + } else { FatalIOErrorIn @@ -531,34 +531,34 @@ GenericPointPatchField } for - ( + ( HashPtrTable::const_iterator iter = - ptf.symmTensor4thOrderFields_.begin(); + ptf.symmTensor4thOrderFields_.begin(); iter != ptf.symmTensor4thOrderFields_.end(); - ++iter - ) - { + ++iter + ) + { symmTensor4thOrderFields_.insert - ( - iter.key(), - new symmTensor4thOrderField(*iter(), mapper) - ); - } + ( + iter.key(), + new symmTensor4thOrderField(*iter(), mapper) + ); + } for - ( + ( HashPtrTable::const_iterator iter = - ptf.diagTensorFields_.begin(); + ptf.diagTensorFields_.begin(); iter != ptf.diagTensorFields_.end(); - ++iter - ) - { + ++iter + ) + { diagTensorFields_.insert - ( - iter.key(), - new diagTensorField(*iter(), mapper) - ); - } + ( + iter.key(), + new diagTensorField(*iter(), mapper) + ); + } } diff --git a/src/foam/global/argList/argList.H b/src/foam/global/argList/argList.H index 446e71777..77f9d07de 100644 --- a/src/foam/global/argList/argList.H +++ b/src/foam/global/argList/argList.H @@ -311,7 +311,7 @@ public: // cellSet -appDict cellSetDict.rotorOnly // #define AppSpecificDictionary(DefaultAppDict) \ - argList::appDictName_ = (DefaultAppDict); \ + argList::appDictName_ = (DefaultAppDict); \ argList::validOptions.insert("appDict", argList::appDictName_); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C index 1c280342e..85853ae97 100644 --- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C +++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C @@ -185,7 +185,7 @@ GGIInterpolation::polygonIntersection if ( mag(intersectionArea/clippingArea) < areaErrorTol_() - || mag(intersectionArea/subjectArea) < areaErrorTol_() + || mag(intersectionArea/subjectArea) < areaErrorTol_() ) { WarningIn diff --git a/src/foam/meshes/pointMesh/pointMesh.C b/src/foam/meshes/pointMesh/pointMesh.C index 82ce99103..5077c6161 100644 --- a/src/foam/meshes/pointMesh/pointMesh.C +++ b/src/foam/meshes/pointMesh/pointMesh.C @@ -59,9 +59,9 @@ void Foam::pointMesh::mapFields(const mapPolyMesh& mpm) const MapGeometricFields < symmTensor4thOrder, - pointPatchField, - pointMeshMapper, - pointMesh + pointPatchField, + pointMeshMapper, + pointMesh >(m); MapGeometricFields diff --git a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C index 2feb9a7ae..919aef2bb 100644 --- a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C +++ b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C @@ -45,9 +45,9 @@ namespace Foam { defineTypeNameAndDebugWithDescription ( - ggiPolyPatch, - 0, - "If value > 1, write uncovered GGI patch facets to VTK file" + ggiPolyPatch, + 0, + "If value > 1, write uncovered GGI patch facets to VTK file" ); addToRunTimeSelectionTable(polyPatch, ggiPolyPatch, word); diff --git a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C index 6a7db738d..68ba5b58c 100644 --- a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C +++ b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C @@ -43,7 +43,7 @@ namespace Foam polyPatch::disallowGenericPolyPatch ( "disallowGenericPolyPatch", - 0 + 0 ); defineRunTimeSelectionTable(polyPatch, word); diff --git a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrder.H b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrder.H index 9be1a2b68..da9466cf6 100644 --- a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrder.H +++ b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrder.H @@ -132,11 +132,11 @@ public: inline SymmTensor4thOrder ( const Cmpt txxxx, const Cmpt txxyy, const Cmpt txxzz, - const Cmpt tyyyy, const Cmpt tyyzz, - const Cmpt tzzzz, + const Cmpt tyyyy, const Cmpt tyyzz, + const Cmpt tzzzz, const Cmpt txyxy, const Cmpt tyzyz, - const Cmpt tzxzx + const Cmpt tzxzx ); //- Construct from Istream diff --git a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderI.H b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderI.H index f054a58da..dde280cf1 100644 --- a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderI.H +++ b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderI.H @@ -56,7 +56,7 @@ inline SymmTensor4thOrder::SymmTensor4thOrder ( const Cmpt txxxx, const Cmpt txxyy, const Cmpt txxzz, const Cmpt tyyyy, const Cmpt tyyzz, - const Cmpt tzzzz, + const Cmpt tzzzz, const Cmpt txyxy, const Cmpt tyzyz, const Cmpt tzxzx diff --git a/src/foam/primitives/transform/transform.H b/src/foam/primitives/transform/transform.H index 84c4fabeb..799d4df72 100644 --- a/src/foam/primitives/transform/transform.H +++ b/src/foam/primitives/transform/transform.H @@ -302,20 +302,23 @@ inline SymmTensor4thOrder transform template inline DiagTensor transform ( - const tensor& tt, - const DiagTensor& st - ) + const tensor& tt, + const DiagTensor& st +) { - notImplemented("transform.H\n" - "template<>\n" - "inline DiagTensor transform\n" - "(\n" - "const tensor& tt,\n" - "const DiagTensor& st\n" - ")\n" - "not implemented"); + notImplemented + ( + "transform.H\n" + "template<>\n" + "inline DiagTensor transform\n" + "(\n" + "const tensor& tt,\n" + "const DiagTensor& st\n" + ")\n" + "not implemented" + ); - return st; + return st; } @@ -376,9 +379,9 @@ template<> inline symmTensor4thOrder transformMask(const tensor& t) { notImplemented("transform.H\n" - "template<>\n" - "inline symmTensor4thOrder transformMask(const tensor& t)\n" - "not implemented"); + "template<>\n" + "inline symmTensor4thOrder transformMask(const tensor& t)\n" + "not implemented"); return symmTensor4thOrder::zero; } diff --git a/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C b/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C index feca8d18d..89ae7829d 100644 --- a/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C +++ b/src/immersedBoundary/immersedBoundaryTurbulence/wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C @@ -258,7 +258,7 @@ void immersedBoundaryOmegaWallFunctionFvPatchScalarField::updateCoeffs() { // Calculate tauW from log-law using k and U at sampling point - tauW = UtanOld[ibCellI]*Cmu25*sqrt(k[ibCellI])*kappa_ + tauW = UtanOld[ibCellI]*Cmu25*sqrt(k[ibCellI])*kappa_ /log(E_*yPlusSample); } else @@ -288,11 +288,11 @@ void immersedBoundaryOmegaWallFunctionFvPatchScalarField::updateCoeffs() sqr((nutw + nuLam)*magGradUw[ibCellI])/ (Cmu25*sqrt(k[ibCellI])*kappa_*y[ibCellI]); - // Compute k at the IB cell + // Compute k at the IB cell kNew[ibCellI] = tauW/Cmu50; // equilibrium boundary layer - // kNew[ibCellI] = k[ibCellI]; // zero-Gradient (less stable) + // kNew[ibCellI] = k[ibCellI]; // zero-Gradient (less stable) - // Compute omega at the IB cell + // Compute omega at the IB cell omegaNew[ibCellI] = sqrt(kNew[ibCellI])/(Cmu25*kappa_*y[ibCellI]); // Log-Law for tangential velocity - uTau = Cmu25*sqrt(kNew) @@ -312,7 +312,7 @@ void immersedBoundaryOmegaWallFunctionFvPatchScalarField::updateCoeffs() // quadratic fit kNew[ibCellI] = k[ibCellI]*sqr(yPlusIB/yPlusLam); - // Compute omega at the IB cell + // Compute omega at the IB cell omegaNew[ibCellI] = 6.0*nu[ibCellI]/(beta1_*sqr(y[ibCellI])); // Laminar sub-layer for tangential velocity: uPlus = yPlus diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H index 1553dd96c..06955f8c4 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H @@ -549,7 +549,7 @@ public: template<> \ const Foam::word KinematicParcel::typeName(#Type); \ template<> \ - Foam::debug::debugSwitch \ + Foam::debug::debugSwitch \ KinematicParcel::debug \ ( \ std::string(#Type), DebugSwitch \ diff --git a/src/solidModels/contactModels/frictionContactModels/iterativePenaltyFriction/iterativePenaltyFriction.C b/src/solidModels/contactModels/frictionContactModels/iterativePenaltyFriction/iterativePenaltyFriction.C index c5b1e2475..ac1268acd 100644 --- a/src/solidModels/contactModels/frictionContactModels/iterativePenaltyFriction/iterativePenaltyFriction.C +++ b/src/solidModels/contactModels/frictionContactModels/iterativePenaltyFriction/iterativePenaltyFriction.C @@ -299,7 +299,7 @@ Foam::iterativePenaltyFriction::iterativePenaltyFriction // traction to cause slipping //scalar slipTrac = - //frictionLawPtr_->slipTraction(magSlavePressure[faceI]); + // frictionLawPtr_->slipTraction(magSlavePressure[faceI]); vector& slaveTrac = slaveTraction_[faceI]; // if mag(slaveTrac) is greater than slipTrac and diff --git a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/0_orig/T b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/0_orig/T index 353407749..d22520c68 100644 --- a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/0_orig/T +++ b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/0_orig/T @@ -18,51 +18,53 @@ internalField uniform 100; boundaryField { - inlet - { + inlet + { type fixedValue; value uniform 500; - } - outlet - { + } + outlet + { type fixedValue; value uniform 100; - } - wallProlongation - { - type zeroGradient; - } - wallDiffuser - { - type zeroGradient; - } - statSwirlWallB_C - { - type zeroGradient; - } - rotSwirlWallA_BB - { - type zeroGradient; - } - B_UPSTREAM - { - type mixingPlane; - } - B_DOWNSTREAM - { - type mixingPlane; - } - sideWallA_BB_cyclic1 - { - type cyclicGgi; - } - sideWallA_BB_cyclic2 - { - type cyclicGgi; - } - defaultFaces - { - type empty; - } -} // ************************************************************************* // + } + wallProlongation + { + type zeroGradient; + } + wallDiffuser + { + type zeroGradient; + } + statSwirlWallB_C + { + type zeroGradient; + } + rotSwirlWallA_BB + { + type zeroGradient; + } + B_UPSTREAM + { + type mixingPlane; + } + B_DOWNSTREAM + { + type mixingPlane; + } + sideWallA_BB_cyclic1 + { + type cyclicGgi; + } + sideWallA_BB_cyclic2 + { + type cyclicGgi; + } + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/constant/polyMesh/blockMeshDict.m4 b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/constant/polyMesh/blockMeshDict.m4 index 8dce1d717..203f33d8d 100644 --- a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/constant/polyMesh/blockMeshDict.m4 +++ b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/constant/polyMesh/blockMeshDict.m4 @@ -383,9 +383,9 @@ boundary zone B_UPSTREAMZone; ribbonPatch { - discretisation bothPatches; - stackAxis R; - sweepAxis Theta; + discretisation bothPatches; + stackAxis R; + sweepAxis Theta; } coordinateSystem diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict index eb28f6111..538d996e2 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict @@ -64,15 +64,15 @@ boundary frontBack { - type cyclic; - faces - ( - (0 6 7 1) - (1 7 8 2) + type cyclic; + faces + ( + (0 6 7 1) + (1 7 8 2) - (9 3 4 10) - (10 4 5 11) - ); + (9 3 4 10) + (10 4 5 11) + ); } ); diff --git a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/blockMeshDict index 7f73e283f..e371f656a 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/blockMeshDict +++ b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/blockMeshDict @@ -64,9 +64,9 @@ boundary flow { - type cyclic; - faces - ( + type cyclic; + faces + ( (0 6 7 1) (1 7 8 2) diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict index 24b7f6d8d..ff13517cc 100644 --- a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict +++ b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict @@ -8,13 +8,13 @@ FoamFile { version 2.0; - format ascii; ; - class dictionary; ; - object decomposeParDict; ; + format ascii; + class dictionary; + object decomposeParDict; } numberOfSubdomains 4; -method metis; //metis; //simple; +method metis; //metis; //simple; globalFaceZones ( @@ -38,6 +38,6 @@ simpleCoeffs distributed no; roots - ( - ); +( +); diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict.backup b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict.backup index 654475bfe..6ed62d3bc 100644 --- a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict.backup +++ b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict.backup @@ -8,13 +8,13 @@ FoamFile { version 2.0; - format ascii; ; - class dictionary; ; - object decomposeParDict; ; + format ascii; + class dictionary; + object decomposeParDict; } numberOfSubdomains 4; -method manual; //metis; //simple; +method manual; //metis; //simple; globalFaceZones ( ggi1DomAZone @@ -35,6 +35,6 @@ simpleCoeffs distributed no; roots - ( - ); +( +); diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes index 5d10ea844..0b378d702 100644 --- a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes +++ b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { default none; div(phi,U) Gauss linearUpwind Gauss; //upwind; - div((nuEff*dev(grad(U).T()))) Gauss linear; + div((nuEff*dev(grad(U).T()))) Gauss linear; div(phi,epsilon) Gauss upwind; div(phi,k) Gauss upwind; } @@ -44,7 +44,7 @@ laplacianSchemes laplacian((1|A(U)),p) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; - laplacian(1,p) Gauss linear corrected; + laplacian(1,p) Gauss linear corrected; } interpolationSchemes diff --git a/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/controlDict b/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/controlDict index e48755d81..a48267de5 100644 --- a/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/controlDict +++ b/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/controlDict @@ -16,21 +16,21 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application ; -deltaT 1; -endTime 50; -graphFormat raw; -purgeWrite 0; -runTimeModifiable yes; -startFrom startTime; -startTime 0; -stopAt endTime; -timeFormat general; -timePrecision 6; -writeCompression uncompressed; -writeControl timeStep; -writeFormat ascii; -writeInterval 20; -writePrecision 6; +application ; +deltaT 1; +endTime 50; +graphFormat raw; +purgeWrite 0; +runTimeModifiable yes; +startFrom startTime; +startTime 0; +stopAt endTime; +timeFormat general; +timePrecision 6; +writeCompression uncompressed; +writeControl timeStep; +writeFormat ascii; +writeInterval 20; +writePrecision 6; // ************************************************************************* // \ No newline at end of file diff --git a/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/meshDict b/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/meshDict index 66128306d..584891a2c 100644 --- a/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/meshDict +++ b/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/meshDict @@ -8,18 +8,18 @@ FoamFile { -version 2; -format ascii; -class dictionary; -location "system"; -object meshDict; + version 2; + format ascii; + class dictionary; + location "system"; + object meshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -maxCellSize 0.01; +maxCellSize 0.01; -surfaceFile "geom.fms"; +surfaceFile "geom.fms"; boundaryLayers { diff --git a/tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/meshDict b/tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/meshDict index b6128cb8a..0710d058b 100644 --- a/tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/meshDict +++ b/tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/meshDict @@ -48,8 +48,8 @@ boundaryLayers renameBoundary { - defaultName fixedWalls; - defaultType wall; + defaultName fixedWalls; + defaultType wall; newPatchNames { diff --git a/tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/meshDict b/tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/meshDict index 7ea81da3d..f2934377c 100644 --- a/tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/meshDict +++ b/tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/meshDict @@ -64,7 +64,7 @@ boundaryLayers allowDiscontinuity 0; } - "fixedWalls.*" + "fixedWalls.*" { nLayers 4; @@ -75,7 +75,7 @@ boundaryLayers allowDiscontinuity 0; } - "tubes.*" + "tubes.*" { nLayers 4; @@ -90,8 +90,8 @@ boundaryLayers renameBoundary { - defaultName fixedWalls; - defaultType wall; + defaultName fixedWalls; + defaultType wall; newPatchNames { diff --git a/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/controlDict b/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/controlDict index 9eea93a2a..3ebcd35df 100644 --- a/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/controlDict +++ b/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/controlDict @@ -16,21 +16,21 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application ; -deltaT 0.001; -endTime 2; -graphFormat raw; -purgeWrite 0; -runTimeModifiable yes; -startFrom latestTime; -startTime 0; -stopAt endTime; -timeFormat general; -timePrecision 6; -writeCompression compressed; -writeControl timeStep; -writeFormat binary; -writeInterval 100; -writePrecision 6; +application ; +deltaT 0.001; +endTime 2; +graphFormat raw; +purgeWrite 0; +runTimeModifiable yes; +startFrom latestTime; +startTime 0; +stopAt endTime; +timeFormat general; +timePrecision 6; +writeCompression compressed; +writeControl timeStep; +writeFormat binary; +writeInterval 100; +writePrecision 6; // ************************************************************************* // \ No newline at end of file diff --git a/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/meshDict b/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/meshDict index c10976d55..6126203ec 100644 --- a/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/meshDict +++ b/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/meshDict @@ -17,21 +17,21 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -maxCellSize 0.1; +maxCellSize 0.1; -surfaceFile "sBend.fms"; +surfaceFile "sBend.fms"; boundaryLayers { - nLayers 1; + nLayers 1; patchBoundaryLayers { walls { - nLayers 3; - thicknessRatio 1.2; + nLayers 3; + thicknessRatio 1.2; } } } @@ -41,12 +41,12 @@ localRefinement refFine { - cellSize 0.025; + cellSize 0.025; } walls { - cellSize 0.05; + cellSize 0.05; } } diff --git a/tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/controlDict b/tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/controlDict index b68fc6cab..cb0c7ce7e 100644 --- a/tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/controlDict +++ b/tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/controlDict @@ -17,36 +17,36 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application ; +application ; -deltaT 0.05; +deltaT 0.05; -endTime 10; +endTime 10; -graphFormat raw; +graphFormat raw; -purgeWrite 0; +purgeWrite 0; -runTimeModifiable yes; +runTimeModifiable yes; -startFrom latestTime; +startFrom latestTime; -startTime 0; +startTime 0; -stopAt endTime; +stopAt endTime; -timeFormat general; +timeFormat general; -timePrecision 6; +timePrecision 6; -writeCompression uncompressed; +writeCompression uncompressed; -writeControl timeStep; +writeControl timeStep; -writeFormat ascii; +writeFormat ascii; -writeInterval 20; +writeInterval 20; -writePrecision 6; +writePrecision 6; // ************************************************************************* // \ No newline at end of file diff --git a/tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/meshDict b/tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/meshDict index d896afe1b..92a444ac5 100644 --- a/tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/meshDict +++ b/tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/meshDict @@ -54,7 +54,7 @@ boundaryLayers allowDiscontinuity 0; } - "fixedWalls.*" + "fixedWalls.*" { nLayers 4; @@ -69,15 +69,15 @@ boundaryLayers renameBoundary { - defaultName fixedWalls; - defaultType wall; + defaultName fixedWalls; + defaultType wall; newPatchNames { "orificeRegion.*" { - newName orificeRegion; - newType wall; + newName orificeRegion; + newType wall; } "inlet.*" diff --git a/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/meshDict b/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/meshDict index 812a985a4..19a98ad93 100644 --- a/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/meshDict +++ b/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/meshDict @@ -17,28 +17,28 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -boundaryCellSize 1.5; -keepCellsIntersectingBoundary 1; -maxCellSize 3; -minCellSize 0.375; -removeGluedMesh 0; -surfaceFile "socket.fms"; +boundaryCellSize 1.5; +keepCellsIntersectingBoundary 1; +maxCellSize 3; +minCellSize 0.375; +removeGluedMesh 0; +surfaceFile "socket.fms"; boundaryLayers { - maxFirstLayerThickness 0.5; - nLayers 3; - thicknessRatio 1.2; + maxFirstLayerThickness 0.5; + nLayers 3; + thicknessRatio 1.2; patchBoundaryLayers { patch7 { - allowDiscontinuity 0; - maxFirstLayerThickness 0.5; - nLayers 4; - thicknessRatio 1.1; + allowDiscontinuity 0; + maxFirstLayerThickness 0.5; + nLayers 4; + thicknessRatio 1.1; } } } @@ -48,17 +48,17 @@ localRefinement patch15 { - additionalRefinementLevels 1; + additionalRefinementLevels 1; } subset1 { - cellSize 1.5; + cellSize 1.5; } subset2 { - cellSize 1.5; + cellSize 1.5; } } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/0/U b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/0/U index 8074f57c1..21c35c358 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/0/U +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/0/U @@ -24,16 +24,16 @@ boundaryField bottomLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsBottomDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsBottomDisp"; + outOfBounds clamp; value uniform (0 0 0); } topLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsTopDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsTopDisp"; + outOfBounds clamp; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/0/org/U b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/0/org/U index 8074f57c1..21c35c358 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/0/org/U +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/0/org/U @@ -24,16 +24,16 @@ boundaryField bottomLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsBottomDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsBottomDisp"; + outOfBounds clamp; value uniform (0 0 0); } topLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsTopDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsTopDisp"; + outOfBounds clamp; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/constant/timeVsBottomDisp b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/constant/timeVsBottomDisp index cb775fec3..5b906805c 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/constant/timeVsBottomDisp +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/constant/timeVsBottomDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 100 (0 -1e-4 0) ) + ( 0 (0 0 0) ) + ( 100 (0 -1e-4 0) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/constant/timeVsTopDisp b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/constant/timeVsTopDisp index 8e28b807e..affc64fcc 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/constant/timeVsTopDisp +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/constant/timeVsTopDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 100 (0 1e-4 0) ) + ( 0 (0 0 0) ) + ( 100 (0 1e-4 0) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/system/fvSolution b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/system/fvSolution index bf31a6928..d94811bfd 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/system/fvSolution +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/system/fvSolution @@ -40,8 +40,8 @@ solidMechanics infoFrequency 100; aitkenRelaxation yes; crackLimitingBoxes 1( - (0 -1e-5 0)(0.06 1e-5 1) - ); + (0 -1e-5 0)(0.06 1e-5 1) + ); crackPropagationFromSpecifiedPatches no; crackPropagationPatches 1(crack); dynamicTimeStep no; diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/system/setFieldsDict b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/system/setFieldsDict index 05edcbe8a..0b8fc2151 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/system/setFieldsDict +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbDugdale/system/setFieldsDict @@ -24,7 +24,7 @@ regions ( boxToCell { - box (0 0 0) (1 1 1); + box (0 0 0) (1 1 1); fieldValues ( @@ -33,7 +33,7 @@ regions } boxToCell { - box (0.03 -1 -1) (0.06 1 1); + box (0.03 -1 -1) (0.06 1 1); fieldValues ( diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/0/U b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/0/U index 8074f57c1..21c35c358 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/0/U +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/0/U @@ -24,16 +24,16 @@ boundaryField bottomLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsBottomDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsBottomDisp"; + outOfBounds clamp; value uniform (0 0 0); } topLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsTopDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsTopDisp"; + outOfBounds clamp; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/0/org/U b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/0/org/U index 8074f57c1..21c35c358 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/0/org/U +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/0/org/U @@ -24,16 +24,16 @@ boundaryField bottomLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsBottomDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsBottomDisp"; + outOfBounds clamp; value uniform (0 0 0); } topLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsTopDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsTopDisp"; + outOfBounds clamp; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/constant/timeVsBottomDisp b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/constant/timeVsBottomDisp index cb775fec3..5b906805c 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/constant/timeVsBottomDisp +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/constant/timeVsBottomDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 100 (0 -1e-4 0) ) + ( 0 (0 0 0) ) + ( 100 (0 -1e-4 0) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/constant/timeVsTopDisp b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/constant/timeVsTopDisp index 8e28b807e..affc64fcc 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/constant/timeVsTopDisp +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/constant/timeVsTopDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 100 (0 1e-4 0) ) + ( 0 (0 0 0) ) + ( 100 (0 1e-4 0) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/system/fvSolution b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/system/fvSolution index bf31a6928..d94811bfd 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/system/fvSolution +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/system/fvSolution @@ -40,8 +40,8 @@ solidMechanics infoFrequency 100; aitkenRelaxation yes; crackLimitingBoxes 1( - (0 -1e-5 0)(0.06 1e-5 1) - ); + (0 -1e-5 0)(0.06 1e-5 1) + ); crackPropagationFromSpecifiedPatches no; crackPropagationPatches 1(crack); dynamicTimeStep no; diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/system/setFieldsDict b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/system/setFieldsDict index 05edcbe8a..0b8fc2151 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/system/setFieldsDict +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingBiMatDcbLinear/system/setFieldsDict @@ -24,7 +24,7 @@ regions ( boxToCell { - box (0 0 0) (1 1 1); + box (0 0 0) (1 1 1); fieldValues ( @@ -33,7 +33,7 @@ regions } boxToCell { - box (0.03 -1 -1) (0.06 1 1); + box (0.03 -1 -1) (0.06 1 1); fieldValues ( diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/0/U b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/0/U index a6cfc038f..81b47f217 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/0/U +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/0/U @@ -30,8 +30,8 @@ boundaryField top { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsTopDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsTopDisp"; + outOfBounds clamp; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/0/org/U b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/0/org/U index a6cfc038f..81b47f217 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/0/org/U +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/0/org/U @@ -30,8 +30,8 @@ boundaryField top { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsTopDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsTopDisp"; + outOfBounds clamp; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/constant/timeVsBottomDisp b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/constant/timeVsBottomDisp index daff422ae..dd304c773 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/constant/timeVsBottomDisp +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/constant/timeVsBottomDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 100 (0 0 0) ) + ( 0 (0 0 0) ) + ( 100 (0 0 0) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/constant/timeVsTopDisp b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/constant/timeVsTopDisp index 1dae08f6f..4a1104176 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/constant/timeVsTopDisp +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/constant/timeVsTopDisp @@ -1,5 +1,5 @@ ( - ( 0 (0 0 0) ) - ( 10 (0 -1e-5 0) ) - ( 100 (1e-4 -1e-5 0) ) + ( 0 (0 0 0) ) + ( 10 (0 -1e-5 0) ) + ( 100 (1e-4 -1e-5 0) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/system/fvSolution b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/system/fvSolution index 8883cbf34..4736fd1ee 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/system/fvSolution +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/system/fvSolution @@ -40,8 +40,8 @@ solidMechanics infoFrequency 100; aitkenRelaxation yes; crackLimitingBoxes 1( - (0 -1e-5 0)(0.06 1e-5 1) - ); + (0 -1e-5 0)(0.06 1e-5 1) + ); crackPropagationFromSpecifiedPatches no; crackPropagationPatches 1(crack); dynamicTimeStep no; diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/system/setFieldsDict b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/system/setFieldsDict index e2a8ec01d..8c0bb672f 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/system/setFieldsDict +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingPlateShearCompress/system/setFieldsDict @@ -24,7 +24,7 @@ regions ( boxToCell { - box (0 0 0) (1 1 1); + box (0 0 0) (1 1 1); fieldValues ( diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/0/U b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/0/U index 8074f57c1..21c35c358 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/0/U +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/0/U @@ -24,16 +24,16 @@ boundaryField bottomLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsBottomDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsBottomDisp"; + outOfBounds clamp; value uniform (0 0 0); } topLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsTopDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsTopDisp"; + outOfBounds clamp; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/0/org/U b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/0/org/U index 8074f57c1..21c35c358 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/0/org/U +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/0/org/U @@ -24,16 +24,16 @@ boundaryField bottomLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsBottomDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsBottomDisp"; + outOfBounds clamp; value uniform (0 0 0); } topLoading { type timeVaryingFixedDisplacement; - fileName "$FOAM_CASE/constant/timeVsTopDisp"; - outOfBounds clamp; + fileName "$FOAM_CASE/constant/timeVsTopDisp"; + outOfBounds clamp; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/constant/timeVsBottomDisp b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/constant/timeVsBottomDisp index 3836c3fe3..8773a0af6 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/constant/timeVsBottomDisp +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/constant/timeVsBottomDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 100 (-1e-4 -1e-4 0) ) + ( 0 (0 0 0) ) + ( 100 (-1e-4 -1e-4 0) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/constant/timeVsTopDisp b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/constant/timeVsTopDisp index 14b3c5ffa..ef3a3aec7 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/constant/timeVsTopDisp +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/constant/timeVsTopDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 100 (1e-4 1e-4 0) ) + ( 0 (0 0 0) ) + ( 100 (1e-4 1e-4 0) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/system/fvSolution b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/system/fvSolution index bf31a6928..d94811bfd 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/system/fvSolution +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/system/fvSolution @@ -40,8 +40,8 @@ solidMechanics infoFrequency 100; aitkenRelaxation yes; crackLimitingBoxes 1( - (0 -1e-5 0)(0.06 1e-5 1) - ); + (0 -1e-5 0)(0.06 1e-5 1) + ); crackPropagationFromSpecifiedPatches no; crackPropagationPatches 1(crack); dynamicTimeStep no; diff --git a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/system/setFieldsDict b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/system/setFieldsDict index 49aba7bd5..4812eb061 100644 --- a/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/system/setFieldsDict +++ b/tutorials/solidMechanics/elasticAcpSolidFoam/crackingTriMatDcb/system/setFieldsDict @@ -25,7 +25,7 @@ regions ( boxToCell { - box (0 0 0) (1 1 1); + box (0 0 0) (1 1 1); fieldValues ( @@ -34,7 +34,7 @@ regions } boxToCell { - box (0 -0.002 -1) (1 0.002 1); + box (0 -0.002 -1) (1 0.002 1); fieldValues ( diff --git a/tutorials/solidMechanics/elasticIncrSolidFoam/slidingFrictionBallIncr/0/DU b/tutorials/solidMechanics/elasticIncrSolidFoam/slidingFrictionBallIncr/0/DU index be70ad399..abba5308b 100644 --- a/tutorials/solidMechanics/elasticIncrSolidFoam/slidingFrictionBallIncr/0/DU +++ b/tutorials/solidMechanics/elasticIncrSolidFoam/slidingFrictionBallIncr/0/DU @@ -32,53 +32,54 @@ boundaryField bottomBrickUp { type solidContact; - master yes; - contactActive yes; - rigidMaster no; - shadowPatch topBrickDown; - interpolationMethod ggi; - //interpolationMethod patchToPatch; - projectionAlgo visible; - projectionDir contactSphere; - correctionFrequency 10; - normalContactModel standardPenalty;; - standardPenaltyNormalModelDict - { - penaltyScale 1; - relaxationFactor 0.01; - infoFrequency 10; - limitPenetration no; - penetrationLimit -0.03; - limitPressure no; - pressureLimit 1e9; - correctMissedVertices yes; - distanceMethod point; - oscillationCorrection yes; - smoothingSteps 1; - } - frictionContactModel standardPenalty; - standardPenaltyFrictionModelDict - { - penaltyScale 0.5; - relaxationFactor 0.1; - infoFrequency 10; - oscillationCorrection yes; - smoothingSteps 1; - frictionLaw coulomb; - frictionLawDict - { - frictionCoeff 0.3; - } - } - value uniform (0 0 0); + master yes; + contactActive yes; + rigidMaster no; + shadowPatch topBrickDown; + interpolationMethod ggi; + //interpolationMethod patchToPatch; + projectionAlgo visible; + projectionDir contactSphere; + correctionFrequency 10; + normalContactModel standardPenalty;; + standardPenaltyNormalModelDict + { + penaltyScale 1; + relaxationFactor 0.01; + infoFrequency 10; + limitPenetration no; + penetrationLimit -0.03; + limitPressure no; + pressureLimit 1e9; + correctMissedVertices yes; + distanceMethod point; + oscillationCorrection yes; + smoothingSteps 1; + } + frictionContactModel standardPenalty; + standardPenaltyFrictionModelDict + { + penaltyScale 0.5; + relaxationFactor 0.1; + infoFrequency 10; + oscillationCorrection yes; + smoothingSteps 1; + frictionLaw coulomb; + frictionLawDict + { + frictionCoeff 0.3; + } + } + + value uniform (0 0 0); } topBrickDown { type solidContact; - master no; - contactActive yes; - shadowPatch bottomBrickUp; + master no; + contactActive yes; + shadowPatch bottomBrickUp; value uniform (0 0 0); } @@ -113,7 +114,7 @@ boundaryField topBrickRight { type solidTraction; - traction uniform ( 0 0 0 ); + traction uniform ( 0 0 0 ); pressure uniform 0; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticIncrSolidFoam/slidingFrictionBallIncr/constant/timeVsTopDisp b/tutorials/solidMechanics/elasticIncrSolidFoam/slidingFrictionBallIncr/constant/timeVsTopDisp index 1f569f41b..05898a035 100644 --- a/tutorials/solidMechanics/elasticIncrSolidFoam/slidingFrictionBallIncr/constant/timeVsTopDisp +++ b/tutorials/solidMechanics/elasticIncrSolidFoam/slidingFrictionBallIncr/constant/timeVsTopDisp @@ -1,4 +1,4 @@ ( - (0 (0 -1e-4 0)) - (100 (4e-2 -1e-4 0)) + (0 (0 -1e-4 0)) + (100 (4e-2 -1e-4 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/0/U b/tutorials/solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/0/U index 69f5a1952..a4735c0eb 100644 --- a/tutorials/solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/0/U +++ b/tutorials/solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/0/U @@ -22,42 +22,42 @@ internalField uniform (0 0 0); boundaryField { left - { - type fixedDisplacement; - value uniform (0 0 0); - } + { + type fixedDisplacement; + value uniform (0 0 0); + } right - { - type solidTraction; - nonLinear totalLagrangian; - traction uniform (0 -1e8 0); - pressure uniform 0; - value uniform (0 0 0); - } + { + type solidTraction; + nonLinear totalLagrangian; + traction uniform (0 -1e8 0); + pressure uniform 0; + value uniform (0 0 0); + } top - { - type solidTraction; - nonLinear totalLagrangian; - traction uniform (0 0 0); - pressure uniform 0; - value uniform (0 0 0); - } + { + type solidTraction; + nonLinear totalLagrangian; + traction uniform (0 0 0); + pressure uniform 0; + value uniform (0 0 0); + } bottom - { - type solidTraction; - nonLinear totalLagrangian; - traction uniform (0 0 0); - pressure uniform 0; - value uniform (0 0 0); - } + { + type solidTraction; + nonLinear totalLagrangian; + traction uniform (0 0 0); + pressure uniform 0; + value uniform (0 0 0); + } frontAndBack - { - type empty; - } + { + type empty; + } } // ************************************************************************* // diff --git a/tutorials/solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/constant/timeVsTopDisp b/tutorials/solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/constant/timeVsTopDisp index 58f75cf36..f2b2edf0b 100644 --- a/tutorials/solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/constant/timeVsTopDisp +++ b/tutorials/solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam/constant/timeVsTopDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 64 (0 0.4 0)) + ( 0 (0 0 0) ) + ( 64 (0 0.4 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticNonLinTLSolidFoam/nonLinBlock/constant/timeVsDisp b/tutorials/solidMechanics/elasticNonLinTLSolidFoam/nonLinBlock/constant/timeVsDisp index 71063d730..a4560ab08 100644 --- a/tutorials/solidMechanics/elasticNonLinTLSolidFoam/nonLinBlock/constant/timeVsDisp +++ b/tutorials/solidMechanics/elasticNonLinTLSolidFoam/nonLinBlock/constant/timeVsDisp @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 64 (0 0.4 0)) + ( 0 (0 0 0) ) + ( 64 (0 0.4 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticNonLinTLSolidFoam/rotateSphereTL/constant/timeVsAngle b/tutorials/solidMechanics/elasticNonLinTLSolidFoam/rotateSphereTL/constant/timeVsAngle index b523f4def..6b7bdff94 100644 --- a/tutorials/solidMechanics/elasticNonLinTLSolidFoam/rotateSphereTL/constant/timeVsAngle +++ b/tutorials/solidMechanics/elasticNonLinTLSolidFoam/rotateSphereTL/constant/timeVsAngle @@ -1,4 +1,4 @@ ( - ( 0 0 ) - ( 90 90 ) + ( 0 0 ) + ( 90 90 ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticNonLinULSolidFoam/rotateSphereUL/constant/timeVsAngle b/tutorials/solidMechanics/elasticNonLinULSolidFoam/rotateSphereUL/constant/timeVsAngle index b523f4def..6b7bdff94 100644 --- a/tutorials/solidMechanics/elasticNonLinULSolidFoam/rotateSphereUL/constant/timeVsAngle +++ b/tutorials/solidMechanics/elasticNonLinULSolidFoam/rotateSphereUL/constant/timeVsAngle @@ -1,4 +1,4 @@ ( - ( 0 0 ) - ( 90 90 ) + ( 0 0 ) + ( 90 90 ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticOrthoNonLinULSolidFoam/pressureRotatePlate/0/materialDirections b/tutorials/solidMechanics/elasticOrthoNonLinULSolidFoam/pressureRotatePlate/0/materialDirections index 6f4f269ee..8c8edc531 100644 --- a/tutorials/solidMechanics/elasticOrthoNonLinULSolidFoam/pressureRotatePlate/0/materialDirections +++ b/tutorials/solidMechanics/elasticOrthoNonLinULSolidFoam/pressureRotatePlate/0/materialDirections @@ -18,14 +18,14 @@ FoamFile dimensions [0 0 0 0 0 0 0]; // internalField uniform ( 0.7071 0.7071 0 -// -0.7071 0.7071 0 -// 0 0 1 ); +// -0.7071 0.7071 0 +// 0 0 1 ); // internalField uniform ( 0 1 0 -// -1 0 0 -// 0 0 1 ); +// -1 0 0 +// 0 0 1 ); internalField uniform ( 1 0 0 - 0 1 0 - 0 0 1 ); + 0 1 0 + 0 0 1 ); boundaryField { diff --git a/tutorials/solidMechanics/elasticOrthoNonLinULSolidFoam/pressureRotatePlate/constant/timeVsOutsideAngle b/tutorials/solidMechanics/elasticOrthoNonLinULSolidFoam/pressureRotatePlate/constant/timeVsOutsideAngle index d4a8a8fd1..a977e8040 100644 --- a/tutorials/solidMechanics/elasticOrthoNonLinULSolidFoam/pressureRotatePlate/constant/timeVsOutsideAngle +++ b/tutorials/solidMechanics/elasticOrthoNonLinULSolidFoam/pressureRotatePlate/constant/timeVsOutsideAngle @@ -1,6 +1,6 @@ ( - (0 0) - (9.9 0) - (9.99 1) - (360 1) + (0 0) + (9.9 0) + (9.99 1) + (360 1) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/0/materialDirections b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/0/materialDirections index 8f9cba4dc..c4817d75f 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/0/materialDirections +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/0/materialDirections @@ -18,8 +18,8 @@ FoamFile dimensions [0 0 0 0 0 0 0]; internalField uniform ( 1 0 0 - 0 1 0 - 0 0 1 ); + 0 1 0 + 0 0 1 ); boundaryField { diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/0/org/materialDirections b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/0/org/materialDirections index 8f9cba4dc..c4817d75f 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/0/org/materialDirections +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/0/org/materialDirections @@ -18,8 +18,8 @@ FoamFile dimensions [0 0 0 0 0 0 0]; internalField uniform ( 1 0 0 - 0 1 0 - 0 0 1 ); + 0 1 0 + 0 0 1 ); boundaryField { diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/polyMesh/blockMeshDict b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/polyMesh/blockMeshDict index 854da6006..4506937f8 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/polyMesh/blockMeshDict +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/polyMesh/blockMeshDict @@ -18,23 +18,23 @@ convertToMeters 1; vertices ( -(0 0 0) //0 -(1 0 0) //1 -(0 0.5 0) //2 -(1 0.5 0) //3 -(0 0.51 0) //4 -(1 0.51 0) //5 -(0 1 0) //6 -(1 1 0) //7 +(0 0 0) //0 +(1 0 0) //1 +(0 0.5 0) //2 +(1 0.5 0) //3 +(0 0.51 0) //4 +(1 0.51 0) //5 +(0 1 0) //6 +(1 1 0) //7 -(0 0 0.1) //8 -(1 0 0.1) //9 -(0 0.5 0.1) //10 -(1 0.5 0.1) //11 -(0 0.51 0.1) //12 -(1 0.51 0.1) //13 -(0 1 0.1) //14 -(1 1 0.1) //15 +(0 0 0.1) //8 +(1 0 0.1) //9 +(0 0.5 0.1) //10 +(1 0.5 0.1) //11 +(0 0.51 0.1) //12 +(1 0.51 0.1) //13 +(0 1 0.1) //14 +(1 1 0.1) //15 ); @@ -55,38 +55,38 @@ patches ( ( 0 1 3 2) ( 2 3 5 4) - ( 4 5 7 6) + ( 4 5 7 6) ) empty back ( ( 8 9 11 10) (10 11 13 12) - (12 13 15 14) + (12 13 15 14) ) patch left ( ( 0 2 10 8) - ( 2 4 12 10) - ( 4 6 14 12) + ( 2 4 12 10) + ( 4 6 14 12) ) patch bottom ( - ( 0 1 9 8) + ( 0 1 9 8) ) patch right ( - ( 1 3 11 9) - ( 3 5 13 11) - ( 5 7 15 13) + ( 1 3 11 9) + ( 3 5 13 11) + ( 5 7 15 13) ) patch top ( - ( 6 7 15 14) + ( 6 7 15 14) ) ); diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/rheologyProperties b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/rheologyProperties index 35e42cc44..996abc778 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/rheologyProperties +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/rheologyProperties @@ -33,18 +33,18 @@ rheology composite { - type orthotropicLinearElastic; - rho rho [1 -3 0 0 0 0 0] 7854; - Ex Ex [1 -1 -2 0 0 0 0] 200e+9; - Ey Ey [1 -1 -2 0 0 0 0] 200e+9; - Ez Ez [1 -1 -2 0 0 0 0] 200e+9; - nuxy nuxy [0 0 0 0 0 0 0] 0.3; - nuyz nuyz [0 0 0 0 0 0 0] 0.3; - nuzx nuzx [0 0 0 0 0 0 0] 0.3; - Gxy Gxy [1 -1 -2 0 0 0 0] 76.923076923e9; - Gyz Gyz [1 -1 -2 0 0 0 0] 76.923076923e9; - Gzx Gzx [1 -1 -2 0 0 0 0] 76.923076923e9; - } + type orthotropicLinearElastic; + rho rho [1 -3 0 0 0 0 0] 7854; + Ex Ex [1 -1 -2 0 0 0 0] 200e+9; + Ey Ey [1 -1 -2 0 0 0 0] 200e+9; + Ez Ez [1 -1 -2 0 0 0 0] 200e+9; + nuxy nuxy [0 0 0 0 0 0 0] 0.3; + nuyz nuyz [0 0 0 0 0 0 0] 0.3; + nuzx nuzx [0 0 0 0 0 0 0] 0.3; + Gxy Gxy [1 -1 -2 0 0 0 0] 76.923076923e9; + Gyz Gyz [1 -1 -2 0 0 0 0] 76.923076923e9; + Gzx Gzx [1 -1 -2 0 0 0 0] 76.923076923e9; + } ); } diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/timeVsTopDisplacement b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/timeVsTopDisplacement index 9f26a5af6..ed1d2cb1a 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/timeVsTopDisplacement +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlate/constant/timeVsTopDisplacement @@ -1,4 +1,4 @@ ( - (0 (0 0 0)) - (10 (0 0.01 0)) + (0 (0 0 0)) + (10 (0 0.01 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/0/materialDirections b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/0/materialDirections index 8f9cba4dc..c4817d75f 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/0/materialDirections +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/0/materialDirections @@ -18,8 +18,8 @@ FoamFile dimensions [0 0 0 0 0 0 0]; internalField uniform ( 1 0 0 - 0 1 0 - 0 0 1 ); + 0 1 0 + 0 0 1 ); boundaryField { diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/0/org/materialDirections b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/0/org/materialDirections index 8f9cba4dc..c4817d75f 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/0/org/materialDirections +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/0/org/materialDirections @@ -18,8 +18,8 @@ FoamFile dimensions [0 0 0 0 0 0 0]; internalField uniform ( 1 0 0 - 0 1 0 - 0 0 1 ); + 0 1 0 + 0 0 1 ); boundaryField { diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/constant/rheologyProperties b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/constant/rheologyProperties index 35e42cc44..996abc778 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/constant/rheologyProperties +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/constant/rheologyProperties @@ -33,18 +33,18 @@ rheology composite { - type orthotropicLinearElastic; - rho rho [1 -3 0 0 0 0 0] 7854; - Ex Ex [1 -1 -2 0 0 0 0] 200e+9; - Ey Ey [1 -1 -2 0 0 0 0] 200e+9; - Ez Ez [1 -1 -2 0 0 0 0] 200e+9; - nuxy nuxy [0 0 0 0 0 0 0] 0.3; - nuyz nuyz [0 0 0 0 0 0 0] 0.3; - nuzx nuzx [0 0 0 0 0 0 0] 0.3; - Gxy Gxy [1 -1 -2 0 0 0 0] 76.923076923e9; - Gyz Gyz [1 -1 -2 0 0 0 0] 76.923076923e9; - Gzx Gzx [1 -1 -2 0 0 0 0] 76.923076923e9; - } + type orthotropicLinearElastic; + rho rho [1 -3 0 0 0 0 0] 7854; + Ex Ex [1 -1 -2 0 0 0 0] 200e+9; + Ey Ey [1 -1 -2 0 0 0 0] 200e+9; + Ez Ez [1 -1 -2 0 0 0 0] 200e+9; + nuxy nuxy [0 0 0 0 0 0 0] 0.3; + nuyz nuyz [0 0 0 0 0 0 0] 0.3; + nuzx nuzx [0 0 0 0 0 0 0] 0.3; + Gxy Gxy [1 -1 -2 0 0 0 0] 76.923076923e9; + Gyz Gyz [1 -1 -2 0 0 0 0] 76.923076923e9; + Gzx Gzx [1 -1 -2 0 0 0 0] 76.923076923e9; + } ); } diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/constant/timeVsTopDisplacement b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/constant/timeVsTopDisplacement index 9f26a5af6..ed1d2cb1a 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/constant/timeVsTopDisplacement +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBiMatPlateNonOrtho/constant/timeVsTopDisplacement @@ -1,4 +1,4 @@ ( - (0 (0 0 0)) - (10 (0 0.01 0)) + (0 (0 0 0)) + (10 (0 0.01 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/0/U b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/0/U index 295e13a51..ed7dde252 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/0/U +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/0/U @@ -22,46 +22,46 @@ internalField uniform (0 0 0); boundaryField { top - { - type solidTraction; - traction uniform ( 0 2e7 0 ); - pressure uniform 0; - orthotropic yes; - value uniform (0 0 0); - } + { + type solidTraction; + traction uniform ( 0 2e7 0 ); + pressure uniform 0; + orthotropic yes; + value uniform (0 0 0); + } bottom - { - type symmetryPlane; - } + { + type symmetryPlane; + } left - { - type symmetryPlane; - } + { + type symmetryPlane; + } back - { - type symmetryPlane; - } + { + type symmetryPlane; + } right - { - type solidTraction; - traction uniform ( 0 0 0 ); - pressure uniform 0; - orthotropic yes; - value uniform (0 0 0); - } + { + type solidTraction; + traction uniform ( 0 0 0 ); + pressure uniform 0; + orthotropic yes; + value uniform (0 0 0); + } front - { - type solidTraction; - traction uniform ( 0 0 0 ); - pressure uniform 0; - orthotropic yes; - value uniform (0 0 0); - } + { + type solidTraction; + traction uniform ( 0 0 0 ); + pressure uniform 0; + orthotropic yes; + value uniform (0 0 0); + } } // ************************************************************************* // diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/0/materialDirections b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/0/materialDirections index 16d3ff85e..c5e6ebe1e 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/0/materialDirections +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/0/materialDirections @@ -18,14 +18,14 @@ FoamFile dimensions [0 0 0 0 0 0 0]; // internalField uniform ( 0.7071 0.7071 0 -// -0.7071 0.7071 0 -// 0 0 1 ); +// -0.7071 0.7071 0 +// 0 0 1 ); // internalField uniform ( 0 1 0 -// -1 0 0 -// 0 0 1 ); +// -1 0 0 +// 0 0 1 ); internalField uniform ( 1 0 0 - 0 1 0 - 0 0 1 ); + 0 1 0 + 0 0 1 ); boundaryField { diff --git a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/constant/timeVsTopTrac b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/constant/timeVsTopTrac index 36562296c..9215417a5 100644 --- a/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/constant/timeVsTopTrac +++ b/tutorials/solidMechanics/elasticOrthoSolidFoam/orthotropicBlock/constant/timeVsTopTrac @@ -1,4 +1,4 @@ ( - ( 0 (0 0 0) ) - ( 64 (0 1e12 0)) + ( 0 (0 0 0) ) + ( 64 (0 1e12 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticPlasticSolidFoam/rigidBallPlasticBrick/0/DU b/tutorials/solidMechanics/elasticPlasticSolidFoam/rigidBallPlasticBrick/0/DU index eec06c64a..8bd34ecc7 100644 --- a/tutorials/solidMechanics/elasticPlasticSolidFoam/rigidBallPlasticBrick/0/DU +++ b/tutorials/solidMechanics/elasticPlasticSolidFoam/rigidBallPlasticBrick/0/DU @@ -32,57 +32,57 @@ boundaryField topBrickDown { type solidContact; - master yes; - contactActive yes; - rigidMaster yes; - shadowPatch bottomBrickUp; - interpolationMethod ggi; - //interpolationMethod patchToPatch; - projectionAlgo visible; - projectionDir contactSphere; - correctionFrequency 50; - normalContactModel dirichletNeumann; - dirichletNeumannNormalModelDict - { - relaxationFactor 0.9; - contactGapTol 1e-10; - limitPenetration no; + master yes; + contactActive yes; + rigidMaster yes; + shadowPatch bottomBrickUp; + interpolationMethod ggi; + //interpolationMethod patchToPatch; + projectionAlgo visible; + projectionDir contactSphere; + correctionFrequency 50; + normalContactModel dirichletNeumann; + dirichletNeumannNormalModelDict + { + relaxationFactor 0.9; + contactGapTol 1e-10; + limitPenetration no; settleContact no; settleIterationNumber 100; - penetrationLimit -0.03; - limitPressure no; - pressureLimit 1e9; - correctMissedVertices no; - distanceMethod point; - aitkenRelaxation no; - infoFrequency 10; - oscillationCorrection yes; - smoothingSteps 1; - } - //frictionContactModel frictionless; - frictionContactModel dirichletNeumann; - dirichletNeumannFrictionModelDict - { - relaxationFactor 0.2; - infoFrequency 10; - oscillationCorrection yes; - smoothingSteps 1; + penetrationLimit -0.03; + limitPressure no; + pressureLimit 1e9; + correctMissedVertices no; + distanceMethod point; + aitkenRelaxation no; + infoFrequency 10; + oscillationCorrection yes; + smoothingSteps 1; + } + //frictionContactModel frictionless; + frictionContactModel dirichletNeumann; + dirichletNeumannFrictionModelDict + { + relaxationFactor 0.2; + infoFrequency 10; + oscillationCorrection yes; + smoothingSteps 1; - frictionLaw coulomb; - frictionLawDict - { - frictionCoeff 0.01; - } - } - value uniform (0 0 0); + frictionLaw coulomb; + frictionLawDict + { + frictionCoeff 0.01; + } + } + value uniform (0 0 0); } bottomBrickUp { type solidContact; - master no; - contactActive yes; - shadowPatch topBrickDown; + master no; + contactActive yes; + shadowPatch topBrickDown; value uniform (0 0 0); } @@ -117,7 +117,7 @@ boundaryField topBrickRight { type solidTraction; - traction uniform ( 0 0 0 ); + traction uniform ( 0 0 0 ); pressure uniform 0; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticPlasticSolidFoam/rigidBallPlasticBrick/constant/timeVsTopDisp b/tutorials/solidMechanics/elasticPlasticSolidFoam/rigidBallPlasticBrick/constant/timeVsTopDisp index 113c76c41..2c5bba1ce 100644 --- a/tutorials/solidMechanics/elasticPlasticSolidFoam/rigidBallPlasticBrick/constant/timeVsTopDisp +++ b/tutorials/solidMechanics/elasticPlasticSolidFoam/rigidBallPlasticBrick/constant/timeVsTopDisp @@ -1,4 +1,4 @@ ( - ( 0 ( 0 0 0 ) ) - ( 10 ( 0 -0.5e-4 0 ) ) + ( 0 ( 0 0 0 ) ) + ( 10 ( 0 -0.5e-4 0 ) ) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlate/constant/polyMesh/blockMeshDict b/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlate/constant/polyMesh/blockMeshDict index 854da6006..df431800c 100644 --- a/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlate/constant/polyMesh/blockMeshDict +++ b/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlate/constant/polyMesh/blockMeshDict @@ -18,23 +18,23 @@ convertToMeters 1; vertices ( -(0 0 0) //0 -(1 0 0) //1 -(0 0.5 0) //2 -(1 0.5 0) //3 -(0 0.51 0) //4 -(1 0.51 0) //5 -(0 1 0) //6 -(1 1 0) //7 +(0 0 0) //0 +(1 0 0) //1 +(0 0.5 0) //2 +(1 0.5 0) //3 +(0 0.51 0) //4 +(1 0.51 0) //5 +(0 1 0) //6 +(1 1 0) //7 -(0 0 0.1) //8 -(1 0 0.1) //9 -(0 0.5 0.1) //10 -(1 0.5 0.1) //11 -(0 0.51 0.1) //12 -(1 0.51 0.1) //13 -(0 1 0.1) //14 -(1 1 0.1) //15 +(0 0 0.1) //8 +(1 0 0.1) //9 +(0 0.5 0.1) //10 +(1 0.5 0.1) //11 +(0 0.51 0.1) //12 +(1 0.51 0.1) //13 +(0 1 0.1) //14 +(1 1 0.1) //15 ); @@ -55,38 +55,38 @@ patches ( ( 0 1 3 2) ( 2 3 5 4) - ( 4 5 7 6) + ( 4 5 7 6) ) empty back ( ( 8 9 11 10) (10 11 13 12) - (12 13 15 14) + (12 13 15 14) ) patch left ( ( 0 2 10 8) - ( 2 4 12 10) - ( 4 6 14 12) + ( 2 4 12 10) + ( 4 6 14 12) ) patch bottom ( - ( 0 1 9 8) + ( 0 1 9 8) ) patch right ( - ( 1 3 11 9) - ( 3 5 13 11) - ( 5 7 15 13) + ( 1 3 11 9) + ( 3 5 13 11) + ( 5 7 15 13) ) patch top ( - ( 6 7 15 14) + ( 6 7 15 14) ) ); diff --git a/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlate/constant/timeVsDisp b/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlate/constant/timeVsDisp index 9f26a5af6..ed1d2cb1a 100644 --- a/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlate/constant/timeVsDisp +++ b/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlate/constant/timeVsDisp @@ -1,4 +1,4 @@ ( - (0 (0 0 0)) - (10 (0 0.01 0)) + (0 (0 0 0)) + (10 (0 0.01 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlateNonOrtho/constant/timeVsDisp b/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlateNonOrtho/constant/timeVsDisp index 9f26a5af6..ed1d2cb1a 100644 --- a/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlateNonOrtho/constant/timeVsDisp +++ b/tutorials/solidMechanics/elasticSolidFoam/bimaterialPlateNonOrtho/constant/timeVsDisp @@ -1,4 +1,4 @@ ( - (0 (0 0 0)) - (10 (0 0.01 0)) + (0 (0 0 0)) + (10 (0 0.01 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticSolidFoam/slidingFrictionBall/0/U b/tutorials/solidMechanics/elasticSolidFoam/slidingFrictionBall/0/U index 79e7038f4..cb68ee38b 100644 --- a/tutorials/solidMechanics/elasticSolidFoam/slidingFrictionBall/0/U +++ b/tutorials/solidMechanics/elasticSolidFoam/slidingFrictionBall/0/U @@ -37,52 +37,53 @@ boundaryField topBrickDown { - type solidContact; - master yes; - contactActive yes; - rigidMaster no; - shadowPatch bottomBrickUp; - interpolationMethod ggi; - //interpolationMethod patchToPatch; - projectionAlgo visible; - projectionDir contactSphere; - //projectionDir vector; - correctionFrequency 10; - normalContactModel standardPenalty; - standardPenaltyNormalModelDict - { - relaxationFactor 0.1; - penaltyScale 1; - returnScale 1.5; - contactGapTol 1e-7; - limitPenetration no; - penetrationLimit -0.03; - limitPressure no; - pressureLimit 1e12; - correctMissedVertices yes; - distanceMethod point; - //distanceMethod face; - oscillationCorrection yes; - smoothingSteps 1; - infoFrequency 10; - } - //frictionContactModel frictionless; - frictionContactModel standardPenalty; - standardPenaltyFrictionModelDict - { - relaxationFactor 0.1; - penaltyScale 1; - oscillationCorrection yes; - smoothingSteps 1; - infoFrequency 10; + type solidContact; + master yes; + contactActive yes; + rigidMaster no; + shadowPatch bottomBrickUp; + interpolationMethod ggi; + //interpolationMethod patchToPatch; + projectionAlgo visible; + projectionDir contactSphere; + //projectionDir vector; + correctionFrequency 10; + normalContactModel standardPenalty; + standardPenaltyNormalModelDict + { + relaxationFactor 0.1; + penaltyScale 1; + returnScale 1.5; + contactGapTol 1e-7; + limitPenetration no; + penetrationLimit -0.03; + limitPressure no; + pressureLimit 1e12; + correctMissedVertices yes; + distanceMethod point; + //distanceMethod face; + oscillationCorrection yes; + smoothingSteps 1; + infoFrequency 10; + } + //frictionContactModel frictionless; + frictionContactModel standardPenalty; + standardPenaltyFrictionModelDict + { + relaxationFactor 0.1; + penaltyScale 1; + oscillationCorrection yes; + smoothingSteps 1; + infoFrequency 10; - frictionLaw coulomb; - frictionLawDict - { - frictionCoeff 0.1; - } - } - value uniform (0 0 0); + frictionLaw coulomb; + frictionLawDict + { + frictionCoeff 0.1; + } + } + + value uniform (0 0 0); } bottomBrickUp @@ -119,7 +120,7 @@ boundaryField topBrickRight { type solidTraction; - traction uniform ( 0 0 0 ); + traction uniform ( 0 0 0 ); pressure uniform 0; value uniform (0 0 0); } diff --git a/tutorials/solidMechanics/elasticSolidFoam/slidingFrictionBall/constant/timeVsTopDisp b/tutorials/solidMechanics/elasticSolidFoam/slidingFrictionBall/constant/timeVsTopDisp index 288d920f5..2f3c0d927 100644 --- a/tutorials/solidMechanics/elasticSolidFoam/slidingFrictionBall/constant/timeVsTopDisp +++ b/tutorials/solidMechanics/elasticSolidFoam/slidingFrictionBall/constant/timeVsTopDisp @@ -1,5 +1,5 @@ ( - (0 (0 -1e-4 0)) - (50 (2e-2 -1e-4 0)) - (100 (0 -1e-4 0)) + (0 (0 -1e-4 0)) + (50 (2e-2 -1e-4 0)) + (100 (0 -1e-4 0)) ) \ No newline at end of file diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/changeDictionaryDict b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/changeDictionaryDict index 6c4698242..429f5c6e3 100644 --- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/changeDictionaryDict +++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/changeDictionaryDict @@ -20,7 +20,7 @@ dictionaryReplacement { frontAndBackPlanes { - type empty; + type empty; } } } diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSolution b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSolution index 9dc1b99eb..4b4e00873 100644 --- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSolution +++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSolution @@ -18,55 +18,55 @@ FoamFile solvers { - p - { - solver GAMG; - tolerance 1e-06; - relTol 0; - minIter 1; - maxIter 1000; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - scaleCorrection true; - directSolveCoarsest false; - cacheAgglomeration true; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - }; + p + { + solver GAMG; + tolerance 1e-06; + relTol 0; + minIter 1; + maxIter 1000; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; + scaleCorrection true; + directSolveCoarsest false; + cacheAgglomeration true; + nCellsInCoarsestLevel 20; + agglomerator faceAreaPair; + mergeLevels 1; + }; - cellMotionU - { - solver GAMG; - tolerance 1e-6; - relTol 1e-3; - minIter 1; - maxIter 1000; + cellMotionU + { + solver GAMG; + tolerance 1e-6; + relTol 1e-3; + minIter 1; + maxIter 1000; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; - scaleCorrection true; - directSolveCoarsest false; + scaleCorrection true; + directSolveCoarsest false; - cacheAgglomeration true; + cacheAgglomeration true; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - }; + nCellsInCoarsestLevel 20; + agglomerator faceAreaPair; + mergeLevels 1; + }; - U - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + }; } PISO diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/0/DU b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/0/DU index ba2803659..a1558d1aa 100644 --- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/0/DU +++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/0/DU @@ -24,7 +24,7 @@ boundaryField plate { type solidTraction; - nonLinear updatedLagrangian; + nonLinear updatedLagrangian; traction uniform ( 0 0 0 ); pressure uniform 0; value uniform (0 0 0); diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/changeDictionaryDict b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/changeDictionaryDict index 6c4698242..429f5c6e3 100644 --- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/changeDictionaryDict +++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/changeDictionaryDict @@ -20,7 +20,7 @@ dictionaryReplacement { frontAndBackPlanes { - type empty; + type empty; } } } diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSchemes b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSchemes index 2edb374d5..caa6c74c9 100644 --- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSchemes +++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSchemes @@ -43,8 +43,8 @@ divSchemes laplacianSchemes { - default none; - laplacian(DDU,DU) Gauss linear corrected; + default none; + laplacian(DDU,DU) Gauss linear corrected; } snGradSchemes diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSolution b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSolution index 7b9021244..10c8a828b 100644 --- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSolution +++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/solid/system/fvSolution @@ -19,7 +19,7 @@ solvers { DU { - solver GAMG; + solver GAMG; tolerance 1e-8; relTol 0.01; minIter 1; @@ -30,7 +30,7 @@ solvers nPostSweeps 2; nFinestSweeps 2; - scaleCorrection true; + scaleCorrection true; directSolveCoarsest false; cacheAgglomeration true; @@ -42,7 +42,7 @@ solvers // DU // { -// solver amgSolver; +// solver amgSolver; // cycle W-cycle; // policy AAMG; // nPreSweeps 0; @@ -65,9 +65,9 @@ solvers solidMechanics { - nCorrectors 1000; - DU 1e-06; - historyPointID 62; + nCorrectors 1000; + DU 1e-06; + historyPointID 62; } relaxationFactors diff --git a/tutorials/solidMechanics/readMe.txt b/tutorials/solidMechanics/readMe.txt index a81c78519..398cdf19f 100644 --- a/tutorials/solidMechanics/readMe.txt +++ b/tutorials/solidMechanics/readMe.txt @@ -19,7 +19,7 @@ The included solvers feature the following capabilities: small strain orthotropic elasticity large strain orthotropic elasticity cohesive zones - predefined crack path + predefined crack path arbitrary crack propagation custom boundary conditions Aitken's under-relaation for displacement field diff --git a/tutorials/solidMechanics/viscoElasticSolidFoam/compressionRelaxationTest/constant/timeVsLoadingDisp b/tutorials/solidMechanics/viscoElasticSolidFoam/compressionRelaxationTest/constant/timeVsLoadingDisp index 44cae45d4..d5a742266 100644 --- a/tutorials/solidMechanics/viscoElasticSolidFoam/compressionRelaxationTest/constant/timeVsLoadingDisp +++ b/tutorials/solidMechanics/viscoElasticSolidFoam/compressionRelaxationTest/constant/timeVsLoadingDisp @@ -1,6 +1,6 @@ ( - ( 0 (0 -0.00005 0)) - ( 0.05 (0 -0.00005 0)) - ( 0.05001 (0 0 0)) - ( 1000 (0 0 0)) + ( 0 (0 -0.00005 0)) + ( 0.05 (0 -0.00005 0)) + ( 0.05001 (0 0 0)) + ( 1000 (0 0 0)) ) \ No newline at end of file diff --git a/vagrantSandbox/initGeneralScript.sh b/vagrantSandbox/initGeneralScript.sh index c97db693c..c3e044372 100755 --- a/vagrantSandbox/initGeneralScript.sh +++ b/vagrantSandbox/initGeneralScript.sh @@ -8,10 +8,10 @@ do target="/home/vagrant/$f" if [ -e $target ] then - echo "$target already there" + echo "$target already there" else - echo "Copying $target from skeleton" - cp -r "/vagrant/skel/$f" $target + echo "Copying $target from skeleton" + cp -r "/vagrant/skel/$f" $target chown -R vagrant:vagrant $target fi done @@ -41,34 +41,34 @@ then echo if [ -e "$OFParent/.git" ] then - echo - echo "Parent is git" - echo "Cloning. This may take some time" - echo + echo + echo "Parent is git" + echo "Cloning. This may take some time" + echo - # su -c not correctly working on FreeBSD - su - vagrant -c "git clone $OFParent $OFClone" + # su -c not correctly working on FreeBSD + su - vagrant -c "git clone $OFParent $OFClone" - echo - echo "Git cloned: TODO: set same branch as parent" - echo + echo + echo "Git cloned: TODO: set same branch as parent" + echo elif [ -e "$OFParent/.hg" ] then - echo - echo "Parent is mercurial. Hello Bernhard" - echo -# branchName=`hg branch -R $OFParent` - idName=`hg id -i -R $OFParent | sed -e "s/\+//"` - # sed removes + in case of a 'tainted' parent + echo + echo "Parent is mercurial. Hello Bernhard" + echo +# branchName=`hg branch -R $OFParent` + idName=`hg id -i -R $OFParent | sed -e "s/\+//"` + # sed removes + in case of a 'tainted' parent - echo "Parent is on id $idName" - echo "Cloning. This may take some time" - su - vagrant -c "hg clone -u $idName $OFParent $OFClone" - echo + echo "Parent is on id $idName" + echo "Cloning. This may take some time" + su - vagrant -c "hg clone -u $idName $OFParent $OFClone" + echo else - echo - echo "Problem. Parent $OFParent is neither git nor mercurial" - echo + echo + echo "Problem. Parent $OFParent is neither git nor mercurial" + echo fi else echo "Repository $OFClone already there. No cloning" diff --git a/vagrantSandbox/skel/.bashrc b/vagrantSandbox/skel/.bashrc index 6aa500ab5..2631ef307 100644 --- a/vagrantSandbox/skel/.bashrc +++ b/vagrantSandbox/skel/.bashrc @@ -2,7 +2,7 @@ # Source global definitions if [ -f /etc/bashrc ]; then - . /etc/bashrc + . /etc/bashrc fi # User specific aliases and functions