Skip to content

Commit 1159362

Browse files
committed
delete unnecessary methods, fix new compiler warnings, fix some indentation.
1 parent 18eedfa commit 1159362

4 files changed

Lines changed: 248 additions & 521 deletions

File tree

SU2_CFD/include/solvers/CAdjEulerSolver.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class CAdjEulerSolver : public CSolver {
236236
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
237237
* \return Value of the pressure coefficient.
238238
*/
239-
inline su2double *GetDonorAdjVar(unsigned short val_marker, unsigned long val_vertex) const final {
239+
inline su2double *GetDonorAdjVar(unsigned short val_marker, unsigned long val_vertex) const {
240240
return DonorAdjVar[val_marker][val_vertex];
241241
}
242242

@@ -249,7 +249,7 @@ class CAdjEulerSolver : public CSolver {
249249
inline void SetDonorAdjVar(unsigned short val_marker,
250250
unsigned long val_vertex,
251251
unsigned short val_var,
252-
su2double val_value) final {
252+
su2double val_value) {
253253
DonorAdjVar[val_marker][val_vertex][val_var] = val_value;
254254
}
255255

@@ -261,7 +261,7 @@ class CAdjEulerSolver : public CSolver {
261261
*/
262262
inline su2double GetDonorAdjVar(unsigned short val_marker,
263263
unsigned long val_vertex,
264-
unsigned short val_var) const final {
264+
unsigned short val_var) const {
265265
return DonorAdjVar[val_marker][val_vertex][val_var];
266266
}
267267

SU2_CFD/include/solvers/CEulerSolver.hpp

Lines changed: 0 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,41 +1046,6 @@ class CEulerSolver : public CFVMFlowSolverBase<CEulerVariable, COMPRESSIBLE> {
10461046
*/
10471047
inline void SetTotal_DC60(su2double val_Total_DC60) final { Total_DC60 = val_Total_DC60; }
10481048

1049-
/*!
1050-
* \brief Value of the characteristic variables at the boundaries.
1051-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1052-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1053-
* \return Value of the pressure coefficient.
1054-
*/
1055-
inline su2double *GetDonorPrimVar(unsigned short val_marker, unsigned long val_vertex) const final{
1056-
return DonorPrimVar[val_marker][val_vertex];
1057-
}
1058-
1059-
/*!
1060-
* \brief Value of the characteristic variables at the boundaries.
1061-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1062-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1063-
* \return Value of the pressure coefficient.
1064-
*/
1065-
inline void SetDonorPrimVar(unsigned short val_marker,
1066-
unsigned long val_vertex,
1067-
unsigned short val_var,
1068-
su2double val_value) final {
1069-
DonorPrimVar[val_marker][val_vertex][val_var] = val_value;
1070-
}
1071-
1072-
/*!
1073-
* \brief Value of the characteristic variables at the boundaries.
1074-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1075-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1076-
* \return Value of the pressure coefficient.
1077-
*/
1078-
inline su2double GetDonorPrimVar(unsigned short val_marker,
1079-
unsigned long val_vertex,
1080-
unsigned short val_var) const final {
1081-
return DonorPrimVar[val_marker][val_vertex][val_var];
1082-
}
1083-
10841049
/*!
10851050
* \brief Value of the characteristic global index at the boundaries.
10861051
* \param[in] val_marker - Surface marker where the coefficient is computed.
@@ -1104,133 +1069,6 @@ class CEulerSolver : public CFVMFlowSolverBase<CEulerVariable, COMPRESSIBLE> {
11041069
DonorGlobalIndex[val_marker][val_vertex] = val_index;
11051070
}
11061071

1107-
/*!
1108-
* \brief Value of the characteristic global index at the boundaries.
1109-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1110-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1111-
* \return Value of the axial force per unit area.
1112-
*/
1113-
inline su2double GetActDisk_Fa(unsigned short val_marker,
1114-
unsigned long val_vertex) const {
1115-
return ActDisk_Fa[val_marker][val_vertex];
1116-
}
1117-
1118-
/*!
1119-
* \brief Value of the characteristic global index at the boundaries.
1120-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1121-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1122-
* \return Value of the axial force per unit area.
1123-
*/
1124-
inline void SetActDisk_Fa(unsigned short val_marker,
1125-
unsigned long val_vertex,
1126-
su2double val_fa) { ActDisk_Fa[val_marker][val_vertex] = val_fa; }
1127-
1128-
/*!
1129-
* \brief Value of the characteristic global index at the boundaries.
1130-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1131-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1132-
* \return Value of the x component of the radial and tangential forces per unit area resultant.
1133-
*/
1134-
inline su2double GetActDisk_Fx(unsigned short val_marker,
1135-
unsigned long val_vertex) const {
1136-
return ActDisk_Fx[val_marker][val_vertex];
1137-
}
1138-
1139-
/*!
1140-
* \brief Value of the characteristic global index at the boundaries.
1141-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1142-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1143-
* \return Value of the x component of the radial and tangential forces per unit area resultant.
1144-
*/
1145-
inline void SetActDisk_Fx(unsigned short val_marker,
1146-
unsigned long val_vertex,
1147-
su2double val_fx) { ActDisk_Fx[val_marker][val_vertex] = val_fx; }
1148-
1149-
/*!
1150-
* \brief Value of the characteristic global index at the boundaries.
1151-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1152-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1153-
* \return Value of the y component of the radial and tangential forces per unit area resultant.
1154-
*/
1155-
inline su2double GetActDisk_Fy(unsigned short val_marker,
1156-
unsigned long val_vertex) const {
1157-
return ActDisk_Fy[val_marker][val_vertex];
1158-
}
1159-
1160-
/*!
1161-
* \brief Value of the characteristic global index at the boundaries.
1162-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1163-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1164-
* \return Value of the y component of the radial and tangential forces per unit area resultant.
1165-
*/
1166-
inline void SetActDisk_Fy(unsigned short val_marker,
1167-
unsigned long val_vertex,
1168-
su2double val_fy) { ActDisk_Fy[val_marker][val_vertex] = val_fy; }
1169-
1170-
/*!
1171-
* \brief Value of the characteristic global index at the boundaries.
1172-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1173-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1174-
* \return Value of the z component of the radial and tangential forces per unit area resultant.
1175-
*/
1176-
inline su2double GetActDisk_Fz(unsigned short val_marker,
1177-
unsigned long val_vertex) const {
1178-
return ActDisk_Fz[val_marker][val_vertex];
1179-
}
1180-
1181-
/*!
1182-
* \brief Value of the characteristic global index at the boundaries.
1183-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1184-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1185-
* \return Value of the z component of the radial and tangential forces per unit area resultant.
1186-
*/
1187-
inline void SetActDisk_Fz(unsigned short val_marker,
1188-
unsigned long val_vertex,
1189-
su2double val_fz) { ActDisk_Fz[val_marker][val_vertex] = val_fz; }
1190-
1191-
/*!
1192-
* \brief Value of the characteristic global index at the boundaries.
1193-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1194-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1195-
* \return Value of the pressure coefficient.
1196-
*/
1197-
inline su2double GetActDisk_DeltaP(unsigned short val_marker,
1198-
unsigned long val_vertex) const final {
1199-
return ActDisk_DeltaP[val_marker][val_vertex];
1200-
}
1201-
1202-
/*!
1203-
* \brief Value of the characteristic global index at the boundaries.
1204-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1205-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1206-
* \return Value of the pressure coefficient.
1207-
*/
1208-
inline void SetActDisk_DeltaP(unsigned short val_marker,
1209-
unsigned long val_vertex,
1210-
su2double val_deltap) final { ActDisk_DeltaP[val_marker][val_vertex] = val_deltap; }
1211-
1212-
/*!
1213-
* \brief Value of the characteristic global index at the boundaries.
1214-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1215-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1216-
* \return Value of the pressure coefficient.
1217-
*/
1218-
inline su2double GetActDisk_DeltaT(unsigned short val_marker, unsigned long val_vertex) final {
1219-
return ActDisk_DeltaT[val_marker][val_vertex];
1220-
}
1221-
1222-
/*!
1223-
* \brief Value of the characteristic global index at the boundaries.
1224-
* \param[in] val_marker - Surface marker where the coefficient is computed.
1225-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
1226-
* \return Value of the pressure coefficient.
1227-
*/
1228-
inline void SetActDisk_DeltaT(unsigned short val_marker,
1229-
unsigned long val_vertex,
1230-
su2double val_deltat) final {
1231-
ActDisk_DeltaT[val_marker][val_vertex] = val_deltat;
1232-
}
1233-
12341072
/*!
12351073
* \brief Update the multi-grid structure for the customized boundary conditions
12361074
* \param geometry_container - Geometrical definition.

SU2_CFD/include/solvers/CSolver.hpp

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -2954,72 +2954,6 @@ class CSolver {
29542954
unsigned short val_var,
29552955
su2double val_value) { }
29562956

2957-
/*!
2958-
* \brief A virtual member.
2959-
* \param[in] val_marker - Surface marker where the coefficient is computed.
2960-
2961-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
2962-
* \return Value of the pressure coefficient.
2963-
*/
2964-
inline virtual su2double *GetDonorPrimVar(unsigned short val_marker, unsigned long val_vertex) const { return nullptr; }
2965-
2966-
/*!
2967-
* \brief A virtual member.
2968-
* \param[in] val_marker - Surface marker where the coefficient is computed.
2969-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
2970-
* \return Value of the pressure coefficient.
2971-
*/
2972-
inline virtual void SetDonorPrimVar(unsigned short val_marker,
2973-
unsigned long val_vertex,
2974-
unsigned short val_var,
2975-
su2double val_value) { }
2976-
2977-
/*!
2978-
* \brief A virtual member.
2979-
* \param[in] val_marker - Surface marker where the coefficient is computed.
2980-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
2981-
* \return Value of the pressure coefficient.
2982-
*/
2983-
2984-
inline virtual void SetDonorAdjVar(unsigned short val_marker,
2985-
unsigned long val_vertex,
2986-
unsigned short val_var,
2987-
su2double val_value) { }
2988-
2989-
/*!
2990-
* \brief A virtual member.
2991-
* \param[in] val_marker - Surface marker where the coefficient is computed.
2992-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
2993-
* \return Value of the pressure coefficient.
2994-
*/
2995-
inline virtual su2double GetDonorPrimVar(unsigned short val_marker,
2996-
unsigned long val_vertex,
2997-
unsigned short val_var) const { return 0; }
2998-
2999-
/*!
3000-
* \brief A virtual member.
3001-
* \param[in] val_marker - Surface marker where the coefficient is computed.
3002-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
3003-
* \return Value of the pressure coefficient.
3004-
*/
3005-
3006-
inline virtual su2double *GetDonorAdjVar(unsigned short val_marker, unsigned long val_vertex) const {
3007-
return nullptr;
3008-
}
3009-
3010-
/*!
3011-
* \brief A virtual member.
3012-
* \param[in] val_marker - Surface marker where the coefficient is computed.
3013-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
3014-
* \return Value of the pressure coefficient.
3015-
*/
3016-
3017-
inline virtual su2double GetDonorAdjVar(unsigned short val_marker,
3018-
unsigned long val_vertex,
3019-
unsigned short val_var) const {
3020-
return 0;
3021-
}
3022-
30232957
/*!
30242958
* \brief A virtual member.
30252959
* \param[in] val_marker - Surface marker where the coefficient is computed.
@@ -3050,42 +2984,6 @@ class CSolver {
30502984
inline virtual su2double *GetCharacPrimVar(unsigned short val_marker,
30512985
unsigned long val_vertex) const { return nullptr; }
30522986

3053-
/*!
3054-
* \brief A virtual member.
3055-
* \param[in] val_marker - Surface marker where the coefficient is computed.
3056-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
3057-
* \return Value of the pressure coefficient.
3058-
*/
3059-
inline virtual su2double GetActDisk_DeltaP(unsigned short val_marker, unsigned long val_vertex) const { return 0; }
3060-
3061-
/*!
3062-
* \brief A virtual member.
3063-
* \param[in] val_marker - Surface marker where the coefficient is computed.
3064-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
3065-
* \return Value of the pressure coefficient.
3066-
*/
3067-
inline virtual void SetActDisk_DeltaP(unsigned short val_marker,
3068-
unsigned long val_vertex,
3069-
su2double val_deltap) { }
3070-
3071-
/*!
3072-
* \brief A virtual member.
3073-
* \param[in] val_marker - Surface marker where the coefficient is computed.
3074-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
3075-
* \return Value of the pressure coefficient.
3076-
*/
3077-
inline virtual su2double GetActDisk_DeltaT(unsigned short val_marker, unsigned long val_vertex) { return 0; }
3078-
3079-
/*!
3080-
* \brief A virtual member.
3081-
* \param[in] val_marker - Surface marker where the coefficient is computed.
3082-
* \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
3083-
* \return Value of the pressure coefficient.
3084-
*/
3085-
inline virtual void SetActDisk_DeltaT(unsigned short val_marker,
3086-
unsigned long val_vertex,
3087-
su2double val_deltat) { }
3088-
30892987
/*!
30902988
* \brief A virtual member
30912989
* \param[in] val_marker - Surface marker where the total temperature is evaluated.

0 commit comments

Comments
 (0)