Skip to content

Commit 3bc55bb

Browse files
committed
removing the tabs in folders.
1 parent 348198e commit 3bc55bb

9 files changed

Lines changed: 65 additions & 66 deletions

File tree

Common/include/geometry/CGeometry.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class CGeometry {
8484
nPointGhost{0}, /*!< \brief Number of ghost points of the mesh. */
8585
nPointNode{0}, /*!< \brief Size of the node array allocated to hold CPoint objects. */
8686
Global_nPoint{0}, /*!< \brief Total number of nodes in a simulation across all processors (including halos). */
87-
Global_nPointDomain{0}, /*!< \brief Total number of nodes in a simulation across all processors (excluding halos). */
87+
Global_nPointDomain{0}, /*!< \brief Total number of nodes in a simulation across all processors (excluding halos). */
8888
nElem{0}, /*!< \brief Number of elements of the mesh. */
8989
Global_nElem{0}, /*!< \brief Total number of elements in a simulation across all processors (all types). */
9090
Global_nElemDomain{0}, /*!< \brief Total number of elements in a simulation across all processors (excluding halos). */
@@ -189,7 +189,7 @@ class CGeometry {
189189

190190
CPrimalGrid** elem{nullptr}; /*!< \brief Element vector (primal grid information). */
191191
CPrimalGrid** face{nullptr}; /*!< \brief Face vector (primal grid information). */
192-
CPrimalGrid*** bound{nullptr}; /*!< \brief Boundary vector (primal grid information). */
192+
CPrimalGrid*** bound{nullptr}; /*!< \brief Boundary vector (primal grid information). */
193193
CPoint* nodes{nullptr}; /*!< \brief Node vector (dual grid information). */
194194
CEdge* edges{nullptr}; /*!< \brief Edge vector (dual grid information). */
195195
CVertex*** vertex{nullptr}; /*!< \brief Boundary Vertex vector (dual grid information). */

Common/include/option_structure.hpp

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ using MapType = CEmptyMap<T,U>;
6464
* \brief Different software components of SU2
6565
*/
6666
enum SU2_COMPONENT {
67-
SU2_CFD = 1, /*!< \brief Running the SU2_CFD software. */
68-
SU2_DEF = 2, /*!< \brief Running the SU2_DEF software. */
69-
SU2_DOT = 3, /*!< \brief Running the SU2_DOT software. */
70-
SU2_MSH = 4, /*!< \brief Running the SU2_MSH software. */
71-
SU2_GEO = 5, /*!< \brief Running the SU2_GEO software. */
72-
SU2_SOL = 6 /*!< \brief Running the SU2_SOL software. */
67+
SU2_CFD = 1, /*!< \brief Running the SU2_CFD software. */
68+
SU2_DEF = 2, /*!< \brief Running the SU2_DEF software. */
69+
SU2_DOT = 3, /*!< \brief Running the SU2_DOT software. */
70+
SU2_MSH = 4, /*!< \brief Running the SU2_MSH software. */
71+
SU2_GEO = 5, /*!< \brief Running the SU2_GEO software. */
72+
SU2_SOL = 6 /*!< \brief Running the SU2_SOL software. */
7373
};
7474

7575
const unsigned int EXIT_DIVERGENCE = 2; /*!< \brief Exit code (divergence). */
@@ -110,9 +110,9 @@ const su2double PI_NUMBER = 4.0 * atan(1.0); /*!< \brief Pi number. */
110110

111111
const su2double STEFAN_BOLTZMANN = 5.670367E-08; /*!< \brief Stefan-Boltzmann constant in W/(m^2*K^4). */
112112

113-
const int MASTER_NODE = 0; /*!< \brief Master node for MPI parallelization. */
114-
const int SINGLE_NODE = 1; /*!< \brief There is only a node in the MPI parallelization. */
115-
const int SINGLE_ZONE = 1; /*!< \brief There is only a zone. */
113+
const int MASTER_NODE = 0; /*!< \brief Master node for MPI parallelization. */
114+
const int SINGLE_NODE = 1; /*!< \brief There is only a node in the MPI parallelization. */
115+
const int SINGLE_ZONE = 1; /*!< \brief There is only a zone. */
116116

117117
const unsigned short COMM_TYPE_UNSIGNED_LONG = 1; /*!< \brief Communication type for unsigned long. */
118118
const unsigned short COMM_TYPE_LONG = 2; /*!< \brief Communication type for long. */
@@ -400,8 +400,8 @@ enum ENUM_TRANSFER {
400400
* \brief different regime modes
401401
*/
402402
enum ENUM_REGIME {
403-
COMPRESSIBLE = 0, /*!< \brief Definition of compressible solver. */
404-
INCOMPRESSIBLE = 1, /*!< \brief Definition of incompressible solver. */
403+
COMPRESSIBLE = 0, /*!< \brief Definition of compressible solver. */
404+
INCOMPRESSIBLE = 1, /*!< \brief Definition of incompressible solver. */
405405
NO_FLOW = 2
406406
};
407407

@@ -429,8 +429,8 @@ static const MapType<string, ENUM_KIND_NONDIM> NonDim_Map = {
429429
* \brief different system of measurements
430430
*/
431431
enum ENUM_MEASUREMENTS {
432-
SI = 0, /*!< \brief Definition of compressible solver. */
433-
US = 1 /*!< \brief Definition of incompressible solver. */
432+
SI = 0, /*!< \brief Definition of compressible solver. */
433+
US = 1 /*!< \brief Definition of incompressible solver. */
434434
};
435435
static const MapType<string, ENUM_MEASUREMENTS> Measurements_Map = {
436436
MakePair("SI", SI)
@@ -1268,7 +1268,7 @@ enum RIEMANN_TYPE {
12681268
TOTAL_CONDITIONS_PT = 1, /*!< \brief User specifies total pressure, total temperature, and flow direction. */
12691269
DENSITY_VELOCITY = 2, /*!< \brief User specifies density and velocity, and flow direction. */
12701270
STATIC_PRESSURE = 3, /*!< \brief User specifies static pressure. */
1271-
TOTAL_SUPERSONIC_INFLOW = 4, /*!< \brief User specifies total pressure, total temperature and Velocity components. */
1271+
TOTAL_SUPERSONIC_INFLOW = 4, /*!< \brief User specifies total pressure, total temperature and Velocity components. */
12721272
STATIC_SUPERSONIC_INFLOW_PT = 5, /*!< \brief User specifies static pressure, static temperature, and Mach components. */
12731273
STATIC_SUPERSONIC_INFLOW_PD = 6, /*!< \brief User specifies static pressure, static temperature, and Mach components. */
12741274
MIXING_IN = 7, /*!< \brief User does not specify anything; information is retrieved from the other domain */
@@ -1320,7 +1320,7 @@ static const MapType<string, RIEMANN_TYPE> Giles_Map = {
13201320
enum AVERAGEPROCESS_TYPE {
13211321
ALGEBRAIC = 1, /*!< \brief an algebraic average is computed at the boundary of interest. */
13221322
AREA = 2, /*!< \brief an area average is computed at the boundary of interest. */
1323-
MIXEDOUT = 3, /*!< \brief an mixed-out average is computed at the boundary of interest. */
1323+
MIXEDOUT = 3, /*!< \brief an mixed-out average is computed at the boundary of interest. */
13241324
MASSFLUX = 4 /*!< \brief a mass flow average is computed at the boundary of interest. */
13251325
};
13261326
static const MapType<string, AVERAGEPROCESS_TYPE> AverageProcess_Map = {
@@ -1378,15 +1378,15 @@ static const MapType<string, TURBOMACHINERY_TYPE> TurboMachinery_Map = {
13781378
* \brief Types of Turbomachinery performance flag.
13791379
*/
13801380
enum TURBO_MARKER_TYPE{
1381-
INFLOW = 1, /*!< \brief flag for inflow marker for compute turboperformance. */
1381+
INFLOW = 1, /*!< \brief flag for inflow marker for compute turboperformance. */
13821382
OUTFLOW = 2 /*!< \brief flag for outflow marker for compute turboperformance. */
13831383
};
13841384

13851385
/*!
13861386
* \brief Types inlet boundary treatments
13871387
*/
13881388
enum INLET_TYPE {
1389-
TOTAL_CONDITIONS = 1, /*!< \brief User specifies total pressure, total temperature, and flow direction. */
1389+
TOTAL_CONDITIONS = 1, /*!< \brief User specifies total pressure, total temperature, and flow direction. */
13901390
MASS_FLOW = 2, /*!< \brief User specifies density and velocity (mass flow). */
13911391
INPUT_FILE = 3, /*!< \brief User specifies an input file. */
13921392
VELOCITY_INLET = 4, /*!< \brief Velocity inlet for an incompressible flow. */
@@ -1482,7 +1482,7 @@ enum ENUM_OBJECTIVE {
14821482
LIFT_COEFFICIENT = 2, /*!< \brief Lift objective function definition. */
14831483
SIDEFORCE_COEFFICIENT = 3, /*!< \brief Side force objective function definition. */
14841484
EFFICIENCY = 4, /*!< \brief Efficiency objective function definition. */
1485-
INVERSE_DESIGN_PRESSURE = 5, /*!< \brief Pressure objective function definition (inverse design). */
1485+
INVERSE_DESIGN_PRESSURE = 5, /*!< \brief Pressure objective function definition (inverse design). */
14861486
INVERSE_DESIGN_HEATFLUX = 6, /*!< \brief Heat flux objective function definition (inverse design). */
14871487
TOTAL_HEATFLUX = 7, /*!< \brief Total heat flux. */
14881488
MAXIMUM_HEATFLUX = 8, /*!< \brief Maximum heat flux. */
@@ -1507,8 +1507,8 @@ enum ENUM_OBJECTIVE {
15071507
SURFACE_SECONDARY = 53, /*!< \brief Secondary flow strength objective function definition. */
15081508
SURFACE_MOM_DISTORTION = 54, /*!< \brief Momentum distortion objective function definition. */
15091509
SURFACE_SECOND_OVER_UNIFORM = 55, /*!< \brief Secondary over uniformity (relative secondary strength) objective function definition. */
1510-
SURFACE_PRESSURE_DROP = 56, /*!< \brief Pressure drop objective function definition. */
1511-
CUSTOM_OBJFUNC = 31, /*!< \brief Custom objective function definition. */
1510+
SURFACE_PRESSURE_DROP = 56, /*!< \brief Pressure drop objective function definition. */
1511+
CUSTOM_OBJFUNC = 31, /*!< \brief Custom objective function definition. */
15121512
TOTAL_PRESSURE_LOSS = 39,
15131513
KINETIC_ENERGY_LOSS = 40,
15141514
TOTAL_EFFICIENCY = 41,
@@ -1582,8 +1582,8 @@ static const MapType<string, ENUM_OBJECTIVE> Objective_Map = {
15821582
* \brief Types of residual criteria equations
15831583
*/
15841584
enum ENUM_RESIDUAL {
1585-
RHO_RESIDUAL = 1, /*!< \brief Rho equation residual criteria equation. */
1586-
RHO_ENERGY_RESIDUAL = 2 /*!< \brief RhoE equation residual criteria equation. */
1585+
RHO_RESIDUAL = 1, /*!< \brief Rho equation residual criteria equation. */
1586+
RHO_ENERGY_RESIDUAL = 2 /*!< \brief RhoE equation residual criteria equation. */
15871587
};
15881588
static const MapType<string, ENUM_RESIDUAL> Residual_Map = {
15891589
MakePair("RHO", RHO_RESIDUAL)
@@ -2029,7 +2029,7 @@ static const MapType<string, ENUM_GEO_ANALYTIC> Geo_Analytic_Map = {
20292029
*/
20302030
enum ENUM_GEO_DESCRIPTION {
20312031
TWOD_AIRFOIL = 0, /*!< \brief Airfoil analysis. */
2032-
WING = 1, /*!< \brief Wing analysis. */
2032+
WING = 1, /*!< \brief Wing analysis. */
20332033
FUSELAGE = 2, /*!< \brief Fuselage analysis. */
20342034
NACELLE = 3 /*!< \brief Nacelle analysis. */
20352035
};
@@ -2046,8 +2046,8 @@ static const MapType<string, ENUM_GEO_DESCRIPTION> Geo_Description_Map = {
20462046
enum ENUM_UNSTEADY {
20472047
STEADY = 0, /*!< \brief A steady computation. */
20482048
TIME_STEPPING = 1, /*!< \brief Use a time stepping strategy for unsteady computations. */
2049-
DT_STEPPING_1ST = 2, /*!< \brief Use a dual time stepping strategy for unsteady computations (1st order). */
2050-
DT_STEPPING_2ND = 3, /*!< \brief Use a dual time stepping strategy for unsteady computations (2nd order). */
2049+
DT_STEPPING_1ST = 2, /*!< \brief Use a dual time stepping strategy for unsteady computations (1st order). */
2050+
DT_STEPPING_2ND = 3, /*!< \brief Use a dual time stepping strategy for unsteady computations (2nd order). */
20512051
ROTATIONAL_FRAME = 4, /*!< \brief Use a rotational source term. */
20522052
HARMONIC_BALANCE = 5 /*!< \brief Use a harmonic balance source term. */
20532053
};

Common/src/geometry/CPhysicalGeometry.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5088,7 +5088,7 @@ unsigned short iMarker, jMarker, iMarkerTP, iSpan, jSpan, kSpan = 0;
50885088
if (nDim == 2){
50895089
nSpanWiseSections[marker_flag-1] = 1;
50905090
//TODO (turbo) make it more genral
5091-
if(marker_flag == OUTFLOW) config->SetnSpanWiseSections(1);
5091+
if(marker_flag == OUTFLOW) config->SetnSpanWiseSections(1);
50925092

50935093
/*---Initilize the vector of span-wise values that will be ordered ---*/
50945094
SpanWiseValue[marker_flag -1] = new su2double[1];
@@ -5154,7 +5154,7 @@ unsigned short iMarker, jMarker, iMarkerTP, iSpan, jSpan, kSpan = 0;
51545154
for (jMarker = 0; jMarker < nMarker; jMarker++){
51555155
if (config->GetMarker_All_KindBC(jMarker) == PERIODIC_BOUNDARY) {
51565156
PeriodicBoundary = config->GetMarker_All_PerBound(jMarker);
5157-
jVertex = nodes->GetVertex(iPoint, jMarker);
5157+
jVertex = nodes->GetVertex(iPoint, jMarker);
51585158
if ((jVertex != -1) && (PeriodicBoundary == (val_iZone + 1))){
51595159
coord = nodes->GetCoord(iPoint);
51605160
switch (config->GetKind_TurboMachinery(val_iZone)){
@@ -5234,9 +5234,9 @@ unsigned short iMarker, jMarker, iMarkerTP, iSpan, jSpan, kSpan = 0;
52345234
// check if the value are gathered correctly
52355235
//
52365236
// for (iSpan = 0; iSpan < nSpan; iSpan++){
5237-
// if(rank == MASTER_NODE){
5238-
// cout << setprecision(16)<< iSpan +1 << " with a value of " <<valueSpan[iSpan]<< " at flag " << marker_flag <<endl;
5239-
// }
5237+
// if(rank == MASTER_NODE){
5238+
// cout << setprecision(16)<< iSpan +1 << " with a value of " <<valueSpan[iSpan]<< " at flag " << marker_flag <<endl;
5239+
// }
52405240
// }
52415241

52425242

Common/src/geometry/elements/CHEXA8.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CHEXA8::CHEXA8() : CElementWithKnownSizes<NGAUSS,NNODE,NDIM>() {
3434

3535
su2double oneOnSqrt3 = 0.577350269189626;
3636

37-
GaussCoord[0][0] = -oneOnSqrt3; GaussCoord[0][1] = -oneOnSqrt3; GaussCoord[0][2] = -oneOnSqrt3; GaussWeight(0) = 1.0;
37+
GaussCoord[0][0] = -oneOnSqrt3; GaussCoord[0][1] = -oneOnSqrt3; GaussCoord[0][2] = -oneOnSqrt3; GaussWeight(0) = 1.0;
3838
GaussCoord[1][0] = oneOnSqrt3; GaussCoord[1][1] = -oneOnSqrt3; GaussCoord[1][2] = -oneOnSqrt3; GaussWeight(1) = 1.0;
3939
GaussCoord[2][0] = oneOnSqrt3; GaussCoord[2][1] = oneOnSqrt3; GaussCoord[2][2] = -oneOnSqrt3; GaussWeight(2) = 1.0;
4040
GaussCoord[3][0] = -oneOnSqrt3; GaussCoord[3][1] = oneOnSqrt3; GaussCoord[3][2] = -oneOnSqrt3; GaussWeight(3) = 1.0;
@@ -54,14 +54,14 @@ CHEXA8::CHEXA8() : CElementWithKnownSizes<NGAUSS,NNODE,NDIM>() {
5454
Eta = GaussCoord[iGauss][1];
5555
Zeta = GaussCoord[iGauss][2];
5656

57-
val_Ni = 0.125*(1.0-Xi)*(1.0-Eta)*(1.0-Zeta); GaussPoint[iGauss].SetNi(val_Ni,0);
58-
val_Ni = 0.125*(1.0+Xi)*(1.0-Eta)*(1.0-Zeta); GaussPoint[iGauss].SetNi(val_Ni,1);
59-
val_Ni = 0.125*(1.0+Xi)*(1.0+Eta)*(1.0-Zeta); GaussPoint[iGauss].SetNi(val_Ni,2);
60-
val_Ni = 0.125*(1.0-Xi)*(1.0+Eta)*(1.0-Zeta); GaussPoint[iGauss].SetNi(val_Ni,3);
61-
val_Ni = 0.125*(1.0-Xi)*(1.0-Eta)*(1.0+Zeta); GaussPoint[iGauss].SetNi(val_Ni,4);
62-
val_Ni = 0.125*(1.0+Xi)*(1.0-Eta)*(1.0+Zeta); GaussPoint[iGauss].SetNi(val_Ni,5);
63-
val_Ni = 0.125*(1.0+Xi)*(1.0+Eta)*(1.0+Zeta); GaussPoint[iGauss].SetNi(val_Ni,6);
64-
val_Ni = 0.125*(1.0-Xi)*(1.0+Eta)*(1.0+Zeta); GaussPoint[iGauss].SetNi(val_Ni,7);
57+
val_Ni = 0.125*(1.0-Xi)*(1.0-Eta)*(1.0-Zeta); GaussPoint[iGauss].SetNi(val_Ni,0);
58+
val_Ni = 0.125*(1.0+Xi)*(1.0-Eta)*(1.0-Zeta); GaussPoint[iGauss].SetNi(val_Ni,1);
59+
val_Ni = 0.125*(1.0+Xi)*(1.0+Eta)*(1.0-Zeta); GaussPoint[iGauss].SetNi(val_Ni,2);
60+
val_Ni = 0.125*(1.0-Xi)*(1.0+Eta)*(1.0-Zeta); GaussPoint[iGauss].SetNi(val_Ni,3);
61+
val_Ni = 0.125*(1.0-Xi)*(1.0-Eta)*(1.0+Zeta); GaussPoint[iGauss].SetNi(val_Ni,4);
62+
val_Ni = 0.125*(1.0+Xi)*(1.0-Eta)*(1.0+Zeta); GaussPoint[iGauss].SetNi(val_Ni,5);
63+
val_Ni = 0.125*(1.0+Xi)*(1.0+Eta)*(1.0+Zeta); GaussPoint[iGauss].SetNi(val_Ni,6);
64+
val_Ni = 0.125*(1.0-Xi)*(1.0+Eta)*(1.0+Zeta); GaussPoint[iGauss].SetNi(val_Ni,7);
6565

6666
/*--- dN/d xi ---*/
6767

Common/src/geometry/elements/CTETRA1.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ CTETRA1::CTETRA1() : CElementWithKnownSizes<NGAUSS,NNODE,NDIM>() {
4545
Eta = GaussCoord[iGauss][1];
4646
Zeta = GaussCoord[iGauss][2];
4747

48-
val_Ni = Xi; GaussPoint[iGauss].SetNi(val_Ni,0);
49-
val_Ni = Eta; GaussPoint[iGauss].SetNi(val_Ni,1);
48+
val_Ni = Xi; GaussPoint[iGauss].SetNi(val_Ni,0);
49+
val_Ni = Eta; GaussPoint[iGauss].SetNi(val_Ni,1);
5050
val_Ni = 1.0-Xi-Eta-Zeta; GaussPoint[iGauss].SetNi(val_Ni,2);
51-
val_Ni = Zeta; GaussPoint[iGauss].SetNi(val_Ni,3);
51+
val_Ni = Zeta; GaussPoint[iGauss].SetNi(val_Ni,3);
5252

5353
/*--- dN/d xi, dN/d eta, dN/d zeta ---*/
5454

SU2_CFD/src/output/output_physics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void COutputLegacy::ComputeTurboPerformance(CSolver *solver_container, CGeometry
279279
TotalEnthalpyOutIs[nBladesRow + nStages][nSpanWiseSections] = EnthalpyOutIs[nBladesRow + nStages][nSpanWiseSections] + 0.5*absVel2;
280280

281281
TotalTotalEfficiency[nBladesRow + nStages][nSpanWiseSections] = (TotalEnthalpyIn[0][config->GetnSpan_iZones(0)] - TotalEnthalpyOut[nBladesRow-1][config->GetnSpan_iZones(nBladesRow-1)]);
282-
TotalTotalEfficiency[nBladesRow + nStages][nSpanWiseSections] /= (TotalEnthalpyIn[0][config->GetnSpan_iZones(0)] - TotalEnthalpyOutIs[nBladesRow + nStages][nSpanWiseSections]);
282+
TotalTotalEfficiency[nBladesRow + nStages][nSpanWiseSections] /= (TotalEnthalpyIn[0][config->GetnSpan_iZones(0)] - TotalEnthalpyOutIs[nBladesRow + nStages][nSpanWiseSections]);
283283
TotalStaticEfficiency[nBladesRow +nStages][nSpanWiseSections] = (TotalEnthalpyIn[0][config->GetnSpan_iZones(0)] - TotalEnthalpyOut[nBladesRow-1][config->GetnSpan_iZones(nBladesRow-1)]);
284284
TotalStaticEfficiency[nBladesRow +nStages][nSpanWiseSections] /= (TotalEnthalpyIn[0][config->GetnSpan_iZones(0)] - EnthalpyOutIs[nBladesRow + nStages][nSpanWiseSections]);
285285
PressureRatio[nBladesRow + nStages][nSpanWiseSections] = PressureRatio[0][config->GetnSpan_iZones(0)]*PressureOut[0][config->GetnSpan_iZones(0)]/PressureOut[nBladesRow-1][config->GetnSpan_iZones(nBladesRow-1)];

0 commit comments

Comments
 (0)