Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update config_template.cfg #1934

Merged
merged 61 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
1b53dd0
update config_template
bigfooted Feb 17, 2023
98e9319
add config options to config_template
bigfooted Feb 19, 2023
b850cd3
alignment
bigfooted Feb 19, 2023
efa6a4f
Update config_template.cfg
bigfooted Feb 20, 2023
4efd236
Merge branch 'develop' into update_config_template
bigfooted Feb 20, 2023
26df91b
add config options to config_template
bigfooted Feb 20, 2023
dbbaa0b
Merge branch 'update_config_template' of https://github.com/su2code/S…
bigfooted Feb 20, 2023
20e0525
Merge branch 'develop' into update_config_template
bigfooted Feb 21, 2023
1b7fcde
Merge branch 'develop' into update_config_template
bigfooted Feb 24, 2023
3653933
Merge branch 'develop' into update_config_template
bigfooted Mar 2, 2023
d606ef3
update config_template
bigfooted Mar 8, 2023
a19243b
Merge branch 'update_config_template' of https://github.com/su2code/S…
bigfooted Mar 8, 2023
5642831
Merge branch 'develop' into update_config_template
bigfooted Mar 10, 2023
0182ac1
Merge branch 'develop' into update_config_template
bigfooted Mar 13, 2023
982c606
Merge branch 'develop' into update_config_template
bigfooted Mar 14, 2023
602743b
Merge branch 'develop' into update_config_template
bigfooted Mar 16, 2023
4415e32
Update config_template.cfg
bigfooted Apr 10, 2023
fb7a266
Update config_template.cfg
bigfooted Apr 10, 2023
3736e7c
remove grid adaptation options
bigfooted May 7, 2023
600288c
merge develop, implement review suggestions
bigfooted May 7, 2023
3f4b04d
remove some commented code
bigfooted May 7, 2023
5a78710
Update config_template.cfg
bigfooted May 8, 2023
71f2093
add tick again
bigfooted May 8, 2023
37fd54d
Merge branch 'update_config_template' of https://github.com/su2code/S…
bigfooted May 8, 2023
45a1737
Update config_template.cfg
bigfooted May 16, 2023
7d43d9b
Update config_template.cfg
bigfooted May 16, 2023
5dbc7af
Update config_template.cfg
bigfooted May 16, 2023
f996033
Merge branch 'develop' into update_config_template
bigfooted May 16, 2023
00ca858
Merge branch 'develop' into update_config_template
bigfooted May 23, 2023
6f7349d
Merge branch 'develop' into update_config_template
bigfooted May 31, 2023
c4d44a7
update
bigfooted Aug 8, 2023
4473418
update
bigfooted Aug 8, 2023
6337414
update
bigfooted Aug 8, 2023
b4cd072
clang formatting
bigfooted Aug 8, 2023
9f93d6b
remove direct_diff, auto_diff
bigfooted Aug 9, 2023
93e5fdc
update cconfig with clang
bigfooted Aug 11, 2023
27e9b33
update cconfig with clang
bigfooted Aug 11, 2023
b668005
remove marker_flowload
bigfooted Aug 11, 2023
288c790
Merge branch 'develop' into update_config_template
bigfooted Aug 21, 2023
80193b6
change actdisk
bigfooted Aug 21, 2023
219feae
change actdisk
bigfooted Aug 21, 2023
b68157b
Merge branch 'develop' into update_config_template
bigfooted Aug 22, 2023
461e104
add disk
bigfooted Aug 23, 2023
be0bf44
Merge branch 'develop' into update_config_template
bigfooted Aug 26, 2023
8774d60
Merge branch 'develop' into update_config_template
bigfooted Aug 31, 2023
d59329e
Merge branch 'develop' into update_config_template
bigfooted Sep 15, 2023
a9136c7
remove commented lined
bigfooted Sep 21, 2023
3d55e82
Merge branch 'develop' into update_config_template
bigfooted Sep 25, 2023
6e83a4b
remove commented line
bigfooted Sep 25, 2023
2f7c899
Merge branch 'develop' into update_config_template
bigfooted Oct 26, 2023
16948a3
Merge branch 'develop' into update_config_template
bigfooted Nov 6, 2023
458b636
Update Common/include/CConfig.hpp
bigfooted Nov 6, 2023
1f4dca2
remove duplicate entries, add deprecation statements
bigfooted Nov 6, 2023
8531ae8
remove dcm_dih
bigfooted Nov 12, 2023
9364ed2
merge develop
bigfooted Nov 12, 2023
18bb23b
remove comment
bigfooted Nov 17, 2023
769f451
Merge branch 'develop' into update_config_template
bigfooted Nov 17, 2023
0633793
update regression test
bigfooted Nov 17, 2023
4cdefc5
Merge branch 'update_config_template' of https://github.com/su2code/s…
bigfooted Nov 17, 2023
0cd77ae
update regression test
bigfooted Nov 17, 2023
c3d8b9c
update regression test
bigfooted Nov 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 11 additions & 91 deletions Common/include/CConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class CConfig {
*TemperatureLimits; /*!< \brief Limits for the primitive variables */
bool ActDisk_DoubleSurface; /*!< \brief actuator disk double surface */
bool Engine_HalfModel; /*!< \brief only half model is in the computational grid */
bool ActDisk_SU2_DEF; /*!< \brief actuator disk double surface */
//bool ActDisk_SU2_DEF; /*!< \brief actuator disk double surface */
unsigned short nFFD_Iter; /*!< \brief Iteration for the point inversion problem. */
unsigned short FFD_Blending; /*!< \brief Kind of FFD Blending function. */
su2double FFD_Tol; /*!< \brief Tolerance in the point inversion problem. */
Expand Down Expand Up @@ -212,8 +212,8 @@ class CConfig {
nMarker_Damper, /*!< \brief Number of damper surface markers. */
nMarker_Load_Dir, /*!< \brief Number of load surface markers defined by magnitude and direction. */
nMarker_Disp_Dir, /*!< \brief Number of load surface markers defined by magnitude and direction. */
nMarker_Load_Sine, /*!< \brief Number of load surface markers defined by magnitude and direction. */
nMarker_FlowLoad, /*!< \brief Number of load surface markers. */
//nMarker_Load_Sine, /*!< \brief Number of load surface markers defined by magnitude and direction. */
//nMarker_FlowLoad, /*!< \brief Number of load surface markers. */
nMarker_Internal, /*!< \brief Number of internal flow markers. */
nMarker_All, /*!< \brief Total number of markers using the grid information. */
nMarker_Max, /*!< \brief Max number of number of markers using the grid information. */
Expand Down Expand Up @@ -324,10 +324,10 @@ class CConfig {
su2double *Disp_Dir_Multiplier; /*!< \brief Specified multiplier for load boundaries defined in cartesian coordinates. */
su2double **Load_Dir; /*!< \brief Specified flow direction vector (unit vector) for inlet boundaries. */
su2double **Disp_Dir; /*!< \brief Specified structural displacement direction (unit vector). */
su2double *Load_Sine_Amplitude; /*!< \brief Specified amplitude for a sine-wave load. */
su2double *Load_Sine_Frequency; /*!< \brief Specified multiplier for load boundaries defined in cartesian coordinates. */
su2double **Load_Sine_Dir; /*!< \brief Specified flow direction vector (unit vector) for inlet boundaries. */
su2double *FlowLoad_Value; /*!< \brief Specified force for flow load boundaries. */
//su2double *Load_Sine_Amplitude; /*!< \brief Specified amplitude for a sine-wave load. */
//su2double *Load_Sine_Frequency; /*!< \brief Specified multiplier for load boundaries defined in cartesian coordinates. */
//su2double **Load_Sine_Dir; /*!< \brief Specified flow direction vector (unit vector) for inlet boundaries. */
//su2double *FlowLoad_Value; /*!< \brief Specified force for flow load boundaries. */
su2double *ActDiskInlet_MassFlow; /*!< \brief Specified inlet mass flow for actuator disk. */
su2double *ActDiskInlet_Temperature; /*!< \brief Specified inlet temperature for actuator disk. */
su2double *ActDiskInlet_TotalTemperature; /*!< \brief Specified inlet total temperature for actuator disk. */
Expand Down Expand Up @@ -506,8 +506,6 @@ class CConfig {
Kind_Deform_Linear_Solver_Prec, /*!< \brief Preconditioner of the linear solver. */
Kind_Linear_Solver, /*!< \brief Numerical solver for the implicit scheme. */
Kind_Linear_Solver_Prec, /*!< \brief Preconditioner of the linear solver. */
Kind_AdjTurb_Linear_Solver, /*!< \brief Numerical solver for the turbulent adjoint implicit scheme. */
Kind_AdjTurb_Linear_Prec, /*!< \brief Preconditioner of the turbulent adjoint linear solver. */
Kind_DiscAdj_Linear_Solver, /*!< \brief Linear solver for the discrete adjoint system. */
Kind_DiscAdj_Linear_Prec, /*!< \brief Preconditioner of the discrete adjoint linear solver. */
Kind_TimeNumScheme, /*!< \brief Global explicit or implicit time integration. */
Expand Down Expand Up @@ -615,9 +613,7 @@ class CConfig {
su2double Roe_Kappa; /*!< \brief Relaxation of the Roe scheme. */
su2double Relaxation_Factor_Adjoint; /*!< \brief Relaxation coefficient for variable updates of adjoint solvers. */
su2double Relaxation_Factor_CHT; /*!< \brief Relaxation coefficient for the update of conjugate heat variables. */
su2double AdjTurb_Linear_Error; /*!< \brief Min error of the turbulent adjoint linear solver for the implicit formulation. */
su2double EntropyFix_Coeff; /*!< \brief Entropy fix coefficient. */
unsigned short AdjTurb_Linear_Iter; /*!< \brief Min error of the turbulent adjoint linear solver for the implicit formulation. */
unsigned short nLocationStations, /*!< \brief Number of section cuts to make when outputting mesh and cp . */
nWingStations; /*!< \brief Number of section cuts to make when calculating internal volume. */
su2double Kappa_1st_AdjFlow, /*!< \brief Lax 1st order dissipation coefficient for adjoint flow equations (coarse multigrid levels). */
Expand Down Expand Up @@ -919,8 +915,8 @@ class CConfig {
bool RampAndRelease; /*!< \brief option for ramp load and release */
bool Sine_Load; /*!< \brief option for sine load */
su2double Thermal_Diffusivity; /*!< \brief Thermal diffusivity used in the heat solver. */
su2double Cyclic_Pitch, /*!< \brief Cyclic pitch for rotorcraft simulations. */
Collective_Pitch; /*!< \brief Collective pitch for rotorcraft simulations. */
//su2double Cyclic_Pitch, /*!< \brief Cyclic pitch for rotorcraft simulations. */
//Collective_Pitch; /*!< \brief Collective pitch for rotorcraft simulations. */
su2double Mach_Motion; /*!< \brief Mach number based on mesh velocity and freestream quantities. */

su2double Motion_Origin[3] = {0.0}, /*!< \brief Mesh motion origin. */
Expand Down Expand Up @@ -1102,7 +1098,7 @@ class CConfig {
distortion[2], /*!< \brief SU2_GEO section locations array for the COption class. */
ea_lim[3], /*!< \brief equivalent area limit array for the COption class. */
grid_fix[6], /*!< \brief fixed grid (non-deforming region) array for the COption class. */
htp_axis[2], /*!< \brief HTP axis for the COption class. */
//htp_axis[2], /*!< \brief HTP axis for the COption class. */
ffd_axis[3], /*!< \brief FFD axis for the COption class. */
inc_crit[3], /*!< \brief incremental criteria array for the COption class. */
extrarelfac[2], /*!< \brief extra relaxation factor for Giles BC in the COption class. */
Expand Down Expand Up @@ -1538,7 +1534,7 @@ class CConfig {
* \brief Get the values of subsonic engine.
* \return Values of subsonic engine.
*/
const su2double *GetSubsonicEngine_Values(void) const { return eng_val; }
const su2double *GetSubsonicEngine_Values(void) const { return eng_val; }
bigfooted marked this conversation as resolved.
Show resolved Hide resolved

/*!
* \brief Get the cycle of a subsonic engine.
Expand Down Expand Up @@ -4159,18 +4155,6 @@ class CConfig {
*/
su2double GetSemiSpan(void) const { return SemiSpan; }

/*!
* \brief Get the kind of solver for the implicit solver.
* \return Numerical solver for implicit formulation (solving the linear system).
*/
unsigned short GetKind_AdjTurb_Linear_Solver(void) const { return Kind_AdjTurb_Linear_Solver; }

/*!
* \brief Get the kind of preconditioner for the implicit solver.
* \return Numerical preconditioner for implicit formulation (solving the linear system).
*/
unsigned short GetKind_AdjTurb_Linear_Prec(void) const { return Kind_AdjTurb_Linear_Prec; }

/*!
* \brief Get the kind of solver for the implicit solver.
* \return Numerical solver for implicit formulation (solving the linear system).
Expand All @@ -4189,30 +4173,12 @@ class CConfig {
*/
unsigned short GetKind_Deform_Linear_Solver_Prec(void) const { return Kind_Deform_Linear_Solver_Prec; }

/*!
* \brief Set the kind of preconditioner for the implicit solver.
* \return Numerical preconditioner for implicit formulation (solving the linear system).
*/
void SetKind_AdjTurb_Linear_Prec(unsigned short val_kind_prec) { Kind_AdjTurb_Linear_Prec = val_kind_prec; }

/*!
* \brief Get min error of the linear solver for the implicit formulation.
* \return Min error of the linear solver for the implicit formulation.
*/
su2double GetAdjTurb_Linear_Error(void) const { return AdjTurb_Linear_Error; }

/*!
* \brief Get the entropy fix.
* \return Vaule of the entropy fix.
*/
su2double GetEntropyFix_Coeff(void) const { return EntropyFix_Coeff; }

/*!
* \brief Get max number of iterations of the linear solver for the implicit formulation.
* \return Max number of iterations of the linear solver for the implicit formulation.
*/
unsigned short GetAdjTurb_Linear_Iter(void) const { return AdjTurb_Linear_Iter; }

/*!
* \brief Get CFL reduction factor for adjoint turbulence model.
* \return CFL reduction factor.
Expand Down Expand Up @@ -5683,12 +5649,6 @@ class CConfig {
*/
bool GetEngine_HalfModel(void) const { return Engine_HalfModel; }

/*!
* \brief Actuator disk defined with a double surface.
* \return <code>TRUE</code> if the elements must be divided; otherwise <code>FALSE</code>.
*/
bool GetActDisk_SU2_DEF(void) const { return ActDisk_SU2_DEF; }

/*!
* \brief Value of the design variable step, we use this value in design problems.
* \param[in] val_dv - Number of the design variable that we want to read.
Expand Down Expand Up @@ -8162,46 +8122,6 @@ class CConfig {
*/
const su2double* GetDisp_Dir(const string& val_index) const;

/*!
* \brief Get the amplitude of the sine-wave at a load boundary defined in cartesian coordinates.
* \param[in] val_index - Index corresponding to the load boundary.
* \return The load value.
*/
su2double GetLoad_Sine_Amplitude(const string& val_index) const;

/*!
* \brief Get the frequency of the sine-wave at a load boundary in cartesian coordinates.
* \param[in] val_index - Index corresponding to the load boundary.
* \return The load frequency.
*/
su2double GetLoad_Sine_Frequency(const string& val_index) const;

/*!
* \brief Get the force direction at a sine-wave loaded boundary in cartesian coordinates.
* \param[in] val_index - Index corresponding to the load boundary.
* \return The load direction.
*/
const su2double* GetLoad_Sine_Dir(const string& val_index) const;

/*!
* \brief Get the force value at an load boundary.
* \param[in] val_index - Index corresponding to the load boundary.
* \return The load value.
*/
su2double GetFlowLoad_Value(const string& val_index) const;

/*!
* \brief Cyclic pitch amplitude for rotor blades.
* \return The specified cyclic pitch amplitude.
*/
su2double GetCyclic_Pitch(void) const { return Cyclic_Pitch; }

/*!
* \brief Collective pitch setting for rotor blades.
* \return The specified collective pitch setting.
*/
su2double GetCollective_Pitch(void) const { return Collective_Pitch; }

/*!
* \brief Get name of the arbitrary mesh motion input file.
* \return File name of the arbitrary mesh motion input file.
Expand Down
7 changes: 0 additions & 7 deletions Common/include/grid_movement/CSurfaceMovement.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,6 @@ class CSurfaceMovement : public CGridMovement {
void SetBoundary_Flutter3D(CGeometry* geometry, CConfig* config, CFreeFormDefBox** FFDBox, unsigned long iter,
unsigned short iZone);

/*!
* \brief Set the collective pitch for a blade surface movement.
* \param[in] geometry - Geometrical definition of the problem.
* \param[in] config - Definition of the particular problem.
*/
void SetCollective_Pitch(CGeometry* geometry, CConfig* config);

/*!
* \brief Set any surface deformationsbased on an input file.
* \param[in] geometry - Geometrical definition of the problem.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/option_structure.inl
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ class COptionDVParam : public COptionBase {
default: {
string newstring;
newstring.append(this->name);
newstring.append(": undefined design variable type found in configuration file.");
newstring.append(": undefined design variable type found in configuration file. ");
return newstring;
}
}
Expand Down
Loading