[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] [getfem-commits] branch master updated: preparing 5.4 r
From: |
Yves Renard |
Subject: |
[Getfem-commits] [getfem-commits] branch master updated: preparing 5.4 release : small fixes for passing the make check with the option --enable-paralevel=2 |
Date: |
Mon, 20 Apr 2020 02:40:32 -0400 |
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 6dd8f13 preparing 5.4 release : small fixes for passing the make
check with the option --enable-paralevel=2
6dd8f13 is described below
commit 6dd8f136148c563743c544ce4c232155710c8e98
Author: Yves Renard <address@hidden>
AuthorDate: Mon Apr 20 08:39:41 2020 +0200
preparing 5.4 release : small fixes for passing the make check with the
option --enable-paralevel=2
---
.gitignore | 1 +
contrib/level_set_contact/test_contact.cpp | 5 ++++-
contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc | 7 +++----
interface/tests/Makefile.am | 4 ++++
interface/tests/matlab-octave/check_all_octave.sh | 10 ++++++----
tests/crack.cc | 3 +++
tests/cyl_slicer.cc | 7 ++++++-
tests/elastostatic.cc | 2 --
tests/elastostatic.param | 2 +-
tests/heat_equation.cc | 3 +++
tests/helmholtz.cc | 3 +++
tests/laplacian.cc | 3 +++
tests/laplacian_with_bricks.cc | 3 +++
tests/nonlinear_elastostatic.cc | 3 +++
tests/nonlinear_membrane.cc | 2 ++
tests/plasticity.cc | 3 +++
tests/plate.cc | 3 +++
tests/stokes.cc | 2 ++
tests/test_assembly.cc | 6 +++++-
tests/test_assembly_assignment.cc | 6 +++++-
tests/test_condensation.cc | 5 ++++-
tests/test_continuation.cc | 2 ++
tests/test_internal_variables.cc | 3 +++
tests/test_interpolated_fem.cc | 6 ++++--
tests/test_range_basis.cc | 3 +++
tests/thermo_elasticity_electrical_coupling.cc | 5 ++++-
tests/wave_equation.cc | 3 +++
27 files changed, 86 insertions(+), 19 deletions(-)
diff --git a/.gitignore b/.gitignore
index d05871e..796f14a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -295,6 +295,7 @@ Makefile
/contrib/static_contact_gears/static_contact_gears.mfd
/contrib/static_contact_gears/static_contact_gears_u1_u2
/contrib/xfem_contact/xfem_contact
+/contrib/xfem_contact/xfem_dirichlet
/contrib/xfem_contact/xfem_stokes
/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact
/interface/tests/*/*.vtk
diff --git a/contrib/level_set_contact/test_contact.cpp
b/contrib/level_set_contact/test_contact.cpp
index aac790a..977c25d 100644
--- a/contrib/level_set_contact/test_contact.cpp
+++ b/contrib/level_set_contact/test_contact.cpp
@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
{
using namespace getfem;
+ GETFEM_MPI_INIT(argc, argv);
gmm::set_traces_level(1);
gmm::set_warning_level(1);
@@ -185,5 +186,7 @@ int main(int argc, char *argv[])
std::cout << "end iter " << std::endl;
}
+ GETFEM_MPI_FINALIZE;
+
return 0;
-}
\ No newline at end of file
+}
diff --git a/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc
b/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc
index 3f6ecc1..5791701 100644
--- a/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc
+++ b/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc
@@ -529,7 +529,7 @@ h
//cout<<"size_of_mesh="<<h<<endl;
cout<<"size_of_crack="<< size_of_crack <<endl;
cout<<"nb_partition="<<nparts<<endl;
- cout<<"partition="<<part<<endl;
+ cout<<"partition="<<gmm::vref(part)<<endl;
cout<<"edgecut="<<edgecut<<endl;
#else
GMM_ASSERT1(false, "METIS not linked");
@@ -1582,7 +1582,7 @@ bool unilateral_contact_problem::solve(plain_vector &U,
plain_vector &LAMBDA, p
int main(int argc, char *argv[]) {
-
+ GETFEM_MPI_INIT(argc, argv);
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
//getfem::getfem_mesh_level_set_noisy();
@@ -2027,9 +2027,8 @@ int main(int argc, char *argv[]) {
}
}
+ GETFEM_MPI_FINALIZE;
return 0;
-
-
}
diff --git a/interface/tests/Makefile.am b/interface/tests/Makefile.am
index 2eb3f27..1e1e41d 100644
--- a/interface/tests/Makefile.am
+++ b/interface/tests/Makefile.am
@@ -18,6 +18,10 @@
if BUILDMEX
subdirMATLAB=matlab-octave
+else
+if BUILDPYTHON
+subdirMATLAB=matlab-octave
+endif
endif
if BUILDPYTHON
diff --git a/interface/tests/matlab-octave/check_all_octave.sh
b/interface/tests/matlab-octave/check_all_octave.sh
index 42bf693..53dd703 100755
--- a/interface/tests/matlab-octave/check_all_octave.sh
+++ b/interface/tests/matlab-octave/check_all_octave.sh
@@ -22,17 +22,19 @@
echo "running checks..."
echo " srcdir='$srcdir'"
-export
MATLABPATH=$(pwd)/../../src/matlab:$(pwd)/../../tests/matlab:${srcdir}:${srcdir}/../../src/matlab
+#export
MATLABPATH=$(pwd)/../../src/matlab:$(pwd)/../../tests/matlab:${srcdir}:${srcdir}/../../src/matlab
-echo " export MATLAB_ROOT=$MATLAB_ROOT"
-echo " export MATLABPATH=$MATLABPATH"
+#echo " export MATLAB_ROOT=$MATLAB_ROOT"
+#echo " export MATLABPATH=$MATLABPATH"
#echo " setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH"
#echo " setenv PATH $PATH"
#export PATH;
# s=$(echo "s=getenv('MATLABPATH'); while (length(s)), [a,s]=strtok(s,':');
addpath(a); end; disp(pwd); check_all; pause(1)" | ${MLAB} 2>&1);
-s=$(echo "addpath('../../src/octave'); addpath('${srcdir}/../../src/octave');
disp(pwd); check_all; pause(1)" | octave 2>&1);
+s=$(echo "addpath('../../src/octave'); addpath('${srcdir}/../../src/octave');
disp(pwd); pause(1);" | octave check_all.m 2>&1);
+
+# echo $s
k=`echo "$s" | grep "All tests succeeded"`;
if test x"$k" = x""; then
diff --git a/tests/crack.cc b/tests/crack.cc
index 5e88d73..52350dd 100644
--- a/tests/crack.cc
+++ b/tests/crack.cc
@@ -905,6 +905,7 @@ void crack_problem::compute_sif(const plain_vector &U) {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -1062,6 +1063,8 @@ int main(int argc, char *argv[]) {
}
GMM_STANDARD_CATCH_ERROR;
+
+ GETFEM_MPI_FINALIZE;
return 0;
}
diff --git a/tests/cyl_slicer.cc b/tests/cyl_slicer.cc
index cc7ca92..9e09b89 100644
--- a/tests/cyl_slicer.cc
+++ b/tests/cyl_slicer.cc
@@ -47,7 +47,8 @@ bgeot::scalar_type func(const bgeot::base_node& x) {
return x[0];
}
-int main(int /* argc */, char * /* argv */ []) {
+int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
try {
getfem::mesh mymesh;
@@ -89,4 +90,8 @@ int main(int /* argc */, char * /* argv */ []) {
expsl.write_point_data(mf, U, "temperature");
} GMM_STANDARD_CATCH_ERROR;
+
+ GETFEM_MPI_FINALIZE;
+
+ return 0;
}
diff --git a/tests/elastostatic.cc b/tests/elastostatic.cc
index 4f90c12..9ccaf0d 100644
--- a/tests/elastostatic.cc
+++ b/tests/elastostatic.cc
@@ -554,7 +554,5 @@ int main(int argc, char *argv[]) {
GETFEM_MPI_FINALIZE;
-
-
return 0;
}
diff --git a/tests/elastostatic.param b/tests/elastostatic.param
index 5012b55..214e570 100644
--- a/tests/elastostatic.param
+++ b/tests/elastostatic.param
@@ -25,7 +25,7 @@
MU = 1.0; % Lam� coefficient.
LAMBDA = 1.0; % Lam� coefficient.
N = 2;
-NX = 100; % number of subdivisions for structured meshes.
+NX = 200; % number of subdivisions for structured meshes.
QUAD = 0;
FT = 3.0; % parameter for the exact solution.
SOL_SING = 0; % 0 : Regular exact solution.
diff --git a/tests/heat_equation.cc b/tests/heat_equation.cc
index f56e41a..25e0fec 100644
--- a/tests/heat_equation.cc
+++ b/tests/heat_equation.cc
@@ -329,6 +329,7 @@ void heat_equation_problem::compute_error() {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
heat_equation_problem p;
@@ -339,5 +340,7 @@ int main(int argc, char *argv[]) {
p.mf_u.write_to_file(p.datafilename + ".mf", true);
p.compute_error();
+ GETFEM_MPI_FINALIZE;
+
return 0;
}
diff --git a/tests/helmholtz.cc b/tests/helmholtz.cc
index 10e9307..449a206 100644
--- a/tests/helmholtz.cc
+++ b/tests/helmholtz.cc
@@ -220,6 +220,7 @@ bool Helmholtz_problem::solve(plain_vector &U) {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -242,5 +243,7 @@ int main(int argc, char *argv[]) {
"\n";
}
+ GETFEM_MPI_FINALIZE;
+
return 0;
}
diff --git a/tests/laplacian.cc b/tests/laplacian.cc
index a7b9f51..d4caf94 100644
--- a/tests/laplacian.cc
+++ b/tests/laplacian.cc
@@ -319,6 +319,7 @@ void laplacian_problem::compute_error() {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -332,6 +333,8 @@ int main(int argc, char *argv[]) {
p.compute_error();
}
GMM_STANDARD_CATCH_ERROR;
+
+ GETFEM_MPI_FINALIZE;
return 0;
}
diff --git a/tests/laplacian_with_bricks.cc b/tests/laplacian_with_bricks.cc
index ef7450c..5b08abb 100644
--- a/tests/laplacian_with_bricks.cc
+++ b/tests/laplacian_with_bricks.cc
@@ -271,6 +271,7 @@ void laplacian_problem::compute_error() {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
laplacian_problem p;
@@ -279,6 +280,8 @@ int main(int argc, char *argv[]) {
p.mesh.write_to_file(p.datafilename + ".mesh");
if (!p.solve()) GMM_ASSERT1(false, "Solve procedure has failed");
p.compute_error();
+
+ GETFEM_MPI_FINALIZE;
return 0;
}
diff --git a/tests/nonlinear_elastostatic.cc b/tests/nonlinear_elastostatic.cc
index 5ead4e5..dfa59c2 100644
--- a/tests/nonlinear_elastostatic.cc
+++ b/tests/nonlinear_elastostatic.cc
@@ -318,6 +318,7 @@ bool elastostatic_problem::solve(plain_vector &U) {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -344,5 +345,7 @@ int main(int argc, char *argv[]) {
}
GMM_STANDARD_CATCH_ERROR;
+ GETFEM_MPI_FINALIZE;
+
return 0;
}
diff --git a/tests/nonlinear_membrane.cc b/tests/nonlinear_membrane.cc
index af7091c..80167f9 100644
--- a/tests/nonlinear_membrane.cc
+++ b/tests/nonlinear_membrane.cc
@@ -460,6 +460,7 @@ bool membrane_problem::solve (plain_vector
&U,getfem::base_vector &VM) {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -477,5 +478,6 @@ int main(int argc, char *argv[]) {
}
GMM_STANDARD_CATCH_ERROR;
+ GETFEM_MPI_FINALIZE;
return 0;
}
diff --git a/tests/plasticity.cc b/tests/plasticity.cc
index df8b79f..b32233d 100644
--- a/tests/plasticity.cc
+++ b/tests/plasticity.cc
@@ -374,6 +374,7 @@ bool elastoplasticity_problem::solve(plain_vector &U) {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG;
// Exceptions make a memory fault, to debug.
@@ -393,6 +394,8 @@ int main(int argc, char *argv[]) {
scalar_type t[2]={p.mu,p.lambda};
vecsave(p.datafilename+".coef",
std::vector<scalar_type>(t, t+2));
+
+ GETFEM_MPI_FINALIZE;
return 0;
}
diff --git a/tests/plate.cc b/tests/plate.cc
index f93780d..6273a3c 100644
--- a/tests/plate.cc
+++ b/tests/plate.cc
@@ -555,6 +555,7 @@ bool plate_problem::solve(plain_vector &Ut, plain_vector
&U3, plain_vector &THET
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -573,5 +574,7 @@ int main(int argc, char *argv[]) {
}
GMM_STANDARD_CATCH_ERROR;
+ GETFEM_MPI_FINALIZE;
+
return 0;
}
diff --git a/tests/stokes.cc b/tests/stokes.cc
index 77c7be6..6a0dc90 100644
--- a/tests/stokes.cc
+++ b/tests/stokes.cc
@@ -212,6 +212,7 @@ bool stokes_problem::solve(plain_vector &U) {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -234,6 +235,7 @@ int main(int argc, char *argv[]) {
}
}
GMM_STANDARD_CATCH_ERROR;
+ GETFEM_MPI_FINALIZE;
return 0;
}
diff --git a/tests/test_assembly.cc b/tests/test_assembly.cc
index 329adf1..1f7381c 100644
--- a/tests/test_assembly.cc
+++ b/tests/test_assembly.cc
@@ -888,7 +888,8 @@ static void test_new_assembly(int N, int NX, int pK) {
int main(int argc, char *argv[]) {
-
+
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -910,5 +911,8 @@ int main(int argc, char *argv[]) {
<< "---------\n\n";
cout << "failures: " << fail_cnt << endl;
+
+ GETFEM_MPI_FINALIZE;
+
return fail_cnt;
}
diff --git a/tests/test_assembly_assignment.cc
b/tests/test_assembly_assignment.cc
index 221bc25..d149d16 100644
--- a/tests/test_assembly_assignment.cc
+++ b/tests/test_assembly_assignment.cc
@@ -22,7 +22,8 @@
#include "getfem/getfem_regular_meshes.h"
int main(int argc, char *argv[]) {
-
+
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -51,5 +52,8 @@ int main(int argc, char *argv[]) {
w.add_assignment_expression("d", "Norm(X)", -1, 1, true);
w.add_expression("d * Test_u", mim, -1);
w.assembly(1);
+
+ GETFEM_MPI_FINALIZE;
+
return (gmm::abs(gmm::vect_norm2(v) - RESULT) < 1e-10) ? 0 : 1;
}
diff --git a/tests/test_condensation.cc b/tests/test_condensation.cc
index f8fdab4..1cfb5d5 100644
--- a/tests/test_condensation.cc
+++ b/tests/test_condensation.cc
@@ -30,7 +30,8 @@ using bgeot::base_node;
static bool debug=false;
int main(int argc, char *argv[]) {
-
+ GETFEM_MPI_INIT(argc, argv);
+
gmm::set_traces_level(1);
bgeot::md_param PARAM;
@@ -180,5 +181,7 @@ int main(int argc, char *argv[]) {
ret += gmm::vect_dist1(md1.real_variable("p"), md2.real_variable("p")) <
1e-9 ? 0 : 4;
std::cout<<"Test with difficulty "<<DIFFICULTY<<" returned "<<ret<<std::endl;
+
+ GETFEM_MPI_FINALIZE;
return ret;
}
diff --git a/tests/test_continuation.cc b/tests/test_continuation.cc
index 4d7352c..bb6f41d 100644
--- a/tests/test_continuation.cc
+++ b/tests/test_continuation.cc
@@ -229,6 +229,7 @@ int main(int argc, char *argv[]) {
srand(7689);
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -240,6 +241,7 @@ int main(int argc, char *argv[]) {
p.cont(U);
}
GMM_STANDARD_CATCH_ERROR;
+ GETFEM_MPI_FINALIZE;
return 0;
}
diff --git a/tests/test_internal_variables.cc b/tests/test_internal_variables.cc
index a400ef6..bd25bb1 100644
--- a/tests/test_internal_variables.cc
+++ b/tests/test_internal_variables.cc
@@ -29,6 +29,7 @@ using bgeot::base_node;
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
// gmm::set_traces_level(1);
bgeot::md_param PARAM;
@@ -110,5 +111,7 @@ int main(int argc, char *argv[]) {
std::cout << "Total dofs of model 1: " << md1.nb_dof() << std::endl;
std::cout << "Total dofs of model 2: " << md2.nb_dof() << std::endl;
+ GETFEM_MPI_FINALIZE;
+
return gmm::vect_dist2(md1.real_variable("u"), md2.real_variable("u")) <
1e-9 ? 0 : 1;
}
diff --git a/tests/test_interpolated_fem.cc b/tests/test_interpolated_fem.cc
index f33935b..54fdbdd 100644
--- a/tests/test_interpolated_fem.cc
+++ b/tests/test_interpolated_fem.cc
@@ -333,7 +333,8 @@ void test3() {
int main(int argc, char *argv[]) {
- // try {
+ GETFEM_MPI_INIT(argc, argv);
+
test3(); // test for vectorial fems
test2(); // test for scalar fems
lap_pb p;
@@ -345,6 +346,7 @@ int main(int argc, char *argv[]) {
cout << "Assembling \n";
p.assemble();
- // } GMM_STANDARD_CATCH_ERROR;
+ GETFEM_MPI_FINALIZE;
+
return 0;
}
diff --git a/tests/test_range_basis.cc b/tests/test_range_basis.cc
index 2bd89ba..3297de2 100644
--- a/tests/test_range_basis.cc
+++ b/tests/test_range_basis.cc
@@ -246,6 +246,7 @@ void laplacian_problem::assembly(void) {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
@@ -261,5 +262,7 @@ int main(int argc, char *argv[]) {
p.mesh.write_to_file(p.datafilename + ".mesh");
p.assembly();
+ GETFEM_MPI_FINALIZE;
+
return 0;
}
diff --git a/tests/thermo_elasticity_electrical_coupling.cc
b/tests/thermo_elasticity_electrical_coupling.cc
index 74f64f9..397e8f0 100644
--- a/tests/thermo_elasticity_electrical_coupling.cc
+++ b/tests/thermo_elasticity_electrical_coupling.cc
@@ -71,6 +71,7 @@ typedef getfem::model_real_plain_vector plain_vector;
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
bgeot::md_param PARAM; // Small tool which reads a parameter file
PARAM.read_command_line(argc, argv);
@@ -322,7 +323,9 @@ int main(int argc, char *argv[]) {
<< endl;
cout << "L2 norm of temperature = " << getfem::asm_L2_norm(mim, mft, THETA)
<< endl;
-
+
+ GETFEM_MPI_FINALIZE;
+
return 0;
}
diff --git a/tests/wave_equation.cc b/tests/wave_equation.cc
index b028d20..3d5f656 100644
--- a/tests/wave_equation.cc
+++ b/tests/wave_equation.cc
@@ -373,6 +373,7 @@ void wave_equation_problem::compute_error() {
int main(int argc, char *argv[]) {
+ GETFEM_MPI_INIT(argc, argv);
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
wave_equation_problem p;
@@ -383,5 +384,7 @@ int main(int argc, char *argv[]) {
p.mf_u.write_to_file(p.datafilename + ".mf", true);
p.compute_error();
+ GETFEM_MPI_FINALIZE;
+
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] [getfem-commits] branch master updated: preparing 5.4 release : small fixes for passing the make check with the option --enable-paralevel=2,
Yves Renard <=