fix and reformatting

amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP.cpp

@@ -446,7 +446,6 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
 #pragma omp single
         {
 
-
     for ( v=0; v < NLVer; v++ )
             {
                 //Start: PARALLEL_PROCESS_EXPOSED_VERTEX_B(v)
@@ -461,8 +460,14 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
 #ifdef PRINT_DEBUG_INFO_
                 cout<<"\n("<<myRank<<")"<<v+StartIndex<<" Points to: "<<w; fflush(stdout);
 #endif
-                if (isAlreadyMatched(k, verLocInd, StartIndex, EndIndex, GMate, Mate, Ghost2LocalMap))
+
-                {
+
+
+                //If found a dominating edge:
+                if (w >= 0) {
+
+                    //This piece of code is actually executed under 0.01% of the times
+                    if (isAlreadyMatched(k, verLocInd, StartIndex, EndIndex, GMate, Mate, Ghost2LocalMap)) {
                         w = computeCandidateMate(verLocPtr[v],
                                                  verLocPtr[v + 1],
                                                  edgeLocWeight, 0,
@@ -475,8 +480,8 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
                         candidateMate[v] = w;
                     }
 
-                //If found a dominating edge:
                     if (w >= 0) {
+
                         myCard++;
                         if ((w < StartIndex) || (w > EndIndex)) { //w is a ghost vertex
                             //Build the Message Packet:
@@ -546,8 +551,12 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
 
                             } //End of if ( candidateMate[w-StartIndex] == (v+StartIndex) )
                         } //End of Else
+                        continue;
+
+                    } //End of second if
                 } //End of if(w >=0)
-                else {
+
+                    //if (w < 0) { -- if it arrives here this one if is useless, it is certainly -1
                         adj11 = verLocPtr[v];
                         adj12 = verLocPtr[v + 1];
                         for (k1 = adj11; k1 < adj12; k1++) {
@@ -582,10 +591,9 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
 
                             } //End of if(GHOST)
                         } //End of for loop
-                } // End of Else: w == -1
+                    //} // End of Else: w == -1
                     //End:   PARALLEL_PROCESS_EXPOSED_VERTEX_B(v)
             } //End of for ( v=0; v < NLVer; v++ )
-
         } // end of single region
     } // end of parallel region
 

samples/advanced/pdegen/runs/amg_pde3d.inp

@@ -1,6 +1,6 @@
 %%%%%%%%%%%  General  arguments % Lines starting with % are ignored.
 CSR                         ! Storage format CSR COO JAD
-0123                        ! IDIM; domain size. Linear system size is IDIM**3
+0080                        ! IDIM; domain size. Linear system size is IDIM**3
 CONST                       ! PDECOEFF: CONST, EXP, GAUSS Coefficients of the PDE
 BICGSTAB                    ! Iterative method: BiCGSTAB BiCGSTABL BiCG CG CGS FCG GCR RGMRES
 2                           ! ISTOPC