From 041d9b4b6b504ade464572b97c7e5d26e3f3cf54 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 7 Mar 2013 11:30:52 +0000
Subject: [PATCH 1/4] readSTLASCII.L: support the change to flex in version
 2.5.37

---
 src/triSurface/triSurface/interfaces/STL/readSTLASCII.L | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
index ddefb95a85..06ac6ef0c1 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -55,7 +55,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! \cond dummy
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_SUBMINOR_VERSION < 34 || YY_FLEX_SUBMINOR_VERSION > 36
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()

From e6de1c624944269d629cba58e945f06c723afe22 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 7 Mar 2013 11:31:03 +0000
Subject: [PATCH 2/4] update header

---
 src/triSurface/triSurface/interfaces/STL/readSTLASCII.L | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
index 06ac6ef0c1..f2fb5c6e4d 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -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-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 5624ea7f54e1f6dd7b35dc683bc1a6fef44be810 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 7 Mar 2013 11:31:30 +0000
Subject: [PATCH 3/4] fvMesh: handle MeshObjects allocated to lduMesh

---
 src/finiteVolume/fvMesh/fvMesh.C | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index ca37a793af..fb78a0838c 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -50,6 +50,7 @@ namespace Foam
 void Foam::fvMesh::clearGeomNotOldVol()
 {
     meshObject::clear<fvMesh, GeometricMeshObject>(*this);
+    meshObject::clear<lduMesh, GeometricMeshObject>(*this);
 
     slicedVolScalarField::DimensionedInternalField* VPtr =
         static_cast<slicedVolScalarField::DimensionedInternalField*>(VPtr_);
@@ -112,6 +113,7 @@ void Foam::fvMesh::clearGeom()
 void Foam::fvMesh::clearAddressing()
 {
     meshObject::clear<fvMesh, TopologicalMeshObject>(*this);
+    meshObject::clear<lduMesh, TopologicalMeshObject>(*this);
     deleteDemandDrivenData(lduPtr_);
 }
 
@@ -632,6 +634,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
     surfaceInterpolation::movePoints();
 
     meshObject::movePoints<fvMesh>(*this);
+    meshObject::movePoints<lduMesh>(*this);
 
     return tsweptVols;
 }
@@ -654,6 +657,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
     clearAddressing();
 
     meshObject::updateMesh<fvMesh>(*this, mpm);
+    meshObject::updateMesh<lduMesh>(*this, mpm);
 }
 
 

From 436bcac64fefe129a1eff53f8ad58da3a46457db Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 7 Mar 2013 11:32:06 +0000
Subject: [PATCH 4/4] tractionDisplacementFvPatchVectorField: changed applied
 pressure to be +ve from the outside Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=763

---
 .../tractionDisplacementFvPatchVectorField.C                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index a0056d3c9a..57f4e68589 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.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-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,7 +181,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs()
 
     gradient() =
     (
-        (traction_ + pressure_*n)/rho
+        (traction_ - pressure_*n)/rho
       + twoMuLambda*fvPatchField<vector>::snGrad() - (n & sigmaD)
     )/twoMuLambda;