From 831474dcfaab691bef53b0208f5c2b84b3f1d2bc Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 2 Apr 2013 02:28:13 +0000 Subject: [PATCH] Make sure the C++ compiler does not interpret "abc"ID"abc" as a user-defined literal with tag "ID". git-svn-id: https://svn.dealii.org/trunk@29141 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/umfpack/AMD/Source/amd_1.cc | 2 +- deal.II/bundled/umfpack/AMD/Source/amd_2.cc | 88 +++++++++---------- deal.II/bundled/umfpack/AMD/Source/amd_aat.cc | 10 +-- .../bundled/umfpack/AMD/Source/amd_dump.cc | 24 ++--- .../umfpack/AMD/Source/amd_post_tree.cc | 8 +- .../umfpack/AMD/Source/amd_postorder.cc | 16 ++-- .../bundled/umfpack/AMD/Source/amd_valid.cc | 10 +-- 7 files changed, 79 insertions(+), 79 deletions(-) diff --git a/deal.II/bundled/umfpack/AMD/Source/amd_1.cc b/deal.II/bundled/umfpack/AMD/Source/amd_1.cc index 30cb277249..cb1b9a6c93 100644 --- a/deal.II/bundled/umfpack/AMD/Source/amd_1.cc +++ b/deal.II/bundled/umfpack/AMD/Source/amd_1.cc @@ -86,7 +86,7 @@ GLOBAL void AMD_1 for (k = 0 ; k < n ; k++) { - AMD_DEBUG1 (("Construct row/column k= "ID" of A+A'\n", k)) ; + AMD_DEBUG1 (("Construct row/column k= " ID " of A+A'\n", k)) ; p1 = Ap [k] ; p2 = Ap [k+1] ; diff --git a/deal.II/bundled/umfpack/AMD/Source/amd_2.cc b/deal.II/bundled/umfpack/AMD/Source/amd_2.cc index 97b4f7a365..9a923dd282 100644 --- a/deal.II/bundled/umfpack/AMD/Source/amd_2.cc +++ b/deal.II/bundled/umfpack/AMD/Source/amd_2.cc @@ -604,7 +604,7 @@ GLOBAL void AMD_2 } dense = MAX (16, dense) ; dense = MIN (n, dense) ; - AMD_DEBUG1 (("\n\nAMD (debug), alpha %g, aggr. "ID"\n", + AMD_DEBUG1 (("\n\nAMD (debug), alpha %g, aggr. " ID "\n", alpha, aggressive)) ; for (i = 0 ; i < n ; i++) @@ -622,7 +622,7 @@ GLOBAL void AMD_2 } #ifndef NDEBUG - AMD_DEBUG1 (("\n======Nel "ID" initial\n", nel)) ; + AMD_DEBUG1 (("\n======Nel " ID " initial\n", nel)) ; AMD_dump (n, Pe, Iw, Len, iwlen, pfree, Nv, Next, Last, Head, Elen, Degree, W, -1) ; #endif @@ -667,7 +667,7 @@ GLOBAL void AMD_2 * version does not have this option. * ------------------------------------------------------------- */ - AMD_DEBUG1 (("Dense node "ID" degree "ID"\n", i, deg)) ; + AMD_DEBUG1 (("Dense node " ID " degree " ID "\n", i, deg)) ; ndense++ ; Nv [i] = 0 ; /* do not postorder this node */ Elen [i] = EMPTY ; @@ -699,7 +699,7 @@ GLOBAL void AMD_2 { #ifndef NDEBUG - AMD_DEBUG1 (("\n======Nel "ID"\n", nel)) ; + AMD_DEBUG1 (("\n======Nel " ID "\n", nel)) ; if (AMD_debug >= 2) { AMD_dump (n, Pe, Iw, Len, iwlen, pfree, Nv, Next, @@ -723,7 +723,7 @@ GLOBAL void AMD_2 } mindeg = deg ; ASSERT (me >= 0 && me < n) ; - AMD_DEBUG1 (("=================me: "ID"\n", me)) ; + AMD_DEBUG1 (("=================me: " ID "\n", me)) ; /* ----------------------------------------------------------------- */ /* remove chosen variable from link list */ @@ -831,7 +831,7 @@ GLOBAL void AMD_2 e = me ; pj = p ; ln = slenme ; - AMD_DEBUG2 (("Search sv: "ID" "ID" "ID"\n", me,pj,ln)) ; + AMD_DEBUG2 (("Search sv: " ID " " ID " " ID "\n", me,pj,ln)) ; } else { @@ -840,7 +840,7 @@ GLOBAL void AMD_2 ASSERT (e >= 0 && e < n) ; pj = Pe [e] ; ln = Len [e] ; - AMD_DEBUG2 (("Search element e "ID" in me "ID"\n", e,me)) ; + AMD_DEBUG2 (("Search element e " ID " in me " ID "\n", e,me)) ; ASSERT (Elen [e] < EMPTY && W [e] > 0 && pj >= 0) ; } ASSERT (ln >= 0 && (ln == 0 || (pj >= 0 && pj < iwlen))) ; @@ -857,7 +857,7 @@ GLOBAL void AMD_2 i = Iw [pj++] ; ASSERT (i >= 0 && i < n && (i == me || Elen [i] >= EMPTY)); nvi = Nv [i] ; - AMD_DEBUG2 ((": "ID" "ID" "ID" "ID"\n", + AMD_DEBUG2 ((": " ID " " ID " " ID " " ID "\n", i, Elen [i], Nv [i], wflg)) ; if (nvi > 0) @@ -912,7 +912,7 @@ GLOBAL void AMD_2 j = FLIP (Iw [psrc++]) ; if (j >= 0) { - AMD_DEBUG2 (("Got object j: "ID"\n", j)) ; + AMD_DEBUG2 (("Got object j: " ID "\n", j)) ; Iw [pdst] = Pe [j] ; Pe [j] = pdst++ ; lenj = Len [j] ; @@ -946,7 +946,7 @@ GLOBAL void AMD_2 degme += nvi ; Nv [i] = -nvi ; Iw [pfree++] = i ; - AMD_DEBUG2 ((" s: "ID" nv "ID"\n", i, Nv [i])); + AMD_DEBUG2 ((" s: " ID " nv " ID "\n", i, Nv [i])); /* ------------------------------------------------- */ /* remove variable i from degree link list */ @@ -974,7 +974,7 @@ GLOBAL void AMD_2 { /* set tree pointer and flag to indicate element e is * absorbed into new element me (the parent of e is me) */ - AMD_DEBUG1 ((" Element "ID" => "ID"\n", e, me)) ; + AMD_DEBUG1 ((" Element " ID " => " ID "\n", e, me)) ; Pe [e] = FLIP (me) ; W [e] = 0 ; } @@ -998,8 +998,8 @@ GLOBAL void AMD_2 * diagonal part). */ #ifndef NDEBUG - AMD_DEBUG2 (("New element structure: length= "ID"\n", pme2-pme1+1)) ; - for (pme = pme1 ; pme <= pme2 ; pme++) AMD_DEBUG3 ((" "ID"", Iw[pme])); + AMD_DEBUG2 (("New element structure: length= " ID "\n", pme2-pme1+1)) ; + for (pme = pme1 ; pme <= pme2 ; pme++) AMD_DEBUG3 ((" " ID "", Iw[pme])); AMD_DEBUG3 (("\n")) ; #endif @@ -1036,7 +1036,7 @@ GLOBAL void AMD_2 i = Iw [pme] ; ASSERT (i >= 0 && i < n) ; eln = Elen [i] ; - AMD_DEBUG3 ((""ID" Elen "ID": \n", i, eln)) ; + AMD_DEBUG3 (("" ID " Elen " ID ": \n", i, eln)) ; if (eln > 0) { /* note that Nv [i] has been negated to denote i in Lme: */ @@ -1048,7 +1048,7 @@ GLOBAL void AMD_2 e = Iw [p] ; ASSERT (e >= 0 && e < n) ; we = W [e] ; - AMD_DEBUG4 ((" e "ID" we "ID" ", e, we)) ; + AMD_DEBUG4 ((" e " ID " we " ID " ", e, we)) ; if (we >= wflg) { /* unabsorbed element e has been seen in this loop */ @@ -1084,7 +1084,7 @@ GLOBAL void AMD_2 { i = Iw [pme] ; ASSERT (i >= 0 && i < n && Nv [i] < 0 && Elen [i] >= 0) ; - AMD_DEBUG2 (("Updating: i "ID" "ID" "ID"\n", i, Elen[i], Len [i])); + AMD_DEBUG2 (("Updating: i " ID " " ID " " ID "\n", i, Elen[i], Len [i])); p1 = Pe [i] ; p2 = p1 + Elen [i] - 1 ; pn = p1 ; @@ -1114,12 +1114,12 @@ GLOBAL void AMD_2 deg += dext ; Iw [pn++] = e ; hash += e ; - AMD_DEBUG4 ((" e: "ID" hash = "ID"\n",e,hash)) ; + AMD_DEBUG4 ((" e: " ID " hash = " ID "\n",e,hash)) ; } else { /* external degree of e is zero, absorb e into me*/ - AMD_DEBUG1 ((" Element "ID" =>"ID" (aggressive)\n", + AMD_DEBUG1 ((" Element " ID " =>" ID " (aggressive)\n", e, me)) ; ASSERT (dext == 0) ; Pe [e] = FLIP (me) ; @@ -1143,7 +1143,7 @@ GLOBAL void AMD_2 deg += dext ; Iw [pn++] = e ; hash += e ; - AMD_DEBUG4 ((" e: "ID" hash = "ID"\n",e,hash)) ; + AMD_DEBUG4 ((" e: " ID " hash = " ID "\n",e,hash)) ; } } } @@ -1172,7 +1172,7 @@ GLOBAL void AMD_2 deg += nvj ; Iw [pn++] = j ; hash += j ; - AMD_DEBUG4 ((" s: "ID" hash "ID" Nv[j]= "ID"\n", + AMD_DEBUG4 ((" s: " ID " hash " ID " Nv[j]= " ID "\n", j, hash, nvj)) ; } } @@ -1212,7 +1212,7 @@ GLOBAL void AMD_2 * flop count analysis. It also means that the post-ordering * is not an exact elimination tree post-ordering. */ - AMD_DEBUG1 ((" MASS i "ID" => parent e "ID"\n", i, me)) ; + AMD_DEBUG1 ((" MASS i " ID " => parent e " ID "\n", i, me)) ; Pe [i] = FLIP (me) ; nvi = -Nv [i] ; degme -= nvi ; @@ -1304,7 +1304,7 @@ GLOBAL void AMD_2 { i = Iw [pme] ; ASSERT (i >= 0 && i < n) ; - AMD_DEBUG2 (("Consider i "ID" nv "ID"\n", i, Nv [i])) ; + AMD_DEBUG2 (("Consider i " ID " nv " ID "\n", i, Nv [i])) ; if (Nv [i] < 0) { /* i is a principal variable in Lme */ @@ -1345,7 +1345,7 @@ GLOBAL void AMD_2 */ ASSERT (i >= EMPTY && i < n) ; - AMD_DEBUG2 (("----i "ID" hash "ID"\n", i, hash)) ; + AMD_DEBUG2 (("----i " ID " hash " ID "\n", i, hash)) ; while (i != EMPTY && Next [i] != EMPTY) { @@ -1381,7 +1381,7 @@ GLOBAL void AMD_2 /* check if j and i have identical nonzero pattern */ /* ------------------------------------------------- */ - AMD_DEBUG3 (("compare i "ID" and j "ID"\n", i,j)) ; + AMD_DEBUG3 (("compare i " ID " and j " ID "\n", i,j)) ; /* check if i and j have the same Len and Elen */ ASSERT (Len [j] >= 0 && Elen [j] >= 0) ; @@ -1399,7 +1399,7 @@ GLOBAL void AMD_2 /* found it! j can be absorbed into i */ /* --------------------------------------------- */ - AMD_DEBUG1 (("found it! j "ID" => i "ID"\n", j,i)); + AMD_DEBUG1 (("found it! j " ID " => i " ID "\n", j,i)); Pe [j] = FLIP (i) ; /* both Nv [i] and Nv [j] are negated since they */ /* are in Lme, and the absolute values of each */ @@ -1448,7 +1448,7 @@ GLOBAL void AMD_2 i = Iw [pme] ; ASSERT (i >= 0 && i < n) ; nvi = -Nv [i] ; - AMD_DEBUG3 (("Restore i "ID" "ID"\n", i, nvi)) ; + AMD_DEBUG3 (("Restore i " ID " " ID "\n", i, nvi)) ; if (nvi > 0) { /* i is a principal variable in Lme */ @@ -1495,7 +1495,7 @@ GLOBAL void AMD_2 /* FINALIZE THE NEW ELEMENT */ /* ========================================================================= */ - AMD_DEBUG2 (("ME = "ID" DONE\n", me)) ; + AMD_DEBUG2 (("ME = " ID " DONE\n", me)) ; Nv [me] = nvpiv ; /* save the length of the list for the new element me */ Len [me] = p - pme1 ; @@ -1542,10 +1542,10 @@ GLOBAL void AMD_2 } #ifndef NDEBUG - AMD_DEBUG2 (("finalize done nel "ID" n "ID"\n ::::\n", nel, n)) ; + AMD_DEBUG2 (("finalize done nel " ID " n " ID "\n ::::\n", nel, n)) ; for (pme = Pe [me] ; pme <= Pe [me] + Len [me] - 1 ; pme++) { - AMD_DEBUG3 ((" "ID"", Iw [pme])) ; + AMD_DEBUG3 ((" " ID "", Iw [pme])) ; } AMD_DEBUG3 (("\n")) ; #endif @@ -1649,13 +1649,13 @@ GLOBAL void AMD_2 AMD_DEBUG2 (("\nTree:\n")) ; for (i = 0 ; i < n ; i++) { - AMD_DEBUG2 ((" "ID" parent: "ID" ", i, Pe [i])) ; + AMD_DEBUG2 ((" " ID " parent: " ID " ", i, Pe [i])) ; ASSERT (Pe [i] >= EMPTY && Pe [i] < n) ; if (Nv [i] > 0) { /* this is an element */ e = i ; - AMD_DEBUG2 ((" element, size is "ID"\n", Elen [i])) ; + AMD_DEBUG2 ((" element, size is " ID "\n", Elen [i])) ; ASSERT (Elen [e] > 0) ; } AMD_DEBUG2 (("\n")) ; @@ -1665,7 +1665,7 @@ GLOBAL void AMD_2 { if (Nv [e] > 0) { - AMD_DEBUG3 (("Element e= "ID" size "ID" nv "ID" \n", e, + AMD_DEBUG3 (("Element e= " ID " size " ID " nv " ID " \n", e, Elen [e], Nv [e])) ; } } @@ -1675,10 +1675,10 @@ GLOBAL void AMD_2 Int cnt ; if (Nv [i] == 0) { - AMD_DEBUG3 (("i unordered: "ID"\n", i)) ; + AMD_DEBUG3 (("i unordered: " ID "\n", i)) ; j = Pe [i] ; cnt = 0 ; - AMD_DEBUG3 ((" j: "ID"\n", j)) ; + AMD_DEBUG3 ((" j: " ID "\n", j)) ; if (j == EMPTY) { AMD_DEBUG3 ((" i is a dense variable\n")) ; @@ -1688,14 +1688,14 @@ GLOBAL void AMD_2 ASSERT (j >= 0 && j < n) ; while (Nv [j] == 0) { - AMD_DEBUG3 ((" j : "ID"\n", j)) ; + AMD_DEBUG3 ((" j : " ID "\n", j)) ; j = Pe [j] ; - AMD_DEBUG3 ((" j:: "ID"\n", j)) ; + AMD_DEBUG3 ((" j:: " ID "\n", j)) ; cnt++ ; if (cnt > n) break ; } e = j ; - AMD_DEBUG3 ((" got to e: "ID"\n", e)) ; + AMD_DEBUG3 ((" got to e: " ID "\n", e)) ; } } } @@ -1717,10 +1717,10 @@ GLOBAL void AMD_2 * was selected as pivot. * ------------------------------------------------------------- */ - AMD_DEBUG1 (("Path compression, i unordered: "ID"\n", i)) ; + AMD_DEBUG1 (("Path compression, i unordered: " ID "\n", i)) ; j = Pe [i] ; ASSERT (j >= EMPTY && j < n) ; - AMD_DEBUG3 ((" j: "ID"\n", j)) ; + AMD_DEBUG3 ((" j: " ID "\n", j)) ; if (j == EMPTY) { /* Skip a dense variable. It has no parent. */ @@ -1731,14 +1731,14 @@ GLOBAL void AMD_2 /* while (j is a variable) */ while (Nv [j] == 0) { - AMD_DEBUG3 ((" j : "ID"\n", j)) ; + AMD_DEBUG3 ((" j : " ID "\n", j)) ; j = Pe [j] ; - AMD_DEBUG3 ((" j:: "ID"\n", j)) ; + AMD_DEBUG3 ((" j:: " ID "\n", j)) ; ASSERT (j >= 0 && j < n) ; } /* got to an element e */ e = j ; - AMD_DEBUG3 (("got to e: "ID"\n", e)) ; + AMD_DEBUG3 (("got to e: " ID "\n", e)) ; /* ------------------------------------------------------------- * traverse the path again from i to e, and compress the path @@ -1751,7 +1751,7 @@ GLOBAL void AMD_2 while (Nv [j] == 0) { jnext = Pe [j] ; - AMD_DEBUG3 (("j "ID" jnext "ID"\n", j, jnext)) ; + AMD_DEBUG3 (("j " ID " jnext " ID "\n", j, jnext)) ; Pe [j] = e ; j = jnext ; ASSERT (j >= 0 && j < n) ; @@ -1837,6 +1837,6 @@ GLOBAL void AMD_2 k = Next [i] ; ASSERT (k >= 0 && k < n) ; Last [k] = i ; - AMD_DEBUG2 ((" perm ["ID"] = "ID"\n", k, i)) ; + AMD_DEBUG2 ((" perm [" ID "] = " ID "\n", k, i)) ; } } diff --git a/deal.II/bundled/umfpack/AMD/Source/amd_aat.cc b/deal.II/bundled/umfpack/AMD/Source/amd_aat.cc index 4f02b755fb..38a56f58f8 100644 --- a/deal.II/bundled/umfpack/AMD/Source/amd_aat.cc +++ b/deal.II/bundled/umfpack/AMD/Source/amd_aat.cc @@ -61,7 +61,7 @@ GLOBAL size_t AMD_aat /* returns nz in A+A' */ { p1 = Ap [k] ; p2 = Ap [k+1] ; - AMD_DEBUG2 (("\nAAT Column: "ID" p1: "ID" p2: "ID"\n", k, p1, p2)) ; + AMD_DEBUG2 (("\nAAT Column: " ID " p1: " ID " p2: " ID "\n", k, p1, p2)) ; /* construct A+A' */ for (p = p1 ; p < p2 ; ) @@ -74,7 +74,7 @@ GLOBAL size_t AMD_aat /* returns nz in A+A' */ * add both A (j,k) and A (k,j) to the matrix A+A' */ Len [j]++ ; Len [k]++ ; - AMD_DEBUG3 ((" upper ("ID","ID") ("ID","ID")\n", j,k, k,j)); + AMD_DEBUG3 ((" upper (" ID "," ID ") (" ID "," ID ")\n", j,k, k,j)); p++ ; } else if (j == k) @@ -103,7 +103,7 @@ GLOBAL size_t AMD_aat /* returns nz in A+A' */ * add both A (i,j) and A (j,i) to the matrix A+A' */ Len [i]++ ; Len [j]++ ; - AMD_DEBUG3 ((" lower ("ID","ID") ("ID","ID")\n", + AMD_DEBUG3 ((" lower (" ID "," ID ") (" ID "," ID ")\n", i,j, j,i)) ; pj++ ; } @@ -136,7 +136,7 @@ GLOBAL size_t AMD_aat /* returns nz in A+A' */ * add both A (i,j) and A (j,i) to the matrix A+A' */ Len [i]++ ; Len [j]++ ; - AMD_DEBUG3 ((" lower cleanup ("ID","ID") ("ID","ID")\n", + AMD_DEBUG3 ((" lower cleanup (" ID "," ID ") (" ID "," ID ")\n", i,j, j,i)) ; } } @@ -168,7 +168,7 @@ GLOBAL size_t AMD_aat /* returns nz in A+A' */ AMD_DEBUG1 (("AMD nz in A+A', excluding diagonal (nzaat) = %g\n", (double) nzaat)) ; - AMD_DEBUG1 ((" nzboth: "ID" nz: "ID" nzdiag: "ID" symmetry: %g\n", + AMD_DEBUG1 ((" nzboth: " ID " nz: " ID " nzdiag: " ID " symmetry: %g\n", nzboth, nz, nzdiag, sym)) ; if (Info != (double *) NULL) diff --git a/deal.II/bundled/umfpack/AMD/Source/amd_dump.cc b/deal.II/bundled/umfpack/AMD/Source/amd_dump.cc index 89d67b875f..30ff32b10d 100644 --- a/deal.II/bundled/umfpack/AMD/Source/amd_dump.cc +++ b/deal.II/bundled/umfpack/AMD/Source/amd_dump.cc @@ -42,7 +42,7 @@ GLOBAL void AMD_debug_init ( char *s ) } if (AMD_debug >= 0) { - printf ("%s: AMD_debug_init, D= "ID"\n", s, AMD_debug) ; + printf ("%s: AMD_debug_init, D= " ID "\n", s, AMD_debug) ; } } @@ -76,7 +76,7 @@ GLOBAL void AMD_dump ( if (AMD_debug < 0) return ; ASSERT (pfree <= iwlen) ; - AMD_DEBUG3 (("\nAMD dump, pfree: "ID"\n", pfree)) ; + AMD_DEBUG3 (("\nAMD dump, pfree: " ID "\n", pfree)) ; for (i = 0 ; i < n ; i++) { pe = Pe [i] ; @@ -89,7 +89,7 @@ GLOBAL void AMD_dump ( { if (nv == 0) { - AMD_DEBUG3 (("\nI "ID": nonprincipal: ", i)) ; + AMD_DEBUG3 (("\nI " ID ": nonprincipal: ", i)) ; ASSERT (elen == EMPTY) ; if (pe == EMPTY) { @@ -99,13 +99,13 @@ GLOBAL void AMD_dump ( else { ASSERT (pe < EMPTY) ; - AMD_DEBUG3 ((" i "ID" -> parent "ID"\n", i, FLIP (Pe[i]))); + AMD_DEBUG3 ((" i " ID " -> parent " ID "\n", i, FLIP (Pe[i]))); } } else { - AMD_DEBUG3 (("\nI "ID": active principal supervariable:\n",i)); - AMD_DEBUG3 ((" nv(i): "ID" Flag: %d\n", nv, (nv < 0))) ; + AMD_DEBUG3 (("\nI " ID ": active principal supervariable:\n",i)); + AMD_DEBUG3 ((" nv(i): " ID " Flag: %d\n", nv, (nv < 0))) ; ASSERT (elen >= 0) ; ASSERT (nv > 0 && pe >= 0) ; p = pe ; @@ -115,7 +115,7 @@ GLOBAL void AMD_dump ( for (k = 0 ; k < len ; k++) { j = Iw [p] ; - AMD_DEBUG3 ((" "ID"", j)) ; + AMD_DEBUG3 ((" " ID "", j)) ; ASSERT (j >= 0 && j < n) ; if (k == elen-1) AMD_DEBUG3 ((" : ")) ; p++ ; @@ -128,13 +128,13 @@ GLOBAL void AMD_dump ( e = i ; if (w == 0) { - AMD_DEBUG3 (("\nE "ID": absorbed element: w "ID"\n", e, w)) ; + AMD_DEBUG3 (("\nE " ID ": absorbed element: w " ID "\n", e, w)) ; ASSERT (nv > 0 && pe < 0) ; - AMD_DEBUG3 ((" e "ID" -> parent "ID"\n", e, FLIP (Pe [e]))) ; + AMD_DEBUG3 ((" e " ID " -> parent " ID "\n", e, FLIP (Pe [e]))) ; } else { - AMD_DEBUG3 (("\nE "ID": unabsorbed element: w "ID"\n", e, w)) ; + AMD_DEBUG3 (("\nE " ID ": unabsorbed element: w " ID "\n", e, w)) ; ASSERT (nv > 0 && pe >= 0) ; p = pe ; AMD_DEBUG3 ((" : ")) ; @@ -142,7 +142,7 @@ GLOBAL void AMD_dump ( for (k = 0 ; k < len ; k++) { j = Iw [p] ; - AMD_DEBUG3 ((" "ID"", j)) ; + AMD_DEBUG3 ((" " ID "", j)) ; ASSERT (j >= 0 && j < n) ; p++ ; } @@ -163,7 +163,7 @@ GLOBAL void AMD_dump ( AMD_DEBUG3 ((ID": \n", deg)) ; for (i = Head [deg] ; i != EMPTY ; i = Next [i]) { - AMD_DEBUG3 ((" "ID" : next "ID" last "ID" deg "ID"\n", + AMD_DEBUG3 ((" " ID " : next " ID " last " ID " deg " ID "\n", i, Next [i], Last [i], Degree [i])) ; ASSERT (i >= 0 && i < n && ilast == Last [i] && deg == Degree [i]) ; diff --git a/deal.II/bundled/umfpack/AMD/Source/amd_post_tree.cc b/deal.II/bundled/umfpack/AMD/Source/amd_post_tree.cc index b4e063d52b..baf888b511 100644 --- a/deal.II/bundled/umfpack/AMD/Source/amd_post_tree.cc +++ b/deal.II/bundled/umfpack/AMD/Source/amd_post_tree.cc @@ -65,7 +65,7 @@ GLOBAL Int AMD_post_tree /* get head of stack */ ASSERT (head < nn) ; i = Stack [head] ; - AMD_DEBUG1 (("head of stack "ID" \n", i)) ; + AMD_DEBUG1 (("head of stack " ID " \n", i)) ; ASSERT (i >= 0 && i < nn) ; if (Child [i] != EMPTY) @@ -86,7 +86,7 @@ GLOBAL Int AMD_post_tree { ASSERT (h > 0) ; Stack [h--] = f ; - AMD_DEBUG1 (("push "ID" on stack\n", f)) ; + AMD_DEBUG1 (("push " ID " on stack\n", f)) ; ASSERT (f >= 0 && f < nn) ; } ASSERT (Stack [h] == i) ; @@ -99,7 +99,7 @@ GLOBAL Int AMD_post_tree /* the children of i (if there were any) are already ordered */ /* remove i from the stack and order it. Front i is kth front */ head-- ; - AMD_DEBUG1 (("pop "ID" order "ID"\n", i, k)) ; + AMD_DEBUG1 (("pop " ID " order " ID "\n", i, k)) ; Order [i] = k++ ; ASSERT (k <= nn) ; } @@ -109,7 +109,7 @@ GLOBAL Int AMD_post_tree for (h = head ; h >= 0 ; h--) { Int j = Stack [h] ; - AMD_DEBUG1 ((" "ID, j)) ; + AMD_DEBUG1 ((" " ID, j)) ; ASSERT (j >= 0 && j < nn) ; } AMD_DEBUG1 (("\n\n")) ; diff --git a/deal.II/bundled/umfpack/AMD/Source/amd_postorder.cc b/deal.II/bundled/umfpack/AMD/Source/amd_postorder.cc index 4adcea3c02..10b2ad7ec5 100644 --- a/deal.II/bundled/umfpack/AMD/Source/amd_postorder.cc +++ b/deal.II/bundled/umfpack/AMD/Source/amd_postorder.cc @@ -68,8 +68,8 @@ GLOBAL void AMD_postorder { if (Nv [j] > 0) { - AMD_DEBUG1 (( ""ID" : nels "ID" npiv "ID" size "ID - " parent "ID" maxfr "ID"\n", j, nels, + AMD_DEBUG1 (( "" ID " : nels " ID " npiv " ID " size " ID + " parent " ID " maxfr " ID "\n", j, nels, Nv [j], Fsize [j], Parent [j], Fsize [j])) ; /* this is an element */ /* dump the link list of children */ @@ -107,12 +107,12 @@ GLOBAL void AMD_postorder #ifndef NDEBUG Int nchild ; - AMD_DEBUG1 (("Before partial sort, element "ID"\n", i)) ; + AMD_DEBUG1 (("Before partial sort, element " ID "\n", i)) ; nchild = 0 ; for (f = Child [i] ; f != EMPTY ; f = Sibling [f]) { ASSERT (f >= 0 && f < nn) ; - AMD_DEBUG1 ((" f: "ID" size: "ID"\n", f, Fsize [f])) ; + AMD_DEBUG1 ((" f: " ID " size: " ID "\n", f, Fsize [f])) ; nchild++ ; ASSERT (nchild <= nn) ; } @@ -140,7 +140,7 @@ GLOBAL void AMD_postorder fnext = Sibling [bigf] ; - AMD_DEBUG1 (("bigf "ID" maxfrsize "ID" bigfprev "ID" fnext "ID + AMD_DEBUG1 (("bigf " ID " maxfrsize " ID " bigfprev " ID " fnext " ID " fprev " ID"\n", bigf, maxfrsize, bigfprev, fnext, fprev)) ; if (fnext != EMPTY) @@ -167,11 +167,11 @@ GLOBAL void AMD_postorder } #ifndef NDEBUG - AMD_DEBUG1 (("After partial sort, element "ID"\n", i)) ; + AMD_DEBUG1 (("After partial sort, element " ID "\n", i)) ; for (f = Child [i] ; f != EMPTY ; f = Sibling [f]) { ASSERT (f >= 0 && f < nn) ; - AMD_DEBUG1 ((" "ID" "ID"\n", f, Fsize [f])) ; + AMD_DEBUG1 ((" " ID " " ID "\n", f, Fsize [f])) ; ASSERT (Nv [f] > 0) ; nchild-- ; } @@ -196,7 +196,7 @@ GLOBAL void AMD_postorder { if (Parent [i] == EMPTY && Nv [i] > 0) { - AMD_DEBUG1 (("Root of assembly tree "ID"\n", i)) ; + AMD_DEBUG1 (("Root of assembly tree " ID "\n", i)) ; k = AMD_post_tree (i, k, Child, Sibling, Order, Stack #ifndef NDEBUG , nn diff --git a/deal.II/bundled/umfpack/AMD/Source/amd_valid.cc b/deal.II/bundled/umfpack/AMD/Source/amd_valid.cc index 4d05925c21..b9c9725193 100644 --- a/deal.II/bundled/umfpack/AMD/Source/amd_valid.cc +++ b/deal.II/bundled/umfpack/AMD/Source/amd_valid.cc @@ -62,28 +62,28 @@ GLOBAL Int AMD_valid { p1 = Ap [j] ; p2 = Ap [j+1] ; - AMD_DEBUG2 (("\nColumn: "ID" p1: "ID" p2: "ID"\n", j, p1, p2)) ; + AMD_DEBUG2 (("\nColumn: " ID " p1: " ID " p2: " ID "\n", j, p1, p2)) ; if (p1 > p2) { /* column pointers must be ascending */ - AMD_DEBUG0 (("column "ID" pointer bad\n", j)) ; + AMD_DEBUG0 (("column " ID " pointer bad\n", j)) ; return (AMD_INVALID) ; } ilast = EMPTY ; for (p = p1 ; p < p2 ; p++) { i = Ai [p] ; - AMD_DEBUG3 (("row: "ID"\n", i)) ; + AMD_DEBUG3 (("row: " ID "\n", i)) ; if (i < 0 || i >= n_row) { /* row index out of range */ - AMD_DEBUG0 (("index out of range, col "ID" row "ID"\n", j, i)); + AMD_DEBUG0 (("index out of range, col " ID " row " ID "\n", j, i)); return (AMD_INVALID) ; } if (i <= ilast) { /* row index unsorted, or duplicate entry present */ - AMD_DEBUG1 (("index unsorted/dupl col "ID" row "ID"\n", j, i)); + AMD_DEBUG1 (("index unsorted/dupl col " ID " row " ID "\n", j, i)); result = AMD_OK_BUT_JUMBLED ; } ilast = i ; -- 2.39.5