OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Clear the threadGroups before (re)generating them.

Browse Source 
Added: Implementation of ASMunstruct::findClosestNode.
Changed: Some cosmetics in other ASMunstruct methods.
This commit is contained in:
Knut Morten Okstad 2018-07-14 07:39:12 +02:00
parent 607c9771cf
commit 4c6d82eb73
3 changed files with 161 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ASM/ASMunstruct.C
View File

@ -53,4 +53,10 @@ bool ASMunstruct::refine (const LR::RefineData&, Vectors&, const char*)
return false;
}
std::pair<size_t,double> ASMunstruct::findClosestNode (const Vec3&) const
{
return std::make_pair(0,-1.0);
}
#endif

3
src/ASM/ASMunstruct.h
View File

@ -214,6 +214,9 @@ public:
//! \param[in] refTol Mesh refinement threshold
virtual bool refine(const RealFunc& refC, double refTol) = 0;
//! \brief Finds the node that is closest to the given point \b X.
virtual std::pair<size_t,double> findClosestNode(const Vec3& X) const;
protected:
//! \brief Refines the mesh adaptively.
//! \param[in] prm Input data used to control the mesh refinement

124
src/ASM/LR/ASMLRSpline.C
View File

@ -15,10 +15,11 @@
#include "IFEM.h"
#include "LRSpline/LRSplineSurface.h"
#include "LRSpline/Basisfunction.h"
#include "Profiler.h"
#include "Vec3.h"
#include "Vec3Oper.h"
#include "ThreadGroups.h"
#include "Profiler.h"
#include <fstream>
#include <numeric>
#ifdef USE_OPENMP
#include <omp.h>
@ -88,30 +89,31 @@ void LR::getGaussPointParameters (const LR::LRSpline* lrspline, RealArray& uGP,
}
void LR::generateThreadGroups (ThreadGroups& threadGroups, const LR::LRSpline* lr)
void LR::generateThreadGroups (ThreadGroups& threadGroups,
const LR::LRSpline* lr)
{
int nElement = lr->nElements();
int nt = 1;
#ifdef USE_OPENMP
nt = omp_get_max_threads();
#endif
if (nt == 1) {
threadGroups[0].resize(1);
threadGroups[0][0].resize(nElement);
std::iota(threadGroups[0][0].begin(), threadGroups[0][0].end(), 0);
} else {
std::vector<int> status(nElement, 0); // status vector for elements: -1 is unusable for current color, 0 is available, any other is assigned color
std::vector<std::vector<int> > answer;
if (omp_get_max_threads() > 1)
{
for (int i = 0; i < 2; i++)
threadGroups[i].clear();
IntMat& answer = threadGroups[0];
IntVec status(nElement,0); // status vector for elements:
// -1 is unusable for current color, 0 is available,
// any other value is the assigned color
int fixedElements = 0;
int nColors = 0;
while(fixedElements < nElement) {
for (int nColors = 0; fixedElements < nElement; nColors++)
{
// reset un-assigned element tags
for (int i=0; i<nElement; i++)
if (status[i]<0)
status[i] = 0;
std::vector<int> thisColor;
// look for available elements
IntVec thisColor;
for (auto e : lr->getAllElements() ) {
int i = e->getId();
if (status[i] == 0) {
@ -119,7 +121,7 @@ void LR::generateThreadGroups (ThreadGroups& threadGroups, const LR::LRSpline* l
thisColor.push_back(i);
fixedElements++;
for (auto b : e->support()) // for all basisfunctions with support here
for (auto el2 : b->support()) {// for all element this function supports
for (auto el2 : b->support()) {// for all elements this function supports
int j = el2->getId();
if (status[j] == 0) // if not assigned a color yet
status[j] = -1; // set as unavailable (with current color)
@ -127,11 +129,12 @@ void LR::generateThreadGroups (ThreadGroups& threadGroups, const LR::LRSpline* l
}
}
answer.push_back(thisColor);
nColors++;
}
return;
}
#endif
threadGroups[0] = answer;
}
threadGroups.oneGroup(nElement); // No threading, all elements in one group
}
@ -147,20 +150,18 @@ bool ASMunstruct::refine (const LR::RefineData& prm,
nnod = geo->nBasisFunctions();
return true;
}
else if (prm.errors.empty() && prm.elements.empty())
return true;
std::vector<int> nf(sol.size());
if (!prm.errors.empty() || !prm.elements.empty()) {
IntVec nf(sol.size());
for (size_t j = 0; j < sol.size(); j++)
if (!(nf[j] = LR::extendControlPoints(geo,sol[j],this->getNoFields(1))))
return false;
}
else
return true;
if (doRefine(prm, geo))
{
if (!this->doRefine(prm,geo))
return false;
nnod = geo->nBasisFunctions();
for (int i = sol.size()-1; i >= 0; i--) {
sol[i].resize(nf[i]*geo->nBasisFunctions());
LR::contractControlPoints(geo,sol[i],nf[i]);
@ -234,15 +235,20 @@ bool ASMunstruct::refine (const LR::RefineData& prm,
return true;
}
return false;
}
bool ASMunstruct::doRefine(const LR::RefineData& prm,
LR::LRSpline* lrspline)
bool ASMunstruct::doRefine (const LR::RefineData& prm, LR::LRSpline* lrspline)
{
// to pick up if LR splines get stuck while doing refinement,
// print entry and exit point of this function
char doRefine = 0;
if (!prm.errors.empty())
doRefine = 'E'; // Refine based on error indicators
else if (!prm.elements.empty())
doRefine = 'I'; // Refine the specified elements
else
return doRefine;
double beta = prm.options.size() > 0 ? prm.options[0]/100.0 : 0.10;
int multiplicity = prm.options.size() > 1 ? prm.options[1] : 1;
if (multiplicity > 1)
@ -262,13 +268,6 @@ bool ASMunstruct::doRefine(const LR::RefineData& prm,
int maxAspectRatio = prm.options.size() > 5 ? prm.options[5] : -1;
bool closeGaps = prm.options.size() > 6 ? prm.options[6] != 0 : false;
char doRefine = 0;
if (!prm.errors.empty())
doRefine = 'E'; // Refine based on error indicators
else if (!prm.elements.empty())
doRefine = 'I'; // Refine the specified elements
if (doRefine) {
// set refinement parameters
if (maxTjoints > 0)
lrspline->setMaxTjoints(maxTjoints);
@ -287,7 +286,6 @@ bool ASMunstruct::doRefine(const LR::RefineData& prm,
lrspline->refineElement(prm.elements);
lrspline->generateIDs();
}
return doRefine;
}
@ -381,20 +379,19 @@ void ASMunstruct::Sort(int u, int v, int orient,
std::sort(functions.begin(), functions.end(),
[u,v,orient](const LR::Basisfunction* a, const LR::Basisfunction* b)
{
int p1 = a->getOrder(u);
int p2 = a->getOrder(v);
int i,p = a->getOrder(orient < 4 ? v : u);
int idx = orient & 4 ? v : u;
for (i = 0; i <= p; i++)
if ((*a)[idx][i] != (*b)[idx][i])
return orient & 2 ? (*a)[idx][i] > (*b)[idx][i]
: (*a)[idx][i] < (*b)[idx][i];
int idx1 = orient & 4 ? v : u;
int idx2 = orient & 4 ? u : v;
for (int i = 0; i < 1 + (orient < 4 ? p2 : p1); ++i)
if ((*a)[idx1][i] != (*b)[idx1][i])
return orient & 2 ? (*a)[idx1][i] > (*b)[idx1][i]
: (*a)[idx1][i] < (*b)[idx1][i];
for (int i = 0; i < 1 + (orient < 4 ? p1 : p2); ++i)
if ((*a)[idx2][i] != (*b)[idx2][i])
return orient & 1 ? (*a)[idx2][i] > (*b)[idx2][i]
: (*a)[idx2][i] < (*b)[idx2][i];
p = a->getOrder(orient < 4 ? u : v);
idx = orient & 4 ? u : v;
for (i = 0; i <= p; i++)
if ((*a)[idx][i] != (*b)[idx][i])
return orient & 1 ? (*a)[idx][i] > (*b)[idx][i]
: (*a)[idx][i] < (*b)[idx][i];
return false;
});
@ -402,10 +399,29 @@ void ASMunstruct::Sort(int u, int v, int orient,
bool ASMunstruct::transferCntrlPtVars (LR::LRSpline* oldBasis,
const RealArray& oldVars, RealArray& newVars,
const RealArray& oldVars,
RealArray& newVars,
int nGauss, int nf) const
{
oldBasis->rebuildDimension(nf);
oldBasis->setControlPoints(const_cast<RealArray&>(oldVars));
return this->transferCntrlPtVars(oldBasis,newVars,nGauss);
}
std::pair<size_t,double> ASMunstruct::findClosestNode (const Vec3& X) const
{
double distance = 0.0;
size_t inod = 0, iclose = 0;
for (LR::Basisfunction* b : geo->getAllBasisfunctions())
{
double d = (X-Vec3(&(*b->cp()),nsd)).length();
if (++inod == 1 || d < distance)
{
iclose = inod;
distance = d;
}
}
return std::make_pair(iclose,distance);
}