Skip to content

Commit dffa192

Browse files
EvertBunschotenEvertBunschoten
committed
Implemented comments from reviewers
1 parent d0a77f2 commit dffa192

7 files changed

Lines changed: 16 additions & 47 deletions

File tree

‎SU2_CFD/include/fluid/CFluidFlamelet.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class CFluidFlamelet final : public CFluidModel {
9898
* \param[in] output_refs - output data.
9999
* \param[out] Extrapolation - scalar solution is within bounds (0) or out of bounds (1).
100100
*/
101-
inline unsigned long EvaluateDataSet(vector<su2double>& input_scalar, unsigned short lookup_type,
101+
inline unsigned long EvaluateDataSet(const vector<su2double>& input_scalar, unsigned short lookup_type,
102102
vector<su2double>& output_refs) override;
103103

104104
/*!

‎SU2_CFD/include/fluid/CFluidModel.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class CFluidModel {
147147
* \brief Evaluate data manifold for flamelet or data-driven fluid problems.
148148
* \param[in] input - input data for manifold regression.
149149
*/
150-
virtual unsigned long EvaluateDataSet(vector<su2double> &input_scalar, unsigned short lookup_type, vector<su2double> &output_refs) { return 0; }
150+
virtual unsigned long EvaluateDataSet(const vector<su2double> &input_scalar, unsigned short lookup_type, vector<su2double> &output_refs) { return 0; }
151151

152152
/*!
153153
* \brief Get fluid dynamic viscosity.

‎SU2_CFD/include/solvers/CSpeciesFlameletSolver.hpp‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* \file CSpeciesFlameletSolver.hpp
33
* \brief Headers of the CSpeciesFlameletSolver class
4-
* \author D. Mayer, N. Beishuizen, T. Economon
4+
* \author D. Mayer, N. Beishuizen, T. Economon, E. Bunschoten
55
* \version 7.5.1 "Blackbird"
66
*
77
* SU2 Project Website: https://su2code.github.io
@@ -47,15 +47,6 @@ class CSpeciesFlameletSolver final : public CSpeciesSolver {
4747
*/
4848
void SetPreconditioner(CGeometry* geometry, CSolver** solver_container, CConfig* config);
4949

50-
/*!
51-
* \brief Compute the primitive variables (diffusivities).
52-
* \param[in] solver_container - Container vector with all the solutions.
53-
* \param[in] config - Definition of the particular problem.
54-
* \param[in] Output - Boolean to determine whether to print output.
55-
* \return - The number of non-physical points.
56-
*/
57-
unsigned long SetPrimitive_Variables(CSolver** solver_container, CConfig* config, bool Output);
58-
5950
/*!
6051
* \brief Generic implementation of the isothermal wall also covering CHT cases,
6152
* for which the wall temperature is given by GetConjugateHeatVariable.
@@ -93,7 +84,7 @@ class CSpeciesFlameletSolver final : public CSpeciesSolver {
9384
* \return - within manifold bounds (0) or outside manifold bounds (1).
9485
*/
9586
unsigned long SetScalarSources(const CConfig* config, CFluidModel* fluid_model_local, unsigned long iPoint,
96-
vector<su2double>& scalars);
87+
const vector<su2double>& scalars);
9788

9889
/*!
9990
* \brief Retrieve passive look-up data from manifold.
@@ -104,7 +95,7 @@ class CSpeciesFlameletSolver final : public CSpeciesSolver {
10495
* \return - within manifold bounds (0) or outside manifold bounds (1).
10596
*/
10697
unsigned long SetScalarLookUps(const CConfig* config, CFluidModel* fluid_model_local, unsigned long iPoint,
107-
vector<su2double>& scalars);
98+
const vector<su2double>& scalars);
10899

109100
public:
110101
/*!
@@ -184,29 +175,4 @@ class CSpeciesFlameletSolver final : public CSpeciesSolver {
184175
*/
185176
void BC_ConjugateHeat_Interface(CGeometry* geometry, CSolver** solver_container, CNumerics* numerics, CConfig* config,
186177
unsigned short val_marker) override;
187-
188-
/*!
189-
* \brief Get the conjugate heat variables.
190-
* \param[in] val_marker - The marker index.
191-
* \param[in] val_vertex - The vertex index.
192-
* \param[in] pos_var - The variable position (in vector of all conjugate heat variables).
193-
*/
194-
inline su2double GetConjugateHeatVariable(unsigned short val_marker, unsigned long val_vertex,
195-
unsigned short pos_var) const override {
196-
return conjugate_var[val_marker][val_vertex][pos_var];
197-
}
198-
199-
/*!
200-
* \brief Set the conjugate heat variables.
201-
* \param[in] val_marker - The marker index.
202-
* \param[in] val_vertex - The vertex index.
203-
* \param[in] pos_var - The variable position (in vector of all conjugate heat variables).
204-
* \param[in] relaxation_factor - The relaxation factor for the change of the variables.
205-
* \param[in] val_var - The value of the variable.
206-
*/
207-
inline void SetConjugateHeatVariable(unsigned short val_marker, unsigned long val_vertex, unsigned short pos_var,
208-
su2double relaxation_factor, su2double val_var) override {
209-
conjugate_var[val_marker][val_vertex][pos_var] =
210-
relaxation_factor * val_var + (1.0 - relaxation_factor) * conjugate_var[val_marker][val_vertex][pos_var];
211-
}
212178
};

