Changeset 2744 for ThirdParty


Ignore:
Timestamp:
Apr 26, 2013 6:41:38 AM (7 years ago)
Author:
stefan
Message:

sync with trunk rev 2743

Location:
ThirdParty/Mumps/stable/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/stable/1.4

  • ThirdParty/Mumps/stable/1.4/mumps.patch

    r2739 r2744  
    1 diff -Nu MUMPS.orig/src/dmumps_part2.F MUMPS/src/dmumps_part2.F
    2 --- MUMPS.orig/src/dmumps_part2.F       2013-04-13 12:38:26.000000000 +0200
    3 +++ MUMPS/src/dmumps_part2.F    2013-04-13 12:39:56.000000000 +0200
     1--- /home/stefan/work/coin/CoinAll-trunk/ThirdParty/Mumps/MUMPS/src/dmumps_part2.F      2011-05-10 14:57:26.000000000 +0200
     2+++ MUMPS/src/dmumps_part2.F    2013-04-26 12:21:16.000000000 +0200
    43@@ -1146,7 +1146,7 @@
    54       IF ( (KEEP(50).EQ.2)
     
    76      & .AND. (IORD .EQ. 7) ) THEN 
    87-        IORD = 2
    9 +        IORD = 6
     8+        IORD = 0
    109       ENDIF
    1110       CALL DMUMPS_701( N, KEEP(50), NSLAVES, IORD,
    1211      &     symmetry, MedDens, NBQD, AvgDens,
    13 @@ -3642,7 +3642,7 @@
     12@@ -1162,8 +1162,13 @@
     13          IF(KEEP(95) .EQ. 2 .AND. IORD .EQ. 0) THEN
     14             IF (PROK) WRITE(MP,*)
     15      &      'WARNING: DMUMPS_195 AMD not available with ',
     16-     &      ' compressed ordering -> move to QAMD'
     17-            IORD = 6
     18+#if defined(metis) || defined(parmetis)
     19+     &      'compressed ordering -> move to METIS'
     20+            IORD = 5
     21+#else
     22+     &      'compressed ordering -> move to AMF'
     23+            IORD = 2
     24+#endif
     25          ENDIF
     26       ELSE
     27          KEEP(95) = 1
     28@@ -3642,7 +3647,7 @@
    1429              IF (NBQD.GE.MAXQD) THEN
    1530                IORD = 6         
    1631              ELSE
    1732-               IORD = 2         
    18 +               IORD = 6         
     33+               IORD = 0         
    1934              ENDIF
    2035           ELSE
    2136              IF (NBQD.GE.MedDens*NPROCS) THEN
    22 @@ -3668,7 +3668,7 @@
     37@@ -3668,7 +3673,7 @@
    2338             IF (NBQD.GE.MAXQD) THEN
    2439               IORD = 6 
    2540             ELSE
    2641-              IORD = 2   
    27 +              IORD = 6   
     42+              IORD = 0   
    2843             ENDIF
    2944           ELSE
Note: See TracChangeset for help on using the changeset viewer.