[Getfem-commits] (no subject)

[Yves Renard]

branch: master
commit 44541beb7541f6627382ef644948cb0db4a3b68e
Author: Yves Renard <address@hidden>
AuthorDate: Fri May 22 17:49:36 2020 +0200

    minor changes
---
 doc/sphinx/source/.templates/indexcontent.html |  2 +-
 interface/tests/matlab-octave/check_all.m      | 19 +++++++++++++++++--
 interface/tests/matlab-octave/check_mitc.m     |  2 +-
 interface/tests/matlab-octave/check_spmat.m    |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/doc/sphinx/source/.templates/indexcontent.html 
b/doc/sphinx/source/.templates/indexcontent.html
index d6da0b0..eaf4190 100644
--- a/doc/sphinx/source/.templates/indexcontent.html
+++ b/doc/sphinx/source/.templates/indexcontent.html
@@ -10,7 +10,7 @@
 
 <p><strong>NEW</strong> (April 2020): Version 5.4 has been released.<br/></p>
 
-<p>Thank you for citing <a class="biglink" 
href="https://hal.archives-ouvertes.fr/hal-02532422/document";> [GetFEM2020]</a> 
in scientific work using GetFEM.<br/></p>
+<p>Thank you for citing <a class="biglink" 
href="https://hal.archives-ouvertes.fr/hal-02532422/document";> [GetFEM2020]</a> 
in scientific works that use GetFEM.<br/></p>
 
 
   <p><strong>Parts of the documentation:</strong></p>
diff --git a/interface/tests/matlab-octave/check_all.m 
b/interface/tests/matlab-octave/check_all.m
index bde1970..365ea1f 100644
--- a/interface/tests/matlab-octave/check_all.m
+++ b/interface/tests/matlab-octave/check_all.m
@@ -15,9 +15,10 @@
 % along  with  this program;  if not, write to the Free Software Foundation,
 % Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 
-errcnt=0;
+errcnt=0; nbtests=0;
 t = 'check_integ [integration methods]            ';
 try
+  nbtests=nbtests+1;
   check_integ;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -26,6 +27,7 @@ end;
 
 t = 'check_fem [finite element methods]           ';
 try
+  nbtests=nbtests+1;
   check_fem;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -34,6 +36,7 @@ end;
 
 t = 'check_geotrans [geometric transformations]   ';
 try
+  nbtests=nbtests+1;
   check_geotrans;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -42,6 +45,7 @@ end;
 
 t = 'check_workspace [objects management]         ';
 try
+  nbtests=nbtests+1;
   check_workspace;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -50,6 +54,7 @@ end;
 
 t = 'check_mesh_fem [mesh_fem manipulations]      ';
 try
+  nbtests=nbtests+1;
   check_mesh_fem;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -58,6 +63,7 @@ end;
 
 t = 'check_asm [assembly routines]                ';
 try
+  nbtests=nbtests+1;
   check_asm;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -66,6 +72,7 @@ end;
 
 t = 'check_oo [pseudo object oriented interface]  ';
 try
+  nbtests=nbtests+1;
   check_oo;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -74,6 +81,7 @@ end;
 
 t = 'check_slices [mesh slicing functions]        ';
 try
+  nbtests=nbtests+1;
   check_slices;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -82,6 +90,7 @@ end;
 
 t = 'check_spmat [sparse matrix functions]        ';
 try
+  nbtests=nbtests+1;
   check_spmat;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -90,6 +99,7 @@ end;
 
 t = 'check_plasticity [model brick complex generic assembly] ';
 try
+  nbtests=nbtests+1;
   check_plasticity;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -98,6 +108,7 @@ end;
 
 t = 'check_mitc [check mitc4 element and elementary transformations] ';
 try
+  nbtests=nbtests+1;
   check_mitc;
   disp(['== ' t ': SUCCESS']);
 catch
@@ -106,6 +117,7 @@ end;
 
 t = 'demo_laplacian [model use for solving a Poisson problem] ';
 try
+  nbtests=nbtests+1;
   automatic_var654 = 1;
   demo_laplacian;
   disp(['== ' t ': SUCCESS']);
@@ -115,6 +127,7 @@ end;
 
 t = 'demo_laplacian_DG [model use for solving a Poisson problem] ';
 try
+  nbtests=nbtests+1;
   automatic_var654 = 1;
   demo_laplacian_DG;
   disp(['== ' t ': SUCCESS']);
@@ -124,6 +137,7 @@ end;
 
 t = 'demo_periodic_laplacian [model use for solving a Poisson problem]        
';
 try
+  nbtests=nbtests+1;
   automatic_var654 = 1;
   demo_periodic_laplacian;
   disp(['== ' t ': SUCCESS']);
@@ -133,6 +147,7 @@ end;
 
 t = 'demo_refine [adaptative refinement for an elastostatic problem] ';
 try
+  nbtests=nbtests+1;
   automatic_var654 = 1;
   demo_refine;
   disp(['== ' t ': SUCCESS']);
@@ -142,7 +157,7 @@ end;
 
 
 if (errcnt),
-  disp(sprintf('\n\n== %d/11 tests FAILED\n', errcnt));
+  disp(sprintf('\n\n== %d/%d tests FAILED\n', errcnt, nbtests));
 else
   disp(sprintf('\n\n== All tests succeeded\n'));
 end;
diff --git a/interface/tests/matlab-octave/check_mitc.m 
b/interface/tests/matlab-octave/check_mitc.m
index d46db1c..99818d3 100644
--- a/interface/tests/matlab-octave/check_mitc.m
+++ b/interface/tests/matlab-octave/check_mitc.m
@@ -114,7 +114,7 @@ switch (dirichlet_version)
   case 2,
     gf_model_set(md, 'add Dirichlet condition with penalization', mim, 'u', r, 
1, 'DirichletData');
 end
-gf_model_get(md, 'solve');
+gf_model_get(md, 'solve', 'noisy');
 U = gf_model_get(md, 'variable', 'u');
 
 gfassert('abs(min(U) + 0.1828) < 0.001');
diff --git a/interface/tests/matlab-octave/check_spmat.m 
b/interface/tests/matlab-octave/check_spmat.m
index 1f26c77..1837f7a 100644
--- a/interface/tests/matlab-octave/check_spmat.m
+++ b/interface/tests/matlab-octave/check_spmat.m
@@ -34,7 +34,7 @@ function check_spmat(iverbose,idebug)
     asserterr('gf_spmat(''empty'',2:3)');
     asserterr('gf_spmat(''empty'',0)');
   end;
-  is_octave = exist('octave_config_info');
+  is_octave = exist('octave_config_info') || exist('octave_core_file_options');
   % TEST EMPTY COPY FULL
   A = gf_spmat('empty', 5,6);
   B = gf_spmat('empty', 11111);