‎SU2_CFD/src/fluid/CFluidFlamelet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ void CFluidFlamelet::PreprocessLookUp(CConfig* config) {
199199
}
200200
}
201201

202-
unsigned long CFluidFlamelet::EvaluateDataSet(vector<su2double>& input_scalar, unsigned short lookup_type,
202+
unsigned long CFluidFlamelet::EvaluateDataSet(const vector<su2double>& input_scalar, unsigned short lookup_type,
203203
vector<su2double>& output_refs) {
204204
su2double val_enth = input_scalar[I_ENTH];
205205
su2double val_prog = input_scalar[I_PROGVAR];

‎SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* \file CSpeciesFlameletSolver.cpp
33
* \brief Main subroutines of CSpeciesFlameletSolver class
4-
* \author D. Mayer, T. Economon, N. Beishuizen
4+
* \author D. Mayer, T. Economon, N. Beishuizen, E. Bunschoten
55
* \version 7.5.1 "Blackbird"
66
*
77
* SU2 Project Website: https://su2code.github.io
@@ -343,7 +343,7 @@ void CSpeciesFlameletSolver::BC_Isothermal_Wall_Generic(CGeometry* geometry, CSo
343343
CConfig* config, unsigned short val_marker, bool cht_mode) {
344344
const bool implicit = config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT;
345345
const string Marker_Tag = config->GetMarker_All_TagBound(val_marker);
346-
su2double temp_wall = config->GetIsothermal_Temperature(Marker_Tag);
346+
su2double temp_wall;
347347
CFluidModel* fluid_model_local = solver_container[FLOW_SOL]->GetFluidModel();
348348
auto* flowNodes = su2staticcast_p<CFlowVariable*>(solver_container[FLOW_SOL]->GetNodes());
349349
su2double enth_wall;
@@ -354,7 +354,10 @@ void CSpeciesFlameletSolver::BC_Isothermal_Wall_Generic(CGeometry* geometry, CSo
354354
for (unsigned long iVertex = 0; iVertex < geometry->nVertex[val_marker]; iVertex++) {
355355
unsigned long iPoint = geometry->vertex[val_marker][iVertex]->GetNode();
356356

357-
if (cht_mode) temp_wall = solver_container[FLOW_SOL]->GetConjugateHeatVariable(val_marker, iVertex, 0);
357+
if (cht_mode)
358+
temp_wall = solver_container[FLOW_SOL]->GetConjugateHeatVariable(val_marker, iVertex, 0);
359+
else
360+
temp_wall = config->GetIsothermal_Temperature(Marker_Tag);
358361

359362
/*--- Check if the node belongs to the domain (i.e., not a halo node). ---*/
360363

@@ -434,7 +437,7 @@ void CSpeciesFlameletSolver::BC_ConjugateHeat_Interface(CGeometry* geometry, CSo
434437
}
435438

436439
unsigned long CSpeciesFlameletSolver::SetScalarSources(const CConfig* config, CFluidModel* fluid_model_local,
437-
unsigned long iPoint, vector<su2double>& scalars) {
440+
unsigned long iPoint, const vector<su2double>& scalars) {
438441
/*--- Compute total source terms from the production and consumption. ---*/
439442

440443
vector<su2double> table_sources(config->GetNControlVars() + 2 * config->GetNUserScalars());
@@ -462,7 +465,7 @@ unsigned long CSpeciesFlameletSolver::SetScalarSources(const CConfig* config, CF
462465
}
463466

464467
unsigned long CSpeciesFlameletSolver::SetScalarLookUps(const CConfig* config, CFluidModel* fluid_model_local,
465-
unsigned long iPoint, vector<su2double>& scalars) {
468+
unsigned long iPoint, const vector<su2double>& scalars) {
466469
/*--- Compute total source terms from the production and consumption. ---*/
467470

468471
vector<su2double> lookup_scalar(config->GetNLookups());

‎meson_scripts/init.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def init_submodules(
7171
github_repo_coolprop = "https://github.com/CoolProp/CoolProp"
7272
sha_version_mel = "2484cd3258ef800a10e361016cb341834ee7930b"
7373
github_repo_mel = "https://github.com/pcarruscag/MEL"
74-
sha_version_mlpcpp = "a80115c6f4779cc168d1464cf32aead61559c9ea"
74+
sha_version_mlpcpp = "665c45b7d3533c977eb1f637918d5b8b75c07d3b"
7575
github_repo_mlpcpp = "https://github.com/EvertBunschoten/MLPCpp"
7676

7777
medi_name = "MeDiPack"

‎subprojects/MLPCpp‎

0 commit comments

Comments
 (0)