diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp index 5d5a0cb5ac0d85e05e04dae250976e7e07eb782c..70fbd7346a529b3628ff408322d756d1ab922290 100644 --- a/Geo/GFaceCompound.cpp +++ b/Geo/GFaceCompound.cpp @@ -782,12 +782,6 @@ void GFaceCompound::parametrize_conformal() const 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 *v2 = ordered[1]; diff --git a/contrib/gmm/gmm_solver_qmr.h b/contrib/gmm/gmm_solver_qmr.h index a9a5582d2ba5941872b3ca79e30bf351e038f031..48be120368a45a26826701c9cabaf34636913f57 100644 --- a/contrib/gmm/gmm_solver_qmr.h +++ b/contrib/gmm/gmm_solver_qmr.h @@ -120,11 +120,11 @@ namespace gmm { 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)) { GMM_ASSERT1(false, "QMR failed to converge"); } else { GMM_WARNING1("QMR failed to converge"); return; } - + } gmm::copy(gmm::scaled(v_tld, T(R(1)/rho)), v); gmm::scale(y, T(R(1)/rho)); @@ -132,11 +132,11 @@ namespace gmm { gmm::scale(z, T(R(1)/xi)); delta = gmm::vect_sp(z, y); - if (delta == T(0)) + if (delta == T(0)){ if (iter.get_maxiter() == size_type(-1)) { GMM_ASSERT1(false, "QMR failed to converge"); } else { GMM_WARNING1("QMR failed to converge"); return; } - + } gmm::right_mult(M1, y, y_tld); gmm::transposed_left_mult(M1, z, z_tld); @@ -151,17 +151,17 @@ namespace gmm { gmm::mult(A, p, p_tld); ep = gmm::vect_sp(q, p_tld); - if (ep == T(0)) + if (ep == T(0)){ if (iter.get_maxiter() == size_type(-1)) { GMM_ASSERT1(false, "QMR failed to converge"); } else { GMM_WARNING1("QMR failed to converge"); return; } - + } beta = ep / delta; - if (beta == T(0)) + if (beta == T(0)){ if (iter.get_maxiter() == size_type(-1)) { GMM_ASSERT1(false, "QMR failed to converge"); } else { GMM_WARNING1("QMR failed to converge"); return; } - + } gmm::add(p_tld, gmm::scaled(v, -beta), v_tld); gmm::left_mult(M1, v_tld, y); @@ -180,11 +180,11 @@ namespace gmm { theta = rho / (gamma_1 * beta); 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)) { GMM_ASSERT1(false, "QMR failed to converge"); } else { GMM_WARNING1("QMR failed to converge"); return; } - + } eta = -eta * T(rho_1) * gmm::sqr(gamma) / (beta * gmm::sqr(gamma_1)); if (iter.first()) {