Skip to content

Commit 97645e0

Browse files
pcarruscagpcarruscag
authored
Merge branch 'develop' into cubic_spline_interp
2 parents 4208aa7 + 350fee9 commit 97645e0

40 files changed

Lines changed: 929 additions & 415 deletions

‎Common/include/CConfig.hpp‎

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ class CConfig {
676676

677677
unsigned short nConfig_Files; /*!< \brief Number of config files for multiphysics problems. */
678678
string *Config_Filenames; /*!< \brief List of names for configuration files. */
679-
unsigned short *Kind_WallFunctions; /*!< \brief The kind of wall function to use for the corresponding markers. */
679+
WALL_FUNCTIONS *Kind_WallFunctions; /*!< \brief The kind of wall function to use for the corresponding markers. */
680680
unsigned short **IntInfo_WallFunctions; /*!< \brief Additional integer information for the wall function markers. */
681681
su2double **DoubleInfo_WallFunctions; /*!< \brief Additional double information for the wall function markers. */
682682
unsigned short *Marker_All_Monitoring, /*!< \brief Global index for monitoring using the grid information. */
@@ -816,21 +816,23 @@ class CConfig {
816816
Turb2LamViscRatio_FreeStream, /*!< \brief Ratio of turbulent to laminar viscosity. */
817817
NuFactor_FreeStream, /*!< \brief Ratio of turbulent to laminar viscosity. */
818818
NuFactor_Engine, /*!< \brief Ratio of turbulent to laminar viscosity at the engine. */
819-
SecondaryFlow_ActDisk, /*!< \brief Ratio of turbulent to laminar viscosity at the actuator disk. */
820-
Initial_BCThrust, /*!< \brief Ratio of turbulent to laminar viscosity at the actuator disk. */
821-
Pressure_FreeStream, /*!< \brief Total pressure of the fluid. */
822-
Pressure_Thermodynamic, /*!< \brief Thermodynamic pressure of the fluid. */
823-
Temperature_FreeStream, /*!< \brief Total temperature of the fluid. */
824-
Temperature_ve_FreeStream; /*!< \brief Total vibrational-electronic temperature of the fluid. */
825-
su2double Prandtl_Lam, /*!< \brief Laminar Prandtl number for the gas. */
826-
Prandtl_Turb, /*!< \brief Turbulent Prandtl number for the gas. */
827-
Length_Ref, /*!< \brief Reference length for non-dimensionalization. */
828-
Pressure_Ref, /*!< \brief Reference pressure for non-dimensionalization. */
829-
Temperature_Ref, /*!< \brief Reference temperature for non-dimensionalization.*/
830-
Temperature_ve_Ref, /*!< \brief Reference vibrational-electronic temperature for non-dimensionalization.*/
831-
Density_Ref, /*!< \brief Reference density for non-dimensionalization.*/
832-
Velocity_Ref, /*!< \brief Reference velocity for non-dimensionalization.*/
833-
Time_Ref, /*!< \brief Reference time for non-dimensionalization. */
819+
SecondaryFlow_ActDisk, /*!< \brief Ratio of turbulent to laminar viscosity at the actuator disk. */
820+
Initial_BCThrust, /*!< \brief Ratio of turbulent to laminar viscosity at the actuator disk. */
821+
Pressure_FreeStream, /*!< \brief Total pressure of the fluid. */
822+
Pressure_Thermodynamic, /*!< \brief Thermodynamic pressure of the fluid. */
823+
Temperature_FreeStream, /*!< \brief Total temperature of the fluid. */
824+
Temperature_ve_FreeStream; /*!< \brief Total vibrational-electronic temperature of the fluid. */
825+
su2double Prandtl_Lam, /*!< \brief Laminar Prandtl number for the gas. */
826+
Prandtl_Turb, /*!< \brief Turbulent Prandtl number for the gas. */
827+
wallModelKappa, /*!< \brief von Karman constant kappa for turbulence wall modeling */
828+
wallModelB, /*!< \brief constant B for turbulence wall modeling */
829+
Length_Ref, /*!< \brief Reference length for non-dimensionalization. */
830+
Pressure_Ref, /*!< \brief Reference pressure for non-dimensionalization. */
831+
Temperature_Ref, /*!< \brief Reference temperature for non-dimensionalization.*/
832+
Temperature_ve_Ref, /*!< \brief Reference vibrational-electronic temperature for non-dimensionalization.*/
833+
Density_Ref, /*!< \brief Reference density for non-dimensionalization.*/
834+
Velocity_Ref, /*!< \brief Reference velocity for non-dimensionalization.*/
835+
Time_Ref, /*!< \brief Reference time for non-dimensionalization. */
834836
Viscosity_Ref, /*!< \brief Reference viscosity for non-dimensionalization. */
835837
Conductivity_Ref, /*!< \brief Reference conductivity for non-dimensionalization. */
836838
Energy_Ref, /*!< \brief Reference viscosity for non-dimensionalization. */
@@ -1255,7 +1257,7 @@ class CConfig {
12551257
su2double** & ActDisk_PressJump, su2double** & ActDisk_TempJump, su2double** & ActDisk_Omega);
12561258

12571259
void addWallFunctionOption(const string &name, unsigned short &list_size,
1258-
string* &string_field, unsigned short* &val_Kind_WF,
1260+
string* &string_field, WALL_FUNCTIONS* &val_Kind_WF,
12591261
unsigned short** &val_IntInfo_WF, su2double** &val_DoubleInfo_WF);
12601262

12611263
void addPythonOption(const string name);
@@ -1664,6 +1666,18 @@ class CConfig {
16641666
*/
16651667
su2double GetPrandtl_Turb(void) const { return Prandtl_Turb; }
16661668

1669+
/*!
1670+
* \brief Get the value of the von Karman constant kappa for turbulence wall modeling.
1671+
* \return von Karman constant.
1672+
*/
1673+
su2double GetwallModelKappa(void) const { return wallModelKappa; }
1674+
1675+
/*!
1676+
* \brief Get the value of the von Karman constant kappa for turbulence wall modeling.
1677+
* \return von Karman constant.
1678+
*/
1679+
su2double GetwallModelB(void) const { return wallModelB; }
1680+
16671681
/*!
16681682
* \brief Get the value of the thermal conductivity for solids.
16691683
* \return Thermal conductivity (solid).
@@ -6618,7 +6632,7 @@ class CConfig {
66186632
* \param[in] val_marker - String of the viscous wall marker.
66196633
* \return The type of wall function treatment.
66206634
*/
6621-
unsigned short GetWallFunction_Treatment(string val_marker) const;
6635+
WALL_FUNCTIONS GetWallFunction_Treatment(string val_marker) const;
66226636

66236637
/*!
66246638
* \brief Get the additional integer info for the wall function treatment

‎Common/include/linear_algebra/CSysMatrix.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
#include <vector>
3737
#include <cassert>
3838

39-
using namespace std;
40-
4139
/*--- In forward mode the matrix is not of a built-in type. ---*/
4240
#if defined(HAVE_MKL) && !defined(CODI_FORWARD_TYPE)
4341
#include "mkl.h"

‎Common/include/option_structure.hpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -935,23 +935,23 @@ static const MapType<std::string, ENUM_ROELOWDISS> RoeLowDiss_Map = {
935935
/*!
936936
* \brief Types of wall functions.
937937
*/
938-
enum ENUM_WALL_FUNCTIONS {
939-
NO_WALL_FUNCTION = 0, /*!< \brief No wall function treatment, integration to the wall. Default behavior. */
940-
STANDARD_WALL_FUNCTION = 1, /*!< \brief Standard wall function. */
941-
ADAPTIVE_WALL_FUNCTION = 2, /*!< \brief Adaptive wall function. Formulation depends on y+. */
942-
SCALABLE_WALL_FUNCTION = 3, /*!< \brief Scalable wall function. */
943-
EQUILIBRIUM_WALL_MODEL = 4, /*!< \brief Equilibrium wall model for LES. */
944-
NONEQUILIBRIUM_WALL_MODEL = 5, /*!< \brief Non-equilibrium wall model for LES. */
945-
LOGARITHMIC_WALL_MODEL = 6 /*!< \brief Logarithmic law-of-the-wall model for LES. */
946-
};
947-
static const MapType<std::string, ENUM_WALL_FUNCTIONS> Wall_Functions_Map = {
948-
MakePair("NO_WALL_FUNCTION", NO_WALL_FUNCTION)
949-
MakePair("STANDARD_WALL_FUNCTION", STANDARD_WALL_FUNCTION)
950-
MakePair("ADAPTIVE_WALL_FUNCTION", ADAPTIVE_WALL_FUNCTION)
951-
MakePair("SCALABLE_WALL_FUNCTION", SCALABLE_WALL_FUNCTION)
952-
MakePair("EQUILIBRIUM_WALL_MODEL", EQUILIBRIUM_WALL_MODEL)
953-
MakePair("NONEQUILIBRIUM_WALL_MODEL", NONEQUILIBRIUM_WALL_MODEL)
954-
MakePair("LOGARITHMIC_WALL_MODEL", LOGARITHMIC_WALL_MODEL)
938+
enum class WALL_FUNCTIONS {
939+
NONE , /*!< \brief No wall function treatment, integration to the wall. Default behavior. */
940+
STANDARD_FUNCTION , /*!< \brief Standard wall function. */
941+
ADAPTIVE_FUNCTION , /*!< \brief Adaptive wall function. Formulation depends on y+. */
942+
SCALABLE_FUNCTION , /*!< \brief Scalable wall function. */
943+
EQUILIBRIUM_MODEL , /*!< \brief Equilibrium wall model for LES. */
944+
NONEQUILIBRIUM_MODEL , /*!< \brief Non-equilibrium wall model for LES. */
945+
LOGARITHMIC_MODEL /*!< \brief Logarithmic law-of-the-wall model for LES. */
946+
};
947+
static const MapType<std::string, WALL_FUNCTIONS> Wall_Functions_Map = {
948+
MakePair("NO_WALL_FUNCTION", WALL_FUNCTIONS::NONE)
949+
MakePair("STANDARD_WALL_FUNCTION", WALL_FUNCTIONS::STANDARD_FUNCTION)
950+
MakePair("ADAPTIVE_WALL_FUNCTION", WALL_FUNCTIONS::ADAPTIVE_FUNCTION)
951+
MakePair("SCALABLE_WALL_FUNCTION", WALL_FUNCTIONS::SCALABLE_FUNCTION)
952+
MakePair("EQUILIBRIUM_WALL_MODEL", WALL_FUNCTIONS::EQUILIBRIUM_MODEL)
953+
MakePair("NONEQUILIBRIUM_WALL_MODEL", WALL_FUNCTIONS::NONEQUILIBRIUM_MODEL)
954+
MakePair("LOGARITHMIC_WALL_MODEL", WALL_FUNCTIONS::LOGARITHMIC_MODEL)
955955
};
956956

957957
/*!

‎Common/include/option_structure.inl‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,13 +1738,13 @@ class COptionWallFunction : public COptionBase {
17381738
string name; // identifier for the option
17391739
unsigned short &nMarkers;
17401740
string* &markers;
1741-
unsigned short* &walltype;
1741+
WALL_FUNCTIONS* &walltype;
17421742
unsigned short** &intInfo;
17431743
su2double** &doubleInfo;
17441744

17451745
public:
17461746
COptionWallFunction(const string name, unsigned short &nMarker_WF,
1747-
string* &Marker_WF, unsigned short* &type_WF,
1747+
string* &Marker_WF, WALL_FUNCTIONS* &type_WF,
17481748
unsigned short** &intInfo_WF, su2double** &doubleInfo_WF) :
17491749
nMarkers(nMarker_WF), markers(Marker_WF), walltype(type_WF),
17501750
intInfo(intInfo_WF), doubleInfo(doubleInfo_WF) {
@@ -1776,14 +1776,16 @@ public:
17761776
If not, create an error message and return. */
17771777
++counter;
17781778
const unsigned short indWallType = counter;
1779-
unsigned short typeWF = NO_WALL_FUNCTION;
1779+
auto typeWF = WALL_FUNCTIONS::NONE;
17801780
bool validWF = true;
17811781
if (counter == totalSize) validWF = false;
17821782
else {
1783-
map<string, ENUM_WALL_FUNCTIONS>::const_iterator it;
1783+
map<string, WALL_FUNCTIONS>::const_iterator it;
17841784
it = Wall_Functions_Map.find(option_value[counter]);
1785-
if(it == Wall_Functions_Map.end()) validWF = false;
1786-
else typeWF = it->second;
1785+
if(it == Wall_Functions_Map.end())
1786+
validWF = false;
1787+
else
1788+
typeWF = it->second;
17871789
}
17881790

17891791
if (!validWF ) {
@@ -1803,9 +1805,9 @@ public:
18031805
must be specified. Hence the counter must be updated
18041806
accordingly. ---*/
18051807
switch( typeWF ) {
1806-
case EQUILIBRIUM_WALL_MODEL: counter += 3; break;
1807-
case NONEQUILIBRIUM_WALL_MODEL: counter += 2; break;
1808-
case LOGARITHMIC_WALL_MODEL: counter += 3; break;
1808+
case WALL_FUNCTIONS::EQUILIBRIUM_MODEL: counter += 3; break;
1809+
case WALL_FUNCTIONS::NONEQUILIBRIUM_MODEL: counter += 2; break;
1810+
case WALL_FUNCTIONS::LOGARITHMIC_MODEL: counter += 3; break;
18091811
default: break;
18101812
}
18111813

@@ -1826,7 +1828,7 @@ public:
18261828
/* Allocate the memory to store the data for the wall function markers. */
18271829
this->nMarkers = nVals;
18281830
this->markers = new string[nVals];
1829-
this->walltype = new unsigned short[nVals];
1831+
this->walltype = new WALL_FUNCTIONS[nVals];
18301832
this->intInfo = new unsigned short*[nVals];
18311833
this->doubleInfo = new su2double*[nVals];
18321834

@@ -1845,7 +1847,7 @@ public:
18451847

18461848
/* Determine the wall function type. As their validaties have
18471849
already been tested, there is no need to do so again. */
1848-
map<string, ENUM_WALL_FUNCTIONS>::const_iterator it;
1850+
map<string, WALL_FUNCTIONS>::const_iterator it;
18491851
it = Wall_Functions_Map.find(option_value[counter++]);
18501852

18511853
this->walltype[i] = it->second;
@@ -1854,7 +1856,7 @@ public:
18541856
is needed, which is extracted from option_value. ---*/
18551857
switch( this->walltype[i] ) {
18561858

1857-
case EQUILIBRIUM_WALL_MODEL: {
1859+
case WALL_FUNCTIONS::EQUILIBRIUM_MODEL: {
18581860

18591861
/* LES equilibrium wall model. The exchange distance, stretching
18601862
factor and number of points in the wall model must be specified. */
@@ -1879,7 +1881,7 @@ public:
18791881
break;
18801882
}
18811883

1882-
case NONEQUILIBRIUM_WALL_MODEL: {
1884+
case WALL_FUNCTIONS::NONEQUILIBRIUM_MODEL: {
18831885

18841886
/* LES non-equilibrium model. The RANS turbulence model and
18851887
the exchange distance need to be specified. */
@@ -1912,7 +1914,7 @@ public:
19121914

19131915
break;
19141916
}
1915-
case LOGARITHMIC_WALL_MODEL: {
1917+
case WALL_FUNCTIONS::LOGARITHMIC_MODEL: {
19161918

19171919
/* LES Logarithmic law-of-the-wall model. The exchange distance, stretching
19181920
factor and number of points in the wall model must be specified. */

‎Common/include/toolboxes/geometry_toolbox.hpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,17 @@ inline void Rotate(const Scalar R[][nDim], const Scalar* O, const Scalar* d, Sca
192192
}
193193
}
194194

195+
/*! \brief Tangent projection */
196+
template<class Mat, class Scalar, class Int>
197+
inline void TangentProjection(Int nDim, const Mat& tensor, const Scalar* vector, Scalar* proj) {
198+
199+
for (Int iDim = 0; iDim < nDim; iDim++)
200+
proj[iDim] = DotProduct(nDim, tensor[iDim], vector);
201+
202+
auto normalProj = DotProduct(nDim, proj, vector);
203+
204+
for (Int iDim = 0; iDim < nDim; iDim++)
205+
proj[iDim] -= normalProj * vector[iDim];
206+
}
207+
195208
}

‎Common/src/CConfig.cpp‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ void CConfig::addActDiskOption(const string & name, unsigned short & nMarker_Act
531531
}
532532

533533
void CConfig::addWallFunctionOption(const string &name, unsigned short &list_size, string* &string_field,
534-
unsigned short* &val_Kind_WF, unsigned short** &val_IntInfo_WF,
534+
WALL_FUNCTIONS* &val_Kind_WF, unsigned short** &val_IntInfo_WF,
535535
su2double** &val_DoubleInfo_WF) {
536536
assert(option_map.find(name) == option_map.end());
537537
all_options.insert(pair<string, bool>(name, true));
@@ -1223,6 +1223,10 @@ void CConfig::SetConfig_Options() {
12231223
addDoubleOption("PRANDTL_LAM", Prandtl_Lam, 0.72);
12241224
/*!\brief PRANDTL_TURB \n DESCRIPTION: Turbulent Prandtl number (0.9 (air), only for compressible flows) \n DEFAULT 0.90 \ingroup Config*/
12251225
addDoubleOption("PRANDTL_TURB", Prandtl_Turb, 0.90);
1226+
/*!\brief WALLMODELKAPPA \n DESCRIPTION: von Karman constant used for the wall model \n DEFAULT 0.41 \ingroup Config*/
1227+
addDoubleOption("WALLMODELKAPPA", wallModelKappa, 0.41);
1228+
/*!\brief WALLMODELB \n DESCRIPTION: constant B used for the wall model \n DEFAULT 5.0 \ingroup Config*/
1229+
addDoubleOption("WALLMODELB", wallModelB, 5.5);
12261230
/*!\brief BULK_MODULUS \n DESCRIPTION: Value of the Bulk Modulus \n DEFAULT 1.42E5 \ingroup Config*/
12271231
addDoubleOption("BULK_MODULUS", Bulk_Modulus, 1.42E5);
12281232
/* DESCRIPTION: Epsilon^2 multipier in Beta calculation for incompressible preconditioner. */
@@ -3258,13 +3262,13 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
32583262
Wall_Functions = false;
32593263
if (nMarker_WallFunctions > 0) {
32603264
for (iMarker = 0; iMarker < nMarker_WallFunctions; iMarker++) {
3261-
if (Kind_WallFunctions[iMarker] != NO_WALL_FUNCTION)
3265+
if (Kind_WallFunctions[iMarker] != WALL_FUNCTIONS::NONE)
32623266
Wall_Functions = true;
32633267

3264-
if ((Kind_WallFunctions[iMarker] == ADAPTIVE_WALL_FUNCTION) || (Kind_WallFunctions[iMarker] == SCALABLE_WALL_FUNCTION)
3265-
|| (Kind_WallFunctions[iMarker] == NONEQUILIBRIUM_WALL_MODEL))
3268+
if ((Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::ADAPTIVE_FUNCTION) || (Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::SCALABLE_FUNCTION)
3269+
|| (Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::NONEQUILIBRIUM_MODEL))
32663270

3267-
SU2_MPI::Error(string("For RANS problems, use NO_WALL_FUNCTION, STANDARD_WALL_FUNCTION or EQUILIBRIUM_WALL_MODEL.\n"), CURRENT_FUNCTION);
3271+
SU2_MPI::Error(string("For RANS problems, use NONE, STANDARD_WALL_FUNCTION or EQUILIBRIUM_WALL_MODEL.\n"), CURRENT_FUNCTION);
32683272

32693273
}
32703274
}
@@ -8871,9 +8875,9 @@ pair<WALL_TYPE, su2double> CConfig::GetWallRoughnessProperties(string val_marker
88718875
return WallProp;
88728876
}
88738877

8874-
unsigned short CConfig::GetWallFunction_Treatment(string val_marker) const {
8878+
WALL_FUNCTIONS CConfig::GetWallFunction_Treatment(string val_marker) const {
88758879

8876-
unsigned short WallFunction = NO_WALL_FUNCTION;
8880+
WALL_FUNCTIONS WallFunction = WALL_FUNCTIONS::NONE;
88778881

88788882
for(unsigned short iMarker=0; iMarker<nMarker_WallFunctions; iMarker++) {
88798883
if(Marker_WallFunctions[iMarker] == val_marker) {

‎Common/src/fem/fem_geometry_structure.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6128,7 +6128,7 @@ void CMeshFEM_DG::WallFunctionPreprocessing(CConfig *config) {
61286128
case ISOTHERMAL:
61296129
case HEAT_FLUX: {
61306130
const string Marker_Tag = config->GetMarker_All_TagBound(iMarker);
6131-
if(config->GetWallFunction_Treatment(Marker_Tag) != NO_WALL_FUNCTION)
6131+
if(config->GetWallFunction_Treatment(Marker_Tag) != WALL_FUNCTIONS::NONE)
61326132
wallFunctions = true;
61336133
break;
61346134
}
@@ -6235,19 +6235,19 @@ void CMeshFEM_DG::WallFunctionPreprocessing(CConfig *config) {
62356235
case ISOTHERMAL:
62366236
case HEAT_FLUX: {
62376237
const string Marker_Tag = config->GetMarker_All_TagBound(iMarker);
6238-
if(config->GetWallFunction_Treatment(Marker_Tag) != NO_WALL_FUNCTION) {
6238+
if(config->GetWallFunction_Treatment(Marker_Tag) != WALL_FUNCTIONS::NONE) {
62396239

62406240
/* An LES wall model is used for this boundary marker. Determine
62416241
which wall model and allocate the memory for the member variable. */
62426242
switch (config->GetWallFunction_Treatment(Marker_Tag) ) {
6243-
case EQUILIBRIUM_WALL_MODEL: {
6243+
case WALL_FUNCTIONS::EQUILIBRIUM_MODEL: {
62446244
if(rank == MASTER_NODE)
62456245
cout << "Marker " << Marker_Tag << " uses an Equilibrium Wall Model." << endl;
62466246

62476247
boundaries[iMarker].wallModel = new CWallModel1DEQ(config, Marker_Tag);
62486248
break;
62496249
}
6250-
case LOGARITHMIC_WALL_MODEL: {
6250+
case WALL_FUNCTIONS::LOGARITHMIC_MODEL: {
62516251
if(rank == MASTER_NODE)
62526252
cout << "Marker " << Marker_Tag << " uses the Reichardt and Kader analytical laws for the Wall Model." << endl;
62536253

‎Common/src/fem/geometry_structure_fem_part.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3355,7 +3355,7 @@ void CPhysicalGeometry::DetermineDonorElementsWallFunctions(CConfig *config) {
33553355
case ISOTHERMAL:
33563356
case HEAT_FLUX: {
33573357
const string Marker_Tag = config->GetMarker_All_TagBound(iMarker);
3358-
if(config->GetWallFunction_Treatment(Marker_Tag) != NO_WALL_FUNCTION)
3358+
if(config->GetWallFunction_Treatment(Marker_Tag) != WALL_FUNCTIONS::NONE)
33593359
wallFunctions = true;
33603360
break;
33613361
}
@@ -3500,7 +3500,7 @@ void CPhysicalGeometry::DetermineDonorElementsWallFunctions(CConfig *config) {
35003500
case ISOTHERMAL:
35013501
case HEAT_FLUX: {
35023502
const string Marker_Tag = config->GetMarker_All_TagBound(iMarker);
3503-
if(config->GetWallFunction_Treatment(Marker_Tag) != NO_WALL_FUNCTION) {
3503+
if(config->GetWallFunction_Treatment(Marker_Tag) != WALL_FUNCTIONS::NONE) {
35043504

35053505
/* Retrieve the floating point information for this boundary marker.
35063506
The exchange location is the first element of this array. */
@@ -3952,7 +3952,7 @@ void CPhysicalGeometry::DetermineDonorElementsWallFunctions(CConfig *config) {
39523952
case ISOTHERMAL:
39533953
case HEAT_FLUX: {
39543954
const string Marker_Tag = config->GetMarker_All_TagBound(iMarker);
3955-
if(config->GetWallFunction_Treatment(Marker_Tag) != NO_WALL_FUNCTION) {
3955+
if(config->GetWallFunction_Treatment(Marker_Tag) != WALL_FUNCTIONS::NONE) {
39563956

39573957
for(unsigned long l=0; l<nElem_Bound[iMarker]; ++l)
39583958
bound[iMarker][l]->RemoveMultipleDonorsWallFunctions();
@@ -4825,7 +4825,7 @@ void CPhysicalGeometry::ComputeFEMGraphWeights(
48254825
case ISOTHERMAL:
48264826
case HEAT_FLUX: {
48274827
const string Marker_Tag = config->GetMarker_All_TagBound(iMarker);
4828-
if(config->GetWallFunction_Treatment(Marker_Tag) != NO_WALL_FUNCTION) {
4828+
if(config->GetWallFunction_Treatment(Marker_Tag) != WALL_FUNCTIONS::NONE) {
48294829

48304830
/* Retrieve the integer information for this boundary marker.
48314831
The number of points in normal direction for the wall function

0 commit comments

Comments
 (0)