Commits

Satish Balay  committed 79d5ba7 Merge

Merge branch 'maint'

  • Participants
  • Parent commits 96a8e8c, a4b1a0f

Comments (0)

Files changed (4)

         v = "%d.%d" % (major, minor)
         if micro > 0:
             v += ".%d" % micro
-        if patch > 0:
-            v += ".%d" % patch
+        #if patch > 0:
+        #    v += ".post%d" % patch
     else:
         v = "%d.%d.dev%d" % (major, minor+1, 0)
     return v
         return None
     bits = VERSION.split('.')
     if len(bits) == 2: bits.append('0')
-    PETSC_VERSION = '.'.join(bits[:-1]) + '-p' + bits[-1]
+    PETSC_VERSION = '.'.join(bits[:3])
     return ('http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/'
             'petsc-lite-%s.tar.gz#egg=petsc-%s' % (PETSC_VERSION, VERSION))
 

File src/docs/website/documentation/changes/34.html

   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <link href="../../style.css" rel="stylesheet" type="text/css">
-    <title>PETSc: Documentation: Changes: Development</title>
+    <title>PETSc: Documentation: Changes: 3.4</title>
   </head>
   <body>
 
     </div>
 
     <div id="header">
-      <h1><!--begin-->Documentation: Changes: Development<!--end--></h1>
+      <h1><!--begin-->Documentation: Changes: 3.4<!--end--></h1>
     </div>
 
     <hr>
     <div id="main">
 
       <div align="center">
-        <h2><a name="CHANGES">CHANGES in the PETSc Development Version</a></h2>
+        <h2><a name="CHANGES">CHANGES in the PETSc 3.4 Version</a></h2>
       </div>
 
       <h4>General:</h4>

File src/mat/impls/baij/mpi/mpibaij.c

 
 .vb
            0 1 2 3 4 5 6 7 8 9 10 11
-          -------------------
-   row 3  |  o o o d d d o o o o o o
-   row 4  |  o o o d d d o o o o o o
-   row 5  |  o o o d d d o o o o o o
-          -------------------
+          --------------------------
+   row 3  |o o o d d d o o o o  o  o
+   row 4  |o o o d d d o o o o  o  o
+   row 5  |o o o d d d o o o o  o  o
+          --------------------------
 .ve
 
    Thus, any entries in the d locations are stored in the d (diagonal)
 
 .vb
            0 1 2 3 4 5 6 7 8 9 10 11
-          -------------------
-   row 3  |  o o o d d d o o o o o o
-   row 4  |  o o o d d d o o o o o o
-   row 5  |  o o o d d d o o o o o o
-          -------------------
+          --------------------------
+   row 3  |o o o d d d o o o o  o  o
+   row 4  |o o o d d d o o o o  o  o
+   row 5  |o o o d d d o o o o  o  o
+          --------------------------
 .ve
 
    Thus, any entries in the d locations are stored in the d (diagonal)

File src/mat/impls/sbaij/mpi/mpisbaij.c

 
 .vb
            0 1 2 3 4 5 6 7 8 9 10 11
-          -------------------
-   row 3  |  . . . d d d o o o o o o
-   row 4  |  . . . d d d o o o o o o
-   row 5  |  . . . d d d o o o o o o
-          -------------------
+          --------------------------
+   row 3  |. . . d d d o o o o  o  o
+   row 4  |. . . d d d o o o o  o  o
+   row 5  |. . . d d d o o o o  o  o
+          --------------------------
 .ve
 
    Thus, any entries in the d locations are stored in the d (diagonal)
 
 .vb
            0 1 2 3 4 5 6 7 8 9 10 11
-          -------------------
-   row 3  |  . . . d d d o o o o o o
-   row 4  |  . . . d d d o o o o o o
-   row 5  |  . . . d d d o o o o o o
-          -------------------
+          --------------------------
+   row 3  |. . . d d d o o o o  o  o
+   row 4  |. . . d d d o o o o  o  o
+   row 5  |. . . d d d o o o o  o  o
+          --------------------------
 .ve
 
    Thus, any entries in the d locations are stored in the d (diagonal)