[Getfem-commits] [getfem-commits] branch master updated: preparing 5.4 release, minor fixes

[Yves Renard]

This is an automated email from the git hooks/post-receive script.

renard pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new c750c90  preparing 5.4 release, minor fixes
     new c2c0457  Merge branch 'master' of ssh://git.sv.gnu.org:/srv/git/getfem
c750c90 is described below

commit c750c90505cc493e210c442623ecba29fbdc30ef
Author: Yves Renard <address@hidden>
AuthorDate: Mon Apr 20 19:15:41 2020 +0200

    preparing 5.4 release, minor fixes
---
 interface/tests/matlab-octave/check_levelset.m | 2 +-
 tests/test_condensation.cc                     | 6 +++++-
 tests/test_gmm_matrix_functions.cc             | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/interface/tests/matlab-octave/check_levelset.m 
b/interface/tests/matlab-octave/check_levelset.m
index 632551a..c7579b0 100644
--- a/interface/tests/matlab-octave/check_levelset.m
+++ b/interface/tests/matlab-octave/check_levelset.m
@@ -26,7 +26,7 @@ ls=gfLevelSet(m, 2, 'x*x + y*y - 0.7*0.7', 'x-.4')
 ls2=gf_levelset(m, 2, '0.6*x*x + (y-0.1)*(y-0.1) - 0.6*0.6');
 ls3=gf_levelset(m, 4, 'x*x + (y+.08)*(y+.08) - 0.05*0.05');
 
-mls=gfMeshLevelset(m)
+mls=gfMeshLevelSet(m)
 set(mls, 'add', ls);
 if 1,
   set(mls, 'sup', ls);
diff --git a/tests/test_condensation.cc b/tests/test_condensation.cc
index 1cfb5d5..e92e95a 100644
--- a/tests/test_condensation.cc
+++ b/tests/test_condensation.cc
@@ -31,6 +31,9 @@ static bool debug=false;
 
 int main(int argc, char *argv[]) {
   GETFEM_MPI_INIT(argc, argv);
+  int ret=0;
+
+#if defined(GMM_USES_MUMPS)
   
   gmm::set_traces_level(1);
 
@@ -174,7 +177,6 @@ int main(int argc, char *argv[]) {
     exp.write_point_data(mf, gmm::sub_vector(md2.real_rhs(true), 
md2.interval_of_variable("u")), "u residual");
   }
 
-  int ret=0;
   ret += gmm::vect_dist1(md1.real_variable("u"), md2.real_variable("u")) < 
1e-9 ? 0 : 1;
   if (DIFFICULTY % 100 > 9)
     ret += gmm::vect_dist1(md1.real_variable("eps"), md2.real_variable("eps")) 
< 1e-9 ? 0 : 2;
@@ -182,6 +184,8 @@ int main(int argc, char *argv[]) {
 
   std::cout<<"Test with difficulty "<<DIFFICULTY<<" returned "<<ret<<std::endl;
 
+#endif
+  
   GETFEM_MPI_FINALIZE;
   return ret;
 }
diff --git a/tests/test_gmm_matrix_functions.cc 
b/tests/test_gmm_matrix_functions.cc
index 2ed7c4c..614b41a 100644
--- a/tests/test_gmm_matrix_functions.cc
+++ b/tests/test_gmm_matrix_functions.cc
@@ -92,6 +92,8 @@ template <class T> void test_logm(T) {
 
 int main(void)
 {
+
+#if defined(GMM_USES_LAPACK)
   srand(1459);
 
   test_sqrtm(float());
@@ -103,6 +105,8 @@ int main(void)
   test_logm(double());
   test_logm(std::complex<float>());
   test_logm(std::complex<double>());
+
+#endif
  
   return 0;
 }