[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
From: |
Yves Renard |
Subject: |
[Getfem-commits] (no subject) |
Date: |
Sun, 4 Jun 2017 03:35:58 -0400 (EDT) |
branch: devel-yves
commit 1180632c7f75ea8ffe80efa63cb0d834cda8a03a
Author: Yves Renard <address@hidden>
Date: Sun Jun 4 09:35:40 2017 +0200
minor additional fixes
---
contrib/crack_plate/crack_bilaplacian_moment.cc | 3 ++-
contrib/crack_plate/crack_bilaplacian_problem.cc | 6 ++++--
contrib/crack_plate/crack_bilaplacian_tools.cc | 10 +++++-----
contrib/crack_plate/crack_mindlin.cc | 10 +++++-----
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/contrib/crack_plate/crack_bilaplacian_moment.cc
b/contrib/crack_plate/crack_bilaplacian_moment.cc
index 67b75d5..769e3aa 100644
--- a/contrib/crack_plate/crack_bilaplacian_moment.cc
+++ b/contrib/crack_plate/crack_bilaplacian_moment.cc
@@ -140,7 +140,8 @@ bool bilaplacian_crack_problem::solve_moment(plain_vector
&U) {
if (gmm::sqr(mesh.points_of_convex(i)[j][0]) +
gmm::sqr(mesh.points_of_convex(i)[j][1]) >
gmm::sqr(enr_area_radius))
- pm_convexes.sup(i); break;
+ pm_convexes.sup(i);
+ break;
}
}
diff --git a/contrib/crack_plate/crack_bilaplacian_problem.cc
b/contrib/crack_plate/crack_bilaplacian_problem.cc
index d04f0ec..e27c660 100644
--- a/contrib/crack_plate/crack_bilaplacian_problem.cc
+++ b/contrib/crack_plate/crack_bilaplacian_problem.cc
@@ -602,7 +602,8 @@ void bilaplacian_crack_problem::compute_error(plain_vector
&U) {
if (gmm::sqr(mesh.points_of_convex(cv)[j][0] ) +
gmm::sqr(mesh.points_of_convex(cv)[j][1] ) >
gmm::sqr(radius_split_domain))
- in_area = false; break;
+ in_area = false;
+ break;
}
if (in_area) r_center.add(cv) ;
else r_ext.add(cv) ;
@@ -742,7 +743,8 @@ bool bilaplacian_crack_problem::solve(plain_vector &U) {
if (gmm::sqr(mesh.points_of_convex(i)[j][0]) +
gmm::sqr(mesh.points_of_convex(i)[j][1]) >
gmm::sqr(enr_area_radius))
- pm_convexes.sup(i); break;
+ pm_convexes.sup(i);
+ break;
}
}
diff --git a/contrib/crack_plate/crack_bilaplacian_tools.cc
b/contrib/crack_plate/crack_bilaplacian_tools.cc
index 5ad768d..1d69af4 100644
--- a/contrib/crack_plate/crack_bilaplacian_tools.cc
+++ b/contrib/crack_plate/crack_bilaplacian_tools.cc
@@ -1091,14 +1091,14 @@ void bilaplacian_crack_problem::export_solution(const
plain_vector &U){
assert(pts.size() == 1);
size_type j=pts[0].i;
scalar_type x3 = P[2];
- assert(finite(VTHETA[2*j]));
- //assert(finite(VT[2*j]));
+ assert(std::isfinite(VTHETA[2*j]));
+ //assert(std::isfinite(VT[2*j]));
V[3*i+0] = - x3 * VTHETA[2*j+0]; //V[3*i+0] = VT[2*j+0] + x3 *
VTHETA.at(2*j+0);
V[3*i+1] = - x3 * VTHETA[2*j+1]; //V[3*i+1] = VT[2*j+1] + x3 *
VTHETA[2*j+1];
V[3*i+2] = V3[j];
- assert(finite(V[3*i]));
- assert(finite(V[3*i+1]));
- assert(finite(V[3*i+2]));
+ assert(std::isfinite(V[3*i]));
+ assert(std::isfinite(V[3*i+1]));
+ assert(std::isfinite(V[3*i+2]));
}
cout << "export to " << datafilename + "_3d.dx" << "..\n";
diff --git a/contrib/crack_plate/crack_mindlin.cc
b/contrib/crack_plate/crack_mindlin.cc
index c0b2db4..89cf7cf 100644
--- a/contrib/crack_plate/crack_mindlin.cc
+++ b/contrib/crack_plate/crack_mindlin.cc
@@ -1033,14 +1033,14 @@ int main(int argc, char *argv[]) {
assert(pts.size() == 1);
size_type j=pts[0].i;
scalar_type x3 = P[2];
- assert(finite(VTHETA[2*j]));
- assert(finite(VT[2*j]));
+ assert(std::isfinite(VTHETA[2*j]));
+ assert(std::isfinite(VT[2*j]));
V[3*i+0] = VT[2*j+0] + x3 * VTHETA.at(2*j+0);
V[3*i+1] = VT[2*j+1] + x3 * VTHETA[2*j+1];
V[3*i+2] = V3[j];
- assert(finite(V[3*i]));
- assert(finite(V[3*i+1]));
- assert(finite(V[3*i+2]));
+ assert(std::isfinite(V[3*i]));
+ assert(std::isfinite(V[3*i+1]));
+ assert(std::isfinite(V[3*i+2]));
}