BUG: Corrected forces function object calc and file output on change - mantis #773

src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "functionObjectFile.H"
 #include "Time.H"
 #include "polyMesh.H"
+#include "IFstream.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -84,7 +85,16 @@ void Foam::functionObjectFile::createFiles()
 
                 mkDir(outputDir);
 
-                filePtrs_.set(i, new OFstream(outputDir/(iter.key() + ".dat")));
+                word fName(iter.key());
+
+                // check if file already exists
+                IFstream is(outputDir/(fName + ".dat"));
+                if (is.good())
+                {
+                    fName = fName + "_" + obr_.time().timeName();
+                }
+
+                filePtrs_.set(i, new OFstream(outputDir/(fName + ".dat")));
 
                 writeFileHeader(i);
             }

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

@@ -198,10 +198,10 @@ void Foam::forces::applyBins
 {
     if (nBin_ == 1)
     {
-        force_[0][0] = sum(fN);
-        force_[1][0] = sum(fT);
-        moment_[0][0] = sum(Md ^ fN);
-        moment_[1][0] = sum(Md ^ fT);
+        force_[0][0] += sum(fN);
+        force_[1][0] += sum(fT);
+        moment_[0][0] += sum(Md ^ fN);
+        moment_[1][0] += sum(Md ^ fT);
     }
     else
     {
@@ -471,7 +471,7 @@ void Foam::forces::read(const dictionary& dict)
         // specified directly, from coordinate system, or implicitly (0 0 0)
         if (!dict.readIfPresent<point>("CofR", coordSys_.origin()))
         {
-            coordSys_ = coordinateSystem(obr_, dict);
+            coordSys_ = coordinateSystem(dict, obr_);
             localSystem_ = true;
         }