Skip to content

Commit 27f790f

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature_mz_adjoint_for_turbo
2 parents a284b6b + f4cda52 commit 27f790f

File tree

1,027 files changed

+2697
-2282
lines changed

Some content is hidden

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

1,027 files changed

+2697
-2282
lines changed

Common/include/CConfig.hpp

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* \brief All the information about the definition of the physical problem.
44
* The subroutines and functions are in the <i>CConfig.cpp</i> file.
55
* \author F. Palacios, T. Economon, B. Tracey
6-
* \version 8.0.1 "Harrier"
6+
* \version 8.1.0 "Harrier"
77
*
88
* SU2 Project Website: https://su2code.github.io
99
*
@@ -701,6 +701,7 @@ class CConfig {
701701
unsigned long StartConv_Iter; /*!< \brief Start convergence criteria at iteration. */
702702
su2double Cauchy_Eps; /*!< \brief Epsilon used for the convergence. */
703703
bool Restart, /*!< \brief Restart solution (for direct, adjoint, and linearized problems).*/
704+
Wrt_Restart_Compact, /*!< \brief Write compact restart files with minimum nr. of variables. */
704705
Read_Binary_Restart, /*!< \brief Read binary SU2 native restart files.*/
705706
Wrt_Restart_Overwrite, /*!< \brief Overwrite restart files or append iteration number.*/
706707
Wrt_Surface_Overwrite, /*!< \brief Overwrite surface output files or append iteration number.*/
@@ -1003,7 +1004,7 @@ class CConfig {
10031004
bool ExtraOutput; /*!< \brief Check if extra output need. */
10041005
bool Wall_Functions; /*!< \brief Use wall functions with the turbulence model */
10051006
long ExtraHeatOutputZone; /*!< \brief Heat solver zone with extra screen output */
1006-
bool DeadLoad; /*!< \brief Application of dead loads to the FE analysis */
1007+
bool CentrifugalForce; /*!< \brief Application of centrifugal forces to the FE analysis */
10071008
bool PseudoStatic; /*!< \brief Application of dead loads to the FE analysis */
10081009
bool SteadyRestart; /*!< \brief Restart from a steady state for FSI problems. */
10091010
su2double Newmark_beta, /*!< \brief Parameter alpha for Newmark method. */
@@ -1012,10 +1013,13 @@ class CConfig {
10121013
su2double *Int_Coeffs; /*!< \brief Time integration coefficients for structural method. */
10131014
unsigned short nElasticityMod, /*!< \brief Number of different values for the elasticity modulus. */
10141015
nPoissonRatio, /*!< \brief Number of different values for the Poisson ratio modulus. */
1015-
nMaterialDensity; /*!< \brief Number of different values for the Material density. */
1016+
nMaterialDensity, /*!< \brief Number of different values for the Material density. */
1017+
nMaterialThermalExpansion; /*!< \brief Number of different values for thermal expansion coefficient. */
10161018
su2double *ElasticityMod, /*!< \brief Value of the elasticity moduli. */
10171019
*PoissonRatio, /*!< \brief Value of the Poisson ratios. */
1018-
*MaterialDensity; /*!< \brief Value of the Material densities. */
1020+
*MaterialDensity, /*!< \brief Value of the Material densities. */
1021+
*MaterialThermalExpansion, /*!< \brief Value of the thermal expansion coefficients. */
1022+
MaterialReferenceTemperature; /*!< \brief Value of the reference temperature for thermal expansion. */
10191023
unsigned short nElectric_Field, /*!< \brief Number of different values for the electric field in the membrane. */
10201024
nDim_Electric_Field; /*!< \brief Dimensionality of the problem. */
10211025
unsigned short nDim_RefNode; /*!< \brief Dimensionality of the vector . */
@@ -1108,7 +1112,7 @@ class CConfig {
11081112
bool Radiation; /*!< \brief Determines if a radiation model is incorporated. */
11091113
su2double CFL_Rad; /*!< \brief CFL Number for the radiation solver. */
11101114

1111-
array<su2double,5> default_cfl_adapt; /*!< \brief Default CFL adapt param array for the COption class. */
1115+
array<su2double,6> default_cfl_adapt; /*!< \brief Default CFL adapt param array for the COption class. */
11121116
su2double vel_init[3], /*!< \brief initial velocity array for the COption class. */
11131117
vel_inf[3], /*!< \brief freestream velocity array for the COption class. */
11141118
eng_cyl[7], /*!< \brief engine box array for the COption class. */
@@ -2388,6 +2392,16 @@ class CConfig {
23882392
*/
23892393
su2double GetMaterialDensity(unsigned short id_val) const { return MaterialDensity[id_val]; }
23902394

2395+
/*!
2396+
* \brief Get the thermal expansion coefficient.
2397+
*/
2398+
su2double GetMaterialThermalExpansion(unsigned short id_val) const { return MaterialThermalExpansion[id_val]; }
2399+
2400+
/*!
2401+
* \brief Temperature at which there is no stress from thermal expansion.
2402+
*/
2403+
su2double GetMaterialReferenceTemperature() const { return MaterialReferenceTemperature; }
2404+
23912405
/*!
23922406
* \brief Compressibility/incompressibility of the solids analysed using the structural solver.
23932407
* \return Compressible or incompressible.
@@ -5469,6 +5483,12 @@ class CConfig {
54695483
*/
54705484
bool GetRead_Binary_Restart(void) const { return Read_Binary_Restart; }
54715485

5486+
/*!
5487+
* \brief Flag for whether restart files contain only necessary variables.
5488+
* \return Flag <code>TRUE</code> then the code will write compact restart files.
5489+
*/
5490+
bool GetWrt_Restart_Compact(void) const { return Wrt_Restart_Compact; }
5491+
54725492
/*!
54735493
* \brief Flag for whether restart solution files are overwritten.
54745494
* \return Flag for overwriting. If Flag=false, iteration nr is appended to filename
@@ -8936,10 +8956,9 @@ class CConfig {
89368956
su2double GetAitkenDynMinInit(void) const { return AitkenDynMinInit; }
89378957

89388958
/*!
8939-
* \brief Decide whether to apply dead loads to the model.
8940-
* \return <code>TRUE</code> if the dead loads are to be applied, <code>FALSE</code> otherwise.
8959+
* \brief Decide whether to apply centrifugal forces to the model.
89418960
*/
8942-
bool GetDeadLoad(void) const { return DeadLoad; }
8961+
bool GetCentrifugalForce(void) const { return CentrifugalForce; }
89438962

89448963
/*!
89458964
* \brief Identifies if the mesh is matching or not (temporary, while implementing interpolation procedures).

Common/include/adt/CADTBaseClass.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file CADTBaseClass.hpp
33
* \brief Base class for storing an ADT in an arbitrary number of dimensions.
44
* \author E. van der Weide
5-
* \version 8.0.1 "Harrier"
5+
* \version 8.1.0 "Harrier"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*

Common/include/adt/CADTComparePointClass.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file CADTComparePointClass.hpp
33
* \brief subroutines for comparing two points in an alternating digital tree (ADT).
44
* \author E. van der Weide
5-
* \version 8.0.1 "Harrier"
5+
* \version 8.1.0 "Harrier"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*

Common/include/adt/CADTElemClass.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file CADTElemClass.hpp
33
* \brief Class for storing an ADT of (linear) elements in an arbitrary number of dimensions.
44
* \author E. van der Weide
5-
* \version 8.0.1 "Harrier"
5+
* \version 8.1.0 "Harrier"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*
@@ -36,7 +36,7 @@
3636
* \ingroup ADT
3737
* \brief Class for storing an ADT of (linear) elements in an arbitrary number of dimensions.
3838
* \author E. van der Weide
39-
* \version 8.0.1 "Harrier"
39+
* \version 8.1.0 "Harrier"
4040
*/
4141
class CADTElemClass : public CADTBaseClass {
4242
private:

Common/include/adt/CADTNodeClass.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file CADTNodeClass.hpp
33
* \brief Class for storing the information needed in a node of an ADT.
44
* \author E. van der Weide
5-
* \version 8.0.1 "Harrier"
5+
* \version 8.1.0 "Harrier"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*

Common/include/adt/CADTPointsOnlyClass.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file CADTPointsOnlyClass.hpp
33
* \brief Class for storing an ADT of only points in an arbitrary number of dimensions.
44
* \author E. van der Weide
5-
* \version 8.0.1 "Harrier"
5+
* \version 8.1.0 "Harrier"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*

Common/include/adt/CBBoxTargetClass.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* \brief Class for storing the information of a possible bounding box candidate
44
during a minimum distance search.
55
* \author E. van der Weide
6-
* \version 8.0.1 "Harrier"
6+
* \version 8.1.0 "Harrier"
77
*
88
* SU2 Project Website: https://su2code.github.io
99
*
@@ -35,7 +35,7 @@
3535
* \brief Class for storing the information of a possible bounding box candidate
3636
during a minimum distance search.
3737
* \author E. van der Weide
38-
* \version 8.0.1 "Harrier"
38+
* \version 8.1.0 "Harrier"
3939
*/
4040
struct CBBoxTargetClass {
4141
unsigned long boundingBoxID; /*!< \brief Corresponding bounding box ID. */

Common/include/basic_types/ad_structure.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file ad_structure.hpp
33
* \brief Main routines for the algorithmic differentiation (AD) structure.
44
* \author T. Albring, J. Blühdorn
5-
* \version 8.0.1 "Harrier"
5+
* \version 8.1.0 "Harrier"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*

Common/include/basic_types/datatype_structure.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file datatype_structure.hpp
33
* \brief Headers for generalized datatypes, defines an interface for AD types.
44
* \author T. Albring
5-
* \version 8.0.1 "Harrier"
5+
* \version 8.1.0 "Harrier"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*

Common/include/code_config.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* \file code_config.hpp
33
* \brief Header file for collecting common macros, definitions and type configurations.
44
* \author T. Albring, P. Gomes, J. Blühdorn
5-
* \version 8.0.1 "Harrier"
5+
* \version 8.1.0 "Harrier"
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*

0 commit comments

Comments
 (0)