Changeset 3223

Timestamp:

03/08/10 15:13:33 (15 years ago)

Author:

Eric.Larour

Message:

Introduced petsc 3 in coexistence with petsc2.

Location:

issm/trunk

Files:

• configs/linux64/linux64.sh.petsc2 (modified) (1 diff)
• configs/linux64/linux64.sh.petsc3 (added)
• m4/issm_options.m4 (modified) (4 diffs)
• src/c/Reduceloadfromgtofx/Reduceloadfromgtofx.cpp (modified) (2 diffs)
• src/c/Reducematrixfromgtofx/Reducematrixfromgton.cpp (modified) (1 diff)
• src/c/Solverx/Solverx.cpp (modified) (4 diffs)
• src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp (modified) (1 diff)
• src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (modified) (1 diff)

issm/trunk/configs/linux64/linux64.sh.petsc2

@@ -1 +1 @@
 #!/bin/sh
 
-./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32/$ISSM_ARCH --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2"
+./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-petsc-version=2

issm/trunk/m4/issm_options.m4

@@ -286 +286 @@
                 fi
         fi
-        
+
+        AC_ARG_WITH([petsc-version],
+                          AS_HELP_STRING([--with-petsc-version = VERSION],
+                                                         [petsc version -- 2 or 3]),
+                          [PETSC_VERSION=$withval],[PETSC_VERSION=""])
+
+        if test "$PARALLEL_VALUE" = "yes" ; then
+                if test "$PETSC_VERSION" = "" ; then
+                        AC_MSG_ERROR([missing --with-petsc-version argument for parallel compilation!])
+                fi
+                if test "$PETSC_VERSION" = "2" ; then
+                AC_DEFINE([_PETSC_VERSION_],[2],[ Petsc version number])
+                fi
+
+                if test "$PETSC_VERSION" = "3" ; then
+                AC_DEFINE([_PETSC_VERSION_],[3],[ Petsc version number])
+                fi
+        fi
+        
+                
         AC_ARG_WITH([petsc-arch],
                           AS_HELP_STRING([--with-petsc-arch = DIR],
@@ -315 +334 @@
                         ;;
                 esac
-                                                                  
+        
 
 
@@ -481 +500 @@
         
         dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%plapack-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-        AC_ARG_WITH([plapack-dir],
-                          AS_HELP_STRING([--with-plapack-dir = DIR],
-                                                         [plapack root directory]),
-                          [PLAPACK_ROOT=$withval],[PLAPACK_ROOT=""])
-                          
-        AC_MSG_CHECKING(for Plapack headers and libraries in $PLAPACK_ROOT)
-        if test -d "$PLAPACK_ROOT"; then
-
-                dnl defaults
-                HAVE_PLAPACK=yes
-                PLAPACKINCL=-I"$PLAPACK_ROOT/INCLUDE"
-                PLAPACKLIB=-L"$PLAPACK_ROOT/ -lPLAPACK"
-
-                AC_DEFINE([_HAVE_PLAPACK_],[1],[with Plapack in ISSM src])
-                AC_SUBST([PLAPACKINCL])
-                AC_SUBST([PLAPACKLIB])
+        AC_ARG_WITH([plapack-lib],
+                          AS_HELP_STRING([--with-plapack-lib = lib],
+                                                         [plapack library]),
+                          [PLAPACK_LIB=$withval],[PLAPACK_LIB=""])
+        AC_MSG_CHECKING(for Plapack libraries)
+        
+        AC_ARG_WITH([plapack-include],
+                          AS_HELP_STRING([--with-plapack-include = include],
+                                                         [plapack include ]),
+                          [PLAPACK_INCLUDE=$withval],[PLAPACK_INCLUDE=""])
+        AC_MSG_CHECKING(for Plapack headers)
+          
+        if test -n "$PLAPACK_LIB"; then
+                if test -n "$PLAPACK_INCLUDE"; then
+                
+                        dnl defaults
+                        HAVE_PLAPACK=yes
+                        PLAPACKINCL="$PLAPACK_INCLUDE"
+                        PLAPACKLIB="$PLAPACK_LIB"
+
+                        AC_DEFINE([_HAVE_PLAPACK_],[1],[with Plapack in ISSM src])
+                        AC_SUBST([PLAPACKINCL])
+                        AC_SUBST([PLAPACKLIB])
+                else
+                        HAVE_PLAPACK=no
+                fi
         else
                 HAVE_PLAPACK=no
@@ -521 +550 @@
                 HAVE_MUMPS=yes
                 MUMPSINCL=-I"$MUMPS_ROOT/include"
-                dnl MUMPSLIB=-L"$MUMPS_ROOT/lib -ldmumps -lcmumps  -lmumps_common -lpord -lparmetis"
+                if test "$PETSC_VERSION" = "2" ; then
                 MUMPSLIB=-L"$MUMPS_ROOT/lib -ldmumps -lcmumps  -lpord "
+                else
+                MUMPSLIB=-L"$MUMPS_ROOT/lib -ldmumps -lcmumps  -lmumps_common -lpord -lparmetis"
+                fi
 
                 AC_DEFINE([_HAVE_MUMPS_],[1],[with Mumps in ISSM src])

issm/trunk/src/c/Reduceloadfromgtofx/Reduceloadfromgtofx.cpp

@@ -2 +2 @@
  * \brief reduce loads from g set to f set 
  */
+
+#ifdef HAVE_CONFIG_H
+        #include "config.h"
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
 
 #include "./Reduceloadfromgtofx.h"
@@ -36 +43 @@
                 
                         /*Create G_mn'*/
+                        #if _PETSC_VERSION_ == 2
                         MatTranspose(G_mn,&tG_mn);  
+                        #else
+                        MatTranspose(G_mn,MAT_INITIAL_MATRIX,&tG_mn);  
+                        #endif
 
                         /*Create G_mn' * pm*/

issm/trunk/src/c/Reducematrixfromgtofx/Reducematrixfromgton.cpp

@@ -50 +50 @@
                         
                         //K_nn = K_nn + G_mn' * K_mn;
+                        #if _PETSC_VERSION_ == 2
                         MatTranspose(Gmn,&tGmn);
+                        #else
+                        MatTranspose(Gmn,MAT_INITIAL_MATRIX,&tGmn);
+                        #endif
                         MatMatMult(tGmn,Kmn,MAT_INITIAL_MATRIX,PETSC_DEFAULT,&tGmnKmn);
                         MatAXPY(Knn,a,tGmnKmn,DIFFERENT_NONZERO_PATTERN);

issm/trunk/src/c/Solverx/Solverx.cpp

@@ -19 +19 @@
         
         /*Solver*/
-        KSP ksp=NULL;
+        KSP ksp=NULL; 
+        PC  pc=NULL;
         int iteration_number;
         PetscTruth flag;
@@ -39 +40 @@
         PetscOptionsDetermineSolverType(&solver_type,solver_string);
 
+        #if _PETSC_VERSION_ == 2 
         if (solver_type==MUMPSPACKAGE_LU){
                 /*Convert Kff to MATTAIJMUMPS: */
@@ -59 +61 @@
                 MatConvert(Kff,MATSUPERLU_DIST,MAT_REUSE_MATRIX,&Kff);
         }
-
+        #endif
 
         /*Prepare solver*/
@@ -65 +67 @@
         KSPSetOperators(ksp,Kff,Kff,DIFFERENT_NONZERO_PATTERN);
         KSPSetFromOptions(ksp);
+
+        #if _PETSC_VERSION_ == 3 
+        /*specific solver?: */
+        KSPGetPC(ksp,&pc);
+        if (solver_type==MUMPSPACKAGE_LU){
+                PCFactorSetMatSolverPackage(pc,MAT_SOLVER_MUMPS);
+        }
+        #endif
+
 
         /*If initial guess for solution, use it, except if we are using the MUMPS direct solver, where any initial 

issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp

@@ -45 +45 @@
 
         /*The list of options is going to be pairs of the type "-option option_value"*/
+        #if _PETSC_VERSION_ == 2
         PetscToken *token=NULL;
+        #else
+        PetscToken token=NULL;
+        #endif
         char* first=NULL;
         char* second=NULL;

issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp

@@ -25 +25 @@
 
         /*The list of options is going to be pairs of the type "-option option_value"*/
-        PetscToken *token=NULL;
+        #if _PETSC_VERSION_ == 2
+                PetscToken *token=NULL ;
+        #else
+                PetscToken token=NULL;
+        #endif
         char* first=NULL;
         char* second=NULL;