Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 4a2c44da8bc08afd6ccaf7a1b2106103748ec436 2 parents 638e9c8 + 4300870
authored November 28, 2011
2  src/OpenFOAM/primitives/ops/ops.H
@@ -136,6 +136,8 @@ Op(cmptDivide, cmptDivide(x, y))
136 136
 Op(stabilise, stabilise(x, y))
137 137
 Op(max, max(x, y))
138 138
 Op(min, min(x, y))
  139
+Op(minMagSqr, (magSqr(x)<=magSqr(y) ? x : y))
  140
+Op(maxMagSqr, (magSqr(x)>=magSqr(y) ? x : y))
139 141
 Op(minMod, minMod(x, y))
140 142
 Op(and, x && y)
141 143
 Op(or, x || y)
7  src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
@@ -77,10 +77,9 @@ void Foam::basicSource::writeData(Ostream& os) const
77 77
 
78 78
 bool Foam::basicSource::read(const dictionary& dict)
79 79
 {
80  
-    const dictionary& sourceDict = dict.subDict(name_);
81  
-    active_ = readBool(sourceDict.lookup("active"));
82  
-    timeStart_ = readScalar(sourceDict.lookup("timeStart"));
83  
-    duration_  = readScalar(sourceDict.lookup("duration"));
  80
+    active_ = readBool(dict.lookup("active"));
  81
+    timeStart_ = readScalar(dict.lookup("timeStart"));
  82
+    duration_  = readScalar(dict.lookup("duration"));
84 83
     return true;
85 84
 }
86 85
 
4  src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
@@ -84,8 +84,8 @@ void Foam::rotatedBoxToCell::combine(topoSet& set, const bool add) const
84 84
     {
85 85
         boxFaceNormals[i] = boxFaces[i].normal(boxPoints);
86 86
 
87  
-        Pout<< "Face:" << i << " position:" << boxFaces[i].centre(boxPoints)
88  
-            << " normal:" << boxFaceNormals[i] << endl;
  87
+        //Pout<< "Face:" << i << " position:" << boxFaces[i].centre(boxPoints)
  88
+        //    << " normal:" << boxFaceNormals[i] << endl;
89 89
     }
90 90
 
91 91
     // Check whether cell centre is inside all faces of box.

0 notes on commit 4a2c44d

Please sign in to comment.
Something went wrong with that request. Please try again.