mirror of
https://github.com/sfilippone/amg4psblas.git
synced 2026-10-06 14:44:55 +00:00
Try changes for matching
This commit is contained in:
@@ -272,9 +272,7 @@ contains
|
|||||||
write(0,*) 'Impossible: mate(k) > nc'
|
write(0,*) 'Impossible: mate(k) > nc'
|
||||||
cycle
|
cycle
|
||||||
else
|
else
|
||||||
|
|
||||||
if (ilaggr(k) == ilaggr_neginit) then
|
if (ilaggr(k) == ilaggr_neginit) then
|
||||||
|
|
||||||
wk = w(k)
|
wk = w(k)
|
||||||
widx = w(idx)
|
widx = w(idx)
|
||||||
wmax = max(abs(wk),abs(widx))
|
wmax = max(abs(wk),abs(widx))
|
||||||
|
|||||||
@@ -338,7 +338,7 @@ void processMatchedVerticesS(
|
|||||||
#ifdef COUNT_LOCAL_VERTEX
|
#ifdef COUNT_LOCAL_VERTEX
|
||||||
MilanLongInt localVertices = 0;
|
MilanLongInt localVertices = 0;
|
||||||
#endif
|
#endif
|
||||||
//#pragma omp parallel private(k, w, v, k1, adj1, adj2, adj11, adj12, ghostOwner, option) \
|
#pragma omp parallel private(k, w, v, k1, adj1, adj2, adj11, adj12, ghostOwner, option) \
|
||||||
firstprivate(privateU, StartIndex, EndIndex, privateQLocalVtx, privateQGhostVtx, \
|
firstprivate(privateU, StartIndex, EndIndex, privateQLocalVtx, privateQGhostVtx, \
|
||||||
privateQMsgType, privateQOwner, UChunkBeingProcessed) \
|
privateQMsgType, privateQOwner, UChunkBeingProcessed) \
|
||||||
default(shared) num_threads(NUM_THREAD) \
|
default(shared) num_threads(NUM_THREAD) \
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ void processMatchedVerticesAndSendMessagesD(
|
|||||||
vector<MilanLongInt> &QLocalVtx,
|
vector<MilanLongInt> &QLocalVtx,
|
||||||
vector<MilanLongInt> &QGhostVtx,
|
vector<MilanLongInt> &QGhostVtx,
|
||||||
vector<MilanLongInt> &QMsgType,
|
vector<MilanLongInt> &QMsgType,
|
||||||
vector<MilanInt> &QOwner,
|
vector<MilanInt> &QOwner,
|
||||||
vector<MilanLongInt> &privateQLocalVtx,
|
vector<MilanLongInt> &privateQLocalVtx,
|
||||||
vector<MilanLongInt> &privateQGhostVtx,
|
vector<MilanLongInt> &privateQGhostVtx,
|
||||||
vector<MilanLongInt> &privateQMsgType,
|
vector<MilanLongInt> &privateQMsgType,
|
||||||
@@ -345,7 +345,7 @@ void processMatchedVerticesAndSendMessagesS(
|
|||||||
#ifdef COUNT_LOCAL_VERTEX
|
#ifdef COUNT_LOCAL_VERTEX
|
||||||
MilanLongInt localVertices = 0;
|
MilanLongInt localVertices = 0;
|
||||||
#endif
|
#endif
|
||||||
//#pragma omp parallel private(k, w, v, k1, adj1, adj2, adj11, adj12, ghostOwner, option) \
|
#pragma omp parallel private(k, w, v, k1, adj1, adj2, adj11, adj12, ghostOwner, option) \
|
||||||
firstprivate(Message, privateU, StartIndex, EndIndex, privateQLocalVtx, privateQGhostVtx,\
|
firstprivate(Message, privateU, StartIndex, EndIndex, privateQLocalVtx, privateQGhostVtx,\
|
||||||
privateQMsgType, privateQOwner, UChunkBeingProcessed) default(shared) \
|
privateQMsgType, privateQOwner, UChunkBeingProcessed) default(shared) \
|
||||||
num_threads(NUM_THREAD) \
|
num_threads(NUM_THREAD) \
|
||||||
|
|||||||
@@ -98,8 +98,7 @@ subroutine amg_d_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi
|
|||||||
prefix_ = ""
|
prefix_ = ""
|
||||||
end if
|
end if
|
||||||
|
|
||||||
write(iout_,*) trim(prefix_)
|
if (me == 0) write(iout_,*) trim(prefix_)
|
||||||
|
|
||||||
|
|
||||||
if (global_) then
|
if (global_) then
|
||||||
allocate(sz(6))
|
allocate(sz(6))
|
||||||
|
|||||||
Reference in New Issue
Block a user