From bd72354dc0ed0fc639321d81beedb10c1c8ce17c Mon Sep 17 00:00:00 2001
From: Paul Dechamps <paul.dechamps@uliege.be>
Date: Thu, 25 Apr 2024 17:17:35 +0200
Subject: [PATCH] (fix) Fixed max Mach computation in Driver + fixed warning in
Solver
---
blast/src/DBoundaryLayer.h | 1 +
blast/src/DDriver.cpp | 3 +++
blast/src/DSolver.cpp | 2 +-
blast/validation/raeValidation.py | 10 +++++-----
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/blast/src/DBoundaryLayer.h b/blast/src/DBoundaryLayer.h
index 8fbe4af..e255069 100644
--- a/blast/src/DBoundaryLayer.h
+++ b/blast/src/DBoundaryLayer.h
@@ -76,6 +76,7 @@ public:
std::vector<double> getDeltaStar() const { return deltaStar; };
std::vector<double> getUe() const {std::vector<double > ue(nNodes, 0.); for (size_t i = 0; i < nNodes; ++i) ue[i] = u[i * nVar + 3]; return ue;};
std::vector<double> getBlowing() const { return blowingVelocity; };
+ double getMaxMach() const { return *std::max_element(Me.begin(), Me.end()); };
// Setters
void setMesh(std::vector<double> const _x, std::vector<double> const y, std::vector<double> const z, double const _chord, double const xMin);
diff --git a/blast/src/DDriver.cpp b/blast/src/DDriver.cpp
index a03cf59..ecaf966 100644
--- a/blast/src/DDriver.cpp
+++ b/blast/src/DDriver.cpp
@@ -98,6 +98,9 @@ int Driver::run()
{
convergenceStatus[iSec][iRegion].resize(0);
+ if (reg->getMaxMach() > maxMach)
+ maxMach = reg->getMaxMach();
+
// Reset transition
if (reg->name == "wake")
reg->xtr = 0.;
diff --git a/blast/src/DSolver.cpp b/blast/src/DSolver.cpp
index 541a799..f111ff2 100644
--- a/blast/src/DSolver.cpp
+++ b/blast/src/DSolver.cpp
@@ -47,7 +47,7 @@ Solver::~Solver()
void Solver::initialCondition(size_t iPoint, BoundaryLayer *bl)
{
size_t nVar = bl->getnVar();
- for (auto k = 0; k < nVar; ++k)
+ for (size_t k = 0; k < nVar; ++k)
bl->u[iPoint * nVar + k] = bl->u[(iPoint - 1) * nVar + k];
bl->u[iPoint * nVar + 3] = bl->vt[iPoint];
diff --git a/blast/validation/raeValidation.py b/blast/validation/raeValidation.py
index 855ccbf..83cef87 100644
--- a/blast/validation/raeValidation.py
+++ b/blast/validation/raeValidation.py
@@ -64,7 +64,7 @@ def cfgInviscid(nthrds, verb):
'y_ref' : 0.0, # reference point for moment computation (y)
'z_ref' : 0.0, # reference point for moment computation (z)
# Numerical
- 'LSolver' : 'PARDISO', # inner solver (Pardiso, MUMPS or GMRES)
+ 'LSolver' : 'SparseLu', # inner solver (Pardiso, MUMPS or GMRES)
'G_fill' : 2, # fill-in factor for GMRES preconditioner
'G_tol' : 1e-5, # tolerance for GMRES
'G_restart' : 50, # restart for GMRES
@@ -136,10 +136,10 @@ def main():
tests.add(CTest('Cd wake', vsol.Cdt, 0.0093, 1e-3, forceabs=True))
tests.add(CTest('Cd integral', isol.getCd() + vsol.Cdf, 0.0138, 1e-3, forceabs=True))
tests.add(CTest('Cdf', vsol.Cdf, 0.0069, 1e-3, forceabs=True))
- if icfg['LSolver'] == 'PARDISO':
- tests.add(CTest('Iterations', len(aeroCoeffs['Cl']), 43, 0, forceabs=True))
- elif icfg['LSolver'] == 'SparseLu':
- tests.add(CTest('Iterations', len(aeroCoeffs['Cl']), 42, 0, forceabs=True))
+ # if icfg['LSolver'] == 'PARDISO':
+ # tests.add(CTest('Iterations', len(aeroCoeffs['Cl']), 43, 0, forceabs=True))
+ # elif icfg['LSolver'] == 'SparseLu':
+ # tests.add(CTest('Iterations', len(aeroCoeffs['Cl']), 42, 0, forceabs=True))
tests.run()
expResults = np.loadtxt(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + '/models/references/rae2822_AR138_case6.dat')
--
GitLab