From af13fd66edc3addfeca2232d568f5a6075f92ae8 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 30 Nov 2012 15:34:33 +0000 Subject: [PATCH 01/17] STYLE: Minor code formatting --- src/regionModels/regionModel/regionModel/regionModel.H | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H index 9f2ec23e67..c59b8d163d 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.H +++ b/src/regionModels/regionModel/regionModel/regionModel.H @@ -52,7 +52,7 @@ namespace regionModels { /*---------------------------------------------------------------------------*\ - Class regionModel Declaration + Class regionModel Declaration \*---------------------------------------------------------------------------*/ class regionModel @@ -162,7 +162,6 @@ public: ); - //- Destructor virtual ~regionModel(); From 09141f30d77fb0f8b1e91fcd9d3988130a26f5be Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Dec 2012 11:04:54 +0000 Subject: [PATCH 02/17] ENH: Corrected spelling mistakes --- .../meshes/meshShapes/cellMatcher/cellMatcher.H | 12 ++++++------ .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H | 6 +++--- .../meshes/polyMesh/syncTools/syncToolsTemplates.C | 2 +- src/Pstream/gamma/Pstream.C | 4 ++-- src/conversion/polyDualMesh/polyDualMesh.C | 4 ++-- src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H | 4 ++-- src/dynamicMesh/meshCut/cellCuts/cellCuts.C | 12 ++++++------ .../meshModifiers/boundaryCutter/boundaryCutter.H | 6 +++--- .../meshCut/meshModifiers/meshCutter/meshCutter.H | 6 +++--- .../undoableMeshCutter/undoableMeshCutter.H | 6 +++--- src/dynamicMesh/perfectInterface/perfectInterface.C | 4 ++-- src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 2 +- .../polyTopoChange/polyTopoChange/hexRef8.C | 2 +- .../polyTopoChange/polyTopoChange/hexRef8.H | 4 ++-- src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C | 2 +- src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H | 4 ++-- .../fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C | 4 ++-- .../autoHexMesh/autoHexMeshDriver/autoLayerDriver.C | 2 +- .../autoHexMesh/autoHexMeshDriver/autoRefineDriver.C | 4 ++-- .../meshRefinement/meshRefinementBaffles.C | 2 +- .../surfaceIntersection/edgeIntersections.C | 4 ++-- .../triSurface/orientedSurface/orientedSurface.C | 4 ++-- .../triSurface/orientedSurface/orientedSurface.H | 6 +++--- src/triSurface/meshTriangulation/meshTriangulation.C | 4 ++-- .../LES/LESdeltas/smoothDelta/smoothDelta.H | 6 +++--- 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H index b623b641f9..36e6b45a1b 100644 --- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H +++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,10 +55,10 @@ Description - find most unique face shape (e.g. triangle for prism) - walk (following either vertices in face or jumping from face to other face) to other faces and checking face sizes. - - if nessecary try other rotations of this face - (only nessecary for wedge, tet-wedge) - - if nessecary try other faces which most unique face shape - (never nessecary for hex degenerates) + - if necessary try other rotations of this face + (only necessary for wedge, tet-wedge) + - if necessary try other faces which most unique face shape + (never necessary for hex degenerates) The whole calculation is done such that no lists are allocated during cell checking. E.g. localFaces_ are always sized to hold max. number @@ -94,7 +94,7 @@ class cellShape; class cellModel; /*---------------------------------------------------------------------------*\ - Class cellMatcher Declaration + Class cellMatcher Declaration \*---------------------------------------------------------------------------*/ class cellMatcher diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H index a6f388672a..2bad5824a1 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ Description cell out of face, edge or point. - can be appended: added 'out of nothing'. - All this information is nessecary to correctly map fields. + All this information is necessary to correctly map fields. \par points @@ -153,7 +153,7 @@ namespace Foam class polyMesh; /*---------------------------------------------------------------------------*\ - Class mapPolyMesh Declaration + Class mapPolyMesh Declaration \*---------------------------------------------------------------------------*/ class mapPolyMesh diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C index 4be6afcf2d..5d6364a681 100644 --- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C +++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C @@ -673,7 +673,7 @@ void Foam::syncTools::syncEdgeMap // Now sharedEdgeValues will contain per potential sharedEdge the value. - // (potential since an edge having two shared points is not nessecary a + // (potential since an edge having two shared points is not necessary a // shared edge). // Reduce this on the master. diff --git a/src/Pstream/gamma/Pstream.C b/src/Pstream/gamma/Pstream.C index 4994fe7884..8113e2b1fc 100644 --- a/src/Pstream/gamma/Pstream.C +++ b/src/Pstream/gamma/Pstream.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -151,7 +151,7 @@ static void handler(void) // Save the pointer (that gamma knows about) so we can safely // gamma_switch_to_buffer with a valid pointer. - // Not sure if nessecary but do anyway. + // Not sure if necessary but do anyway. savedBuf.transfer(buf); // Resize all the buffers diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C index 3e72254d38..9ed6be4c8f 100644 --- a/src/conversion/polyDualMesh/polyDualMesh.C +++ b/src/conversion/polyDualMesh/polyDualMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -424,7 +424,7 @@ void Foam::polyDualMesh::collectPatchInternalFace { featEdgeIndices2[i] = dualFace2.size() -1 - featEdgeIndices2[i]; } - // Reverse indices (might not be nessecary but do anyway) + // Reverse indices (might not be necessary but do anyway) reverse(featEdgeIndices2); } } diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H index eb771003a0..239671d58c 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H @@ -65,7 +65,7 @@ class mapAddedPolyMesh; class mapDistributePolyMesh; /*---------------------------------------------------------------------------*\ - Class fvMeshDistribute Declaration + Class fvMeshDistribute Declaration \*---------------------------------------------------------------------------*/ class fvMeshDistribute @@ -146,7 +146,7 @@ class fvMeshDistribute // patchI. autoPtr deleteProcPatches(const label patchI); - //- Repatch the mesh. This is only nessecary for the proc + //- Repatch the mesh. This is only necessary for the proc // boundary faces. newPatchID is over all boundary faces: -1 or // new patchID. constructFaceMap is being adapted for the // possible new face position (since proc faces get automatically diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C index 7bb9964b58..e213daebd2 100644 --- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C +++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -2720,7 +2720,7 @@ Foam::cellCuts::cellCuts calcLoopsAndAddressing(cutCells); - // Calculate planes and flip cellLoops if nessecary + // Calculate planes and flip cellLoops if necessary orientPlanesAndLoops(); if (debug) @@ -2765,7 +2765,7 @@ Foam::cellCuts::cellCuts calcLoopsAndAddressing(identity(mesh.nCells())); - // Calculate planes and flip cellLoops if nessecary + // Calculate planes and flip cellLoops if necessary orientPlanesAndLoops(); if (debug) @@ -2811,7 +2811,7 @@ Foam::cellCuts::cellCuts // Makes sure cuts are consistent setFromCellLoops(cellLabels, cellLoops, cellEdgeWeights); - // Calculate planes and flip cellLoops if nessecary + // Calculate planes and flip cellLoops if necessary orientPlanesAndLoops(); if (debug) @@ -2855,7 +2855,7 @@ Foam::cellCuts::cellCuts // Makes sure cuts are consistent setFromCellCutter(cellCutter, refCells); - // Calculate planes and flip cellLoops if nessecary + // Calculate planes and flip cellLoops if necessary orientPlanesAndLoops(); if (debug) @@ -2901,7 +2901,7 @@ Foam::cellCuts::cellCuts // Makes sure cuts are consistent setFromCellCutter(cellCutter, cellLabels, cutPlanes); - // Calculate planes and flip cellLoops if nessecary + // Calculate planes and flip cellLoops if necessary orientPlanesAndLoops(); if (debug) diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H index 4f9371fdd3..6f45ad5dc8 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H +++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ Description Does - move boundary points - - split boundary edges (multiple per edge if nessecary) + - split boundary edges (multiple per edge if necessary) - face-centre decomposes boundary faces - diagonal split of boundary faces @@ -60,7 +60,7 @@ class polyMesh; class face; /*---------------------------------------------------------------------------*\ - Class boundaryCutter Declaration + Class boundaryCutter Declaration \*---------------------------------------------------------------------------*/ class boundaryCutter diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H index cc869460f8..72119572f6 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H +++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,7 +28,7 @@ Description Cuts (splits) cells. Description of cut is given as a loop of 'cuts' per cell (see cellCuts). - setRefinement() takes this cut description and inserts the nessecary + setRefinement() takes this cut description and inserts the necessary topoActions (add points/faces/cells) into the polyTopoChange. Stores added cells/faces/points. @@ -129,7 +129,7 @@ class polyMesh; class face; /*---------------------------------------------------------------------------*\ - Class meshCutter Declaration + Class meshCutter Declaration \*---------------------------------------------------------------------------*/ class meshCutter diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H index 229d9d6d25..d9b5ca2f15 100644 --- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H +++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ class refineCell; class splitCell; /*---------------------------------------------------------------------------*\ - Class undoableMeshCutter Declaration + Class undoableMeshCutter Declaration \*---------------------------------------------------------------------------*/ class undoableMeshCutter @@ -192,7 +192,7 @@ public: //- Remove some refinement. Needs to be supplied subset of // getSplitFaces() output. Returns list of faces removed // (can be more or equal but never less than splitFaces - since - // removeFaces might decide to take down unnessecary faces) + // removeFaces might decide to take down unnecessary faces) // Only call if undoable set. labelList removeSplitFaces ( diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C index 36df880891..56fc14cdc7 100644 --- a/src/dynamicMesh/perfectInterface/perfectInterface.C +++ b/src/dynamicMesh/perfectInterface/perfectInterface.C @@ -278,7 +278,7 @@ void Foam::perfectInterface::setRefinement { affectedFaces.erase(pp1.addressing()[i]); } - // Remove patch0 from renumbered faces. Should not be nessecary since + // Remove patch0 from renumbered faces. Should not be necessary since // patch0 and 1 should not share any point (if created by mergeMeshing) // so affectedFaces should not contain any patch0 faces but you can // never be sure what the user is doing. @@ -373,7 +373,7 @@ void Foam::perfectInterface::setRefinement } - // 5. Modify patch0 faces for new points (not really nessecary; see + // 5. Modify patch0 faces for new points (not really necessary; see // comment above about patch1 and patch0 never sharing points) and // becoming internal. const boolList& mfFlip = diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C index 3a9773ce23..dfcc6a545e 100644 --- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C +++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C @@ -713,7 +713,7 @@ void Foam::polyMeshAdder::mergePrimitives } // Copy cut face (since cutPoints are copied first no renumbering - // nessecary) + // necessary) allFaces[allFaceI] = cutFaces[i]; allOwner[allFaceI] = mesh0.faceOwner()[mesh0FaceI]; allNeighbour[allFaceI] = mesh1.faceOwner()[mesh1FaceI] + mesh0.nCells(); diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C index 7dbce8d7bd..5a4deaa8ac 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C @@ -1022,7 +1022,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo } // Check if this call of storeMidPointInfo is the one that completed all - // the nessecary information. + // the necessary information. if (changed && haveTwoAnchors && haveTwoFaceMids) { diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H index 31e2a5587d..f33ee706f9 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H @@ -114,7 +114,7 @@ class hexRef8 label& zoneFlip ) const; - //- Adds a face on top of existing faceI. Reverses if nessecary. + //- Adds a face on top of existing faceI. Reverses if necessary. label addFace ( polyTopoChange& meshMod, @@ -136,7 +136,7 @@ class hexRef8 ) const; //- Modifies existing faceI for either new owner/neighbour or new face - // points. Reverses if nessecary. + // points. Reverses if necessary. void modFace ( polyTopoChange& meshMod, diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C index 59dbc40a8a..d78bee63c1 100644 --- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C +++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C @@ -825,7 +825,7 @@ void Foam::fvMeshSubset::setLargeCellSubset // 3: face coupled and used by one cell only (so should become normal, // non-coupled patch face) // - // Note that this is not really nessecary - but means we can size things + // Note that this is not really necessary - but means we can size things // correctly. Also makes handling coupled faces much easier. labelList nCellsUsingFace(oldFaces.size(), 0); diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H index 350d961115..9d8461f179 100644 --- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H +++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -241,7 +241,7 @@ public: //- Set the subset from all cells with region == currentRegion. // Create "oldInternalFaces" patch for exposed // internal faces (patchID==-1) or use supplied patch. - // Handles coupled patches by if nessecary making coupled patch + // Handles coupled patches by if necessary making coupled patch // face part of patchID (so uncoupled) void setLargeCellSubset ( diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C index 4739309c24..7ee0d53577 100644 --- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C +++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -233,7 +233,7 @@ tmp > fvMeshSubset::interpolate } - // Map exposed internal faces. Note: Only nessecary if exposed faces added + // Map exposed internal faces. Note: Only necessary if exposed faces added // into existing patch but since we don't know that at this point... forAll(patchFields, patchI) { diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C index b08cccbb85..69c25178ed 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C @@ -637,7 +637,7 @@ void Foam::autoLayerDriver::setNumLayers Info<< nl << "Handling points with inconsistent layer specification ..." << endl; - // Get for every point (really only nessecary on patch external points) + // Get for every point (really only necessary on patch external points) // the max and min of any patch faces using it. labelList maxLayers(patchNLayers.size(), labelMin); labelList minLayers(patchNLayers.size(), labelMax); diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C index dfd769fd15..a5b663890c 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C @@ -235,7 +235,7 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine << " cells (out of " << mesh.globalData().nTotalCells() << ')' << endl; - // Stop when no cells to refine or have done minimum nessecary + // Stop when no cells to refine or have done minimum necessary // iterations and not enough cells to refine. if ( @@ -438,7 +438,7 @@ Foam::label Foam::autoRefineDriver::shellRefine << " cells (out of " << mesh.globalData().nTotalCells() << ')' << endl; - // Stop when no cells to refine or have done minimum nessecary + // Stop when no cells to refine or have done minimum necessary // iterations and not enough cells to refine. if ( diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C index aeaa5ac4cb..b9c189ffa0 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C @@ -1108,7 +1108,7 @@ Foam::autoPtr Foam::meshRefinement::mergeBaffles mesh_.setInstance(timeName()); // Update intersections. Recalculate intersections on merged faces since - // this seems to give problems? Note: should not be nessecary since + // this seems to give problems? Note: should not be necessary since // baffles preserve intersections from when they were created. labelList newExposedFaces(2*couples.size()); label newI = 0; diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C index 662c9e0ac1..13730bc5c1 100644 --- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C +++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -589,7 +589,7 @@ Foam::label Foam::edgeIntersections::removeDegenerates // If edge not already marked for retesting if (!affectedEdges[edgeI]) { - // 1. Check edges close to endpoint and perturb if nessecary. + // 1. Check edges close to endpoint and perturb if necessary. bool shiftedEdgeEndPoints = inlinePerturb diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C index e42553d3c1..be73d4bb66 100644 --- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C +++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -204,7 +204,7 @@ void Foam::orientedSurface::propagateOrientation if (side == triSurfaceTools::UNKNOWN) { // Non-closed surface. Do what? For now behave as if no flipping - // nessecary + // necessary flipState[nearestFaceI] = NOFLIP; } else if ((side == triSurfaceTools::OUTSIDE) == orientOutside) diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.H b/src/meshTools/triSurface/orientedSurface/orientedSurface.H index bfb318e015..54b416e590 100644 --- a/src/meshTools/triSurface/orientedSurface/orientedSurface.H +++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ namespace Foam class triSurfaceSearch; /*---------------------------------------------------------------------------*\ - Class orientedSurface Declaration + Class orientedSurface Declaration \*---------------------------------------------------------------------------*/ class orientedSurface @@ -101,7 +101,7 @@ class orientedSurface ); //- Given nearest point and face check orientation to nearest face - // and flip if nessecary (only marked in flipState) and propagate. + // and flip if necessary (only marked in flipState) and propagate. static void propagateOrientation ( const triSurface&, diff --git a/src/triSurface/meshTriangulation/meshTriangulation.C b/src/triSurface/meshTriangulation/meshTriangulation.C index 56c18327d1..4231c3d16f 100644 --- a/src/triSurface/meshTriangulation/meshTriangulation.C +++ b/src/triSurface/meshTriangulation/meshTriangulation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -451,7 +451,7 @@ Foam::meshTriangulation::meshTriangulation } } - // Shrink if nessecary (because of invalid triangulations) + // Shrink if necessary (because of invalid triangulations) triangles.setSize(triI); faceMap_.setSize(triI); diff --git a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H index 6b39231580..ba7fd1be49 100644 --- a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H +++ b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class smoothDelta Declaration + Class smoothDelta Declaration \*---------------------------------------------------------------------------*/ class smoothDelta @@ -62,7 +62,7 @@ public: // Private Member Functions //- Update. Gets information from neighbouring face/cell and - // uses this to update itself (if nessecary) and return true. + // uses this to update itself (if necessary) and return true. template inline bool update ( From a57efb5b19860199b1fe137a8ef121c26a51b07e Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Dec 2012 11:23:48 +0000 Subject: [PATCH 03/17] ENH: Minor optimisation --- .../basicSymmetry/basicSymmetryFvPatchField.C | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C index b612efbc1d..4c40b1ef7c 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,11 +96,11 @@ Foam::basicSymmetryFvPatchField::snGrad() const { tmp nHat = this->patch().nf(); + const Field iF(this->patchInternalField()); + return - ( - transform(I - 2.0*sqr(nHat), this->patchInternalField()) - - this->patchInternalField() - )*(this->patch().deltaCoeffs()/2.0); + (transform(I - 2.0*sqr(nHat), iF) - iF) + *(this->patch().deltaCoeffs()/2.0); } @@ -114,12 +114,11 @@ void Foam::basicSymmetryFvPatchField::evaluate(const Pstream::commsTypes) tmp nHat = this->patch().nf(); + const Field iF(this->patchInternalField()); + Field::operator= ( - ( - this->patchInternalField() - + transform(I - 2.0*sqr(nHat), this->patchInternalField()) - )/2.0 + (iF + transform(I - 2.0*sqr(nHat), iF))/2.0 ); transformFvPatchField::evaluate(); From 76da04621c1d5cd822964fdf21521e50e3389576 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Dec 2012 11:39:56 +0000 Subject: [PATCH 04/17] ENH: Updated info message --- applications/solvers/basic/scalarTransportFoam/createFields.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/basic/scalarTransportFoam/createFields.H b/applications/solvers/basic/scalarTransportFoam/createFields.H index 07731be3d6..394fe42e97 100644 --- a/applications/solvers/basic/scalarTransportFoam/createFields.H +++ b/applications/solvers/basic/scalarTransportFoam/createFields.H @@ -45,7 +45,7 @@ ); - Info<< "Reading diffusivity D\n" << endl; + Info<< "Reading diffusivity DT\n" << endl; dimensionedScalar DT ( From a5fb2fcafcc9caa5597696c15874a02eb1442ad7 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Dec 2012 13:44:15 +0000 Subject: [PATCH 05/17] ENH: Cache kappa for directionalSolidThermo instead of creating field on each pass of face loop --- .../temperatureCoupledBase.C | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C index 034cd50e3e..14448ca71c 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C @@ -99,66 +99,58 @@ Foam::tmp Foam::temperatureCoupledBase::kappa ); return model.kappaEff(patch_.index()); + break; } - break; case SOLIDTHERMO: { const solidThermo& thermo = - mesh.lookupObject - ( - "thermophysicalProperties" - ); + mesh.lookupObject("thermophysicalProperties"); + return thermo.kappa(patch_.index()); + break; } - break; case DIRECTIONALSOLIDTHERMO: { const solidThermo& thermo = - mesh.lookupObject - ( - "thermophysicalProperties" - ); + mesh.lookupObject("thermophysicalProperties"); + + const vectorField kappa(thermo.Kappa(patch_.index())); tmp tmeanKappa(Tp); scalarField& meanKappa = tmeanKappa(); forAll(meanKappa, i) { - meanKappa[i] = - ( - thermo.Kappa(patch_.index())()[i].x() - + thermo.Kappa(patch_.index())()[i].y() - + thermo.Kappa(patch_.index())()[i].z() - )/3.0; + meanKappa[i] = (kappa[i].x() + kappa[i].y() + kappa[i].z())/3.0; } return meanKappa; + break; } - break; case LOOKUP: { if (mesh.objectRegistry::foundObject(kappaName_)) { - return patch_.lookupPatchField - < - volScalarField, scalar - >(kappaName_); + return patch_.lookupPatchField + ( + kappaName_ + ); } else if ( - mesh.objectRegistry::foundObject - < - volSymmTensorField - >(kappaName_) + mesh.objectRegistry::foundObject + ( + kappaName_ + ) ) { const symmTensorField& KWall = - patch_.lookupPatchField - < - volSymmTensorField, scalar - >(kappaName_); + patch_.lookupPatchField + ( + kappaName_ + ); const vectorField n(patch_.nf()); @@ -166,7 +158,10 @@ Foam::tmp Foam::temperatureCoupledBase::kappa } else { - FatalErrorIn("temperatureCoupledBase::K() const") + FatalErrorIn + ( + "temperatureCoupledBase::kappa(const scalarField&) const" + ) << "Did not find field " << kappaName_ << " on mesh " << mesh.name() << " patch " << patch_.name() << endl @@ -178,12 +173,16 @@ Foam::tmp Foam::temperatureCoupledBase::kappa return scalarField(0); } + break; } default: { - FatalErrorIn("temperatureCoupledBase::kappa() const") - << "Unimplemented method " << method_ << endl + FatalErrorIn + ( + "temperatureCoupledBase::kappa(const scalarField&) const" + ) + << "Unimplemented method " << method_ << nl << "Please set 'kappa' to one of " << KMethodTypeNames_.toc() << " and 'kappaName' to the name of the volScalar" << " or volSymmTensor field (if kappa=lookup)" From 995c577b6315295ca4ff3ee262f1e6978cc35bf3 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Dec 2012 13:51:00 +0000 Subject: [PATCH 06/17] STYLE: Removed unused template code --- .../turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C index 850cc79f6e..f04f11ef18 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C @@ -36,9 +36,6 @@ namespace Foam namespace compressible { -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // turbulentTemperatureCoupledBaffleMixedFvPatchScalarField:: From 7be0ae1dbbe5c55e50f0a77779e4094a5af47fdd Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 12:52:16 +0000 Subject: [PATCH 07/17] ENH: Emabled caching of AMI for inter-region communication --- .../regionModel/regionModel/regionModel.C | 89 ++++++++++++++++++- .../regionModel/regionModel/regionModel.H | 27 ++++-- .../regionModel/regionModelTemplates.C | 67 +++++--------- 3 files changed, 129 insertions(+), 54 deletions(-) diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C index 227af0adb4..55ced3fe53 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.C +++ b/src/regionModels/regionModel/regionModel/regionModel.C @@ -190,6 +190,88 @@ bool Foam::regionModels::regionModel::read(const dictionary& dict) } +const Foam::AMIPatchToPatchInterpolation& +Foam::regionModels::regionModel::interRegionAMI +( + const regionModel& nbrRegion, + const label regionPatchI, + const label nbrPatchI, + const bool flip +) +{ + label nbrRegionID = findIndex(interRegionAMINames_, nbrRegion.name()); + + const fvMesh& nbrRegionMesh = nbrRegion.regionMesh(); + + if (nbrRegionID != -1) + { + if (!interRegionAMI_[nbrRegionID].set(regionPatchI)) + { + const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI]; + const polyPatch& nbrP = nbrRegionMesh.boundaryMesh()[nbrPatchI]; + + int oldTag = UPstream::msgType(); + UPstream::msgType() = oldTag + 1; + + interRegionAMI_[nbrRegionID].set + ( + regionPatchI, + new AMIPatchToPatchInterpolation + ( + p, + nbrP, + faceAreaIntersect::tmMesh, + flip + ) + ); + + UPstream::msgType() = oldTag; + } + + return interRegionAMI_[nbrRegionID][regionPatchI]; + } + else + { + label nbrRegionID = interRegionAMINames_.size(); + + interRegionAMINames_.append(nbrRegion.name()); + + const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI]; + const polyPatch& nbrP = nbrRegionMesh.boundaryMesh()[nbrPatchI]; + + label nPatch = regionMesh().boundaryMesh().size(); + + + interRegionAMI_.resize(nbrRegionID + 1); + + interRegionAMI_.set + ( + nbrRegionID, + new PtrList(nPatch) + ); + + int oldTag = UPstream::msgType(); + UPstream::msgType() = oldTag + 1; + + interRegionAMI_[nbrRegionID].set + ( + regionPatchI, + new AMIPatchToPatchInterpolation + ( + p, + nbrP, + faceAreaIntersect::tmMesh, + flip + ) + ); + + UPstream::msgType() = oldTag; + + return interRegionAMI_[nbrRegionID][regionPatchI]; + } +} + + Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID ( const regionModel& nbrRegion, @@ -234,8 +316,7 @@ Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID FatalErrorIn ( - "Foam::tmp > " - "Foam::regionModels::regionModel::nbrCoupledPatchID" + "Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID" "(" "const regionModel& , " "const label" @@ -275,7 +356,9 @@ Foam::regionModels::regionModel::regionModel(const fvMesh& mesh) primaryPatchIDs_(), intCoupledPatchIDs_(), regionName_("none"), - functions_(*this) + functions_(*this), + interRegionAMINames_(), + interRegionAMI_() {} diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H index c59b8d163d..589402c1cf 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.H +++ b/src/regionModels/regionModel/regionModel/regionModel.H @@ -122,6 +122,15 @@ protected: regionModelFunctionObjectList functions_; + // Inter-region AMI interpolation caching + + //- List of region names this region is coupled to + wordList interRegionAMINames_; + + //- List of AMI objects per coupled region + PtrList > interRegionAMI_; + + // Protected member functions //- Read control parameters from dictionary @@ -130,6 +139,14 @@ protected: //- Read control parameters from dictionary virtual bool read(const dictionary& dict); + //- Create or return a new inter-region AMI object + virtual const Foam::AMIPatchToPatchInterpolation& interRegionAMI + ( + const regionModel& nbrRegion, + const label regionPatchI, + const label nbrPatchI, + const bool flip + ); public: @@ -235,28 +252,28 @@ public: const label nbrPatchI, const Field& nbrField, const bool flip = false - ) const; + ); //- Map patch field from another region model to local patch template tmp > mapRegionPatchField ( - const word& regionModelName, + const regionModel& nbrRegion, const word& fieldName, const label regionPatchI, const bool flip = false - ) const; + ); //- Map patch internal field from another region model to local // patch template tmp > mapRegionPatchInternalField ( - const word& regionModelName, + const regionModel& nbrRegion, const word& fieldName, const label regionPatchI, const bool flip = false - ) const; + ); //- Convert a local region field to the primary region template diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C index 4e98b2e2fb..5855ee5906 100644 --- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C +++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C @@ -32,18 +32,13 @@ Foam::regionModels::regionModel::mapRegionPatchField const label nbrPatchI, const Field& nbrField, const bool flip -) const +) { - const fvMesh& nbrRegionMesh = nbrRegion.regionMesh(); - - const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI]; - - const polyPatch& nbrP = nbrRegionMesh.boundaryMesh()[nbrPatchI]; - int oldTag = UPstream::msgType(); UPstream::msgType() = oldTag + 1; - AMIPatchToPatchInterpolation ami(p, nbrP, faceAreaIntersect::tmMesh, flip); + const AMIPatchToPatchInterpolation& ami = + interRegionAMI(nbrRegion, regionPatchI, nbrPatchI, flip); tmp > tresult(ami.interpolateToSource(nbrField)); @@ -57,40 +52,28 @@ template Foam::tmp > Foam::regionModels::regionModel::mapRegionPatchField ( - const word& regionModelName, + const regionModel& nbrRegion, const word& fieldName, const label regionPatchI, const bool flip -) const +) { typedef GeometricField fieldType; - const regionModel& nbrRegion = - this->primaryMesh_.lookupObject(regionModelName); - const fvMesh& nbrRegionMesh = nbrRegion.regionMesh(); - const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI]; - if (nbrRegionMesh.foundObject(fieldName)) { - const fieldType& nbrField = - nbrRegionMesh.lookupObject(fieldName); - const label nbrPatchI = nbrCoupledPatchID(nbrRegion, regionPatchI); - const polyPatch& nbrP = nbrRegionMesh.boundaryMesh()[nbrPatchI]; - int oldTag = UPstream::msgType(); UPstream::msgType() = oldTag + 1; - AMIPatchToPatchInterpolation ami - ( - p, - nbrP, - faceAreaIntersect::tmMesh, - flip - ); + const AMIPatchToPatchInterpolation& ami = + interRegionAMI(nbrRegion, regionPatchI, nbrPatchI, flip); + + const fieldType& nbrField = + nbrRegionMesh.lookupObject(fieldName); const Field& nbrFieldp = nbrField.boundaryField()[nbrPatchI]; @@ -102,6 +85,8 @@ Foam::regionModels::regionModel::mapRegionPatchField } else { + const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI]; + return tmp > ( @@ -119,40 +104,28 @@ template Foam::tmp > Foam::regionModels::regionModel::mapRegionPatchInternalField ( - const word& regionModelName, + const regionModel& nbrRegion, const word& fieldName, const label regionPatchI, const bool flip -) const +) { typedef GeometricField fieldType; - const regionModel& nbrRegion = - this->primaryMesh_.lookupObject(regionModelName); - const fvMesh& nbrRegionMesh = nbrRegion.regionMesh(); - const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI]; - if (nbrRegionMesh.foundObject(fieldName)) { - const fieldType& nbrField = - nbrRegionMesh.lookupObject(fieldName); - const label nbrPatchI = nbrCoupledPatchID(nbrRegion, regionPatchI); - const polyPatch& nbrP = nbrRegionMesh.boundaryMesh()[nbrPatchI]; - int oldTag = UPstream::msgType(); UPstream::msgType() = oldTag + 1; - AMIPatchToPatchInterpolation ami - ( - p, - nbrP, - faceAreaIntersect::tmMesh, - flip - ); + const AMIPatchToPatchInterpolation& ami = + interRegionAMI(nbrRegion, regionPatchI, nbrPatchI, flip); + + const fieldType& nbrField = + nbrRegionMesh.lookupObject(fieldName); const fvPatchField& nbrFieldp = nbrField.boundaryField()[nbrPatchI]; @@ -168,6 +141,8 @@ Foam::regionModels::regionModel::mapRegionPatchInternalField } else { + const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI]; + return tmp > ( From 1e6088377d130adde1b11ec9cca4e11bd9d4302a Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 12:52:50 +0000 Subject: [PATCH 08/17] ENH: Added linking of regionCoupling lib top fireFoam --- applications/solvers/combustion/fireFoam/Make/options | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 861bde659c..b7498e50f5 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -46,5 +46,6 @@ EXE_LIBS = \ -lradiationModels \ -lsurfaceFilmModels \ -lpyrolysisModels \ + -lregionCoupling \ -llagrangianIntermediate \ -lODE From af392757ccb74db022093cac57e6ba443a22ae49 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 14:40:38 +0000 Subject: [PATCH 09/17] BUG: Corrected collision order in parcel pair-collision --- .../Kinematic/CollisionModel/PairCollision/PairCollision.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C index 8804fb6759..47c952db9e 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C @@ -664,10 +664,10 @@ void Foam::PairCollision::collide() { preInteraction(); - wallInteraction(); - parcelInteraction(); + wallInteraction(); + postInteraction(); } From 2f1e96f0f76d5009409b1f1e49b938371f831350 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 16:30:08 +0000 Subject: [PATCH 10/17] ENH: Surface films - using alternatove form for momentum sink contribution --- .../kinematicSingleLayer/kinematicSingleLayer.C | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C index 430d388303..9d053dc3de 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C @@ -308,7 +308,8 @@ tmp kinematicSingleLayer::solveMomentum + fvm::div(phi_, U_) == - USp_ - - fvm::SuSp(rhoSp_, U_) +// - fvm::SuSp(rhoSp_, U_) + - rhoSp_*U_ + forces_.correct(U_) ); From e7d92199f350424aa46a33658a04b15ff6fee1dd Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 17:05:29 +0000 Subject: [PATCH 11/17] ENH: Pyrolysis - updated handling for phiGas --- .../pyrolysisModels/reactingOneDim/reactingOneDim.C | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index 3588060c72..84fb91407f 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C @@ -251,15 +251,12 @@ void reactingOneDim::solveEnergy() tmp alpha(solidThermo_.alpha()); - const surfaceScalarField phiGas(fvc::interpolate(phiHsGas_)); - fvScalarMatrix hEqn ( fvm::ddt(rho_, h_) - fvm::laplacian(alpha, h_) == chemistrySh_ - + fvc::div(phiGas) ); if (regionMesh().moving()) @@ -334,7 +331,7 @@ reactingOneDim::reactingOneDim(const word& modelType, const fvMesh& mesh) "phiGas", time().timeName(), regionMesh(), - IOobject::NO_READ, + IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), regionMesh(), From 2a53a018413c57f61720939a5df70869d3365b10 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 17:05:46 +0000 Subject: [PATCH 12/17] ENH: Minor coding enhancements --- src/randomProcesses/noise/noiseFFT.C | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/randomProcesses/noise/noiseFFT.C b/src/randomProcesses/noise/noiseFFT.C index eea9646f58..0efa5c43f2 100644 --- a/src/randomProcesses/noise/noiseFFT.C +++ b/src/randomProcesses/noise/noiseFFT.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,6 @@ Foam::scalar Foam::noiseFFT::p0 = 2e-5; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from pressure field Foam::noiseFFT::noiseFFT ( const scalar deltat, @@ -49,7 +48,6 @@ Foam::noiseFFT::noiseFFT {} -// Construct from pressure field file name Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip) : scalarField(), @@ -103,7 +101,7 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip) deltat_ = T/pData.size(); - scalarField::operator=(pData.shrink()); + this->transfer(pData); } From d22ba2b63388c5d63430268223a3c5337b46deee Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 17:09:57 +0000 Subject: [PATCH 13/17] ENH: Film radiation - added absorptivity --- .../filmRadiationModel/constantRadiation/constantRadiation.C | 3 ++- .../filmRadiationModel/constantRadiation/constantRadiation.H | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C index bb1b6c294f..f7e1b82143 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C @@ -82,6 +82,7 @@ constantRadiation::constantRadiation owner.regionMesh(), dimensionedScalar("one", dimless, 1.0) ), + absorptivity_(readScalar(coeffs_.lookup("absorptivity"))), timeStart_(readScalar(coeffs_.lookup("timeStart"))), duration_(readScalar(coeffs_.lookup("duration"))) { @@ -129,7 +130,7 @@ tmp constantRadiation::Shs() const scalarField& Qr = QrConst_.internalField(); const scalarField& alpha = owner_.alpha().internalField(); - Shs = mask_*Qr*alpha; + Shs = mask_*Qr*alpha*absorptivity_; } return tShs; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H index 06e6fe676b..911d53e461 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H @@ -68,6 +68,9 @@ private: //- Radiation mask volScalarField mask_; + //- Absorptivity + scalar absorptivity_; + //- Time start [s] const scalar timeStart_; From 51a2313c3ecb5157e39ad5e14cbb57dba5e38ba9 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 18:07:24 +0000 Subject: [PATCH 14/17] BUG: potentialFreeSurfaceFoam - Corrected pressure calculation - mantis #654 --- .../potentialFreeSurfaceFoam/createFields.H | 44 +------------------ .../potentialFreeSurfaceFoam/pEqn.H | 2 +- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H b/applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H index 4437f4983d..27af553b77 100644 --- a/applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H +++ b/applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H @@ -37,48 +37,6 @@ #include "readGravitationalAcceleration.H" - Info<< "\nReading freeSurfaceProperties\n" << endl; - - IOdictionary freeSurfaceProperties - ( - IOobject - ( - "freeSurfaceProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - word freeSurfacePatch(freeSurfaceProperties.lookup("freeSurfacePatch")); - label freeSurfacePatchI = mesh.boundaryMesh().findPatchID(freeSurfacePatch); - if (freeSurfacePatchI < 0) - { - FatalErrorIn(args.executable()) - << "Patch " << freeSurfacePatch << " not found. " - << "Available patches are:" << mesh.boundaryMesh().names() - << exit(FatalError); - } - - Info<< "Creating field refLevel\n" << endl; - volVectorField refLevel - ( - IOobject - ( - "refLevel", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - dimensionedVector("zero", dimLength, vector::zero) - ); - - refLevel.boundaryField()[freeSurfacePatchI] - == mesh.C().boundaryField()[freeSurfacePatchI]; - Info<< "Creating field zeta\n" << endl; volVectorField zeta ( @@ -110,7 +68,7 @@ // Force p_gh to be consistent with p // Height is made relative to field 'refLevel' - p_gh = p - (g & (mesh.C() + zeta - refLevel)); + p_gh = p - (g & mesh.C()); label p_ghRefCell = 0; diff --git a/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H index 5a521a04ff..42b72484d1 100644 --- a/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H +++ b/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H @@ -42,7 +42,7 @@ while (pimple.correctNonOrthogonal()) // Explicitly relax pressure for momentum corrector p_gh.relax(); -p = p_gh + (g & (mesh.C() + zeta - refLevel)); +p = p_gh + (g & mesh.C()); U = HbyA - rAU*fvc::grad(p_gh); U.correctBoundaryConditions(); From 34840f3a28340f5a74f49ca7771c0a1c5fee2865 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Dec 2012 18:08:03 +0000 Subject: [PATCH 15/17] ENH: Removed unused file --- .../constant/freeSurfaceProperties | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/constant/freeSurfaceProperties diff --git a/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/constant/freeSurfaceProperties b/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/constant/freeSurfaceProperties deleted file mode 100644 index 5fdff74e52..0000000000 --- a/tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/constant/freeSurfaceProperties +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object freeSurfaceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -freeSurfacePatch freeSurface; - -// ************************************************************************* // From dff973d5ce89271263a711f1e9d8189ec5bb17c0 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 5 Dec 2012 14:41:09 +0000 Subject: [PATCH 16/17] limitedSnGrad: corrected scheme to be limited is now run-time selectable defaults to "corrected" for backward compatibility --- .../limitedSnGrad/limitedSnGrad.C | 17 +---- .../limitedSnGrad/limitedSnGrad.H | 62 +++++++++++++++---- 2 files changed, 53 insertions(+), 26 deletions(-) diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C index a5def7bcc1..63d81a996f 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,23 +21,12 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Description - snGrad scheme with limited non-orthogonal correction. - - The limiter is controlled by a coefficient with a value between 0 and 1 - which when 0 switches the correction off and the scheme behaves as - uncorrectedSnGrad, when set to 1 the full correction is applied and the - scheme behaves as correctedSnGrad and when set to 0.5 the limiter is - calculated such that the non-orthogonal contribution does not exceed the - orthogonal part. - \*---------------------------------------------------------------------------*/ #include "fv.H" #include "limitedSnGrad.H" #include "volFields.H" #include "surfaceFields.H" -#include "correctedSnGrad.H" #include "localMax.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -68,7 +57,7 @@ limitedSnGrad::correction { const GeometricField corr ( - correctedSnGrad(this->mesh()).correction(vf) + correctedScheme_().correction(vf) ); const surfaceScalarField limiter @@ -76,7 +65,7 @@ limitedSnGrad::correction min ( limitCoeff_ - *mag(snGradScheme::snGrad(vf, deltaCoeffs(vf), "orthSnGrad")) + *mag(snGradScheme::snGrad(vf, deltaCoeffs(vf), "SndGrad")) /( (1 - limitCoeff_)*mag(corr) + dimensionedScalar("small", corr.dimensions(), SMALL) diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H index 9dbe0f0114..5d1ffd2b94 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H +++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,14 +25,20 @@ Class Foam::fv::limitedSnGrad Description - Central-difference snGrad scheme with limited non-orthogonal correction. + Run-time selected snGrad scheme with limited non-orthogonal correction. The limiter is controlled by a coefficient with a value between 0 and 1 which when 0 switches the correction off and the scheme behaves as - uncorrectedSnGrad, when set to 1 the full correction is applied and the - scheme behaves as correctedSnGrad and when set to 0.5 the limiter is - calculated such that the non-orthogonal contribution does not exceed the - orthogonal part. + uncorrectedSnGrad, when set to 1 the full correction of the selected scheme + is used and when set to 0.5 the limiter is calculated such that the + non-orthogonal contribution does not exceed the orthogonal part. + + Format: + limited ; + + or + + limited ; // Backward compatibility SourceFiles limitedSnGrad.C @@ -42,7 +48,7 @@ SourceFiles #ifndef limitedSnGrad_H #define limitedSnGrad_H -#include "snGradScheme.H" +#include "correctedSnGrad.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,6 +71,8 @@ class limitedSnGrad { // Private data + tmp > correctedScheme_; + scalar limitCoeff_; @@ -73,6 +81,34 @@ class limitedSnGrad //- Disallow default bitwise assignment void operator=(const limitedSnGrad&); + //- Lookup function for the corrected to support backward compatibility + // of dictionary specification + tmp > lookupCorrectedScheme(Istream& schemeData) + { + token nextToken(schemeData); + + if (nextToken.isNumber()) + { + limitCoeff_ = nextToken.number(); + return tmp > + ( + new correctedSnGrad(this->mesh()) + ); + } + else + { + schemeData.putBack(nextToken); + tmp > tcorrectedScheme + ( + fv::snGradScheme::New(this->mesh(), schemeData) + ); + + schemeData >> limitCoeff_; + + return tcorrectedScheme; + } + } + public: @@ -85,22 +121,24 @@ public: //- Construct from mesh limitedSnGrad(const fvMesh& mesh) : - snGradScheme(mesh) + snGradScheme(mesh), + correctedScheme_(new correctedSnGrad(this->mesh())), + limitCoeff_(1) {} //- Construct from mesh and data stream - limitedSnGrad(const fvMesh& mesh, Istream& is) + limitedSnGrad(const fvMesh& mesh, Istream& schemeData) : snGradScheme(mesh), - limitCoeff_(readScalar(is)) + correctedScheme_(lookupCorrectedScheme(schemeData)) { if (limitCoeff_ < 0 || limitCoeff_ > 1) { FatalIOErrorIn ( - "limitedSnGrad(const fvMesh& mesh, Istream& is) : ", - is + "limitedSnGrad(const fvMesh& mesh, Istream& schemeData) : ", + schemeData ) << "limitCoeff is specified as " << limitCoeff_ << " but should be >= 0 && <= 1" << exit(FatalIOError); From acbbaf3f4dd6611730d031f9d2fedcf1894c85c0 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 5 Dec 2012 14:58:42 +0000 Subject: [PATCH 17/17] tutorials: Updated "limited" snGrad schemes --- .../system/fvSchemes | 18 +++---- .../engineFoam/kivaTest/system/fvSchemes | 4 +- .../ras/nacaAirfoil/system/fvSchemes | 2 +- .../iglooWithFridges/system/fvSchemes | 14 ++--- .../system/bottomAir/fvSchemes | 14 ++--- .../multiRegionHeater/system/heater/fvSchemes | 4 +- .../system/leftSolid/fvSchemes | 4 +- .../system/rightSolid/fvSchemes | 4 +- .../multiRegionHeater/system/topAir/fvSchemes | 14 ++--- .../system/bottomWater/fvSchemes | 14 ++--- .../system/heater/fvSchemes | 4 +- .../system/leftSolid/fvSchemes | 54 ++++++++++++++++++- .../system/rightSolid/fvSchemes | 54 ++++++++++++++++++- .../system/topAir/fvSchemes | 14 ++--- .../system/bottomAir/fvSchemes | 14 ++--- .../system/heater/fvSchemes | 4 +- .../system/leftSolid/fvSchemes | 54 ++++++++++++++++++- .../system/rightSolid/fvSchemes | 54 ++++++++++++++++++- .../system/topAir/fvSchemes | 14 ++--- .../pimpleDyMFoam/propeller/system/fvSchemes | 4 +- .../system/fvSchemes | 2 +- .../wingMotion_snappyHexMesh/system/fvSchemes | 12 ++--- .../pisoFoam/les/motorBike/lesFiles/fvSchemes | 4 +- .../simpleFoam/turbineSiting/system/fvSchemes | 4 +- .../ras/waterChannel/constant/RASProperties | 1 - .../cavitatingBullet/system/fvSchemes | 8 +-- 26 files changed, 300 insertions(+), 93 deletions(-) mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes index 2d46eb050d..a3dcbfcc2e 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes @@ -57,14 +57,14 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian((rho*inv((((1)*A(U))+tDragDcu))),p) Gauss linear limited 0.333; - laplacian(Db,b) Gauss linear limited 0.333; - laplacian(Db,ft) Gauss linear limited 0.333; - laplacian(Db,ha) Gauss linear limited 0.333; - laplacian(Db,hau) Gauss linear limited 0.333; + laplacian(muEff,U) Gauss linear limited corrected 0.333; + laplacian(DkEff,k) Gauss linear limited corrected 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333; + laplacian((rho*inv((((1)*A(U))+tDragDcu))),p) Gauss linear limited corrected 0.333; + laplacian(Db,b) Gauss linear limited corrected 0.333; + laplacian(Db,ft) Gauss linear limited corrected 0.333; + laplacian(Db,ha) Gauss linear limited corrected 0.333; + laplacian(Db,hau) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -74,7 +74,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes index 9bfa83ecf5..a92565feff 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes @@ -58,7 +58,7 @@ divSchemes laplacianSchemes { - default Gauss linear limited 0.5; + default Gauss linear limited corrected 0.5; } interpolationSchemes @@ -68,7 +68,7 @@ interpolationSchemes snGradSchemes { - default limited 0.5; + default limited corrected 0.5; } fluxRequired diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes index 02e15a0996..ec1368d9ca 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes @@ -40,7 +40,7 @@ divSchemes laplacianSchemes { - default Gauss linear limited 0.5; + default Gauss linear limited corrected 0.5; } interpolationSchemes diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes index 7a53eb9600..52d63773c0 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(nuEff,U) Gauss linear limited 0.333; - laplacian(Dp,p_rgh) Gauss linear limited 0.333; - laplacian(kappaEff,T) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian(DREff,R) Gauss linear limited 0.333; + laplacian(nuEff,U) Gauss linear limited corrected 0.333; + laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333; + laplacian(kappaEff,T) Gauss linear limited corrected 0.333; + laplacian(DkEff,k) Gauss linear limited corrected 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333; + laplacian(DREff,R) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -55,7 +55,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes index 148fdb45eb..74a1cb4a71 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(Dp,p_rgh) Gauss linear limited 0.333; - laplacian(alphaEff,h) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian(DREff,R) Gauss linear limited 0.333; + laplacian(muEff,U) Gauss linear limited corrected 0.333; + laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333; + laplacian(alphaEff,h) Gauss linear limited corrected 0.333; + laplacian(DkEff,k) Gauss linear limited corrected 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333; + laplacian(DREff,R) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -55,7 +55,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes index a1071797a3..998b93b283 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(alpha,h) Gauss linear limited 0.333; + laplacian(alpha,h) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -42,7 +42,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes index 44cdd8eb8c..8fc4915d8e 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(alpha,h) Gauss linear limited 0.333; + laplacian(alpha,h) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -42,7 +42,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes index e21e6d5b8c..d17c3fadce 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(alpha,h) Gauss linear limited 0.333; + laplacian(alpha,h) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -42,7 +42,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes index 5694ac1f59..8dce282ff2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(Dp,p_rgh) Gauss linear limited 0.333; - laplacian(alphaEff,h) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian(DREff,R) Gauss linear limited 0.333; + laplacian(muEff,U) Gauss linear limited corrected 0.333; + laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333; + laplacian(alphaEff,h) Gauss linear limited corrected 0.333; + laplacian(DkEff,k) Gauss linear limited corrected 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333; + laplacian(DREff,R) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -55,7 +55,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes index 5694ac1f59..8dce282ff2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(Dp,p_rgh) Gauss linear limited 0.333; - laplacian(alphaEff,h) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian(DREff,R) Gauss linear limited 0.333; + laplacian(muEff,U) Gauss linear limited corrected 0.333; + laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333; + laplacian(alphaEff,h) Gauss linear limited corrected 0.333; + laplacian(DkEff,k) Gauss linear limited corrected 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333; + laplacian(DREff,R) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -55,7 +55,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes index a1071797a3..998b93b283 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(alpha,h) Gauss linear limited 0.333; + laplacian(alpha,h) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -42,7 +42,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes deleted file mode 120000 index 63236f302c..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSchemes \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes new file mode 100644 index 0000000000..998b93b283 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; +} + +laplacianSchemes +{ + default none; + laplacian(alpha,h) Gauss linear limited corrected 0.333; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default limited corrected 0.333; +} + +fluxRequired +{ + default no; +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes deleted file mode 120000 index 63236f302c..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSchemes \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes new file mode 100644 index 0000000000..998b93b283 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; +} + +laplacianSchemes +{ + default none; + laplacian(alpha,h) Gauss linear limited corrected 0.333; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default limited corrected 0.333; +} + +fluxRequired +{ + default no; +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes index 5694ac1f59..8dce282ff2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(Dp,p_rgh) Gauss linear limited 0.333; - laplacian(alphaEff,h) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian(DREff,R) Gauss linear limited 0.333; + laplacian(muEff,U) Gauss linear limited corrected 0.333; + laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333; + laplacian(alphaEff,h) Gauss linear limited corrected 0.333; + laplacian(DkEff,k) Gauss linear limited corrected 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333; + laplacian(DREff,R) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -55,7 +55,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes index 5694ac1f59..8dce282ff2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(Dp,p_rgh) Gauss linear limited 0.333; - laplacian(alphaEff,h) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian(DREff,R) Gauss linear limited 0.333; + laplacian(muEff,U) Gauss linear limited corrected 0.333; + laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333; + laplacian(alphaEff,h) Gauss linear limited corrected 0.333; + laplacian(DkEff,k) Gauss linear limited corrected 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333; + laplacian(DREff,R) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -55,7 +55,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes index a1071797a3..998b93b283 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes @@ -32,7 +32,7 @@ divSchemes laplacianSchemes { default none; - laplacian(alpha,h) Gauss linear limited 0.333; + laplacian(alpha,h) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -42,7 +42,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes deleted file mode 120000 index 63236f302c..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSchemes \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes new file mode 100644 index 0000000000..998b93b283 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; +} + +laplacianSchemes +{ + default none; + laplacian(alpha,h) Gauss linear limited corrected 0.333; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default limited corrected 0.333; +} + +fluxRequired +{ + default no; +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes deleted file mode 120000 index 63236f302c..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSchemes \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes new file mode 100644 index 0000000000..998b93b283 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; +} + +laplacianSchemes +{ + default none; + laplacian(alpha,h) Gauss linear limited corrected 0.333; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default limited corrected 0.333; +} + +fluxRequired +{ + default no; +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes index 5694ac1f59..8dce282ff2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(Dp,p_rgh) Gauss linear limited 0.333; - laplacian(alphaEff,h) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian(DREff,R) Gauss linear limited 0.333; + laplacian(muEff,U) Gauss linear limited corrected 0.333; + laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333; + laplacian(alphaEff,h) Gauss linear limited corrected 0.333; + laplacian(DkEff,k) Gauss linear limited corrected 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333; + laplacian(DREff,R) Gauss linear limited corrected 0.333; } interpolationSchemes @@ -55,7 +55,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes index 9106eed273..b6ae74a4e9 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes @@ -39,7 +39,7 @@ divSchemes laplacianSchemes { - default Gauss linear limited 0.33; + default Gauss linear limited corrected 0.33; } interpolationSchemes @@ -49,7 +49,7 @@ interpolationSchemes snGradSchemes { - default limited 0.33; + default limited corrected 0.33; } fluxRequired diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes index 258bb383f2..953fe762d0 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes @@ -37,7 +37,7 @@ divSchemes laplacianSchemes { - default Gauss linear limited 0.5; + default Gauss linear limited corrected 0.5; } interpolationSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes index b12dc45dcf..bfd86f807a 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes @@ -42,12 +42,12 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear limited 0.5; - laplacian(DkEff,k) Gauss linear limited 0.5; - laplacian(DREff,R) Gauss linear limited 0.5; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5; - laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5; - laplacian(alphaEff,e) Gauss linear limited 0.5; + laplacian(muEff,U) Gauss linear limited corrected 0.5; + laplacian(DkEff,k) Gauss linear limited corrected 0.5; + laplacian(DREff,R) Gauss linear limited corrected 0.5; + laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.5; + laplacian((rho*(1|A(U))),p) Gauss linear limited corrected 0.5; + laplacian(alphaEff,e) Gauss linear limited corrected 0.5; } interpolationSchemes diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes index 3d223e01d6..03be7b49e0 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes +++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes @@ -45,7 +45,7 @@ divSchemes laplacianSchemes { - default Gauss linear limited 0.33; + default Gauss linear limited corrected 0.33; } interpolationSchemes @@ -55,7 +55,7 @@ interpolationSchemes snGradSchemes { - default limited 0.33; + default limited corrected 0.33; } fluxRequired diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes index 774f507b64..492b79ef74 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes @@ -35,7 +35,7 @@ divSchemes laplacianSchemes { - default Gauss linear limited 0.333; + default Gauss linear limited corrected 0.333; } interpolationSchemes @@ -45,7 +45,7 @@ interpolationSchemes snGradSchemes { - default limited 0.333; + default limited corrected 0.333; } fluxRequired diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties index e0e6b776a2..34da39d900 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties +++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties @@ -21,5 +21,4 @@ turbulence on; printCoeffs on; - // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes index 44313d502d..9143f603f4 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes @@ -42,15 +42,15 @@ gradSchemes laplacianSchemes { - default Gauss linear limited 0.5; + default Gauss linear limited corrected 0.5; } snGradSchemes { default none; - snGrad(pd) limited 0.5; - snGrad(rho) limited 0.5; - snGrad(alpha1) limited 0.5; + snGrad(pd) limited corrected 0.5; + snGrad(rho) limited corrected 0.5; + snGrad(alpha1) limited corrected 0.5; } fluxRequired