Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.0.x

OpenFOAM · Nov 28, 2011 · 4a2c44d · 4a2c44d
2 parents 638e9c8 + 4300870
commit 4a2c44d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
@@ -136,6 +136,8 @@ Op(cmptDivide, cmptDivide(x, y))
 Op(stabilise, stabilise(x, y))
 Op(max, max(x, y))
 Op(min, min(x, y))
+Op(minMagSqr, (magSqr(x)<=magSqr(y) ? x : y))
+Op(maxMagSqr, (magSqr(x)>=magSqr(y) ? x : y))
 Op(minMod, minMod(x, y))
 Op(and, x && y)
 Op(or, x || y)

diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
@@ -77,10 +77,9 @@ void Foam::basicSource::writeData(Ostream& os) const
 
 bool Foam::basicSource::read(const dictionary& dict)
 {
-    const dictionary& sourceDict = dict.subDict(name_);
-    active_ = readBool(sourceDict.lookup("active"));
-    timeStart_ = readScalar(sourceDict.lookup("timeStart"));
-    duration_  = readScalar(sourceDict.lookup("duration"));
+    active_ = readBool(dict.lookup("active"));
+    timeStart_ = readScalar(dict.lookup("timeStart"));
+    duration_  = readScalar(dict.lookup("duration"));
     return true;
 }
 

diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
@@ -84,8 +84,8 @@ void Foam::rotatedBoxToCell::combine(topoSet& set, const bool add) const
     {
         boxFaceNormals[i] = boxFaces[i].normal(boxPoints);
 
-        Pout<< "Face:" << i << " position:" << boxFaces[i].centre(boxPoints)
-            << " normal:" << boxFaceNormals[i] << endl;
+        //Pout<< "Face:" << i << " position:" << boxFaces[i].centre(boxPoints)
+        //    << " normal:" << boxFaceNormals[i] << endl;
     }
 
     // Check whether cell centre is inside all faces of box.