Skip to content

Commit bded2a6

Browse files
author
Francisco Palacios
committed
Collection of improvements
1 parent 5d43821 commit bded2a6

Some content is hidden

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

49 files changed

+1388
-1392
lines changed

Common/include/geometry_structure.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ class CGeometry {
591591
* \brief A virtual member.
592592
* \param[in] config - Definition of the particular problem.
593593
*/
594-
void ComputeAirfoil_Section(double *Plane_P0, double *Plane_Normal, unsigned short iSection,
594+
void ComputeAirfoil_Section(double *Plane_P0, double *Plane_Normal,
595595
double MinXCoord, double MaxXCoord, double *FlowVariable,
596596
vector<double> &Xcoord_Airfoil, vector<double> &Ycoord_Airfoil,
597597
vector<double> &Zcoord_Airfoil, vector<double> &Variable_Airfoil,

Common/include/grid_adaptation_structure.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,6 @@ class CGridAdaptation {
141141
*/
142142
void SetWake_Refinement(CGeometry *geometry, unsigned short strength);
143143

144-
/*!
145-
* \brief Do an adaptation of the computational grid on the two phase problem interphase.
146-
* \param[in] geometry - Geometrical definition of the problem.
147-
* \param[in] strength - Adaptation Strength.
148-
*/
149-
void SetTwoPhase_Refinement(CGeometry *geometry, unsigned short strength);
150-
151144
/*!
152145
* \brief Do an adaptation of the computational grid on the supersonic shock region.
153146
* \param[in] geometry - Geometrical definition of the problem.

Common/include/grid_movement_structure.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -529,14 +529,6 @@ class CFreeFormDefBox : public CGridMovement {
529529
* \return Value of the Derivative of the Bernstein polynomial.
530530
*/
531531
double GetBernsteinDerivative(short val_n, short val_i, double val_t, short val_order);
532-
533-
/*!
534-
* \brief The routine computes F(u,v,w)=||X(u,v,w)-(x,y,z)||^2 evaluated at (u,v,w).
535-
* \param[in] val_coord - Parametric coordiates of the target point.
536-
* \param[in] xyz - Cartesians coordinates of the point.
537-
* \return Value of the analytical objective function.
538-
*/
539-
double GetFFDObjFunc(double *val_coord, double *xyz);
540532

541533
/*!
542534
* \brief The routine computes the gradient of F(u,v,w)=||X(u,v,w)-(x,y,z)||^2 evaluated at (u,v,w).

Common/include/option_structure.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,6 @@ enum ENUM_ADAPT {
863863
WAKE = 12, /*!< \brief Do a grid refinement on the wake. */
864864
SMOOTHING = 14, /*!< \brief Do a grid smoothing of the geometry. */
865865
SUPERSONIC_SHOCK = 15, /*!< \brief Do a grid smoothing. */
866-
TWOPHASE = 16, /*!< \brief Do a grid refinement on the free surface interphase. */
867866
PERIODIC = 17 /*!< \brief Add the periodic halo cells. */
868867
};
869868
static const map<string, ENUM_ADAPT> Adapt_Map = CCreateMap<string, ENUM_ADAPT>
@@ -882,8 +881,7 @@ static const map<string, ENUM_ADAPT> Adapt_Map = CCreateMap<string, ENUM_ADAPT>
882881
("WAKE", WAKE)
883882
("SMOOTHING", SMOOTHING)
884883
("SUPERSONIC_SHOCK", SUPERSONIC_SHOCK)
885-
("PERIODIC", PERIODIC)
886-
("TWOPHASE", TWOPHASE);
884+
("PERIODIC", PERIODIC);
887885

888886
/*!
889887
* \brief types of input file formats

Common/src/config_structure.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,6 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
11111111
/* DESCRIPTION: Evaluate inverse design on the surface */
11121112
addBoolOption("INV_DESIGN_HEATFLUX", InvDesign_HeatFlux, false);
11131113

1114-
11151114
/* CONFIG_CATEGORY: Unsupported options */
11161115
/*--- Options that are experimental and not intended for general use ---*/
11171116

@@ -1148,6 +1147,15 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
11481147
/* DESCRIPTION: Setup for design variables */
11491148
addPythonOption("DEFINITION_DV");
11501149

1150+
/* DESCRIPTION: Maximum number of iterations */
1151+
addPythonOption("OPT_ITERATIONS");
1152+
1153+
/* DESCRIPTION: Requested accuracy */
1154+
addPythonOption("OPT_ACCURACY");
1155+
1156+
/* DESCRIPTION: Setup for design variables */
1157+
addPythonOption("BOUND_DV");
1158+
11511159
/* DESCRIPTION: Current value of the design variables */
11521160
addPythonOption("DV_VALUE_NEW");
11531161

@@ -3387,7 +3395,7 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
33873395

33883396
if (val_software == SU2_MSH) {
33893397
switch (Kind_Adaptation) {
3390-
case FULL: case WAKE: case TWOPHASE: case FULL_FLOW: case FULL_ADJOINT: case FULL_LINEAR: case SMOOTHING: case SUPERSONIC_SHOCK:
3398+
case FULL: case WAKE: case FULL_FLOW: case FULL_ADJOINT: case FULL_LINEAR: case SMOOTHING: case SUPERSONIC_SHOCK:
33913399
break;
33923400
case GRAD_FLOW:
33933401
cout << "Read flow solution from: " << Solution_FlowFileName << "." << endl;
@@ -4083,7 +4091,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
40834091
case PERIODIC: cout << "Grid modification to run periodic bc problems." << endl; break;
40844092
case FULL: cout << "Grid adaptation using a complete refinement." << endl; break;
40854093
case WAKE: cout << "Grid adaptation of the wake." << endl; break;
4086-
case TWOPHASE: cout << "Grid adaptation of the interphase of a free surface flow." << endl; break;
40874094
case FULL_FLOW: cout << "Flow grid adaptation using a complete refinement." << endl; break;
40884095
case FULL_ADJOINT: cout << "Adjoint grid adaptation using a complete refinement." << endl; break;
40894096
case FULL_LINEAR: cout << "Linear grid adaptation using a complete refinement." << endl; break;

Common/src/dual_grid_structure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ CVertex::~CVertex() {
453453
}
454454

455455
void CVertex::SetNodes_Coord(double *val_coord_Edge_CG, double *val_coord_FaceElem_CG, double *val_coord_Elem_CG) {
456-
double vec_a[3], vec_b[3], Dim_Normal[3];
456+
double vec_a[3] = {0.0,0.0,0.0}, vec_b[3] = {0.0,0.0,0.0}, Dim_Normal[3] = {0.0,0.0,0.0};
457457
unsigned short iDim;
458458

459459
for (iDim = 0; iDim < nDim; iDim++) {

0 commit comments

Comments
 (0)