[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] [getfem-commits] branch master updated: towards release
From: |
Yves Renard |
Subject: |
[Getfem-commits] [getfem-commits] branch master updated: towards release 5.4.2 |
Date: |
Tue, 21 Jun 2022 14:42:55 -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 084f9aed towards release 5.4.2
084f9aed is described below
commit 084f9aed690f6d8184f62637f4b9721787228e21
Author: Yves Renard <Yves.Renard@insa-lyon.fr>
AuthorDate: Tue Jun 21 20:42:42 2022 +0200
towards release 5.4.2
---
src/getfem/getfem_derivatives.h | 2 +-
src/getfem/getfem_mesh_slicers.h | 3 ++-
src/getfem_interpolation.cc | 2 +-
src/getfem_models.cc | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/getfem/getfem_derivatives.h b/src/getfem/getfem_derivatives.h
index 155b6089..c605454c 100644
--- a/src/getfem/getfem_derivatives.h
+++ b/src/getfem/getfem_derivatives.h
@@ -231,7 +231,7 @@ namespace getfem
GMM_ASSERT1(!mf_vm.is_reduced(), "Sorry, to be done");
- scalar_type vm_min, vm_max;
+ scalar_type vm_min = 0., vm_max = 0.;
for (dal::bv_visitor i(mf_vm_dofs); !i.finished(); ++i) {
VM[i] = 0;
scalar_type sdiag = 0.;
diff --git a/src/getfem/getfem_mesh_slicers.h b/src/getfem/getfem_mesh_slicers.h
index 1e58fc9b..e69e7078 100644
--- a/src/getfem/getfem_mesh_slicers.h
+++ b/src/getfem/getfem_mesh_slicers.h
@@ -429,7 +429,8 @@ namespace getfem {
scalar_type Fd = gmm::vect_sp(F,d);
scalar_type Dd = gmm::vect_sp(D,d);
scalar_type a = gmm::vect_norm2_sqr(D) - gmm::sqr(Dd);
- if (a < EPS) return pt_bin.is_in(iA) ? 0. : 1./EPS; assert(a> -EPS);
+ if (a < EPS) return pt_bin.is_in(iA) ? 0. : 1./EPS;
+ assert(a> -EPS);
scalar_type b = 2*(gmm::vect_sp(F,D) - Fd*Dd);
scalar_type c = gmm::vect_norm2_sqr(F) - gmm::sqr(Fd) - gmm::sqr(R);
return slicer_volume::trinom(a,b,c);
diff --git a/src/getfem_interpolation.cc b/src/getfem_interpolation.cc
index cf53ebd7..2c5206d6 100644
--- a/src/getfem_interpolation.cc
+++ b/src/getfem_interpolation.cc
@@ -44,7 +44,7 @@ namespace getfem {
size_type mesh_trans_inv::point_on_convex(size_type cv, size_type i) const {
set_iterator it = pts_cvx[cv].begin();
- for (size_type j = 0; it != pts_cvx[cv].end() && j < i; ++it, ++j);
+ for (size_type j = 0; it != pts_cvx[cv].end() && j < i; ++it, ++j) {}
GMM_ASSERT1(it != pts_cvx[cv].end(), "internal error");
return *it;
}
diff --git a/src/getfem_models.cc b/src/getfem_models.cc
index 17241752..3ae1927d 100644
--- a/src/getfem_models.cc
+++ b/src/getfem_models.cc
@@ -522,7 +522,7 @@ namespace getfem {
if (term.is_matrix_term) {
if (term.is_global) {
bool varc = false, multc = false;
- for (const std::string var : brick.vlist) {
+ for (const std::string &var : brick.vlist) {
if (multname.compare(var) == 0) multc = true;
if (vname.compare(var) == 0) varc = true;
}
@@ -691,7 +691,7 @@ namespace getfem {
<< vargroup.first;
if (vargroup.second.size()) {
bool first(true);
- for (const std::string vname : vargroup.second) {
+ for (const std::string &vname : vargroup.second) {
ost << (first ? " " : ", ") << vname;
first = false;
}