Skip to content
Snippets Groups Projects
Commit 23aeb419 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix warn

parent b83bfaec
No related branches found
No related tags found
No related merge requests found
...@@ -782,12 +782,6 @@ void GFaceCompound::parametrize_conformal() const ...@@ -782,12 +782,6 @@ void GFaceCompound::parametrize_conformal() const
return; return;
} }
for(unsigned int i = 0; i < ordered.size(); i++){
MVertex *v = ordered[i];
// printf("coucou\n");
const double theta = 2 * M_PI * coords[i];
// myAssembler.fixVertex(v, 0, 1, cos(theta));
}
{ {
MVertex *v1 = ordered[0]; MVertex *v1 = ordered[0];
MVertex *v2 = ordered[1]; MVertex *v2 = ordered[1];
......
...@@ -120,11 +120,11 @@ namespace gmm { ...@@ -120,11 +120,11 @@ namespace gmm {
while (! iter.finished_vect(r)) { while (! iter.finished_vect(r)) {
if (rho == R(0) || xi == R(0)) if (rho == R(0) || xi == R(0)){
if (iter.get_maxiter() == size_type(-1)) if (iter.get_maxiter() == size_type(-1))
{ GMM_ASSERT1(false, "QMR failed to converge"); } { GMM_ASSERT1(false, "QMR failed to converge"); }
else { GMM_WARNING1("QMR failed to converge"); return; } else { GMM_WARNING1("QMR failed to converge"); return; }
}
gmm::copy(gmm::scaled(v_tld, T(R(1)/rho)), v); gmm::copy(gmm::scaled(v_tld, T(R(1)/rho)), v);
gmm::scale(y, T(R(1)/rho)); gmm::scale(y, T(R(1)/rho));
...@@ -132,11 +132,11 @@ namespace gmm { ...@@ -132,11 +132,11 @@ namespace gmm {
gmm::scale(z, T(R(1)/xi)); gmm::scale(z, T(R(1)/xi));
delta = gmm::vect_sp(z, y); delta = gmm::vect_sp(z, y);
if (delta == T(0)) if (delta == T(0)){
if (iter.get_maxiter() == size_type(-1)) if (iter.get_maxiter() == size_type(-1))
{ GMM_ASSERT1(false, "QMR failed to converge"); } { GMM_ASSERT1(false, "QMR failed to converge"); }
else { GMM_WARNING1("QMR failed to converge"); return; } else { GMM_WARNING1("QMR failed to converge"); return; }
}
gmm::right_mult(M1, y, y_tld); gmm::right_mult(M1, y, y_tld);
gmm::transposed_left_mult(M1, z, z_tld); gmm::transposed_left_mult(M1, z, z_tld);
...@@ -151,17 +151,17 @@ namespace gmm { ...@@ -151,17 +151,17 @@ namespace gmm {
gmm::mult(A, p, p_tld); gmm::mult(A, p, p_tld);
ep = gmm::vect_sp(q, p_tld); ep = gmm::vect_sp(q, p_tld);
if (ep == T(0)) if (ep == T(0)){
if (iter.get_maxiter() == size_type(-1)) if (iter.get_maxiter() == size_type(-1))
{ GMM_ASSERT1(false, "QMR failed to converge"); } { GMM_ASSERT1(false, "QMR failed to converge"); }
else { GMM_WARNING1("QMR failed to converge"); return; } else { GMM_WARNING1("QMR failed to converge"); return; }
}
beta = ep / delta; beta = ep / delta;
if (beta == T(0)) if (beta == T(0)){
if (iter.get_maxiter() == size_type(-1)) if (iter.get_maxiter() == size_type(-1))
{ GMM_ASSERT1(false, "QMR failed to converge"); } { GMM_ASSERT1(false, "QMR failed to converge"); }
else { GMM_WARNING1("QMR failed to converge"); return; } else { GMM_WARNING1("QMR failed to converge"); return; }
}
gmm::add(p_tld, gmm::scaled(v, -beta), v_tld); gmm::add(p_tld, gmm::scaled(v, -beta), v_tld);
gmm::left_mult(M1, v_tld, y); gmm::left_mult(M1, v_tld, y);
...@@ -180,11 +180,11 @@ namespace gmm { ...@@ -180,11 +180,11 @@ namespace gmm {
theta = rho / (gamma_1 * beta); theta = rho / (gamma_1 * beta);
gamma = T(1) / gmm::sqrt(T(1) + gmm::sqr(theta)); gamma = T(1) / gmm::sqrt(T(1) + gmm::sqr(theta));
if (gamma == T(0)) if (gamma == T(0)){
if (iter.get_maxiter() == size_type(-1)) if (iter.get_maxiter() == size_type(-1))
{ GMM_ASSERT1(false, "QMR failed to converge"); } { GMM_ASSERT1(false, "QMR failed to converge"); }
else { GMM_WARNING1("QMR failed to converge"); return; } else { GMM_WARNING1("QMR failed to converge"); return; }
}
eta = -eta * T(rho_1) * gmm::sqr(gamma) / (beta * gmm::sqr(gamma_1)); eta = -eta * T(rho_1) * gmm::sqr(gamma) / (beta * gmm::sqr(gamma_1));
if (iter.first()) { if (iter.first()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment