Skip to content

Commit c2194ec

Browse files
authored
Merge branch 'develop' into Dependabot-GitHub-Actions
2 parents b96ca3f + 52160fc commit c2194ec

129 files changed

Lines changed: 2583 additions & 834 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ assignees: ''
77

88
---
99

10-
**Describe the bug**
11-
*A clear and concise description of what the bug is and what you expect the behavior to be instead. If applicable, add screenshots to help explain your problem.*
10+
*If this is a general question or difficulty building/using the code, please open a "Discussion" instead.*
1211

12+
**Describe the bug**
13+
*Give a clear and concise description of what the bug is and what you expect the behavior to be instead. Please provide enough instructions and data for a developer to reproduce the problem (config, mesh, commands, etc.). Please provide the smallest working example that reproduces the problem.*
1314

1415

15-
**To Reproduce**
16-
*Please provide a config file and mesh for a minimal example that recreates the problem.*
16+
**Bug report checklist**
17+
*Please make sure that you have followed the checklist below, many common problems can be solved by:*
1718

19+
- [ ] Consulting the build instructions (https://su2code.github.io/docs_v7/Build-SU2-Linux-MacOS/).
20+
- [ ] Looking for similar problems on GitHub or CFD-Online (https://www.cfd-online.com/Forums/su2/).
21+
- [ ] Updating to the newest version of SU2 (either develop, master, or the pre-built executables https://su2code.github.io/download.html).
1822

1923

2024
**Desktop (please complete the following information):**

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*Put an X by all that apply. You can fill this out after submitting the PR. If you have any questions, don't hesitate to ask! We want to help. These are a guide for you to know what the reviewers will be looking for in your contribution.*
1313

1414
- [ ] I am submitting my contribution to the develop branch.
15-
- [ ] My contribution generates no new compiler warnings (try with the '-Wall -Wextra -Wno-unused-parameter -Wno-empty-body' compiler flags, or simply --warnlevel=2 when using meson).
16-
- [ ] My contribution is commented and consistent with SU2 style.
15+
- [ ] My contribution generates no new compiler warnings (try with --warnlevel=3 when using meson).
16+
- [ ] My contribution is commented and consistent with SU2 style (https://su2code.github.io/docs_v7/Style-Guide/).
1717
- [ ] I have added a test case that demonstrates my contribution, if necessary.
18-
- [ ] I have updated appropriate documentation (Tutorials, Docs Page, config_template.cpp) , if necessary.
18+
- [ ] I have updated appropriate documentation (Tutorials, Docs Page, config_template.cpp), if necessary.

.github/workflows/regression.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- config_set: ForwardNoMPI
3232
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
3333
- config_set: BaseOMP
34-
flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
34+
flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
3535
- config_set: ReverseOMP
3636
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
3737
- config_set: ForwardOMP

.github/workflows/release-management.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- os_bin: macos64-mpi
2424
flags: '-Dcustom-mpi=true --cross-file=/hostfiles/hostfile_darwin_mpi'
2525
- os_bin: linux64
26-
flags: '-Dwith-mpi=disabled --cross-file=/hostfiles/hostfile_linux'
26+
flags: '-Dwith-mpi=disabled -Dstatic-cgns-deps=true --cross-file=/hostfiles/hostfile_linux'
2727
- os_bin: linux64-mpi
2828
flags: '-Dcustom-mpi=true --cross-file=/hostfiles/hostfile_linux_mpi'
2929
runs-on: ubuntu-latest

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Giulio Gori
7777
Guillaume Bâty
7878
Harichand M V
7979
HL Kline
80+
HL Zhi
8081
IndianaStokes
8182
J. Sinsay
8283
JSmith36

Common/include/CConfig.hpp

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,12 @@ class CConfig {
699699
*Marker_WallFunctions, /*!< \brief Markers for which wall functions must be applied. */
700700
*Marker_SobolevBC; /*!< \brief Markers in the gradient solver */
701701

702-
unsigned short nConfig_Files; /*!< \brief Number of config files for multiphysics problems. */
703-
string *Config_Filenames; /*!< \brief List of names for configuration files. */
702+
unsigned short nConfig_Files; /*!< \brief Number of config files for multiphysics problems. */
703+
string *Config_Filenames; /*!< \brief List of names for configuration files. */
704+
SST_OPTIONS *SST_Options; /*!< \brief List of modifications/corrections/versions of SST turbulence model.*/
705+
SA_OPTIONS *SA_Options; /*!< \brief List of modifications/corrections/versions of SA turbulence model.*/
706+
unsigned short nSST_Options; /*!< \brief Number of SST options specified. */
707+
unsigned short nSA_Options; /*!< \brief Number of SA options specified. */
704708
WALL_FUNCTIONS *Kind_WallFunctions; /*!< \brief The kind of wall function to use for the corresponding markers. */
705709
unsigned short **IntInfo_WallFunctions; /*!< \brief Additional integer information for the wall function markers. */
706710
su2double **DoubleInfo_WallFunctions; /*!< \brief Additional double information for the wall function markers. */
@@ -798,8 +802,9 @@ class CConfig {
798802
Beta_Factor, /*!< \brief Value of the epsilon^2 multiplier for Beta for the incompressible preconditioner. */
799803
Gas_Constant, /*!< \brief Specific gas constant. */
800804
Gas_ConstantND, /*!< \brief Non-dimensional specific gas constant. */
801-
Molecular_Weight, /*!< \brief Molecular weight of an incompressible ideal gas (g/mol). */
802-
Specific_Heat_Cp, /*!< \brief Specific heat at constant pressure. */
805+
*Molecular_Weight; /*!< \brief Molecular weight of an incompressible ideal gas (g/mol). */
806+
unsigned short nMolecular_Weight; /*!< \brief Number of species molecular weights. */
807+
su2double Specific_Heat_Cp, /*!< \brief Specific heat at constant pressure. */
803808
Specific_Heat_CpND, /*!< \brief Non-dimensional specific heat at constant pressure. */
804809
Specific_Heat_Cv, /*!< \brief Specific heat at constant volume. */
805810
Specific_Heat_CvND, /*!< \brief Non-dimensional specific heat at constant volume. */
@@ -1013,7 +1018,6 @@ class CConfig {
10131018
WINDOW_FUNCTION Kind_WindowFct; /*!< \brief Type of window (weight) function for objective functional. */
10141019
unsigned short Kind_HybridRANSLES; /*!< \brief Kind of Hybrid RANS/LES. */
10151020
unsigned short Kind_RoeLowDiss; /*!< \brief Kind of Roe scheme with low dissipation for unsteady flows. */
1016-
bool QCR; /*!< \brief Spalart-Allmaras with Quadratic Constitutive Relation, 2000 version (SA-QCR2000) . */
10171021

10181022
unsigned short nSpanWiseSections; /*!< \brief number of span-wise sections */
10191023
unsigned short nSpanMaxAllZones; /*!< \brief number of maximum span-wise sections for all zones */
@@ -1135,8 +1139,8 @@ class CConfig {
11351139
unsigned short nScreenOutput, /*!< \brief Number of screen output variables (max: 6). */
11361140
nHistoryOutput, nVolumeOutput; /*!< \brief Number of variables printed to the history file. */
11371141
bool Multizone_Residual; /*!< \brief Determines if memory should be allocated for the multizone residual. */
1138-
1139-
bool using_uq; /*!< \brief Using uncertainty quantification with SST model */
1142+
SST_ParsedOptions sstParsedOptions; /*!< \brief Additional parameters for the SST turbulence model. */
1143+
SA_ParsedOptions saParsedOptions; /*!< \brief Additional parameters for the SA turbulence model. */
11401144
su2double uq_delta_b; /*!< \brief Parameter used to perturb eigenvalues of Reynolds Stress Matrix */
11411145
unsigned short eig_val_comp; /*!< \brief Parameter used to determine type of eigenvalue perturbation */
11421146
su2double uq_urlx; /*!< \brief Under-relaxation factor */
@@ -1161,8 +1165,9 @@ class CConfig {
11611165
unsigned short maxBasisDim, /*!< \brief Maximum number of POD basis dimensions. */
11621166
rom_save_freq; /*!< \brief Frequency of unsteady time steps to save. */
11631167

1168+
unsigned short nSpecies, /*!< \brief Number of transported species equations (for NEMO and species transport)*/
1169+
11641170
/* other NEMO configure options*/
1165-
unsigned short nSpecies, /*!< \brief No of species present in flow */
11661171
iWall_Catalytic,
11671172
nWall_Catalytic; /*!< \brief No of catalytic walls */
11681173
su2double *Gas_Composition, /*!< \brief Initial mass fractions of flow [dimensionless] */
@@ -1183,7 +1188,6 @@ class CConfig {
11831188
bool Species_StrongBC; /*!< \brief Boolean whether strong BC's are used for in- outlet of the species solver. */
11841189
su2double* Species_Init; /*!< \brief Initial uniform value for scalar transport. */
11851190
unsigned short nSpecies_Init; /*!< \brief Number of entries of SPECIES_INIT */
1186-
unsigned short n_species; /*!< \brief Number of species equations! Not species itself which would be 1 more. */
11871191

11881192
/*!
11891193
* \brief Set the default values of config options not set in the config file using another config object.
@@ -1605,7 +1609,7 @@ class CConfig {
16051609
* \brief Get the value of the molecular weight for an incompressible ideal gas (g/mol).
16061610
* \return Value of the molecular weight for an incompressible ideal gas (g/mol).
16071611
*/
1608-
su2double GetMolecular_Weight(void) const { return Molecular_Weight; }
1612+
su2double GetMolecular_Weight(unsigned short val_index = 0) const { return Molecular_Weight[val_index]; }
16091613

16101614
/*!
16111615
* \brief Get the value of specific heat at constant pressure.
@@ -2694,7 +2698,12 @@ class CConfig {
26942698
* \brief Set the number of multigrid levels.
26952699
* \param[in] val_nMGLevels - Index of the mesh were the CFL is applied
26962700
*/
2697-
void SetMGLevels(unsigned short val_nMGLevels) { nMGLevels = val_nMGLevels; }
2701+
void SetMGLevels(unsigned short val_nMGLevels) {
2702+
nMGLevels = val_nMGLevels;
2703+
if (MGCycle == FULLMG_CYCLE) {
2704+
SetFinestMesh(val_nMGLevels);
2705+
}
2706+
}
26982707

26992708
/*!
27002709
* \brief Get the index of the finest grid.
@@ -8975,12 +8984,6 @@ class CConfig {
89758984
*/
89768985
bool GetPrintInlet_InterpolatedData(void) const { return PrintInlet_InterpolatedData; }
89778986

8978-
/*!
8979-
* \brief Get information about using UQ methodology
8980-
* \return <code>TRUE</code> means that UQ methodology of eigenspace perturbation will be used
8981-
*/
8982-
bool GetUsing_UQ(void) const { return using_uq; }
8983-
89848987
/*!
89858988
* \brief Get the amount of eigenvalue perturbation to be done
89868989
* \return Value of the uq_delta_b parameter
@@ -9058,11 +9061,6 @@ class CConfig {
90589061
*/
90599062
su2double GetConst_DES(void) const { return Const_DES; }
90609063

9061-
/*!
9062-
* \brief Get QCR (SA-QCR2000).
9063-
*/
9064-
bool GetQCR(void) const { return QCR;}
9065-
90669064
/*!
90679065
* \brief Get if AD preaccumulation should be performed.
90689066
*/
@@ -9617,10 +9615,22 @@ class CConfig {
96179615
*/
96189616
unsigned short GetKind_Grad_Linear_Solver_Prec(void) const { return Kind_Grad_Linear_Solver_Prec; }
96199617

9620-
/*!
9618+
/*!
96219619
* \brief Get max number of iterations of the for the gradient smoothing.
96229620
* \return Max number of iterations of the linear solver for the gradient smoothing.
96239621
*/
96249622
unsigned long GetGrad_Linear_Solver_Iter(void) const { return Grad_Linear_Solver_Iter; }
96259623

9624+
/*!
9625+
* \brief Get parsed SST option data structure.
9626+
* \return SST option data structure.
9627+
*/
9628+
SST_ParsedOptions GetSSTParsedOptions() const { return sstParsedOptions; }
9629+
9630+
/*!
9631+
* \brief Get parsed SA option data structure.
9632+
* \return SA option data structure.
9633+
*/
9634+
SA_ParsedOptions GetSAParsedOptions() const { return saParsedOptions; }
9635+
96269636
};

Common/include/geometry/dual_grid/CPoint.hpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class CPoint {
7070
su2vector<bool> Boundary; /*!< \brief To see if a point belong to the boundary (including MPI). */
7171
su2vector<bool> PhysicalBoundary; /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
7272
su2vector<bool> SolidBoundary; /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
73+
su2vector<bool> ViscousBoundary; /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
7374
su2vector<bool> PeriodicBoundary; /*!< \brief To see if a point belongs to a periodic boundary (without including MPI). */
7475

7576
su2activematrix Coord; /*!< \brief vector with the coordinates of the node. */
@@ -351,6 +352,20 @@ class CPoint {
351352
*/
352353
inline bool GetSolidBoundary(unsigned long iPoint) const { return SolidBoundary(iPoint); }
353354

355+
/*!
356+
* \brief Set if a point belong to the boundary.
357+
* \param[in] iPoint - Index of the point.
358+
* \param[in] boundary - <code>TRUE</code> if the point belong to the physical boundary; otherwise <code>FALSE</code>.
359+
*/
360+
inline void SetViscousBoundary(unsigned long iPoint, bool boundary) { ViscousBoundary(iPoint) = boundary; }
361+
362+
/*!
363+
* \brief Provides information about if a point belong to the physical boundaries (without MPI).
364+
* \param[in] iPoint - Index of the point.
365+
* \return <code>TRUE</code> if the point belong to the boundary; otherwise <code>FALSE</code>.
366+
*/
367+
inline bool GetViscousBoundary(unsigned long iPoint) const { return ViscousBoundary(iPoint); }
368+
354369
/*!
355370
* \brief Set if a point belongs to a periodic boundary.
356371
* \param[in] iPoint - Index of the point.

0 commit comments

Comments
 (0)