Changeset 22560

Timestamp:

03/18/18 20:55:21 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cleanup, forget about PETSc 2 now

Location:

issm/trunk-jpl/src/c

Files:

• classes/Params/Parameters.cpp (modified) (2 diffs)
• toolkits/petsc/patches/NewMat.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

@@ -658 +658 @@
                 /*In case we are using PETSC, we do not rely on issmoptions. Instead, we dump issmoptions into the Petsc 
                  * options database: */
-
-                #if _PETSC_MAJOR_ == 2 
-                PetscOptionsDestroy();
-                PetscOptionsCreate();
-                //PetscOptionsCheckInitial_Private();
-                //PetscOptionsCheckInitial_Components();
-                PetscOptionsSetFromOptions();
-                PetscOptionsInsertMultipleString(options); //our patch
-                #else
                 #if (_PETSC_MINOR_>=7)
                 PetscOptionsSetFromOptions(NULL);
@@ -674 +665 @@
                 PetscOptionsClear();
                 #endif
-                //PetscOptionsSetFromOptions();
-                PetscOptionsInsertMultipleString(options); //our patch
-                #endif
+                int ierr = PetscOptionsInsertString(NULL,options);
+                //int ierr = PetscOptionsInsertString(NULL,"-mat_type mpiaij -ksp_type preonly -pc_type lu -pc_factor_mat_solver_package mumps -mat_mumps_icntl_14 120 -mat_mumps_icntl_28 2 -mat_mumps_icntl_29 2");
+                //int ierr = PetscOptionsInsertString(NULL,"-mat_type mpiaij -ksp_type preonly -pc_type lu -pc_factor_mat_solver_package mumps -mat_mumps_icntl_14 120");
+                if(ierr) _error_("Could not enter PETSc options");
 
         #endif

issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp

@@ -25 +25 @@
 
         /*parameters: */
-        double sparsity=.001; //default
+        double sparsity=0.001; //default
         int    m,n;
         int    d_nz,o_nz,nnz;
@@ -114 +114 @@
         MatGetType(outmatrix,&type);
 
-        #if _PETSC_MAJOR_ == 2 
-        if((strcmp(type,"mpiaij")==0) || (strcmp(type,"aijmumps")==0)){
-                MatMPIAIJSetPreallocation(outmatrix,d_nz,NULL,o_nz,NULL);
-        }
-        #else
         if((strcmp(type,"mpiaij")==0) || (strcmp(type,"mpidense")==0)){
                 MatMPIAIJSetPreallocation(outmatrix,d_nz,NULL,o_nz,NULL);
         }
-        #endif
 
         return outmatrix;