diff --git a/applications/utilities/errorEstimation/estimateScalarError/Make/files b/applications/utilities/errorEstimation/estimateScalarError/Make/files deleted file mode 100644 index a898536770..0000000000 --- a/applications/utilities/errorEstimation/estimateScalarError/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -estimateScalarError.C - -EXE = $(FOAM_APPBIN)/estimateScalarError diff --git a/applications/utilities/errorEstimation/estimateScalarError/Make/options b/applications/utilities/errorEstimation/estimateScalarError/Make/options deleted file mode 100644 index fa5bda2896..0000000000 --- a/applications/utilities/errorEstimation/estimateScalarError/Make/options +++ /dev/null @@ -1,9 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/errorEstimation/lnInclude - -EXE_LIBS = \ - -lerrorEstimation \ - -lfiniteVolume \ - -lmeshTools \ - -ldynamicMesh diff --git a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C deleted file mode 100644 index 51d9b6bb40..0000000000 --- a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C +++ /dev/null @@ -1,133 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - estimateScalarError - -Description - Estimates the error in the solution for a scalar transport equation in the - standard form - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "errorEstimate.H" -#include "resError.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - timeSelector::addOptions(); - -# include "setRootCase.H" -# include "createTime.H" - - instantList timeDirs = timeSelector::select0(runTime, args); - -# include "createMesh.H" - - Info<< "\nEstimating error in scalar transport equation\n" - << "Reading transportProperties\n" << endl; - - IOdictionary transportProperties - ( - IOobject - ( - "transportProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE - ) - ); - - - Info<< "Reading diffusivity DT\n" << endl; - - dimensionedScalar DT - ( - transportProperties.lookup("DT") - ); - - - forAll(timeDirs, timeI) - { - runTime.setTime(timeDirs[timeI], timeI); - - Info<< "Time = " << runTime.timeName() << endl; - - mesh.readUpdate(); - - IOobject THeader - ( - "T", - runTime.timeName(), - mesh, - IOobject::MUST_READ - ); - - IOobject Uheader - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ - ); - - if (THeader.headerOk() && Uheader.headerOk()) - { - Info<< "Reading T" << endl; - volScalarField T(THeader, mesh); - - Info<< "Reading U" << endl; - volVectorField U(Uheader, mesh); - -# include "createPhi.H" - - errorEstimate ee - ( - resError::div(phi, T) - - resError::laplacian(DT, T) - ); - - ee.residual()().write(); - volScalarField e(ee.error()); - e.write(); - mag(e)().write(); - } - else - { - Info<< " No T or U" << endl; - } - - Info<< endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/Make/files b/applications/utilities/errorEstimation/icoErrorEstimate/Make/files deleted file mode 100644 index 45f2ec0d6f..0000000000 --- a/applications/utilities/errorEstimation/icoErrorEstimate/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -icoErrorEstimate.C - -EXE = $(FOAM_APPBIN)/icoErrorEstimate - diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/Make/options b/applications/utilities/errorEstimation/icoErrorEstimate/Make/options deleted file mode 100644 index e9a68290c0..0000000000 --- a/applications/utilities/errorEstimation/icoErrorEstimate/Make/options +++ /dev/null @@ -1,9 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/errorEstimation/lnInclude - -EXE_LIBS = \ - -lerrorEstimation \ - -lmeshTools \ - -ldynamicMesh \ - -lfiniteVolume diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C deleted file mode 100644 index 233bddcb33..0000000000 --- a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C +++ /dev/null @@ -1,129 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - icoErrorEstimate - -Description - Estimates error for the incompressible laminar CFD application icoFoam. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "errorEstimate.H" -#include "resError.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - timeSelector::addOptions(); - -# include "setRootCase.H" -# include "createTime.H" - - instantList timeDirs = timeSelector::select0(runTime, args); - -# include "createMesh.H" - - Info<< "\nEstimating error in the incompressible momentum equation\n" - << "Reading transportProperties\n" << endl; - - IOdictionary transportProperties - ( - IOobject - ( - "transportProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE - ) - ); - - dimensionedScalar nu - ( - transportProperties.lookup("nu") - ); - - forAll(timeDirs, timeI) - { - runTime.setTime(timeDirs[timeI], timeI); - - Info<< "Time = " << runTime.timeName() << endl; - - mesh.readUpdate(); - - IOobject pHeader - ( - "p", - runTime.timeName(), - mesh, - IOobject::MUST_READ - ); - - IOobject Uheader - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ - ); - - if (pHeader.headerOk() && Uheader.headerOk()) - { - Info<< "Reading p" << endl; - volScalarField p(pHeader, mesh); - - Info<< "Reading U" << endl; - volVectorField U(Uheader, mesh); - -# include "createPhi.H" - - errorEstimate ee - ( - resError::div(phi, U) - - resError::laplacian(nu, U) - == - -fvc::grad(p) - ); - - volVectorField e(ee.error()); - e.write(); - mag(e)().write(); - } - else - { - Info<< " No p or U" << endl; - } - - Info<< endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/utilities/errorEstimation/icoMomentError/Make/files b/applications/utilities/errorEstimation/icoMomentError/Make/files deleted file mode 100644 index d3285275de..0000000000 --- a/applications/utilities/errorEstimation/icoMomentError/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -icoMomentError.C - -EXE = $(FOAM_APPBIN)/icoMomentError - diff --git a/applications/utilities/errorEstimation/icoMomentError/Make/options b/applications/utilities/errorEstimation/icoMomentError/Make/options deleted file mode 100644 index e9a68290c0..0000000000 --- a/applications/utilities/errorEstimation/icoMomentError/Make/options +++ /dev/null @@ -1,9 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/errorEstimation/lnInclude - -EXE_LIBS = \ - -lerrorEstimation \ - -lmeshTools \ - -ldynamicMesh \ - -lfiniteVolume diff --git a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C deleted file mode 100644 index 508c6d0ab2..0000000000 --- a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C +++ /dev/null @@ -1,188 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - icoMomentError - -Description - Estimates error for the incompressible laminar CFD application icoFoam. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "linear.H" -#include "gaussConvectionScheme.H" -#include "gaussLaplacianScheme.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - timeSelector::addOptions(); - -# include "setRootCase.H" -# include "createTime.H" - - instantList timeDirs = timeSelector::select0(runTime, args); - -# include "createMesh.H" - - Info<< "\nEstimating error in the incompressible momentum equation\n" - << "Reading transportProperties\n" << endl; - - IOdictionary transportProperties - ( - IOobject - ( - "transportProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE - ) - ); - - dimensionedScalar nu - ( - transportProperties.lookup("nu") - ); - - forAll(timeDirs, timeI) - { - runTime.setTime(timeDirs[timeI], timeI); - - Info<< "Time = " << runTime.timeName() << endl; - - mesh.readUpdate(); - - IOobject pHeader - ( - "p", - runTime.timeName(), - mesh, - IOobject::MUST_READ - ); - - IOobject Uheader - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ - ); - - if (pHeader.headerOk() && Uheader.headerOk()) - { - Info<< "Reading p" << endl; - volScalarField p(pHeader, mesh); - - Info<< "Reading U" << endl; - volVectorField U(Uheader, mesh); - -# include "createPhi.H" - - volScalarField ek(0.5*magSqr(U)); - volTensorField gradU(fvc::grad(U)); - - // Divergence of the error in U squared - - volScalarField L - ( - IOobject - ( - "L", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - dimensionedScalar("one", dimLength, 1.0) - ); - - L.internalField() = - mesh.V()/fvc::surfaceSum(mesh.magSf())().internalField(); - - // Warning: 4th row of this equation specially modified - // for the momentum equation. The "real" formulation would - // have diffusivity*(gradV && gradV) - volScalarField momError - ( - IOobject - ( - "momErrorL" + U.name(), - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - sqrt - ( - 2.0*mag - ( - ( - fv::gaussConvectionScheme - ( - mesh, - phi, - tmp > - ( - new linear(mesh) - ) - ).fvcDiv(phi, ek) - - - nu* - fv::gaussLaplacianScheme(mesh) - .fvcLaplacian - ( - ek - ) - - (U & fvc::grad(p)) -// + nu*(gradU && gradU) - + 0.5*nu* - ( - gradU && (gradU + gradU.T()) - ) - )*L/(mag(U) + nu/L) - ) - ) - ); - - momError.boundaryField() = 0.0; - momError.write(); - } - else - { - Info<< " No p or U" << endl; - } - - Info<< endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/utilities/errorEstimation/momentScalarError/Make/files b/applications/utilities/errorEstimation/momentScalarError/Make/files deleted file mode 100644 index 0fc18c6691..0000000000 --- a/applications/utilities/errorEstimation/momentScalarError/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -momentScalarError.C - -EXE = $(FOAM_APPBIN)/momentScalarError diff --git a/applications/utilities/errorEstimation/momentScalarError/Make/options b/applications/utilities/errorEstimation/momentScalarError/Make/options deleted file mode 100644 index e6f16fc705..0000000000 --- a/applications/utilities/errorEstimation/momentScalarError/Make/options +++ /dev/null @@ -1,8 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/errorEstimation/lnInclude - -EXE_LIBS = \ - -lmeshTools \ - -ldynamicMesh \ - -lfiniteVolume diff --git a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C deleted file mode 100644 index 74ae1d5d1a..0000000000 --- a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C +++ /dev/null @@ -1,185 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - momentScalarError - -Description - Estimates the error in the solution for a scalar transport equation in the - standard form - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "linear.H" -#include "gaussConvectionScheme.H" -#include "gaussLaplacianScheme.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - timeSelector::addOptions(); - -# include "setRootCase.H" -# include "createTime.H" - - instantList timeDirs = timeSelector::select0(runTime, args); - -# include "createMesh.H" - - Info<< "\nEstimating error in scalar transport equation\n" - << "Reading transportProperties\n" << endl; - - IOdictionary transportProperties - ( - IOobject - ( - "transportProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE - ) - ); - - - Info<< "Reading diffusivity DT\n" << endl; - - dimensionedScalar DT - ( - transportProperties.lookup("DT") - ); - - - forAll(timeDirs, timeI) - { - runTime.setTime(timeDirs[timeI], timeI); - - Info<< "Time = " << runTime.timeName() << endl; - - mesh.readUpdate(); - - IOobject THeader - ( - "T", - runTime.timeName(), - mesh, - IOobject::MUST_READ - ); - - IOobject Uheader - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ - ); - - if (THeader.headerOk() && Uheader.headerOk()) - { - Info<< "Reading T" << endl; - volScalarField T(THeader, mesh); - - Info<< "Reading U" << endl; - volVectorField U(Uheader, mesh); - -# include "createPhi.H" - - volVectorField gradT(fvc::grad(T)); - - volScalarField TE(0.5*sqr(T)); - - volScalarField L - ( - IOobject - ( - "L", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - dimensionedScalar("one", dimLength, 1.0) - ); - - L.internalField() = - mesh.V()/fvc::surfaceSum(mesh.magSf())().internalField(); - - // Divergence of the error in the T squared - volScalarField momError - ( - IOobject - ( - "momErrorL" + T.name(), - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - sqrt - ( - 2.0*mag - ( - ( - fv::gaussConvectionScheme - ( - mesh, - phi, - tmp > - ( - new linear(mesh) - ) - ).fvcDiv(phi, TE) - - - DT* - fv::gaussLaplacianScheme(mesh) - .fvcLaplacian - ( - TE - ) - + DT*(gradT & gradT) - )*L/(mag(U) + DT/L) - ) - ) - ); - - momError.boundaryField() = 0.0; - momError.write(); - } - else - { - Info<< " No T or U" << endl; - } - - Info<< endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index e0635ddb6e..14c5e10a3e 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -19,7 +19,6 @@ EXE_LIBS = \ -ldynamicMesh \ -ledgeMesh \ -lengine \ - -lerrorEstimation \ -lextrudeModel \ -lfieldFunctionObjects \ -lfileFormats \