Skip to content

Commit 2250751

Browse files
authored
Merge pull request #1129 from su2code/chore_minor_cleanups
Deprecate options that did not work since v7.0.0, and other minor cleanups
2 parents 4669934 + efa8f13 commit 2250751

272 files changed

Lines changed: 443 additions & 1699 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,6 @@ Mercurial
8787
# Ignore build folder
8888
./build/
8989
build/
90+
91+
# ninja binary (build system)
9092
ninja

Common/include/CConfig.hpp

Lines changed: 2 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -660,11 +660,6 @@ class CConfig {
660660
unsigned short Res_FEM_CRIT; /*!< \brief Criteria to apply to the FEM convergence (absolute/relative). */
661661
unsigned long StartConv_Iter; /*!< \brief Start convergence criteria at iteration. */
662662
su2double Cauchy_Eps; /*!< \brief Epsilon used for the convergence. */
663-
unsigned long Wrt_Sol_Freq, /*!< \brief Writing solution frequency. */
664-
Wrt_Sol_Freq_DualTime, /*!< \brief Writing solution frequency for Dual Time. */
665-
Wrt_Con_Freq, /*!< \brief Writing convergence history frequency. */
666-
Wrt_Con_Freq_DualTime; /*!< \brief Writing convergence history frequency. */
667-
bool Wrt_Dynamic; /*!< \brief Write dynamic data adding header and prefix. */
668663
bool Restart, /*!< \brief Restart solution (for direct, adjoint, and linearized problems).*/
669664
Read_Binary_Restart, /*!< \brief Read binary SU2 native restart files.*/
670665
Restart_Flow; /*!< \brief Restart flow solution for adjoint and linearized problems. */
@@ -759,7 +754,6 @@ class CConfig {
759754
string Mesh_FileName, /*!< \brief Mesh input file. */
760755
Mesh_Out_FileName, /*!< \brief Mesh output file. */
761756
Solution_FileName, /*!< \brief Flow solution input file. */
762-
Solution_LinFileName, /*!< \brief Linearized flow solution input file. */
763757
Solution_AdjFileName, /*!< \brief Adjoint solution input file for drag functional. */
764758
Volume_FileName, /*!< \brief Flow variables output file. */
765759
Residual_FileName, /*!< \brief Residual variables output file. */
@@ -772,24 +766,13 @@ class CConfig {
772766
ObjFunc_Value_FileName, /*!< \brief Objective function. */
773767
SurfCoeff_FileName, /*!< \brief Output file with the flow variables on the surface. */
774768
SurfAdjCoeff_FileName, /*!< \brief Output file with the adjoint variables on the surface. */
775-
New_SU2_FileName, /*!< \brief Output SU2 mesh file converted from CGNS format. */
776769
SurfSens_FileName, /*!< \brief Output file for the sensitivity on the surface (discrete adjoint). */
777770
VolSens_FileName; /*!< \brief Output file for the sensitivity in the volume (discrete adjoint). */
778771

779-
bool Wrt_Output, /*!< \brief Write any output files */
780-
Wrt_Vol_Sol, /*!< \brief Write a volume solution file */
781-
Wrt_Srf_Sol, /*!< \brief Write a surface solution file */
782-
Wrt_Csv_Sol, /*!< \brief Write a surface comma-separated values solution file */
783-
Wrt_Crd_Sol, /*!< \brief Write a binary file with the grid coordinates only. */
784-
Wrt_Residuals, /*!< \brief Write residuals to solution file */
785-
Wrt_Surface, /*!< \brief Write solution at each surface */
786-
Wrt_Limiters, /*!< \brief Write residuals to solution file */
787-
Wrt_SharpEdges, /*!< \brief Write residuals to solution file */
788-
Wrt_Halo, /*!< \brief Write rind layers in solution files */
772+
bool
789773
Wrt_Performance, /*!< \brief Write the performance summary at the end of a calculation. */
790774
Wrt_AD_Statistics, /*!< \brief Write the tape statistics (discrete adjoint). */
791775
Wrt_MeshQuality, /*!< \brief Write the mesh quality statistics to the visualization files. */
792-
Wrt_Slice, /*!< \brief Write 1D slice of a 2D cartesian solution */
793776
Wrt_Projected_Sensitivity, /*!< \brief Write projected sensitivities (dJ/dx) on surfaces to ASCII file. */
794777
Plot_Section_Forces; /*!< \brief Write sectional forces for specified markers. */
795778
unsigned short
@@ -1010,7 +993,6 @@ class CConfig {
1010993
long ParMETIS_edgeWgt; /*!< \brief Load balancing weight given to edges. */
1011994
unsigned short DirectDiff; /*!< \brief Direct Differentation mode. */
1012995
bool DiscreteAdjoint; /*!< \brief AD-based discrete adjoint mode. */
1013-
unsigned long Wrt_Surf_Freq_DualTime; /*!< \brief Writing surface solution frequency for Dual Time. */
1014996
su2double Const_DES; /*!< \brief Detached Eddy Simulation Constant. */
1015997
unsigned short Kind_WindowFct; /*!< \brief Type of window (weight) function for objective functional. */
1016998
unsigned short Kind_HybridRANSLES; /*!< \brief Kind of Hybrid RANS/LES. */
@@ -3073,102 +3055,6 @@ class CConfig {
30733055
*/
30743056
su2double GetPhysicalTime(void) const { return PhysicalTime; }
30753057

3076-
/*!
3077-
* \brief Get the frequency for writing the solution file.
3078-
* \return It writes the solution file with this frequency.
3079-
*/
3080-
unsigned long GetWrt_Sol_Freq(void) const { return Wrt_Sol_Freq; }
3081-
3082-
/*!
3083-
* \brief Get the frequency for writing the solution file in Dual Time.
3084-
* \return It writes the solution file with this frequency.
3085-
*/
3086-
unsigned long GetWrt_Sol_Freq_DualTime(void) const { return Wrt_Sol_Freq_DualTime; }
3087-
3088-
/*!
3089-
* \brief Get the frequency for writing the convergence file.
3090-
* \return It writes the convergence file with this frequency.
3091-
*/
3092-
unsigned long GetWrt_Con_Freq(void) const { return Wrt_Con_Freq; }
3093-
3094-
/*!
3095-
* \brief Set the frequency for writing the convergence file.
3096-
* \return It writes the convergence file with this frequency.
3097-
*/
3098-
void SetWrt_Con_Freq(unsigned long val_freq) { Wrt_Con_Freq = val_freq; }
3099-
3100-
/*!
3101-
* \brief Get the frequency for writing the convergence file in Dual Time.
3102-
* \return It writes the convergence file with this frequency.
3103-
*/
3104-
unsigned long GetWrt_Con_Freq_DualTime(void) const { return Wrt_Con_Freq_DualTime; }
3105-
3106-
/*!
3107-
* \brief Get information about writing unsteady headers and file extensions.
3108-
* \return <code>TRUE</code> means that unsteady solution files will be written.
3109-
*/
3110-
bool GetWrt_Unsteady(void);
3111-
3112-
/*!
3113-
* \brief Get information about writing output files.
3114-
* \return <code>TRUE</code> means that output files will be written.
3115-
*/
3116-
bool GetWrt_Output(void) const { return Wrt_Output; }
3117-
3118-
/*!
3119-
* \brief Get information about writing a volume solution file.
3120-
* \return <code>TRUE</code> means that a volume solution file will be written.
3121-
*/
3122-
bool GetWrt_Vol_Sol(void) const { return Wrt_Vol_Sol; }
3123-
3124-
/*!
3125-
* \brief Get information about writing a surface solution file.
3126-
* \return <code>TRUE</code> means that a surface solution file will be written.
3127-
*/
3128-
bool GetWrt_Srf_Sol(void) const { return Wrt_Srf_Sol; }
3129-
3130-
/*!
3131-
* \brief Get information about writing a surface comma-separated values (CSV) solution file.
3132-
* \return <code>TRUE</code> means that a surface comma-separated values (CSV) solution file will be written.
3133-
*/
3134-
bool GetWrt_Csv_Sol(void) const { return Wrt_Csv_Sol; }
3135-
3136-
/*!
3137-
* \brief Get information about writing a binary coordinates file.
3138-
* \return <code>TRUE</code> means that a binary coordinates file will be written.
3139-
*/
3140-
bool GetWrt_Crd_Sol(void) const { return Wrt_Crd_Sol; }
3141-
3142-
/*!
3143-
* \brief Get information about writing residuals to volume solution file.
3144-
* \return <code>TRUE</code> means that residuals will be written to the solution file.
3145-
*/
3146-
bool GetWrt_Residuals(void) const { return Wrt_Residuals; }
3147-
3148-
/*!
3149-
* \brief Get information about writing residuals to volume solution file.
3150-
* \return <code>TRUE</code> means that residuals will be written to the solution file.
3151-
*/
3152-
bool GetWrt_Limiters(void) const { return Wrt_Limiters; }
3153-
3154-
/*!
3155-
* \brief Write solution at each surface.
3156-
* \return <code>TRUE</code> means that the solution at each surface will be written.
3157-
*/
3158-
bool GetWrt_Surface(void) const { return Wrt_Surface; }
3159-
3160-
/*!
3161-
* \brief Get information about writing residuals to volume solution file.
3162-
* \return <code>TRUE</code> means that residuals will be written to the solution file.
3163-
*/
3164-
bool GetWrt_SharpEdges(void) const { return Wrt_SharpEdges; }
3165-
3166-
/*!
3167-
* \brief Get information about writing rind layers to the solution files.
3168-
* \return <code>TRUE</code> means that rind layers will be written to the solution file.
3169-
*/
3170-
bool GetWrt_Halo(void) const { return Wrt_Halo; }
3171-
31723058
/*!
31733059
* \brief Get information about writing the performance summary at the end of a calculation.
31743060
* \return <code>TRUE</code> means that the performance summary will be written at the end of a calculation.
@@ -3187,12 +3073,6 @@ class CConfig {
31873073
*/
31883074
bool GetWrt_MeshQuality(void) const { return Wrt_MeshQuality; }
31893075

3190-
/*!
3191-
* \brief Get information about writing a 1D slice of a 2D cartesian solution.
3192-
* \return <code>TRUE</code> means that a 1D slice of a 2D cartesian solution will be written.
3193-
*/
3194-
bool GetWrt_Slice(void) const { return Wrt_Slice; }
3195-
31963076
/*!
31973077
* \brief Get information about writing projected sensitivities on surfaces to an ASCII file with rows as x, y, z, dJ/dx, dJ/dy, dJ/dz for each vertex.
31983078
* \return <code>TRUE</code> means that projected sensitivities on surfaces in an ASCII file with rows as x, y, z, dJ/dx, dJ/dy, dJ/dz for each vertex will be written.
@@ -8523,12 +8403,6 @@ class CConfig {
85238403
*/
85248404
void SetiInst(unsigned short val_iInst) { iInst = val_iInst; }
85258405

8526-
/*!
8527-
* \brief Get information about writing dynamic structural analysis headers and file extensions.
8528-
* \return <code>TRUE</code> means that dynamic structural analysis solution files will be written.
8529-
*/
8530-
bool GetWrt_Dynamic(void) const { return Wrt_Dynamic; }
8531-
85328406
/*!
85338407
* \brief Get Newmark alpha parameter.
85348408
* \return Value of the Newmark alpha parameter.
@@ -8908,12 +8782,6 @@ class CConfig {
89088782
*/
89098783
su2double GetRestart_Bandwidth_Agg(void) const { return Restart_Bandwidth_Agg; }
89108784

8911-
/*!
8912-
* \brief Get the frequency for writing the surface solution file in Dual Time.
8913-
* \return It writes the surface solution file with this frequency.
8914-
*/
8915-
unsigned long GetWrt_Surf_Freq_DualTime(void) const { return Wrt_Surf_Freq_DualTime; }
8916-
89178785
/*!
89188786
* \brief Get the Kind of Hybrid RANS/LES.
89198787
* \return Value of Hybrid RANS/LES method.
@@ -9303,6 +9171,7 @@ class CConfig {
93039171

93049172
/*!
93059173
* \brief GetScreen_Wrt_Freq_Inner
9174+
* \param[in] iter: index for Time (0), Outer (1), or Inner (2) iterations
93069175
* \return
93079176
*/
93089177
unsigned long GetScreen_Wrt_Freq(unsigned short iter) const { return ScreenWrtFreq[iter]; }

Common/include/geometry/CGeometry.hpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -856,20 +856,6 @@ class CGeometry {
856856
*/
857857
inline virtual void SetBoundControlVolume(CConfig *config, CGeometry *geometry, unsigned short action) {}
858858

859-
/*!
860-
* \brief A virtual member.
861-
* \param[in] config - Definition of the particular problem.
862-
* \param[in] val_mesh_out_filename - Name of the output file.
863-
*/
864-
inline virtual void SetMeshFile(CConfig *config, string val_mesh_out_filename) {}
865-
866-
/*!
867-
* \brief A virtual member.
868-
* \param[in] config - Definition of the particular problem.
869-
* \param[in] val_mesh_out_filename - Name of the output file.
870-
*/
871-
inline virtual void SetMeshFile(CGeometry *geometry, CConfig *config, string val_mesh_out_filename) {}
872-
873859
/*!
874860
* \brief A virtual member.
875861
* \param[in] config - Definition of the particular problem.

Common/include/geometry/CMultiGridGeometry.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class CMultiGridGeometry final : public CGeometry {
4040
public:
4141
/*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
4242
using CGeometry::SetVertex;
43-
using CGeometry::SetMeshFile;
4443
using CGeometry::SetControlVolume;
4544
using CGeometry::SetBoundControlVolume;
4645
using CGeometry::SetPoint_Connectivity;

Common/include/geometry/CPhysicalGeometry.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ class CPhysicalGeometry final : public CGeometry {
112112
public:
113113
/*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
114114
using CGeometry::SetVertex;
115-
using CGeometry::SetMeshFile;
116115
using CGeometry::SetControlVolume;
117116
using CGeometry::SetBoundControlVolume;
118117
using CGeometry::SetPoint_Connectivity;
@@ -595,13 +594,6 @@ class CPhysicalGeometry final : public CGeometry {
595594
*/
596595
void SetCoord_Smoothing(unsigned short val_nSmooth, su2double val_smooth_coeff, CConfig *config) override;
597596

598-
/*!
599-
* \brief Write the .su2 file.
600-
* \param[in] config - Definition of the particular problem.
601-
* \param[in] val_mesh_out_filename - Name of the output file.
602-
*/
603-
void SetMeshFile(CConfig *config, string val_mesh_out_filename) override;
604-
605597
/*!
606598
* \brief Compute 3 grid quality metrics: orthogonality angle, dual cell aspect ratio, and dual cell volume ratio.
607599
* \param[in] config - Definition of the particular problem.

0 commit comments

Comments
 (0)