From 59b5d257b88d00a9d264fece7d16152c4495fc1e Mon Sep 17 00:00:00 2001
From: Paul Dechamps <paul.dechamps@uliege.be>
Date: Mon, 28 Oct 2024 00:19:13 +0100
Subject: [PATCH] (style) Test format 10 + (fix) compiler warning
---
blast/src/DCoupledAdjoint.cpp | 8 ++++----
format/{format_cf11.py => format.py} | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
rename format/{format_cf11.py => format.py} (96%)
diff --git a/blast/src/DCoupledAdjoint.cpp b/blast/src/DCoupledAdjoint.cpp
index 2001591..ad23340 100644
--- a/blast/src/DCoupledAdjoint.cpp
+++ b/blast/src/DCoupledAdjoint.cpp
@@ -1054,7 +1054,7 @@ void CoupledAdjoint::gradientwrtMesh() {
// dJ/dx_j)*grad_xPhi dM/dx = dM/dgradPhi * dgradPhi/dx = dM/dgradPhi *
// gradPhi * dv/dx drho/dx = drho/dgradPhi * dgradPhi/dx = drho/dgradPhi
// * gradPhi * dv/dx
- for (int inodOnElm = 0; inodOnElm < e->nodes.size(); inodOnElm++)
+ for (size_t inodOnElm = 0; inodOnElm < e->nodes.size(); inodOnElm++)
for (int idim = 0; idim < nDim; ++idim) {
Eigen::VectorXd gradV = (-e->getJinv(0)) *
e->getGradJ(0)[inodOnElm * nDim + idim] *
@@ -1094,9 +1094,9 @@ void CoupledAdjoint::gradientwrtMesh() {
*/
Eigen::VectorXd CoupledAdjoint::runViscous() {
int exitCode = vsol->run();
- // if (exitCode != 0)
- // std::cout << "vsol terminated with exit code " << exitCode <<
- // std::endl;
+ if (exitCode != 0 && vsol->verbose > 0)
+ std::cout << "vsol terminated with exit code " << exitCode <<
+ std::endl;
// Extract deltaStar
std::vector<Eigen::VectorXd> dStar_p;
diff --git a/format/format_cf11.py b/format/format.py
similarity index 96%
rename from format/format_cf11.py
rename to format/format.py
index 25a2636..49016bb 100755
--- a/format/format_cf11.py
+++ b/format/format.py
@@ -45,7 +45,7 @@ def main():
encs = {}
for f in all_files(os.getcwd(), patterns='*.cpp;*.c;*.h;*.hpp'):
# print(f)
- cmd = ['clang-format-11', "-style=file", "-i", f]
+ cmd = ['clang-format-10', "-style=file", "-i", f]
retcode = subprocess.call(cmd)
if retcode != 0:
print(f'ERROR: retcode = {retcode}')
--
GitLab