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

applications/utilities/mesh/manipulation/createPatch/createPatch.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
@@ -490,11 +490,17 @@ void syncPoints
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
-#   include "addRegionOption.H"
+    #include "addOverwriteOption.H"
+    #include "addRegionOption.H"
+    argList::addOption
+    (
+        "dict",
+        "word",
+        "name of dictionary to provide patch information"
+    );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
 
     Foam::word meshRegionName = polyMesh::defaultRegion;
@@ -502,13 +508,18 @@ int main(int argc, char *argv[])
 
     const bool overwrite = args.optionFound("overwrite");
 
-    Info<< "Reading createPatchDict." << nl << endl;
+    word dictName
+    (
+        args.optionLookupOrDefault<word>("dict", "createPatchDict")
+    );
+
+    Info<< "Reading " << dictName << nl << endl;
 
     IOdictionary dict
     (
         IOobject
         (
-            "createPatchDict",
+            dictName,
             runTime.system(),
             (
                 meshRegionName != polyMesh::defaultRegion
@@ -526,7 +537,7 @@ int main(int argc, char *argv[])
     // Whether to synchronise points
     const Switch pointSync(dict.lookup("pointSync"));
 
-#   include "createNamedPolyMesh.H"
+    #include "createNamedPolyMesh.H"
 
     const word oldInstance = mesh.pointsInstance();
 
@@ -607,6 +618,11 @@ int main(int argc, char *argv[])
                     ).ptr()
                 );
             }
+            else
+            {
+                Info<< "Patch '" << patchName << "' already exists.  Only "
+                    << "moving patch faces - type will remain the same" << endl;
+            }
         }
 
         // Copy old patches.

applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C

@@ -61,6 +61,8 @@ int main(int argc, char *argv[])
     );
 
     argList::noParallel();
+    #include "addOverwriteOption.H"
+
     argList::validArgs.append("masterCase");
     argList::addOption
     (
@@ -83,6 +85,8 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
+    const bool overwrite = args.optionFound("overwrite");
+
     fileName masterCase = args[1];
     word masterRegion = polyMesh::defaultRegion;
     args.optionReadIfPresent("masterRegion", masterRegion);
@@ -126,7 +130,10 @@ int main(int argc, char *argv[])
         )
     );
 
-    runTimeMaster++;
+    if (!overwrite)
+    {
+        runTimeMaster++;
+    }
 
     Info<< "Writing combined mesh to " << runTimeMaster.timeName() << endl;
 

src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C

@@ -128,7 +128,7 @@ void Foam::ReactingParcel<ParcelType>::readFields
     wordList stateLabels(nPhases, "");
     if (compModel.nPhase() == 1)
     {
-        stateLabels = compModel.stateLabels();
+        stateLabels = compModel.stateLabels()[0];
     }
 
 
@@ -198,7 +198,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
         wordList stateLabels(phaseTypes.size(), "");
         if (compModel.nPhase() == 1)
         {
-            stateLabels = compModel.stateLabels();
+            stateLabels = compModel.stateLabels()[0];
         }
 
         forAll(phaseTypes, j)

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties

@@ -136,7 +136,7 @@ charCoeffs
     thermodynamics
     {
         Hf      0;
-        C0      611.0;; // Cp = C0*(T/Tref)^n0
+        C0      611.0; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties

@@ -141,7 +141,7 @@ charCoeffs
     thermodynamics
     {
         Hf      0;
-        C0      611.0;; // Cp = C0*(T/Tref)^n0
+        C0      611.0; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties

@@ -136,7 +136,7 @@ charCoeffs
     thermodynamics
     {
         Hf      0;
-        C0      611.0;; // Cp = C0*(T/Tref)^n0
+        C0      611.0; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties

@@ -141,7 +141,7 @@ charCoeffs
     thermodynamics
     {
         Hf      0;
-        C0      611.0;; // Cp = C0*(T/Tref)^n0
+        C0      611.0; // Cp = C0*(T/Tref)^n0
         Tref    300;
         n0      1.31;
     }