diff --git a/src/finiteVolume/cfdTools/general/include/checkRadiationModel.H b/applications/solvers/basic/thermoFoam/checkRadiationModel.H similarity index 100% rename from src/finiteVolume/cfdTools/general/include/checkRadiationModel.H rename to applications/solvers/basic/thermoFoam/checkRadiationModel.H diff --git a/src/finiteVolume/cfdTools/general/include/meshCourantNo.H b/applications/solvers/lagrangian/denseParticleFoam/meshCourantNo.H similarity index 96% rename from src/finiteVolume/cfdTools/general/include/meshCourantNo.H rename to applications/solvers/lagrangian/denseParticleFoam/meshCourantNo.H index f8eea4c242..9f3dd4df71 100644 --- a/src/finiteVolume/cfdTools/general/include/meshCourantNo.H +++ b/applications/solvers/lagrangian/denseParticleFoam/meshCourantNo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/finiteVolume/cfdTools/incompressible/createUfIfPresent.H b/applications/solvers/multiphase/cavitatingFoam/createUfIfPresent.H similarity index 96% rename from src/finiteVolume/cfdTools/incompressible/createUfIfPresent.H rename to applications/solvers/multiphase/cavitatingFoam/createUfIfPresent.H index d027eb46bc..610411c970 100644 --- a/src/finiteVolume/cfdTools/incompressible/createUfIfPresent.H +++ b/applications/solvers/multiphase/cavitatingFoam/createUfIfPresent.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/finiteVolume/cfdTools/general/include/gh.H b/applications/solvers/multiphase/driftFluxFoam/gh.H similarity index 100% rename from src/finiteVolume/cfdTools/general/include/gh.H rename to applications/solvers/multiphase/driftFluxFoam/gh.H diff --git a/src/finiteVolume/cfdTools/general/include/readhRef.H b/applications/solvers/multiphase/driftFluxFoam/readhRef.H similarity index 100% rename from src/finiteVolume/cfdTools/general/include/readhRef.H rename to applications/solvers/multiphase/driftFluxFoam/readhRef.H diff --git a/src/finiteVolume/cfdTools/compressible/compressibleContinuityErrs.H b/src/finiteVolume/cfdTools/compressible/compressibleContinuityErrs.H deleted file mode 100644 index 41fdb45941..0000000000 --- a/src/finiteVolume/cfdTools/compressible/compressibleContinuityErrs.H +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ 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 . - -Global - continuityErrs - -Description - Calculates and prints the continuity errors. - -\*---------------------------------------------------------------------------*/ - -{ - dimensionedScalar totalMass = fvc::domainIntegrate(rho); - - scalar sumLocalContErr = - (fvc::domainIntegrate(mag(rho - thermo.rho()))/totalMass).value(); - - scalar globalContErr = - (fvc::domainIntegrate(rho - thermo.rho())/totalMass).value(); - - cumulativeContErr += globalContErr; - - Info<< "time step continuity errors : sum local = " << sumLocalContErr - << ", global = " << globalContErr - << ", cumulative = " << cumulativeContErr - << endl; -} - -// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/compressible/createRhoUf.H b/src/finiteVolume/cfdTools/compressible/createRhoUf.H deleted file mode 100644 index 2fca47984b..0000000000 --- a/src/finiteVolume/cfdTools/compressible/createRhoUf.H +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation - \\/ 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 . - -Global - createRhoUf - -Description - Creates and initialises the velocity velocity field rhoUf. - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Info<< "Reading/calculating face velocity rhoUf\n" << endl; - -surfaceVectorField rhoUf -( - IOobject - ( - "rhoUf", - runTime.name(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - fvc::interpolate(rho*U) -); - - -// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/compressible/createRhoUfIfPresent.H b/src/finiteVolume/cfdTools/compressible/createRhoUfIfPresent.H deleted file mode 100644 index 5537ac81e9..0000000000 --- a/src/finiteVolume/cfdTools/compressible/createRhoUfIfPresent.H +++ /dev/null @@ -1,54 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation - \\/ 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 . - -Global - createRhoUfIfPresent - -Description - Creates and initialises the velocity field rhoUf if required. - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -autoPtr rhoUf; - -if (mesh.dynamic()) -{ - Info<< "Constructing face momentum rhoUf" << endl; - - rhoUf = new surfaceVectorField - ( - IOobject - ( - "rhoUf", - runTime.name(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - fvc::interpolate(rho*U) - ); -} - -// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/compressible/updateRhoUf.H b/src/finiteVolume/cfdTools/compressible/updateRhoUf.H deleted file mode 100644 index aa228e09e2..0000000000 --- a/src/finiteVolume/cfdTools/compressible/updateRhoUf.H +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation - \\/ 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 . - -Global - updateRhoUf - -Description - Constructs the face momentum field rhoUf if not already constructed. - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#error Remove rhoUpdateUf.H - -// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H b/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H deleted file mode 100644 index 475cb4c194..0000000000 --- a/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H +++ /dev/null @@ -1,19 +0,0 @@ -if (!isA(k_.boundaryField()[patchi])) -{ - FatalErrorInFunction - << k_.boundaryField()[patchi].type() - << " is the wrong k patchField type for wall-functions on patch " - << curPatch.name() << nl - << " should be zeroGradient" - << exit(FatalError); -} - -if (!isA(epsilon_.boundaryField()[patchi])) -{ - FatalErrorInFunction - << epsilon_.boundaryField()[patchi].type() - << " is the wrong epsilon patchField type for wall-functions on patch " - << curPatch.name() << nl - << " should be zeroGradient" - << exit(FatalError); -} diff --git a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H deleted file mode 100644 index 5d4f3f6dc5..0000000000 --- a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H +++ /dev/null @@ -1,26 +0,0 @@ -bool LTS = fv::localEulerDdt::enabled(mesh); - -tmp trDeltaT; - -if (LTS) -{ - Info<< "Using LTS" << endl; - - trDeltaT = tmp - ( - new volScalarField - ( - IOobject - ( - fv::localEulerDdt::rDeltaTName, - runTime.name(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedScalar(dimless/dimTime, 1), - extrapolatedCalculatedFvPatchScalarField::typeName - ) - ); -} diff --git a/src/finiteVolume/cfdTools/general/include/readpRef.H b/src/finiteVolume/cfdTools/general/include/readpRef.H deleted file mode 100644 index 9a4f0bd195..0000000000 --- a/src/finiteVolume/cfdTools/general/include/readpRef.H +++ /dev/null @@ -1,13 +0,0 @@ - Info<< "\nReading pRef" << endl; - uniformDimensionedScalarField pRef - ( - IOobject - ( - "pRef", - runTime.constant(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::NO_WRITE - ), - dimensionedScalar(dimPressure, 0) - ); diff --git a/src/finiteVolume/cfdTools/incompressible/createPhiv.H b/src/finiteVolume/cfdTools/incompressible/createPhiv.H deleted file mode 100644 index ea9f45e6ec..0000000000 --- a/src/finiteVolume/cfdTools/incompressible/createPhiv.H +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation - \\/ 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 . - -Global - createPhi - -Description - Creates and initialises the face-flux field phiv. - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Info<< "Reading/calculating face flux field phiv\n" << endl; - -surfaceScalarField phiv -( - IOobject - ( - "phiv", - runTime.name(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - flux(U) -); - - -// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/incompressible/createUf.H b/src/finiteVolume/cfdTools/incompressible/createUf.H deleted file mode 100644 index bd6511ee9b..0000000000 --- a/src/finiteVolume/cfdTools/incompressible/createUf.H +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation - \\/ 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 . - -Global - createUf - -Description - Creates and initialises the velocity velocity field Uf. - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Info<< "Reading/calculating face velocity Uf\n" << endl; - -surfaceVectorField Uf -( - IOobject - ( - "Uf", - runTime.name(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - fvc::interpolate(U) -); - - -// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/incompressible/movingMeshContinuityErrs.H b/src/finiteVolume/cfdTools/incompressible/movingMeshContinuityErrs.H deleted file mode 100644 index c33ff66007..0000000000 --- a/src/finiteVolume/cfdTools/incompressible/movingMeshContinuityErrs.H +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ 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 . - -Global - movingMeshContinuityErrs - -Description - Calculates and prints the continuity errors for moving mesh calculation. - -\*---------------------------------------------------------------------------*/ - -{ - volScalarField contErr = fvc::div(phi + fvc::meshPhi(U)); - - scalar sumLocalContErr = runTime.deltaTValue()* - mag(contErr)().weightedAverage(mesh.V()).value(); - - scalar globalContErr = runTime.deltaTValue()* - contErr.weightedAverage(mesh.V()).value(); - - cumulativeContErr += globalContErr; - - Info<< "time step continuity errors : sum local = " << sumLocalContErr - << ", global = " << globalContErr - << ", cumulative = " << cumulativeContErr - << endl; -} - -// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H b/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H deleted file mode 100644 index 067a455be9..0000000000 --- a/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H +++ /dev/null @@ -1,54 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ 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 . - -Global - movingMeshContinuityErrs - -Description - Calculates and prints the continuity errors for moving mesh calculation. - -\*---------------------------------------------------------------------------*/ - -if (mesh.moving()) -{ - scalar sumLocalContErr = runTime.deltaTValue()* - mag(fvc::div(phi + fvc::meshPhi(rho, U)))() - .weightedAverage(mesh.V()).value(); - - scalar globalContErr = runTime.deltaTValue()* - fvc::div(phi + fvc::meshPhi(rho, U))() - .weightedAverage(mesh.V()).value(); - - cumulativeContErr += globalContErr; - - Info<< "time step continuity errors : sum local = " << sumLocalContErr - << ", global = " << globalContErr - << ", cumulative = " << cumulativeContErr - << endl; -} -else -{ - #include "continuityErrs.H" -} - -// ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/incompressible/updateUf.H b/src/finiteVolume/cfdTools/incompressible/updateUf.H deleted file mode 100644 index a402b49a43..0000000000 --- a/src/finiteVolume/cfdTools/incompressible/updateUf.H +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation - \\/ 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 . - -Global - updateUf - -Description - Constructs the face velocity field Uf if not already constructed. - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#error Remove updateUf.H - -// ************************************************************************* //