minor edits

wrtobin · Sep 21, 2017 · 2c05111 · 2c05111
1 parent cacf35d
commit 2c05111
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/api/msi.cc b/api/msi.cc
@@ -132,7 +132,7 @@ void msi_start(pMesh m, pOwnership o, pShape s)
 
 #ifdef DEBUG
   if (!o && !pumi_rank())
-    std::cout<<"[MSI INFO] "<<__func__<<": the default mesh ownership is in use\n";
+    std::cout<<"[msi] "<<__func__<<": the default mesh ownership is in use\n";
   else
     pumi_ownership_verify(m, o);
 #endif
@@ -183,7 +183,7 @@ void msi_finalize(pMesh m)
   while(m->countFields())
   {
     apf::Field* f = m->getField(0);
-    if(!PCU_Comm_Self()) std::cout<<"[MSI INFO] "<<__func__<<": field "<<getName(f)<<" deleted\n";
+    if(!PCU_Comm_Self()) std::cout<<"[msi] "<<__func__<<": field "<<getName(f)<<" deleted\n";
     msi_solver::instance()->field_container->erase(std::map<pField, int>::key_type(f));
 
     destroyField(f);
@@ -253,22 +253,22 @@ int msi_field_getSize(pField f)
 #ifdef MSI_PETSC
 /** matrix and solver functions */
 //*******************************************************
-msi_matrix* msi_matrix_create(int matrix_type, pField f, pOwnership o)
+msi_matrix* msi_matrix_create(int matrix_type, pField f)
 //*******************************************************
 {
 #ifdef DEBUG
   if (!PCU_Comm_Self())
-    std::cout<<"[MSI INFO] "<<__func__<<": type "<<matrix_type<<", field "<<getName(f)<<"\n";
+    std::cout<<"[msi] "<<__func__<<": type "<<matrix_type<<", field "<<getName(f)<<"\n";
 #endif
 
   if (matrix_type==MSI_MULTIPLY) // matrix for multiplication
   {
-    matrix_mult* new_mat = new matrix_mult(f, o);
+    matrix_mult* new_mat = new matrix_mult(f, msi_ownership);
     return (msi_matrix*)new_mat;
   }
   else 
   {
-    matrix_solve* new_mat= new matrix_solve(f, o);
+    matrix_solve* new_mat= new matrix_solve(f, msi_ownership);
     return (msi_matrix*)new_mat;
   }
 }

diff --git a/api/msi.h b/api/msi.h
@@ -57,7 +57,7 @@ class msi_matrix;
 typedef msi_matrix* pMatrix;
 
 /** matrix and solver functions with PETSc */
-pMatrix msi_matrix_create(int matrix_type, pField f, pOwnership o);
+pMatrix msi_matrix_create(int matrix_type, pField f);
 void msi_matrix_delete(pMatrix mat);
 pField msi_matrix_getField(pMatrix mat);
 

diff --git a/cmake/FindPetsc.cmake b/cmake/FindPetsc.cmake
@@ -38,10 +38,8 @@ set(PETSC_LIB_NAMES
   mumps_common
   pord 
   scalapack 
-  superlu_dist_3.3
-  superlu_4.3 
-  flapack 
-  fblas 
+  superlu_dist
+  superlu
   parmetis 
   metis 
   ssl 
@@ -55,18 +53,16 @@ set(PETSC_LIB_NAMES
 else()
 set(PETSC_LIB_NAMES
   petsc
-  superlu_dist_3.3
+  superlu_dist
   cmumps
   dmumps
   smumps
   zmumps
   mumps_common
   pord
   scalapack
-  superlu_4.3
+  superlu
   HYPRE
-  flapack
-  fblas
   parmetis
   metis
   ssl 

diff --git a/mpich3-gcc4.9.2.config.sh b/mpich3-gcc4.9.2.config.sh
@@ -13,8 +13,8 @@ cmake .. \
   -DSCOREC_INCLUDE_DIR=$PREFIX/include \
   -DSCOREC_LIB_DIR=$PREFIX/lib \
   -DZOLTAN_LIBRARY="$PREFIX/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PETSC_DIR/$PETSC_ARCH/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PETSC_DIR/$PETSC_ARCH/lib/libmetis.a" \
+  -DPARMETIS_LIBRARY="$PETSC_DIR/$PETSC_ARCH/lib/libparmetis.so" \
+  -DMETIS_LIBRARY="$PETSC_DIR/$PETSC_ARCH/lib/libmetis.so" \
   -DENABLE_PETSC=ON \
   -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
   -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \