Changeset 23220

Timestamp:

09/05/18 09:47:40 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added switch to MatCreateSubMatrix for PETSc 3.5+

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_schurcg.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_schurcg.cpp

@@ -43 +43 @@
     * [ B^T 0 ] 
          *         */
+        #if (_PETSC_MAJOR_==3) && (_PETSC_MINOR_>=8)
+        MatCreateSubMatrix(Kff,isv,isv,MAT_INITIAL_MATRIX,&A);
+        MatCreateSubMatrix(Kff,isv,isp,MAT_INITIAL_MATRIX,&B);
+        MatCreateSubMatrix(Kff,isp,isv,MAT_INITIAL_MATRIX,&BT);
+        #else
         MatGetSubMatrix(Kff,isv,isv,MAT_INITIAL_MATRIX,&A);
         MatGetSubMatrix(Kff,isv,isp,MAT_INITIAL_MATRIX,&B);
         MatGetSubMatrix(Kff,isp,isv,MAT_INITIAL_MATRIX,&BT);
+        #endif
         
         /* Extract preconditioner matrix on the pressure space*/
+        #if (_PETSC_MAJOR_==3) && (_PETSC_MINOR_>=8)
+        MatCreateSubMatrix(Kff,isp,isp,MAT_INITIAL_MATRIX,&IP);
+        #else
         MatGetSubMatrix(Kff,isp,isp,MAT_INITIAL_MATRIX,&IP);
+        #endif
 
         /* Get number of velocity / pressure nodes */
@@ -313 +323 @@
         * Kff =  |      |
         *                       [B^T IP]
-  /* To calculate the residual, only the necessary blocks need to be extracted */
+   * To calculate the residual, only the necessary blocks need to be extracted */
 
                 /*Extract A, B, B^T */
+                #if (_PETSC_MAJOR_==3) && (_PETSC_MINOR_>=8)
+                MatCreateSubMatrix(Kff->pmatrix->matrix,isv,isv,MAT_INITIAL_MATRIX,&A);
+                MatCreateSubMatrix(Kff->pmatrix->matrix,isv,isp,MAT_INITIAL_MATRIX,&B);
+                MatCreateSubMatrix(Kff->pmatrix->matrix,isp,isv,MAT_INITIAL_MATRIX,&BT);
+                #else
                 MatGetSubMatrix(Kff->pmatrix->matrix,isv,isv,MAT_INITIAL_MATRIX,&A);
                 MatGetSubMatrix(Kff->pmatrix->matrix,isv,isp,MAT_INITIAL_MATRIX,&B);
                 MatGetSubMatrix(Kff->pmatrix->matrix,isp,isv,MAT_INITIAL_MATRIX,&BT);
+                #endif
         
                 /*no. of free nodes in velocity/pressure space*/