Skip to content

Commit 4fd03b9

Browse files
committed
Various smaller changes. Mainly spelling.
1 parent 0cf63e3 commit 4fd03b9

32 files changed

Lines changed: 195 additions & 224 deletions

.github/workflows/regression.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- name: Run Tests in Container
8484
uses: docker://su2code/test-su2:20200303
8585
with:
86-
args: -b ${{github.ref}} -t develop -c feature_periodic_streamwise -s ${{matrix.testscript}}
86+
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
8787
unit_tests:
8888
runs-on: ubuntu-latest
8989
name: Unit Tests

Common/include/CConfig.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -996,8 +996,8 @@ class CConfig {
996996
array<su2double, N_POLY_COEFFS> kt_polycoeffs{{0.0}}; /*!< \brief Array for thermal conductivity polynomial coefficients. */
997997
bool Body_Force; /*!< \brief Flag to know if a body force is included in the formulation. */
998998

999-
unsigned short Kind_Streamwise_Periodic; /*!< \brief Flag to know if a body force is included in the formulation, used for periodic BC as inlet & outlet. */
1000-
bool Streamwise_Periodic_Temperature; /*!< \brief Use real periodicity for Energy equation or oterwise outlet source term. */
999+
unsigned short Kind_Streamwise_Periodic; /*!< \brief Kind of Streamwise periodic flow (pressure drop or massflow) */
1000+
bool Streamwise_Periodic_Temperature; /*!< \brief Use real periodicity for Energy equation or otherwise outlet source term. */
10011001
su2double Streamwise_Periodic_PressureDrop, /*!< \brief Value of prescribed pressure drop [Pa] which results in an artificial body force vector. */
10021002
Streamwise_Periodic_TargetMassFlow, /*!< \brief Value of prescribed massflow [kg/s] which results in an delta p and therefore an artificial body force vector. */
10031003
Streamwise_Periodic_OutletHeat; /*!< /brief Heatflux boundary [W/m^2] imposed at streamwise periodic outlet. */
@@ -3095,7 +3095,7 @@ class CConfig {
30953095
* has the marker <i>val_marker</i>.
30963096
*/
30973097
string GetMarker_Outlet_TagBound(unsigned short val_marker) const { return Marker_Outlet[val_marker]; }
3098-
3098+
30993099
/*!
31003100
* \brief Get the index of the surface defined in the geometry file.
31013101
* \param[in] val_marker - Value of the marker in which we are interested.
@@ -5179,7 +5179,7 @@ class CConfig {
51795179
unsigned short GetTabular_FileFormat(void) const { return Tab_FileFormat; }
51805180

51815181
/*!
5182-
* \brief Get the output precision to be used in <ofstream>.precision(value).
5182+
* \brief Get the output precision to be used in <ofstream>.precision(value) for history and SU2_DOT output.
51835183
* \return Output precision.
51845184
*/
51855185
unsigned short GetOutput_Precision(void) const { return output_precision; }

Common/include/geometry/CGeometry.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -735,12 +735,6 @@ class CGeometry {
735735
*/
736736
inline virtual void MatchPeriodic(CConfig *config, unsigned short val_periodic) {}
737737

738-
/*!
739-
* \brief For streamwise periodicity, find a unique reference node on the designated inlet.
740-
* \param[in] config - Definition of the particular problem.
741-
*/
742-
inline virtual void FindUniqueNode_PeriodicBound(CConfig *config) {}
743-
744738
/*!
745739
* \brief A virtual member.
746740
* \param[in] config - Definition of the particular problem.
@@ -1718,6 +1712,12 @@ class CGeometry {
17181712
*/
17191713
unsigned long GetnNonconvexElements() const {return nNonconvexElements;}
17201714

1715+
/*!
1716+
* \brief For streamwise periodicity, find & store a unique reference node on the designated periodic inlet.
1717+
* \param[in] config - Definition of the particular problem.
1718+
*/
1719+
inline virtual void FindUniqueNode_PeriodicBound(CConfig *config) {}
1720+
17211721
/*!
17221722
* \brief Get a pointer to the reference node coordinate vector.
17231723
* \return A pointer to the reference node coordinate vector.

Common/include/geometry/CPhysicalGeometry.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class CPhysicalGeometry final : public CGeometry {
107107
vector<int> GlobalMarkerStorageDispl;
108108
vector<su2double> GlobalRoughness_Height;
109109

110-
su2double Streamwise_Periodic_RefNode[MAXNDIM] = {0}; /*!< \brief Coordinates of the reference node [m] on the receiving periodic marker, for recovered pressure/temperature computation only. Size nDim.*/
110+
su2double Streamwise_Periodic_RefNode[MAXNDIM] = {0}; /*!< \brief Coordinates of the reference node [m] on the receiving periodic marker, for recovered pressure/temperature computation only.*/
111111

112112
public:
113113
/*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
@@ -467,12 +467,6 @@ class CPhysicalGeometry final : public CGeometry {
467467
*/
468468
void MatchPeriodic(CConfig *config, unsigned short val_periodic) override;
469469

470-
/*!
471-
* \brief For streamwise periodicity, find a unique reference node on the designated inlet.
472-
* \param[in] config - Definition of the particular problem.
473-
*/
474-
void FindUniqueNode_PeriodicBound(CConfig *config) final;
475-
476470
/*!
477471
* \brief Set boundary vertex structure of the control volume.
478472
* \param[in] config - Definition of the particular problem.
@@ -792,6 +786,12 @@ class CPhysicalGeometry final : public CGeometry {
792786
*/
793787
void SetGlobalMarkerRoughness(const CConfig* config);
794788

789+
/*!
790+
* \brief For streamwise periodicity, find & store a unique reference node on the designated periodic inlet.
791+
* \param[in] config - Definition of the particular problem.
792+
*/
793+
void FindUniqueNode_PeriodicBound(CConfig *config) final;
794+
795795
/*!
796796
* \brief Get a pointer to the reference node coordinate vector.
797797
* \return A pointer to the reference node coordinate vector.

Common/include/option_structure.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2257,7 +2257,7 @@ static const MapType<string, ENUM_VERIFICATION_SOLUTIONS> Verification_Solution_
22572257
};
22582258

22592259
/*!
2260-
* \brief types of streamwise periodicity.
2260+
* \brief Types of streamwise periodicity.
22612261
*/
22622262
enum ENUM_STREAMWISE_PERIODIC {
22632263
NO_STREAMWISE_PERIODIC = 0, /*!< \brief No streamwise periodic flow. */

Common/src/CConfig.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,15 +1105,15 @@ void CConfig::SetConfig_Options() {
11051105
/* DESCRIPTION: Vector of body force values (BodyForce_X, BodyForce_Y, BodyForce_Z) */
11061106
addDoubleArrayOption("BODY_FORCE_VECTOR", 3, body_force);
11071107

1108-
/* DESCRIPTION: Apply a body force as a source term for periodic boundary conditions (NONE, PRESSURE_DROP, MASSFLOW) */
1108+
/* DESCRIPTION: Apply a body force as a source term for periodic boundary conditions \n Options: NONE, PRESSURE_DROP, MASSFLOW \n DEFAULT: NONE \ingroup Config */
11091109
addEnumOption("KIND_STREAMWISE_PERIODIC", Kind_Streamwise_Periodic, Streamwise_Periodic_Map, NO_STREAMWISE_PERIODIC);
1110-
/*!\brief STREAMWISE_PERIODIC_TEMPERATURE \n DESCRIPTION: Use real periodicty for temperature: NO, YES \ingroup Config */
1110+
/* DESCRIPTION: Use real periodicity for temperature \n Options: NO, YES \n DEFAULT: NO \ingroup Config */
11111111
addBoolOption("STREAMWISE_PERIODIC_TEMPERATURE", Streamwise_Periodic_Temperature, false);
1112-
/* DESCRIPTION: Heatflux boundary at streamwise periodic 'outlet', choose heat [W] such that net domain heatflux is zero. Only active if STREAMWISE_PERIODIC_TEMPERATURE is active. */
1112+
/* DESCRIPTION: Heatflux boundary at streamwise periodic 'outlet', choose heat [W] such that net domain heatflux is zero. Only active if STREAMWISE_PERIODIC_TEMPERATURE is active. \n DEFAULT: 0.0 \ingroup Config */
11131113
addDoubleOption("STREAMWISE_PERIODIC_OUTLET_HEAT", Streamwise_Periodic_OutletHeat, 0.0);
1114-
/* DESCRIPTION: Delta pressure [Pa] on which basis body force will be computed, serves as initial value if MASSFLOW is chosen */
1114+
/* DESCRIPTION: Delta pressure [Pa] on which basis body force will be computed, serves as initial value if MASSFLOW is chosen. \n DEFAULT: 1.0 \ingroup Config */
11151115
addDoubleOption("STREAMWISE_PERIODIC_PRESSURE_DROP", Streamwise_Periodic_PressureDrop, 1.0);
1116-
/* DESCRIPTION: Target Massflow [kg/s], Delta P will be adapted until m_dot is met. */
1116+
/* DESCRIPTION: Target Massflow [kg/s], Delta P will be adapted until m_dot is met. \n DEFAULT: 0.0 \ingroup Config */
11171117
addDoubleOption("STREAMWISE_PERIODIC_MASSFLOW", Streamwise_Periodic_TargetMassFlow, 0.0);
11181118

11191119
/*!\brief RESTART_SOL \n DESCRIPTION: Restart solution from native solution file \n Options: NO, YES \ingroup Config */
@@ -1936,7 +1936,7 @@ void CConfig::SetConfig_Options() {
19361936

19371937
/*!\brief OUTPUT_FORMAT \n DESCRIPTION: I/O format for output plots. \n OPTIONS: see \link TabOutput_Map \endlink \n DEFAULT: TECPLOT \ingroup Config */
19381938
addEnumOption("TABULAR_FORMAT", Tab_FileFormat, TabOutput_Map, TAB_CSV);
1939-
/*!\brief OUTPUT_PRECISION \n DESCRIPTION: Set <ofstream>.precision(value) to specified value for SU2_DOT and HISTORY output. Useful for exact gradient validation. */
1939+
/*!\brief OUTPUT_PRECISION \n DESCRIPTION: Set <ofstream>.precision(value) to specified value for SU2_DOT and HISTORY output. Useful for exact gradient validation. \n DEFAULT: 6 \ingroup Config */
19401940
addUnsignedShortOption("OUTPUT_PRECISION", output_precision, 6);
19411941
/*!\brief ACTDISK_JUMP \n DESCRIPTION: The jump is given by the difference in values or a ratio */
19421942
addEnumOption("ACTDISK_JUMP", ActDisk_Jump, Jump_Map, DIFFERENCE);
@@ -4602,10 +4602,10 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
46024602

46034603
/*--- Check feassbility for Streamwise Periodic flow ---*/
46044604
if (Kind_Streamwise_Periodic != NONE) {
4605-
if (Kind_Solver == INC_EULER)
4606-
SU2_MPI::Error("Streamwise Periodic Flow + Incompressible Euler: Not tested yet.", CURRENT_FUNCTION);
46074605
if (Kind_Regime != INCOMPRESSIBLE)
46084606
SU2_MPI::Error("Streamwise Periodic Flow currently only implemented for incompressible flow.", CURRENT_FUNCTION);
4607+
if (Kind_Solver == INC_EULER)
4608+
SU2_MPI::Error("Streamwise Periodic Flow + Incompressible Euler: Not tested yet.", CURRENT_FUNCTION);
46094609
if (nMarker_PerBound != 2)
46104610
SU2_MPI::Error("Streamwise Periodic Flow currently only implemented for one Periodic Marker pair. Combining Streamwise and Spanwise periodicity not possible in the moment.", CURRENT_FUNCTION);
46114611
if (Energy_Equation && Streamwise_Periodic_Temperature && nMarker_Isothermal != 0)

Common/src/geometry/CPhysicalGeometry.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7519,7 +7519,7 @@ void CPhysicalGeometry::FindUniqueNode_PeriodicBound(CConfig *config) {
75197519
/*-------------------------------------------------------------------------------------------*/
75207520
/*--- Step 2: Amongst all local nodes with the smallest distance to the origin, find the ---*/
75217521
/*--- globally closest to the origin. Store the found node coordinates in the ---*/
7522-
/*--- config container. ---*/
7522+
/*--- geometry container. ---*/
75237523
/*-------------------------------------------------------------------------------------------*/
75247524

75257525
for (int iRank = 0; iRank < size; iRank++) {
@@ -7533,7 +7533,6 @@ void CPhysicalGeometry::FindUniqueNode_PeriodicBound(CConfig *config) {
75337533
for (unsigned short iDim = 0; iDim < nDim; iDim++)
75347534
Streamwise_Periodic_RefNode[iDim] = Buffer_Recv_RefNode[iRank*nDim + iDim];
75357535
}
7536-
/*--- The theoretical case, that multiple inlet points with the same distance to the origin exists, remains. ---*/
75377536
}
75387537

75397538
/*--- Print the reference node to screen. ---*/

Common/src/grid_movement/CVolumetricMovement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1641,7 +1641,7 @@ void CVolumetricMovement::SetBoundaryDisplacements(CGeometry *geometry, CConfig
16411641
VarIncrement = 1.0/((su2double)config->GetGridDef_Nonlinear_Iter());
16421642

16431643
/*--- As initialization, set to zero displacements of all the surfaces except the symmetry
1644-
plane (which is treated specially, see below), internal and the send-receive boundaries ---*/
1644+
plane (which is treated specially, see below), internal and the send-receive boundaries ---*/
16451645

16461646
for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
16471647
if (((config->GetMarker_All_KindBC(iMarker) != SYMMETRY_PLANE) &&

SU2_CFD/include/numerics/flow/flow_sources.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class CSourceBase_Flow : public CNumerics {
4141
su2double* residual = nullptr;
4242
su2double** jacobian = nullptr;
4343
su2double
44-
Streamwise_Periodic_MassFlow, /*!< \brief Value of current massflow [kg/s] which results in an delta p and therefore an artificial body force vector. */
44+
Streamwise_Periodic_MassFlow, /*!< \brief Value of current massflow [kg/s] which results in a delta p and therefore an artificial body force vector. */
4545
Streamwise_Periodic_IntegratedHeatFlow, /*!< \brief Value of of the net sum of heatflow [W] into the domain. */
46-
Streamwise_Periodic_InletTemperature; /*!< /brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
46+
Streamwise_Periodic_InletTemperature; /*!< \brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
4747

4848
/*!
4949
* \brief Constructor of the class.

SU2_CFD/include/solvers/CIncEulerSolver.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class CIncEulerSolver : public CFVMFlowSolverBase<CIncEulerVariable, INCOMPRESSI
4040
protected:
4141
vector<CFluidModel*> FluidModel; /*!< \brief fluid model used in the solver. */
4242
su2double
43-
Streamwise_Periodic_MassFlow, /*!< \brief Value of current massflow [kg/s] which results in an delta p and therefore an artificial body force vector. */
43+
Streamwise_Periodic_MassFlow, /*!< \brief Value of current massflow [kg/s] which results in a delta p and therefore an artificial body force vector. */
4444
Streamwise_Periodic_IntegratedHeatFlow, /*!< \brief Value of of the net sum of heatflow [W] into the domain. */
45-
Streamwise_Periodic_InletTemperature; /*!< /brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
45+
Streamwise_Periodic_InletTemperature; /*!< \brief Area avg static Temp [K] at the periodic inlet. Used for adaptive outlet heatsink. */
4646

4747
/*!
4848
* \brief Preprocessing actions common to the Euler and NS solvers.

0 commit comments

Comments
 (0)