[Getfem-commits] r5332 - in /trunk/getfem/contrib/static_contact_gears: static_contact_gears.cc static_contact_gears_u1_u2.cc

[Yves . Renard]

Author: renard
Date: Sun Jun 12 11:15:55 2016
New Revision: 5332

URL: http://svn.gna.org/viewcvs/getfem?rev=5332&view=rev
Log:
minor fix

Modified:
    trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc
    trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc

Modified: trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc?rev=5332&r1=5331&r2=5332&view=diff
==============================================================================
--- trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc   
(original)
+++ trunk/getfem/contrib/static_contact_gears/static_contact_gears.cc   Sun Jun 
12 11:15:55 2016
@@ -313,7 +313,12 @@
 
 //  getfem::default_newton_line_search ls;
   getfem::simplest_newton_line_search ls(50, 5., 5., 0.6, 1e-1);
-  getfem::standard_solve(md, iter, getfem::rselect_linear_solver(md,"mumps"), 
ls);
+
+  #ifdef GMM_USES_MUMPS
+    getfem::standard_solve(md, iter, 
getfem::rselect_linear_solver(md,"mumps"), ls);
+  #else
+    getfem::standard_solve(md, iter, 
getfem::default_linear_solver<getfem::model_real_sparse_matrix, 
getfem::model_real_plain_vector>(md), ls);
+  #endif
 
   if (!iter.converged()) return false; // Solution has not converged
 

Modified: 
trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc?rev=5332&r1=5331&r2=5332&view=diff
==============================================================================
--- trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc     
(original)
+++ trunk/getfem/contrib/static_contact_gears/static_contact_gears_u1_u2.cc     
Sun Jun 12 11:15:55 2016
@@ -327,7 +327,12 @@
 
 //  getfem::default_newton_line_search ls;
   getfem::simplest_newton_line_search ls(50, 5., 5., 0.6, 1e-1);
+
+  #ifdef GMM_USES_MUMPS
   getfem::standard_solve(md, iter, getfem::rselect_linear_solver(md,"mumps"), 
ls);
+  #else
+  getfem::standard_solve(md, iter, 
getfem::default_linear_solver<getfem::model_real_sparse_matrix, 
getfem::model_real_plain_vector>(md), ls);
+  #endif
 
   if (!iter.converged()) return false; // Solution has not converged