parallel getminmax

This commit is contained in:
Joachim Schoeberl 2013-07-10 07:07:29 +00:00
parent c68278cd67
commit 7aa13b2cdd

View File

@ -12,7 +12,7 @@
// #include <parallel.hpp> // #include <parallel.hpp>
#include <visual.hpp> #include <visual.hpp>
#include <limits>
namespace netgen namespace netgen
{ {
@ -2409,18 +2409,31 @@ namespace netgen
NgProfiler::RegionTimer reg1 (timer1); NgProfiler::RegionTimer reg1 (timer1);
int ne = mesh->GetNE(); int ne = mesh->GetNE();
#pragma omp parallel for double hmax = -numeric_limits<double>::max();
double hmin = numeric_limits<double>::max();
#pragma omp parallel for reduction (max : hmax) reduction (min : hmin)
for (int i = 0; i < ne; i++) for (int i = 0; i < ne; i++)
{ {
bool considerElem = GetValue (sol, i, 0.333, 0.333, 0.333, comp, val); bool considerElem = GetValue (sol, i, 0.333, 0.333, 0.333, comp, val);
#pragma omp critical(getminmaxvol)
if (considerElem) if (considerElem)
{ {
if (val > maxv || !hasit) maxv = val; /*
if (val < minv || !hasit) minv = val; #pragma omp critical(getminmaxvol)
hasit = true; {
if (val > maxv || !hasit) maxv = val;
if (val < minv || !hasit) minv = val;
hasit = true;
}
*/
if (val > hmax) hmax = val;
if (val < hmin) hmin = val;
} }
} }
maxv = hmax;
minv = hmin;
// cout << "maxv = " << maxv << " =?= " << hmax << endl;
} }
if (sol->draw_surface) if (sol->draw_surface)
{ {
@ -2436,8 +2449,8 @@ namespace netgen
if (considerElem) if (considerElem)
{ {
if (val > maxv || !hasit) maxv = val; if (val > maxv) maxv = val;
if (val < minv || !hasit) minv = val; if (val < minv) minv = val;
hasit = true; hasit = true;
} }
} }