diff --git a/applications/utilities/mesh/conversion/sammToFoam/readPoints.C b/applications/utilities/mesh/conversion/sammToFoam/readPoints.C
index c6b793ff821888861c2228739ee952847d5e031c..00c0a3cc370d8160a0976cd6d56dcd37d094f92d 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readPoints.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readPoints.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
index 5c364266f65cb8976c6b0d976a59cb6a94400f19..bc931fd5c7fe634fe26ccd3505683a06e304a29a 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -86,7 +86,6 @@ void starMesh::readPoints(const scalar scaleFactor)
if (pointsFile.good())
{
label pointLabel;
- scalar x, y, z;
maxLabel = -1;
while (pointsFile)
@@ -97,9 +96,9 @@ void starMesh::readPoints(const scalar scaleFactor)
maxLabel = max(maxLabel, pointLabel);
- x = readVtxCmpt(pointsFile);
- y = readVtxCmpt(pointsFile);
- z = readVtxCmpt(pointsFile);
+ readVtxCmpt(pointsFile);
+ readVtxCmpt(pointsFile);
+ readVtxCmpt(pointsFile);
readToNl(pointsFile);
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index db8765f8cce8824da016e37acc879b79fb378de5..4a73cf1204b884e1ae94dda3fd96929d5b8978a7 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -44,6 +44,7 @@ Description
#include "meshTools.H"
#include "cellSet.H"
#include "faceSet.H"
+#include "SubField.H"
using namespace Foam;
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 827fc25bda5c9a57f066c9632e2adb70805cd036..b41304488d252b1b455a371dc79de0060f7ffd98 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -44,6 +44,7 @@ Description
#include "labelIOList.H"
#include "wedgePolyPatch.H"
#include "plane.H"
+#include "SubField.H"
using namespace Foam;
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index abee4af7ebc0933b70ecf7911926c920baa0960e..988d2a4edb7ae794212d5d69e401a76c07b73828 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -33,7 +33,6 @@ EXE_LIBS = \
-linterfaceProperties \
-lIOFunctionObjects \
-ljobControl \
- -lkineticTheoryModel \
-llagrangian \
-llagrangianIntermediate \
-llaminarFlameSpeedModels \
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
index 099e8d4f37d20f9d07d67ba0111ffaa0c1ac188a..77b53c5815e38dd3fb6c712479080a01ea91264e 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -383,16 +383,12 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
forAll(quadFcs, quadI)
{
- label thisCellI;
-
if (substituteCell)
{
- thisCellI = cellI;
substituteCell = false;
}
else
{
- thisCellI = mesh.nCells() + addCellI;
superCells[addCellI++] = cellI;
}
@@ -430,16 +426,12 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
forAll(triFcs, triI)
{
- label thisCellI;
-
if (substituteCell)
{
- thisCellI = cellI;
substituteCell = false;
}
else
{
- thisCellI = mesh.nCells() + addCellI;
superCells[addCellI++] = cellI;
}
diff --git a/src/OpenFOAM/include/checkTimeOptions.H b/src/OpenFOAM/include/checkTimeOptions.H
index f5e724832245c513f90ad95aaa7f3949b2aa55ea..a52fc1d05ba938b5b9ebe58086db7caf9628e446 100644
--- a/src/OpenFOAM/include/checkTimeOptions.H
+++ b/src/OpenFOAM/include/checkTimeOptions.H
@@ -2,11 +2,11 @@
// checkTimeOptions.H
// ~~~~~~~~~~~~~~~~~~
- Foam::label startTime = 0;
- Foam::label endTime = Times.size();
+Foam::label startTime = 0;
+Foam::label endTime = Times.size();
// unless -constant is present, skip startTime if it is "constant"
-# include "checkConstantOption.H"
+#include "checkConstantOption.H"
// check -time and -latestTime options
-# include "checkTimeOption.H"
+#include "checkTimeOption.H"
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
index 464bfd60b04e0da254bed7354c8683e478d91de8..7350b8d62fa13e806b99abc8839987ecec109ede 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
@@ -24,6 +24,8 @@ License
\*---------------------------------------------------------------------------*/
#include "primitiveMesh.H"
+#include "indexedOctree.H"
+#include "treeDataCell.H"
#include "demandDrivenData.H"
#include "indexedOctree.H"
#include "treeDataCell.H"
diff --git a/src/engine/ignition/ignitionSite.C b/src/engine/ignition/ignitionSite.C
index b83580bd92e9a43fa91b87ac69dfbe10a7d009de..866dfb5ae8bcdf321fee20d74a4ebb9fe9fdf6fc 100644
--- a/src/engine/ignition/ignitionSite.C
+++ b/src/engine/ignition/ignitionSite.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,7 +51,6 @@ void Foam::ignitionSite::findIgnitionCells(const fvMesh& mesh)
cellVolumes_[0] = vols[ignCell];
scalar minDist = GREAT;
- label nearestCell = 0;
label nIgnCells = 1;
forAll(centres, celli)
@@ -60,7 +59,6 @@ void Foam::ignitionSite::findIgnitionCells(const fvMesh& mesh)
if (dist < minDist)
{
- nearestCell = celli;
minDist = dist;
}
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 3a138449b5f07d1057872de2f536df000bcd221c..552ae6fb7003b8e7c89271091a7bfd9661a8da7b 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -654,8 +654,6 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
{
List<label> permutationIndices(nTrans, 0);
- vector s = vector::zero;
-
if (nTrans == 0 && procI != Pstream::myProcNo())
{
treeBoundBox extendedReferredProcBb = allExtendedProcBbs[procI];
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index deb25f37e481635712d8ba55cff58dabf5bdfa6a..dd2aa354d2d9b18cb2e46534d7963b5a948829de 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/src/lagrangian/dieselSpray/parcel/parcel.C
@@ -440,7 +440,6 @@ void Foam::parcel::updateParcelProperties
scalar oldhv = fuels.hl(pg, T(), X());
scalar Np = N(oldDensity);
- scalar newDensity = oldDensity;
scalar newMass = oldMass;
scalar newhg = oldhg;
scalar newhv = oldhv;
@@ -460,7 +459,6 @@ void Foam::parcel::updateParcelProperties
// first time
if (n > 1)
{
- newDensity = fuels.rho(pg, Tnew, X());
newMass = m();
newhg = 0.0;
scalarField Ynew(fuels.Y(X()));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
index b0bf8b74ebf5e6f3baed575d41a500c63af92a8f..bbce1c49d293d35a7a13678f08fff29c7917a931 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
@@ -112,11 +112,10 @@ void Foam::LISA::atomizeParcel
vector uDir = p.U()/mag(p.U());
scalar uGas = mag(vel & uDir);
- vector Ug = uGas*uDir;
// Might be the relative velocity between Liquid and Gas, but using the
// absolute velocity of the parcel as suggested by the authors
-// scalar U = mag(p.Urel(vel));
+ // scalar U = mag(p.Urel(vel));
scalar U = mag(p.U());
p.ct() += deltaT;
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
index a4ff12b6bbbe5771d2255ab2344df8c60e928419..6a378fff5d7de42f9c9eb626154b3a65e08bb656 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
@@ -118,9 +118,6 @@ void Foam::SHF::breakupParcel
scalar reLiquid = p.Re(rhoLiquid, vel, muLiquid);
scalar ohnesorge = sqrt(weLiquid)/(reLiquid + VSMALL);
- vector acceleration = p.Urel(vel)/p.tMom();
- vector trajectory = p.U()/mag(p.U());
-
vector vRel = p.Urel(vel);
scalar weGasCorr = weGas/(1.0 + weCorrCoeff_*ohnesorge);
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
index 3cb6f881f4e9bea4e6799ee1eaf7aeaeb9760fd4..afbdc6de89415dd157362d492be60829d87f4073 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -246,9 +246,6 @@ void Foam::blobsSwirlInjector::calculateHX
)
);
- scalar hOLD = -100.0;
- scalar xOLD = -100.0;
-
label i;
for (i=0; i<20; i++)
@@ -267,10 +264,6 @@ void Foam::blobsSwirlInjector::calculateHX
);
x_ = sqr(1.0 - 2.0*h_/injectorDiameter);
-
- hOLD = h_;
- xOLD = x_;
-
}
x_ = sqr(1.0 - 2.0*h_/injectorDiameter);
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshMerge.C b/src/mesh/blockMesh/blockMesh/blockMeshMerge.C
index 2c63b4f7f5b57df8a1f037c1f8d7abc53f02cd4f..a8cd42eced0fd97df6120b05c065338c7d128f63 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshMerge.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshMerge.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -225,8 +225,6 @@ void Foam::blockMesh::calcMergeInfo()
}
- bool found = false;
-
// N-squared point search over all points of all faces of
// master block over all point of all faces of slave block
forAll(blockPfaceFaces, blockPfaceFaceLabel)
@@ -240,8 +238,6 @@ void Foam::blockMesh::calcMergeInfo()
forAll(blockPfaceFacePoints, blockPfaceFacePointLabel)
{
- found = false;
-
forAll(blockNfaceFaces, blockNfaceFaceLabel)
{
const labelList& blockNfaceFacePoints
@@ -261,7 +257,6 @@ void Foam::blockMesh::calcMergeInfo()
)
{
// Found a new pair
- found = true;
cp[blockPfaceFacePointLabel] =
blockNfaceFacePoints[blockNfaceFacePointLabel];
@@ -332,7 +327,6 @@ void Foam::blockMesh::calcMergeInfo()
const labelListList& curPairs = glueMergePairs[blockFaceLabel];
- bool foundFace = false;
label blockPfaceLabel;
for
(
@@ -347,14 +341,12 @@ void Foam::blockMesh::calcMergeInfo()
== blockInternalFaces[blockFaceLabel]
)
{
- foundFace = true;
break;
}
}
// FIXME? - there seems to be some logic missing here
- foundFace = false;
label blockNfaceLabel;
for
(
@@ -369,7 +361,6 @@ void Foam::blockMesh::calcMergeInfo()
== blockInternalFaces[blockFaceLabel]
)
{
- foundFace = true;
break;
}
}
diff --git a/src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C b/src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C
index d34c4c9e66139962ad2c958801b3f52f97109f69..1bcc5fd7b3f419df6dce9d52aec014e2e4e5ccfa 100644
--- a/src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C
+++ b/src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C
@@ -2958,7 +2958,6 @@ char *timestring ( void )
# define TIME_SIZE 29
const struct tm *tm;
- size_t len;
time_t now;
char *s;
@@ -2967,7 +2966,7 @@ char *timestring ( void )
s = new char[TIME_SIZE];
- len = strftime ( s, TIME_SIZE, "%d %B %Y %I:%M:%S %p", tm );
+ strftime ( s, TIME_SIZE, "%d %B %Y %I:%M:%S %p", tm );
return s;
# undef TIME_SIZE
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
index b3ef7962260ee5579d45f730028485329be3c866..0322954df0db71fddf0b8542ea14749b94835a25 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,20 +83,15 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
) const
{
vector refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 1, 0);
-
vector oldDir = refQ_ & refDir;
-
vector newDir = motion.orientation() & refDir;
if (mag(oldDir & axis_) > 0.95 || mag(newDir & axis_) > 0.95)
{
// Directions getting close to the axis, change reference
-
refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 0, 1);
-
- vector oldDir = refQ_ & refDir;
-
- vector newDir = motion.orientation() & refDir;
+ oldDir = refQ_ & refDir;
+ newDir = motion.orientation() & refDir;
}
// Removing any axis component from oldDir and newDir and normalising
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index a94a885360303df383bedb9abfa7a30457692ecf..00a08fc7f25f7cee2cf3883eebca76f55d4acd4a 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -87,7 +87,6 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
vector refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 1, 0);
vector oldDir = refQ_ & refDir;
-
vector newDir = motion.orientation() & refDir;
if (mag(oldDir & axis_) > 0.95 || mag(newDir & axis_) > 0.95)
@@ -96,9 +95,8 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 0, 1);
- vector oldDir = refQ_ & refDir;
-
- vector newDir = motion.orientation() & refDir;
+ oldDir = refQ_ & refDir;
+ newDir = motion.orientation() & refDir;
}
// Removing any axis component from oldDir and newDir and normalising
diff --git a/tutorials/mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict
index 83ee691b8c6b59eb6267e32abb1f7526fa2e2626..75bf99b39921579efa45f37cd2c8dd3a179bd7ec 100644
--- a/tutorials/mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict
@@ -30,7 +30,7 @@ vertices
blocks
(
- hex (0 1 2 3 4 5 6 7) (15 15 9) simpleGrading (1 1 1)
+ hex (0 1 2 3 4 5 6 7) (20 16 12) simpleGrading (1 1 1)
);
edges
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
index d7f6fd3439d3b475e95ee9656bd9130e1730b7c2..46980c8d2ffad4f0717f3b95390fff344499ccb3 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
@@ -42,16 +42,6 @@ geometry
centre (0 0 -0.012);
radius 0.003;
}
-
- //- Refine a bit extra around the edge of the flange. With only two cells
- // across it might/might not mesh correctly.
- refineCap
- {
- type searchableCylinder;
- point1 (0 0.021 -0.01075);
- point2 (0 0.025 -0.01075);
- radius 0.013;
- }
};
@@ -144,11 +134,6 @@ castellatedMeshControls
mode inside;
levels ((1E15 3));
}
- refineCap
- {
- mode inside;
- levels ((1E15 3));
- }
}