Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

applications/utilities/postProcessing/graphics/PV3Readers/Allwmake

@@ -5,7 +5,7 @@ set -x
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
     case "$ParaView_VERSION" in
-    3*)
+    3* | git)
         wmake libso vtkPV3Readers
         PV3blockMeshReader/Allwmake
         PV3FoamReader/Allwmake

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake

@@ -5,7 +5,7 @@ set -x
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
     case "$ParaView_VERSION" in
-    3*)
+    3* | git)
         wmake libso vtkPV3Foam
         (
             cd PV3FoamReader

applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake

@@ -5,7 +5,7 @@ set -x
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
     case "$ParaView_VERSION" in
-    3*)
+    3* | git)
         wmake libso vtkPV3blockMesh
         (
             cd PV3blockMeshReader

bin/paraFoam

@@ -130,7 +130,7 @@ OpenFOAM)
 esac
 
 case "$ParaView_VERSION" in
-3*)
+3* | git)
     # only create/remove caseFile if it didn't already exist
     [ -e $caseFile ] || {
         trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT

src/OpenFOAM/db/dictionary/dictionary.C

@@ -122,7 +122,7 @@ Foam::dictionary::dictionary
     const dictionary& dict
 )
 :
-    dictionaryName(parentDict.name() + "::" + dict.name()),
+    dictionaryName(dict.name()),
     IDLList<entry>(dict, *this),
     parent_(parentDict)
 {
@@ -489,7 +489,7 @@ Foam::dictionary Foam::dictionary::subOrEmptyDict
 
     if (entryPtr == NULL)
     {
-        return dictionary(*this, dictionary(keyword));
+        return dictionary(*this, dictionary(name() + "::" + keyword));
     }
     else
     {

src/OpenFOAM/global/argList/argList.C

@@ -827,12 +827,12 @@ void Foam::argList::displayDoc(bool source) const
     List<fileName> docDirs(docDict.lookup("doxyDocDirs"));
     List<fileName> docExts(docDict.lookup("doxySourceFileExts"));
 
-    // for source code: change foo_8C.html to foo_8C-source.html
+    // for source code: change foo_8C.html to foo_8C_source.html
     if (source)
     {
         forAll(docExts, extI)
         {
-            docExts[extI].replace(".", "-source.");
+            docExts[extI].replace(".", "_source.");
         }
     }
 

src/fvMotionSolver/Make/files

@@ -31,10 +31,5 @@ pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPat
 pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
 pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
 pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
-pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
-pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
-pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
-pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
-pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C
 
 LIB = $(FOAM_LIBBIN)/libfvMotionSolvers

src/fvMotionSolver/Make/options

@@ -10,4 +10,4 @@ LIB_LIBS = \
     -lmeshTools \
     -ldynamicMesh \
     -lfiniteVolume \
-    -lforces
+    /*-lforces include in controlDict if needed */

src/postProcessing/functionObjects/forces/Make/files

@@ -4,4 +4,10 @@ forces/forcesFunctionObject.C
 forceCoeffs/forceCoeffs.C
 forceCoeffs/forceCoeffsFunctionObject.C
 
+pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
+pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
+pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C
+
 LIB = $(FOAM_LIBBIN)/libforces

src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C

@@ -81,7 +81,7 @@ greyDiffusiveRadiationMixedFvPatchScalarField
     TName_(dict.lookup("T")),
     emissivity_(readScalar(dict.lookup("emissivity")))
 {
-    if (dict.found("value"))
+    if (dict.found("refValue"))
     {
         fvPatchScalarField::operator=
         (

src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C

@@ -161,7 +161,18 @@ LaunderSharmaKE::LaunderSharmaKE
         mesh_
     ),
 
-    mut_(rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_)),
+    mut_
+    (
+        IOobject
+        (
+            "mut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_)
+    ),
 
     alphat_
     (

tutorials/Alltest

@@ -158,7 +158,7 @@ cp ${MAIN_CONTROL_DICT} ${MAIN_CONTROL_DICT}.org
 
 sed \
 -e s/"\(fvSchemes[ \t]*\)\([0-9]\);"/"\1 1;"/g \
--e s/"\(fvSolution[ \t]*\)\([0-9]\);"/"\1 1;"/g \
+-e s/"\(solution[ \t]*\)\([0-9]\);"/"\1 1;"/g \
 ${MAIN_CONTROL_DICT}.org > ${MAIN_CONTROL_DICT}
 
 echo "Copying the tutorials"

tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     rhoPorousSimpleFoam;
+application     porousSimpleFoam;
 
 startFrom       startTime;
 

tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut

@@ -23,25 +23,25 @@ boundaryField
 {
     front
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     back
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     wall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     porosityWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 

tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     rhoPorousSimpleFoam;
+application     porousSimpleFoam;
 
 startFrom       startTime;
 

tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes

@@ -53,8 +53,7 @@ laplacianSchemes
 
 snGradSchemes
 {
-    default         none;
-    snGrad(p)       corrected;
+    default         corrected;
 }
 
 fluxRequired

tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict

@@ -51,6 +51,11 @@ maxCo           0.2;
 
 maxDeltaT       0.025;
 
-libs            ("libincompressibleRASModels.so" "libfvMotionSolvers.so");
+libs
+(
+    "libincompressibleRASModels.so"
+    "libfvMotionSolvers.so"
+    "libforces.so"
+);
 
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict

@@ -19,10 +19,10 @@ dynamicFvMesh   solidBodyMotionFvMesh;
 
 solidBodyMotionFvMeshCoeffs
 {
-    solidBodyMotionFunction SKA;
-    SKACoeffs
+    solidBodyMotionFunction tabulated6DoFMotion;
+    tabulated6DoFMotionCoeffs
     {
-        CofG            ( 0 0 0 );
+        CofG            (0 0 0);
         timeDataFileName "constant/6DoF.dat";
     }
 }