Changeset 23925

Timestamp:

05/20/19 16:33:29 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing warnings with new version of PETSc

File:

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

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

@@ -88 +88 @@
          * and I the Schur preconditioner (stored here, because the space was allocated either way) 
          *         */
+        #if _PETSC_MINOR_>10
+        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_MINOR_>10
+        MatCreateSubMatrix(Kff,isp,isp,MAT_INITIAL_MATRIX,&IP);
+        #else
         MatGetSubMatrix(Kff,isp,isp,MAT_INITIAL_MATRIX,&IP);
+        #endif
 
 
@@ -522 +532 @@
         }
 
-  /* Note: SchurCG also constructs the Schur preconditioner and stores it in the free block of Kff */
-  /*                    [A    B]
+  /* Note: SchurCG also constructs the Schur preconditioner and stores it in the free block of Kff 
+   *                    [A    B]
         * Kff =  |      |
         *                       [B^T IP]
-  /* To calculate the residual, only the necessary blocks need to be extracted */
-
-                /*Extract A, B, B^T */
-                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);
+   * To calculate the residual, only the necessary blocks need to be extracted */
+
+        /*Extract A, B, B^T */
+        #if _PETSC_MINOR_>10
+        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*/
@@ -688 +704 @@
         Vector<IssmDouble>* df  = NULL;
         Vector<IssmDouble>* ys  = NULL;
-
-
 
         /*parameters:*/
@@ -707 +721 @@
         int  count=0;
         bool converged=false;
-
         
         /*Start non-linear iteration using input velocity: */
@@ -716 +729 @@
         InputUpdateFromConstantx(femmodel,converged,ConvergedEnum);
         InputUpdateFromSolutionx(femmodel,ug);
-
         
         for(;;){
@@ -724 +736 @@
                 delete ug;
 
-
-                
                 /*Get stiffness matrix and Load vector*/
                 SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);