From d4d0b88988f0660ba1a28612c4bdc9856a9f51ab Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 7 Apr 2010 15:40:52 +0100 Subject: [PATCH 1/2] fvData: New database (dictionary) held on the fvMesh to store residual information etc. This data can be used for convergence testing e.g. by a functionObject. Other data could also be stored, e.g. global continuity errors and other reduced results. --- .../compressible/rhoPorousSimpleFoam/UEqn.H | 7 +--- .../rhoPorousSimpleFoam/convergenceCheck.H | 9 ----- .../compressible/rhoPorousSimpleFoam/hEqn.H | 3 +- .../initConvergenceCheck.H | 7 ---- .../compressible/rhoPorousSimpleFoam/pEqn.H | 3 +- .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 3 -- .../solvers/compressible/rhoSimpleFoam/UEqn.H | 7 +--- .../rhoSimpleFoam/convergenceCheck.H | 9 ----- .../solvers/compressible/rhoSimpleFoam/hEqn.H | 3 +- .../rhoSimpleFoam/initConvergenceCheck.H | 7 ---- .../solvers/compressible/rhoSimpleFoam/pEqn.H | 6 ++-- .../rhoSimpleFoam/rhoSimpleFoam.C | 3 -- .../compressible/rhoSimplecFoam/UEqn.H | 7 +--- .../compressible/rhoSimplecFoam/hEqn.H | 3 +- .../compressible/rhoSimplecFoam/pEqn.H | 6 ++-- .../rhoSimplecFoam/rhoSimplecFoam.C | 3 -- .../buoyantBoussinesqSimpleFoam/TEqn.H | 3 +- .../buoyantBoussinesqSimpleFoam/UEqn.H | 6 ++-- .../buoyantBoussinesqSimpleFoam.C | 3 -- .../convergenceCheck.H | 9 ----- .../initConvergenceCheck.H | 7 ---- .../buoyantBoussinesqSimpleFoam/pEqn.H | 3 +- .../heatTransfer/buoyantSimpleFoam/UEqn.H | 6 ++-- .../buoyantSimpleFoam/buoyantSimpleFoam.C | 3 -- .../buoyantSimpleFoam/convergenceCheck.H | 9 ----- .../heatTransfer/buoyantSimpleFoam/hEqn.H | 3 +- .../buoyantSimpleFoam/initConvergenceCheck.H | 7 ---- .../heatTransfer/buoyantSimpleFoam/pEqn.H | 3 +- .../buoyantSimpleRadiationFoam.C | 3 -- .../buoyantSimpleRadiationFoam/hEqn.H | 3 +- .../chtMultiRegionSimpleFoam.C | 4 --- .../chtMultiRegionSimpleFoam/fluid/UEqn.H | 6 ++-- .../fluid/convergenceCheck.H | 12 ------- .../chtMultiRegionSimpleFoam/fluid/hEqn.H | 3 +- .../fluid/initConvergenceCheck.H | 7 ---- .../chtMultiRegionSimpleFoam/fluid/pEqn.H | 3 +- .../solid/solveSolid.H | 4 +-- .../incompressible/porousSimpleFoam/UEqn.H | 7 +--- .../incompressible/porousSimpleFoam/pEqn.H | 3 +- .../porousSimpleFoam/porousSimpleFoam.C | 3 -- .../solvers/incompressible/simpleFoam/UEqn.H | 7 +--- .../simpleFoam/convergenceCheck.H | 9 ----- .../simpleFoam/initConvergenceCheck.H | 7 ---- .../solvers/incompressible/simpleFoam/pEqn.H | 3 +- .../incompressible/simpleFoam/simpleFoam.C | 3 -- .../matrices/lduMatrix/lduMatrix/lduMatrix.H | 11 ++++++- .../lduMatrix/lduMatrix/lduMatrixTests.C | 33 +++++++++++++++++++ src/finiteVolume/Make/files | 1 + .../fvMatrices/fvMatrix/fvMatrixSolve.C | 3 ++ .../fvScalarMatrix/fvScalarMatrix.C | 4 +++ src/finiteVolume/fvMesh/fvMesh.C | 9 +++++ src/finiteVolume/fvMesh/fvMesh.H | 8 ++++- .../surfaceInterpolation.C | 2 -- .../surfaceInterpolation.H | 5 --- 54 files changed, 96 insertions(+), 215 deletions(-) delete mode 100644 applications/solvers/compressible/rhoPorousSimpleFoam/convergenceCheck.H delete mode 100644 applications/solvers/compressible/rhoPorousSimpleFoam/initConvergenceCheck.H delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/convergenceCheck.H delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/initConvergenceCheck.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/convergenceCheck.H delete mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/initConvergenceCheck.H delete mode 100644 applications/solvers/heatTransfer/buoyantSimpleFoam/convergenceCheck.H delete mode 100644 applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/convergenceCheck.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/initConvergenceCheck.H delete mode 100644 applications/solvers/incompressible/simpleFoam/convergenceCheck.H delete mode 100644 applications/solvers/incompressible/simpleFoam/initConvergenceCheck.H diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H index 5460944288..fd79c8400e 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H @@ -34,12 +34,7 @@ { pZones.addResistance(UEqn()); - eqnResidual = solve - ( - UEqn() == -fvc::grad(p) - ). initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + solve(UEqn() == -fvc::grad(p)); trAU = 1.0/UEqn().A(); trAU().rename("rAU"); diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/convergenceCheck.H b/applications/solvers/compressible/rhoPorousSimpleFoam/convergenceCheck.H deleted file mode 100644 index 8958063193..0000000000 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/convergenceCheck.H +++ /dev/null @@ -1,9 +0,0 @@ -// check convergence - -if (maxResidual < convergenceCriterion) -{ - Info<< "reached convergence criterion: " << convergenceCriterion << endl; - runTime.writeAndEnd(); - Info<< "latestTime = " << runTime.timeName() << endl; -} - diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H index f33843b48f..9e5138de8a 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H @@ -13,8 +13,7 @@ hEqn.relax(); - eqnResidual = hEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + hEqn.solve(); thermo.correct(); } diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/initConvergenceCheck.H b/applications/solvers/compressible/rhoPorousSimpleFoam/initConvergenceCheck.H deleted file mode 100644 index b56197f22a..0000000000 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/initConvergenceCheck.H +++ /dev/null @@ -1,7 +0,0 @@ -// initialize values for convergence checks - - scalar eqnResidual = 1, maxResidual = 0; - scalar convergenceCriterion = 0; - - simple.readIfPresent("convergence", convergenceCriterion); - diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H index 4d8e010f7e..40b7cb3969 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H @@ -29,8 +29,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) // retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = tpEqn().solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + tpEqn().solve(); } else { diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index a575509b57..bab9d323bb 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" p.storePrevIter(); rho.storePrevIter(); @@ -72,8 +71,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H index 401e1203d2..21ec2646be 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H @@ -8,9 +8,4 @@ UEqn().relax(); - eqnResidual = solve - ( - UEqn() == -fvc::grad(p) - ).initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + solve(UEqn() == -fvc::grad(p)); diff --git a/applications/solvers/compressible/rhoSimpleFoam/convergenceCheck.H b/applications/solvers/compressible/rhoSimpleFoam/convergenceCheck.H deleted file mode 100644 index 8958063193..0000000000 --- a/applications/solvers/compressible/rhoSimpleFoam/convergenceCheck.H +++ /dev/null @@ -1,9 +0,0 @@ -// check convergence - -if (maxResidual < convergenceCriterion) -{ - Info<< "reached convergence criterion: " << convergenceCriterion << endl; - runTime.writeAndEnd(); - Info<< "latestTime = " << runTime.timeName() << endl; -} - diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H index 57395e977e..e6c74938ee 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H @@ -11,8 +11,7 @@ hEqn.relax(); - eqnResidual = hEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + hEqn.solve(); thermo.correct(); } diff --git a/applications/solvers/compressible/rhoSimpleFoam/initConvergenceCheck.H b/applications/solvers/compressible/rhoSimpleFoam/initConvergenceCheck.H deleted file mode 100644 index b56197f22a..0000000000 --- a/applications/solvers/compressible/rhoSimpleFoam/initConvergenceCheck.H +++ /dev/null @@ -1,7 +0,0 @@ -// initialize values for convergence checks - - scalar eqnResidual = 1, maxResidual = 0; - scalar convergenceCriterion = 0; - - simple.readIfPresent("convergence", convergenceCriterion); - diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H index 329ebbd27f..f43ec6cf62 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H @@ -33,8 +33,7 @@ if (transonic) // Retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = pEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + pEqn.solve(); } else { @@ -64,8 +63,7 @@ else // Retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = pEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + pEqn.solve(); } else { diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index 63c59fd1aa..96eef63121 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" p.storePrevIter(); rho.storePrevIter(); @@ -72,8 +71,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/applications/solvers/compressible/rhoSimplecFoam/UEqn.H b/applications/solvers/compressible/rhoSimplecFoam/UEqn.H index 401e1203d2..21ec2646be 100644 --- a/applications/solvers/compressible/rhoSimplecFoam/UEqn.H +++ b/applications/solvers/compressible/rhoSimplecFoam/UEqn.H @@ -8,9 +8,4 @@ UEqn().relax(); - eqnResidual = solve - ( - UEqn() == -fvc::grad(p) - ).initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + solve(UEqn() == -fvc::grad(p)); diff --git a/applications/solvers/compressible/rhoSimplecFoam/hEqn.H b/applications/solvers/compressible/rhoSimplecFoam/hEqn.H index 8ac1c9f510..bec9ed3ae0 100644 --- a/applications/solvers/compressible/rhoSimplecFoam/hEqn.H +++ b/applications/solvers/compressible/rhoSimplecFoam/hEqn.H @@ -11,8 +11,7 @@ hEqn.relax(); - eqnResidual = hEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + hEqn.solve(); thermo.correct(); diff --git a/applications/solvers/compressible/rhoSimplecFoam/pEqn.H b/applications/solvers/compressible/rhoSimplecFoam/pEqn.H index cd3ae5ff1f..a0f17e78bc 100644 --- a/applications/solvers/compressible/rhoSimplecFoam/pEqn.H +++ b/applications/solvers/compressible/rhoSimplecFoam/pEqn.H @@ -41,8 +41,7 @@ if (transonic) // Retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = pEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + pEqn.solve(); } else { @@ -75,8 +74,7 @@ else // Retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = pEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + pEqn.solve(); } else { diff --git a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C index e87091db81..dd05bf88aa 100644 --- a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C +++ b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C @@ -55,7 +55,6 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" p.storePrevIter(); @@ -78,8 +77,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H index 7452a0495a..3bdeea0452 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H @@ -14,8 +14,7 @@ TEqn.relax(); - eqnResidual = TEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + TEqn.solve(); rhok = 1.0 - beta*(T - TRef); } diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H index bcf99e1668..292f44b4bd 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H @@ -8,7 +8,7 @@ UEqn().relax(); - eqnResidual = solve + solve ( UEqn() == @@ -19,6 +19,4 @@ - fvc::snGrad(p)*mesh.magSf() ) ) - ).initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + ); diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C index 5ed588edde..f10d18c512 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C @@ -69,7 +69,6 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" p.storePrevIter(); @@ -87,8 +86,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/convergenceCheck.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/convergenceCheck.H deleted file mode 100644 index 8958063193..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/convergenceCheck.H +++ /dev/null @@ -1,9 +0,0 @@ -// check convergence - -if (maxResidual < convergenceCriterion) -{ - Info<< "reached convergence criterion: " << convergenceCriterion << endl; - runTime.writeAndEnd(); - Info<< "latestTime = " << runTime.timeName() << endl; -} - diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/initConvergenceCheck.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/initConvergenceCheck.H deleted file mode 100644 index b56197f22a..0000000000 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/initConvergenceCheck.H +++ /dev/null @@ -1,7 +0,0 @@ -// initialize values for convergence checks - - scalar eqnResidual = 1, maxResidual = 0; - scalar convergenceCriterion = 0; - - simple.readIfPresent("convergence", convergenceCriterion); - diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H index 6408c7ccc8..9b23330944 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H @@ -24,8 +24,7 @@ // retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = pEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + pEqn.solve(); } else { diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H index 0170d6e384..5609883607 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H @@ -8,7 +8,7 @@ UEqn().relax(); - eqnResidual = solve + solve ( UEqn() == @@ -17,6 +17,4 @@ fvc::interpolate(rho)*(g & mesh.Sf()) - fvc::snGrad(p)*mesh.magSf() ) - ).initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + ); diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index c3a27c13c2..dd33d3ec07 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" p.storePrevIter(); rho.storePrevIter(); @@ -73,8 +72,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/convergenceCheck.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/convergenceCheck.H deleted file mode 100644 index 8958063193..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/convergenceCheck.H +++ /dev/null @@ -1,9 +0,0 @@ -// check convergence - -if (maxResidual < convergenceCriterion) -{ - Info<< "reached convergence criterion: " << convergenceCriterion << endl; - runTime.writeAndEnd(); - Info<< "latestTime = " << runTime.timeName() << endl; -} - diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H index 0c507ce3d1..b91a17ee7c 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H @@ -11,8 +11,7 @@ hEqn.relax(); - eqnResidual = hEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + hEqn.solve(); thermo.correct(); } diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H deleted file mode 100644 index c920b6708d..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H +++ /dev/null @@ -1,7 +0,0 @@ - // initialize values for convergence checks - - scalar eqnResidual = 1, maxResidual = 0; - scalar convergenceCriterion = 0; - - simple.readIfPresent("convergence", convergenceCriterion); - diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H index 11768ea2f6..b0aa0852b2 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H @@ -26,8 +26,7 @@ // retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = pEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + pEqn.solve(); } else { diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C index f3cd688add..7e6d74b98d 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" p.storePrevIter(); rho.storePrevIter(); @@ -76,8 +75,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H index 24b17645d2..57de44e4a0 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H +++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H @@ -12,8 +12,7 @@ hEqn.relax(); - eqnResidual = hEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + hEqn.solve(); thermo.correct(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C index 7474f7d1c7..927bd8124d 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C @@ -64,9 +64,7 @@ int main(int argc, char *argv[]) << fluidRegions[i].name() << endl; #include "setRegionFluidFields.H" #include "readFluidMultiRegionSIMPLEControls.H" - #include "initConvergenceCheck.H" #include "solveFluid.H" - #include "convergenceCheck.H" } forAll(solidRegions, i) @@ -75,9 +73,7 @@ int main(int argc, char *argv[]) << solidRegions[i].name() << endl; #include "setRegionSolidFields.H" #include "readSolidMultiRegionSIMPLEControls.H" - #include "initConvergenceCheck.H" #include "solveSolid.H" - #include "convergenceCheck.H" } runTime.write(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/UEqn.H index 7f317cc2e6..d5ae07ff9b 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/UEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/UEqn.H @@ -7,7 +7,7 @@ UEqn().relax(); - eqnResidual = solve + solve ( UEqn() == @@ -16,6 +16,4 @@ fvc::interpolate(rho)*(g & mesh.Sf()) - fvc::snGrad(p)*mesh.magSf() ) - ).initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + ); diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/convergenceCheck.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/convergenceCheck.H deleted file mode 100644 index 53c00386ff..0000000000 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/convergenceCheck.H +++ /dev/null @@ -1,12 +0,0 @@ -// check convergence -Info<< "maxResidual: " << maxResidual - << " convergence criterion: " << convergenceCriterion - << endl; - -if (maxResidual < convergenceCriterion) -{ - Info<< "reached convergence criterion: " << convergenceCriterion << endl; - runTime.writeAndEnd(); - Info<< "latestTime = " << runTime.timeName() << endl; -} - diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/hEqn.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/hEqn.H index ccd6615990..cef0122928 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/hEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/hEqn.H @@ -11,8 +11,7 @@ hEqn.relax(); - eqnResidual = hEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + hEqn.solve(); thermo.correct(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/initConvergenceCheck.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/initConvergenceCheck.H deleted file mode 100644 index c920b6708d..0000000000 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/initConvergenceCheck.H +++ /dev/null @@ -1,7 +0,0 @@ - // initialize values for convergence checks - - scalar eqnResidual = 1, maxResidual = 0; - scalar convergenceCriterion = 0; - - simple.readIfPresent("convergence", convergenceCriterion); - diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H index 6b6fe6ef5d..9462dc2c39 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H @@ -29,8 +29,7 @@ // retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = pEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + pEqn.solve(); } else { diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H index 7cf2cc1409..4e2a2c7b19 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H +++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H @@ -6,9 +6,7 @@ -fvm::laplacian(K, T) ); tEqn.relax(); - eqnResidual = tEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); - + tEqn.solve(); } Info<< "Min/max T:" << min(T).value() << ' ' diff --git a/applications/solvers/incompressible/porousSimpleFoam/UEqn.H b/applications/solvers/incompressible/porousSimpleFoam/UEqn.H index 688120809a..9cbcd61291 100644 --- a/applications/solvers/incompressible/porousSimpleFoam/UEqn.H +++ b/applications/solvers/incompressible/porousSimpleFoam/UEqn.H @@ -34,12 +34,7 @@ { pZones.addResistance(UEqn()); - eqnResidual = solve - ( - UEqn() == -fvc::grad(p) - ). initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + solve(UEqn() == -fvc::grad(p)); trAU = 1.0/UEqn().A(); trAU().rename("rAU"); diff --git a/applications/solvers/incompressible/porousSimpleFoam/pEqn.H b/applications/solvers/incompressible/porousSimpleFoam/pEqn.H index e6797cd860..a97ff3983c 100644 --- a/applications/solvers/incompressible/porousSimpleFoam/pEqn.H +++ b/applications/solvers/incompressible/porousSimpleFoam/pEqn.H @@ -28,8 +28,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) // retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = tpEqn().solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + tpEqn().solve(); } else { diff --git a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C index 7316b98d2a..0c4701d01b 100644 --- a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C +++ b/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" p.storePrevIter(); @@ -71,8 +70,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H index eb40b7665b..e6fb6bf89e 100644 --- a/applications/solvers/incompressible/simpleFoam/UEqn.H +++ b/applications/solvers/incompressible/simpleFoam/UEqn.H @@ -8,9 +8,4 @@ UEqn().relax(); - eqnResidual = solve - ( - UEqn() == -fvc::grad(p) - ).initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + solve(UEqn() == -fvc::grad(p)); diff --git a/applications/solvers/incompressible/simpleFoam/convergenceCheck.H b/applications/solvers/incompressible/simpleFoam/convergenceCheck.H deleted file mode 100644 index 8958063193..0000000000 --- a/applications/solvers/incompressible/simpleFoam/convergenceCheck.H +++ /dev/null @@ -1,9 +0,0 @@ -// check convergence - -if (maxResidual < convergenceCriterion) -{ - Info<< "reached convergence criterion: " << convergenceCriterion << endl; - runTime.writeAndEnd(); - Info<< "latestTime = " << runTime.timeName() << endl; -} - diff --git a/applications/solvers/incompressible/simpleFoam/initConvergenceCheck.H b/applications/solvers/incompressible/simpleFoam/initConvergenceCheck.H deleted file mode 100644 index b56197f22a..0000000000 --- a/applications/solvers/incompressible/simpleFoam/initConvergenceCheck.H +++ /dev/null @@ -1,7 +0,0 @@ -// initialize values for convergence checks - - scalar eqnResidual = 1, maxResidual = 0; - scalar convergenceCriterion = 0; - - simple.readIfPresent("convergence", convergenceCriterion); - diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H index 207c514d44..91f4e1a140 100644 --- a/applications/solvers/incompressible/simpleFoam/pEqn.H +++ b/applications/solvers/incompressible/simpleFoam/pEqn.H @@ -18,8 +18,7 @@ // retain the residual from the first iteration if (nonOrth == 0) { - eqnResidual = pEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); + pEqn.solve(); } else { diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C index 4cc93af9c3..2c3abb4622 100644 --- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C @@ -52,7 +52,6 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" p.storePrevIter(); @@ -69,8 +68,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H index 0dee351858..b96925a91b 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H @@ -102,6 +102,7 @@ public: // Constructors + //- Construct null solverPerformance() : initialResidual_(0), @@ -111,7 +112,7 @@ public: singular_(false) {} - + //- Construct from components solverPerformance ( const word& solverName, @@ -132,6 +133,9 @@ public: singular_(singular) {} + //- Construct from Istream + solverPerformance(Istream&); + // Member functions @@ -204,6 +208,11 @@ public: //- Print summary of solver performance void print() const; + + + // Ostream Operator + + friend Ostream& operator<<(Ostream&, const solverPerformance&); }; diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C index f625970e7c..c1fafc95ec 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C @@ -30,6 +30,20 @@ Description // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +Foam::lduMatrix::solverPerformance::solverPerformance(Istream& is) +{ + is.readBeginList("lduMatrix::solverPerformance"); + is >> solverName_ + >> fieldName_ + >> initialResidual_ + >> finalResidual_ + >> noIterations_ + >> converged_ + >> singular_; + is.readEndList("lduMatrix::solverPerformance"); +} + + bool Foam::lduMatrix::solverPerformance::checkConvergence ( const scalar Tolerance, @@ -104,4 +118,23 @@ void Foam::lduMatrix::solverPerformance::print() const } +Foam::Ostream& Foam::operator<< +( + Ostream& os, + const Foam::lduMatrix::solverPerformance& sp +) +{ + os << token::BEGIN_LIST + << sp.solverName_ << token::SPACE + << sp.fieldName_ << token::SPACE + << sp.initialResidual_ << token::SPACE + << sp.finalResidual_ << token::SPACE + << sp.noIterations_ << token::SPACE + << sp.converged_ << token::SPACE + << sp.singular_ << token::SPACE + << token::END_LIST; + + return os; +} + // ************************************************************************* // diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index 9101558af3..fecd16bd4e 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -262,6 +262,7 @@ $(multivariateSchemes)/limitedCubic/multivariateLimitedCubic.C finiteVolume/fv/fv.C finiteVolume/fvSchemes/fvSchemes.C +finiteVolume/fvData/fvData.C ddtSchemes = finiteVolume/ddtSchemes $(ddtSchemes)/ddtScheme/ddtSchemes.C diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C index d5112e6461..aa3fe8dd3f 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C @@ -164,6 +164,8 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix::solve psi.correctBoundaryConditions(); + psi.mesh().setSolverPerformance(psi.name(), solverPerfVec); + return solverPerfVec; } @@ -175,6 +177,7 @@ Foam::fvMatrix::solver() return solver(psi_.mesh().solverDict(psi_.name())); } + template Foam::lduMatrix::solverPerformance Foam::fvMatrix::fvSolver::solve() { diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C index fc40b11bca..e1a7ba578b 100644 --- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C +++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C @@ -123,6 +123,8 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix::fvSolver::solve psi.correctBoundaryConditions(); + psi.mesh().setSolverPerformance(psi.name(), solverPerf); + return solverPerf; } @@ -166,6 +168,8 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix::solve psi.correctBoundaryConditions(); + psi.mesh().setSolverPerformance(psi.name(), solverPerf); + return solverPerf; } diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C index b346e6f3dc..f821234b64 100644 --- a/src/finiteVolume/fvMesh/fvMesh.C +++ b/src/finiteVolume/fvMesh/fvMesh.C @@ -151,6 +151,9 @@ Foam::fvMesh::fvMesh(const IOobject& io) : polyMesh(io), surfaceInterpolation(*this), + fvSchemes(static_cast(*this)), + fvSolution(static_cast(*this)), + fvData(static_cast(*this)), boundary_(*this, boundaryMesh()), lduPtr_(NULL), curTimeIndex_(time().timeIndex()), @@ -243,6 +246,9 @@ Foam::fvMesh::fvMesh : polyMesh(io, points, faces, allOwner, allNeighbour, syncPar), surfaceInterpolation(*this), + fvSchemes(static_cast(*this)), + fvSolution(static_cast(*this)), + fvData(static_cast(*this)), boundary_(*this), lduPtr_(NULL), curTimeIndex_(time().timeIndex()), @@ -273,6 +279,9 @@ Foam::fvMesh::fvMesh : polyMesh(io, points, faces, cells, syncPar), surfaceInterpolation(*this), + fvSchemes(static_cast(*this)), + fvSolution(static_cast(*this)), + fvData(static_cast(*this)), boundary_(*this), lduPtr_(NULL), curTimeIndex_(time().timeIndex()), diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H index db5ec3396d..772c30cf9a 100644 --- a/src/finiteVolume/fvMesh/fvMesh.H +++ b/src/finiteVolume/fvMesh/fvMesh.H @@ -52,6 +52,9 @@ SourceFiles #include "primitiveMesh.H" #include "fvBoundaryMesh.H" #include "surfaceInterpolation.H" +#include "fvSchemes.H" +#include "fvSolution.H" +#include "fvData.H" #include "DimensionedField.H" #include "volFieldsFwd.H" #include "surfaceFieldsFwd.H" @@ -77,7 +80,10 @@ class fvMesh : public polyMesh, public lduMesh, - public surfaceInterpolation + public surfaceInterpolation, + public fvSchemes, + public fvSolution, + public fvData { // Private data diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C index 55721c99b7..b434dd752d 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C @@ -57,8 +57,6 @@ void surfaceInterpolation::clearOut() surfaceInterpolation::surfaceInterpolation(const fvMesh& fvm) : - fvSchemes(static_cast(fvm)), - fvSolution(static_cast(fvm)), mesh_(fvm), weightingFactors_(NULL), differenceFactors_(NULL), diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H index 778e6d4169..d3380c1c1c 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H @@ -37,8 +37,6 @@ SourceFiles #include "tmp.H" #include "scalar.H" -#include "fvSchemes.H" -#include "fvSolution.H" #include "volFieldsFwd.H" #include "surfaceFieldsFwd.H" #include "className.H" @@ -53,9 +51,6 @@ namespace Foam \*---------------------------------------------------------------------------*/ class surfaceInterpolation -: - public fvSchemes, - public fvSolution { // Private data From 9a22d7fa77d27ce60882d22df8960470676f5f2c Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 7 Apr 2010 15:42:19 +0100 Subject: [PATCH 2/2] fvData: should have been part of the last commit. --- src/finiteVolume/finiteVolume/fvData/fvData.C | 72 ++++++++++++ src/finiteVolume/finiteVolume/fvData/fvData.H | 103 ++++++++++++++++++ 2 files changed, 175 insertions(+) create mode 100644 src/finiteVolume/finiteVolume/fvData/fvData.C create mode 100644 src/finiteVolume/finiteVolume/fvData/fvData.H diff --git a/src/finiteVolume/finiteVolume/fvData/fvData.C b/src/finiteVolume/finiteVolume/fvData/fvData.C new file mode 100644 index 0000000000..e662c3d394 --- /dev/null +++ b/src/finiteVolume/finiteVolume/fvData/fvData.C @@ -0,0 +1,72 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2009 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 . + +\*---------------------------------------------------------------------------*/ + +#include "fvData.H" +#include "Time.H" +#include "lduMatrix.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +int Foam::fvData::debug(Foam::debug::debugSwitch("fvData", false)); + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::fvData::fvData(const objectRegistry& obr) +: + IOdictionary + ( + IOobject + ( + "fvData", + obr.time().system(), + obr, + IOobject::NO_READ, + IOobject::NO_WRITE + ) + ) +{ + set("solverPerformance", dictionary()); +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +const Foam::dictionary& Foam::fvData::solverPerformanceDict() const +{ + return subDict("solverPerformance"); +} + + +void Foam::fvData::setSolverPerformance +( + const word& name, + const lduMatrix::solverPerformance& sp +) const +{ + const_cast(solverPerformanceDict()).set(name, sp); +} + + +// ************************************************************************* // diff --git a/src/finiteVolume/finiteVolume/fvData/fvData.H b/src/finiteVolume/finiteVolume/fvData/fvData.H new file mode 100644 index 0000000000..ab6c27e33b --- /dev/null +++ b/src/finiteVolume/finiteVolume/fvData/fvData.H @@ -0,0 +1,103 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2009 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 . + +Class + Foam::fvData + +Description + Database for finite volume solution data, solver performance and + other reduced data. fvMesh is derived from fvData so that all fields have + access to the fvData from the mesh reference they hold. + +SourceFiles + fvData.C + +\*---------------------------------------------------------------------------*/ + +#ifndef fvData_H +#define fvData_H + +#include "IOdictionary.H" +#include "lduMatrix.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class fvData Declaration +\*---------------------------------------------------------------------------*/ + +class fvData +: + public IOdictionary +{ + // Private Member Functions + + //- Disallow default bitwise copy construct + fvData(const fvData&); + + //- Disallow default bitwise assignment + void operator=(const fvData&); + + +public: + + //- Debug switch + static int debug; + + + // Constructors + + //- Construct for objectRegistry + fvData(const objectRegistry& obr); + + + // Member Functions + + // Access + + //- Return the dictionary of solver performance data + // which includes initial and final residuals for convergence + // checking + const dictionary& solverPerformanceDict() const; + + //- Add/set the solverPerformance entry for the named field + void setSolverPerformance + ( + const word& name, + const lduMatrix::solverPerformance& + ) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* //