[Getfem-commits] r5165 - in /trunk/getfem: ./ src/

[logari81]

Author: logari81
Date: Wed Dec  2 09:37:24 2015
New Revision: 5165

URL: http://svn.gna.org/viewcvs/getfem?rev=5165&view=rev
Log:
check for and use metis only when it is required

Modified:
    trunk/getfem/configure.ac
    trunk/getfem/src/getfem_contact_and_friction_common.cc
    trunk/getfem/src/getfem_nonlinear_elasticity.cc
    trunk/getfem/src/getfem_plasticity.cc

Modified: trunk/getfem/configure.ac
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/configure.ac?rev=5165&r1=5164&r2=5165&view=diff
==============================================================================
--- trunk/getfem/configure.ac   (original)
+++ trunk/getfem/configure.ac   Wed Dec  2 09:37:24 2015
@@ -538,7 +538,7 @@
    yes | "") usemumps="yes";;
    no) acx_mumps_ok="no" ;;
    -* | */* | *.a | *.so | *.so.* | *.o| builtin) MUMPS_LIBS="$with_mumps"; 
acx_mumps_ok="yes" ;;
-   *) MUMPS_LIBS=`echo $with_mumps | sed -e 's/^/-l/g;s/ / -l/g'` ; 
usemumps="yes";;
+   *) MUMPS_LIBS=`echo $with_mumps | sed -e 's/^/-l/g;s/ \+/ -l/g'` ; 
usemumps="yes";;
   esac]
 )
 
@@ -605,7 +605,7 @@
  [usemetis="test"]
 )
 
-if test $paralevel -ge 2 -a "x$usemetis" = "xno"; then
+if test $paralevel -ge 1 -a "x$usemetis" = "xno"; then
   echo "Parallel getfem requires the METIS library, --enable-metis=no will be 
ignored";
   usemetis="yes"
 fi;
@@ -613,15 +613,13 @@
 if test "x$usemetis" = "xno"; then
   echo "Building without METIS";
 else
-  AC_CHECK_LIB(metis, METIS_PartGraphRecursive,
-               [usemetis="yes"],
-               [usemetis="no";
-                if test $paralevel -ge 2; then
+  if test $paralevel -ge 1; then
+    AC_CHECK_LIB(metis, METIS_PartGraphRecursive,
+                 [usemetis="yes"],
+                 [usemetis="no";
                   AC_MSG_ERROR([METIS library required for parallel getfem was 
not found])
-                fi
-               ])
-
-  if test "x$usemetis" = "xyes"; then
+                 ])
+
     METIS_LIBS="-lmetis"
     LIBS="$LIBS $METIS_LIBS"
     AC_DEFINE_UNQUOTED([HAVE_METIS],1,[defined if the Metis library was found 
and is working])
@@ -634,13 +632,9 @@
       AC_CHECK_HEADERS(metis.h,
                        [usemetis="yes"],
                        [usemetis="no";
-                        if test $paralevel -ge 2; then
-                          AC_MSG_ERROR([metis.h header required for parallel 
getfem was not found])
-                        fi
+                        AC_MSG_ERROR([metis.h header required for parallel 
getfem was not found])
                        ])
     fi;
-  else
-    echo "METIS library could not be found, building without METIS";
   fi;
 fi;
 

Modified: trunk/getfem/src/getfem_contact_and_friction_common.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_contact_and_friction_common.cc?rev=5165&r1=5164&r2=5165&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_common.cc      (original)
+++ trunk/getfem/src/getfem_contact_and_friction_common.cc      Wed Dec  2 
09:37:24 2015
@@ -2383,7 +2383,7 @@
    }
 
   // declared in getfem_generic_assembly.cc
-  extern bool predef_operators_contact_initialized
+  bool predef_operators_contact_initialized
     = init_predef_operators();
 
 }  /* end of namespace getfem.                                             */

Modified: trunk/getfem/src/getfem_nonlinear_elasticity.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_nonlinear_elasticity.cc?rev=5165&r1=5164&r2=5165&view=diff
==============================================================================
--- trunk/getfem/src/getfem_nonlinear_elasticity.cc     (original)
+++ trunk/getfem/src/getfem_nonlinear_elasticity.cc     Wed Dec  2 09:37:24 2015
@@ -2200,7 +2200,7 @@
   }
 
   // declared in getfem_generic_assembly.cc
-  extern bool predef_operators_nonlinear_elasticity_initialized
+  bool predef_operators_nonlinear_elasticity_initialized
     = init_predef_operators();
 
 

Modified: trunk/getfem/src/getfem_plasticity.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_plasticity.cc?rev=5165&r1=5164&r2=5165&view=diff
==============================================================================
--- trunk/getfem/src/getfem_plasticity.cc       (original)
+++ trunk/getfem/src/getfem_plasticity.cc       Wed Dec  2 09:37:24 2015
@@ -1067,7 +1067,7 @@
    }
 
   // declared in getfem_generic_assembly.cc
-  extern bool predef_operators_plasticity_initialized
+  bool predef_operators_plasticity_initialized
     = init_predef_operators();
 
 }  /* end of namespace getfem.  */