Merge branch 'master' into particleInteractions

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C

@@ -1010,9 +1010,9 @@ int main(int argc, char *argv[])
                 writer.writeIOField<label>(labelNames);
                 writer.writeIOField<scalar>(scalarNames);
                 writer.writeIOField<vector>(vectorNames);
-                writer.writeIOField<vector>(sphereNames);
+                writer.writeIOField<sphericalTensor>(sphereNames);
-                writer.writeIOField<vector>(symmNames);
+                writer.writeIOField<symmTensor>(symmNames);
-                writer.writeIOField<vector>(tensorNames);
+                writer.writeIOField<tensor>(tensorNames);
             }
         }
     }

applications/utilities/preProcessing/mapFields/mapFields.C

@@ -228,15 +228,8 @@ wordList addProcessorPatches
 
 int main(int argc, char *argv[])
 {
-#   include "setRoots.H"
+    #include "setRoots.H"
-#   include "createTimes.H"
+    #include "createTimes.H"
-#   include "setTimeIndex.H"
-
-    runTimeSource.setTime(sourceTimes[sourceTimeIndex], sourceTimeIndex);
-
-    Info<< "\nSource time: " << runTimeSource.value()
-        << "\nTarget time: " << runTimeTarget.value()
-        << endl;
 
     HashTable<word> patchMap;
     wordList cuttingPatches;
@@ -302,11 +295,7 @@ int main(int argc, char *argv[])
                 caseDirSource/fileName(word("processor") + name(procI))
             );
 
-            runTimeSource.setTime
+            #include "setTimeIndex.H"
-            (
-                sourceTimes[sourceTimeIndex],
-                sourceTimeIndex
-            );
 
             fvMesh meshSource
             (
@@ -348,6 +337,8 @@ int main(int argc, char *argv[])
 
         Info<< "Create source mesh\n" << endl;
 
+        #include "setTimeIndex.H"
+
         fvMesh meshSource
         (
             IOobject
@@ -450,11 +441,7 @@ int main(int argc, char *argv[])
                 caseDirSource/fileName(word("processor") + name(procISource))
             );
 
-            runTimeSource.setTime
+            #include "setTimeIndex.H"
-            (
-                sourceTimes[sourceTimeIndex],
-                sourceTimeIndex
-            );
 
             fvMesh meshSource
             (
@@ -529,6 +516,8 @@ int main(int argc, char *argv[])
     }
     else
     {
+        #include "setTimeIndex.H"
+
         Info<< "Create meshes\n" << endl;
 
         fvMesh meshSource

applications/utilities/preProcessing/mapFields/setTimeIndex.H

@@ -23,3 +23,9 @@
             runTimeTarget.time().value()
         );
     }
+
+    runTimeSource.setTime(sourceTimes[sourceTimeIndex], sourceTimeIndex);
+
+    Info<< "\nSource time: " << runTimeSource.value()
+        << "\nTarget time: " << runTimeTarget.value()
+        << endl;

etc/bashrc

@@ -33,7 +33,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-export WM_PROJECT_VERSION=dev
+[ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=1.6
 
 ################################################################################
 # USER EDITABLE PART

src/postProcessing/functionObjects/forces/forces/forces.C

@@ -211,12 +211,6 @@ Foam::forces::forces
     }
 
     read(dict);
-
-    if (active_)
-    {
-        // Create the forces file if not already created
-        makeFile();
-    }
 }
 
 
@@ -317,16 +311,18 @@ void Foam::forces::makeFile()
         if (Pstream::master())
         {
             fileName forcesDir;
+            word startTimeName =
+                obr_.time().timeName(obr_.time().startTime().value());
+
             if (Pstream::parRun())
             {
                 // Put in undecomposed case (Note: gives problems for
                 // distributed data running)
-                forcesDir =
+                forcesDir = obr_.time().path()/".."/name_/startTimeName;
-                obr_.time().path()/".."/name_/obr_.time().timeName();
             }
             else
             {
-                forcesDir = obr_.time().path()/name_/obr_.time().timeName();
+                forcesDir = obr_.time().path()/name_/startTimeName;
             }
 
             // Create directory if does not exist.

src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L

@@ -67,8 +67,9 @@ int yyFlexLexer::yywrap()
 Foam::string foamSpecieString(const char* YYText)
 {
     Foam::string specieString(YYText);
-    specieString.replaceAll('(', '<');
+    // Transforming parentheses is no longer necessary
-    specieString.replaceAll(')', '>');
+    //specieString.replaceAll('(', '<');
+    //specieString.replaceAll(')', '>');
     return specieString;
 }
 
@@ -804,7 +805,7 @@ bool finishReaction = false;
         }
         else
         {
-            currentSpecieName = keyword;
+            currentSpecieName = foamName(foamSpecieString(YYText()));
 
             HashTable<label>::iterator specieIndexIter
             (

tutorials/mesh/snappyHexMesh/Allrun

@@ -0,0 +1,2 @@
+# These cases are links to solver test cases and are run when the Allrun scripts of those solvers are run.
+# This empty Allrun script avoids the meshing of theses cases to be run twice.