Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H

@@ -37,14 +37,17 @@ if (mesh.changing())
         pcorrTypes
     );
 
-    // dimensionedScalar rAUf("rAUf", dimTime/rho.dimensions(), 1.0);
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
 
+    #ifndef divUCorr
+    #define divUCorr
+    #endif
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
-            fvm::laplacian(rAUf, pcorr) == fvc::div(phi)
+            fvm::laplacian(rAUf, pcorr) == fvc::div(phi) divUCorr
         );
 
         pcorrEqn.setReference(pRefCell, pRefValue);
@@ -56,5 +59,7 @@ if (mesh.changing())
         }
     }
 
+    #undef divUCorr
+
     #include "continuityErrs.H"
 }

applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H

@@ -82,7 +82,16 @@
                 0
             );
 
-            tphiAlpha() += tphiAlphaCorr();
+            // Under-relax the correction for all but the 1st corrector
+            if (aCorr == 0)
+            {
+                tphiAlpha() += tphiAlphaCorr();
+            }
+            else
+            {
+                alpha1 = 0.5*alpha1 + 0.5*alpha10;
+                tphiAlpha() += 0.5*tphiAlphaCorr();
+            }
         }
         else
         {

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,6 @@ int main(int argc, char *argv[])
         dimensionedScalar("rAUf", dimTime/rho.dimensions(), 1.0)
     );
 
-    #include "../interFoam/interDyMFoam/correctPhi.H"
     #include "createUf.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
@@ -106,6 +105,9 @@ int main(int argc, char *argv[])
         {
             if (pimple.firstIter() || moveMeshOuterCorrectors)
             {
+                // Store divU from the previous mesh for the correctPhi
+                volScalarField divU(fvc::div(fvc::absolute(phi, U)));
+
                 scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
 
                 mesh.update();
@@ -125,6 +127,7 @@ int main(int argc, char *argv[])
                     // Calculate absolute flux from the mapped surface velocity
                     phi = mesh.Sf() & Uf;
 
+                    #define divUCorr -divU
                     #include "../interFoam/interDyMFoam/correctPhi.H"
 
                     // Make the flux relative to the mesh motion

applications/utilities/mesh/generation/Allwmake

@@ -7,7 +7,7 @@ wmake all extrude
 wmake all extrude2DMesh
 wmake all snappyHexMesh
 
-if [ -d "$CGAL_ARCH_PATH" ]
+if [ -n "$CGAL_ARCH_PATH" ]
 then
     wmake libso foamyHexMesh/conformalVoronoiMesh
     wmake all foamyHexMesh

applications/utilities/mesh/generation/foamyHexMesh/Allwmake

@@ -2,7 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-if [ -d "$CGAL_ARCH_PATH" ]
+if [ -n "$CGAL_ARCH_PATH" ]
 then
     wmake libso conformalVoronoiMesh
     wmake

applications/utilities/mesh/generation/foamyQuadMesh/Allwmake

@@ -2,7 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-if [ -d "$CGAL_ARCH_PATH" ]
+if [ -n "$CGAL_ARCH_PATH" ]
 then
     #- Already built by ../Allwake
     #wmake libso ../foamyHexMesh/conformalVoronoiMesh

applications/utilities/parallelProcessing/decomposePar/decomposePar.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,8 +55,8 @@ Usage
     \param -fields \n
     Use existing geometry decomposition and convert fields only.
 
-    \param -sets \n
-    Decompose cellSets, faceSets, pointSets.
+    \param -noSets \n
+    Skip decomposing cellSets, faceSets, pointSets.
 
     \param -force \n
     Remove any existing \a processor subdirectories before decomposing the

applications/utilities/preProcessing/mapFields/Make/options

@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG -g -O0 \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \