Changeset 22758 for issm/trunk/src/c/toolkits/petsc/patches/NewMat.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/toolkits/petsc/patches/NewMat.cpp (modified) (2 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/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;

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod