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

Deprecate options that did not work since v7.0.0, and other minor cleanups #1129

Merged
merged 39 commits into from
Dec 14, 2020
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
aa14cf8
Remove unused SetMeshFile function.
TobiKattmann Dec 10, 2020
956c678
Remove deprecated Conig options WRT_LIMITERS/RESIDUALS.
TobiKattmann Dec 10, 2020
80dbb7f
Remove WRT_CON_FREQ_DUALTIME option. Only used in legacy output.
TobiKattmann Dec 10, 2020
0d24af0
Some additions to the config_template.
TobiKattmann Dec 10, 2020
d008136
Add rank to volume output of (in-)compressible and heat solver.
TobiKattmann Dec 10, 2020
1bd0252
Happy little fixes.
TobiKattmann Dec 10, 2020
b434fc6
Replace WRT_CON_FREQ_DUALTIME with SCREEN_WRT_FREQ_TIME in legacy out…
TobiKattmann Dec 11, 2020
76c0fef
WRT_SURF_FREQ_DUALTIME
pcarruscag Dec 11, 2020
bc55314
WRT_OUTPUT
pcarruscag Dec 11, 2020
8fa6238
WRT_VOL_SOL
pcarruscag Dec 11, 2020
37350d4
Deprecate WRT_SOL_FREQ(_DUALTIME). OUTPUT_WRT_FREQ replaced both.
TobiKattmann Dec 11, 2020
48e7fbe
Merge remote-tracking branch 'origin/chore_minor_cleanups' into chore…
TobiKattmann Dec 11, 2020
6d80751
WRT_SRF_SOL WRT_CSV_SOL WRT_CRD_SOL
pcarruscag Dec 11, 2020
2ccd429
Merge branch 'chore_minor_cleanups' of https://github.com/su2code/SU2…
pcarruscag Dec 11, 2020
5b4ce10
fix merge
pcarruscag Dec 11, 2020
c90efac
copy paste typos
pcarruscag Dec 11, 2020
67a7a60
Merge remote-tracking branch 'upstream/develop' into chore_minor_clea…
pcarruscag Dec 11, 2020
1240a47
WRT_HALO WRT_SHARPEDGES
pcarruscag Dec 11, 2020
1f977f7
delete unused variables, QCR duplication, fix fsi regression
pcarruscag Dec 11, 2020
9f70a6d
Gather some Config postprocessing terms for TimeDomain.
TobiKattmann Dec 11, 2020
784c2fb
Merge branch 'chore_minor_cleanups' of https://github.com/su2code/SU2…
TobiKattmann Dec 11, 2020
c5d474a
WRT_CON_FREQ removed from code.
TobiKattmann Dec 11, 2020
880b16c
Remove WRT_CON_FREQ from Testcases
TobiKattmann Dec 11, 2020
4dc6fb7
Merge remote-tracking branch 'origin/develop' into chore_minor_cleanups
TobiKattmann Dec 11, 2020
f364063
one more unused boolean
pcarruscag Dec 11, 2020
8a70d0a
Revert "Remove WRT_CON_FREQ from Testcases"
pcarruscag Dec 11, 2020
ff733f8
keep the option where value was not default
pcarruscag Dec 11, 2020
5c3acf8
Revert "keep the option where value was not default"
pcarruscag Dec 11, 2020
d8dcfb0
try harder
pcarruscag Dec 11, 2020
b13e10b
Merge remote-tracking branch 'origin/develop' into chore_minor_cleanups
TobiKattmann Dec 12, 2020
834cc1f
Revert "try harder"
TobiKattmann Dec 12, 2020
8100892
Remove WRT_CON_FREQ once again without rewriting files
TobiKattmann Dec 12, 2020
fd191aa
Deprecate WRT_SURFACE config_options.
TobiKattmann Dec 12, 2020
acb8171
Remove text above removed/deprecated WRT_CON_FREQ option.
TobiKattmann Dec 12, 2020
4b847e2
Adapt Quickstart. Remove completely unused Wrt_Slice variable from Co…
TobiKattmann Dec 12, 2020
18c4ea7
Re-add compatible options into legacy output for deprecated options.
TobiKattmann Dec 13, 2020
8705735
fix builds
TobiKattmann Dec 13, 2020
1b6fcc3
Remove WRT_SURFACE from py-scripts to (hopefully) fix the regresion t…
TobiKattmann Dec 13, 2020
efa8f13
Merge remote-tracking branch 'origin/develop' into chore_minor_cleanups
TobiKattmann Dec 14, 2020
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,6 @@ Mercurial
# Ignore build folder
./build/
build/

# ninja binary (build system)
ninja
127 changes: 2 additions & 125 deletions Common/include/CConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -660,11 +660,6 @@ class CConfig {
unsigned short Res_FEM_CRIT; /*!< \brief Criteria to apply to the FEM convergence (absolute/relative). */
unsigned long StartConv_Iter; /*!< \brief Start convergence criteria at iteration. */
su2double Cauchy_Eps; /*!< \brief Epsilon used for the convergence. */
unsigned long Wrt_Sol_Freq, /*!< \brief Writing solution frequency. */
Wrt_Sol_Freq_DualTime, /*!< \brief Writing solution frequency for Dual Time. */
Wrt_Con_Freq, /*!< \brief Writing convergence history frequency. */
Wrt_Con_Freq_DualTime; /*!< \brief Writing convergence history frequency. */
bool Wrt_Dynamic; /*!< \brief Write dynamic data adding header and prefix. */
bool Restart, /*!< \brief Restart solution (for direct, adjoint, and linearized problems).*/
Read_Binary_Restart, /*!< \brief Read binary SU2 native restart files.*/
Restart_Flow; /*!< \brief Restart flow solution for adjoint and linearized problems. */
Expand Down Expand Up @@ -759,7 +754,6 @@ class CConfig {
string Mesh_FileName, /*!< \brief Mesh input file. */
Mesh_Out_FileName, /*!< \brief Mesh output file. */
Solution_FileName, /*!< \brief Flow solution input file. */
Solution_LinFileName, /*!< \brief Linearized flow solution input file. */
Solution_AdjFileName, /*!< \brief Adjoint solution input file for drag functional. */
Volume_FileName, /*!< \brief Flow variables output file. */
Residual_FileName, /*!< \brief Residual variables output file. */
Expand All @@ -772,20 +766,11 @@ class CConfig {
ObjFunc_Value_FileName, /*!< \brief Objective function. */
SurfCoeff_FileName, /*!< \brief Output file with the flow variables on the surface. */
SurfAdjCoeff_FileName, /*!< \brief Output file with the adjoint variables on the surface. */
New_SU2_FileName, /*!< \brief Output SU2 mesh file converted from CGNS format. */
SurfSens_FileName, /*!< \brief Output file for the sensitivity on the surface (discrete adjoint). */
VolSens_FileName; /*!< \brief Output file for the sensitivity in the volume (discrete adjoint). */

bool Wrt_Output, /*!< \brief Write any output files */
Wrt_Vol_Sol, /*!< \brief Write a volume solution file */
Wrt_Srf_Sol, /*!< \brief Write a surface solution file */
Wrt_Csv_Sol, /*!< \brief Write a surface comma-separated values solution file */
Wrt_Crd_Sol, /*!< \brief Write a binary file with the grid coordinates only. */
Wrt_Residuals, /*!< \brief Write residuals to solution file */
bool
Wrt_Surface, /*!< \brief Write solution at each surface */
Wrt_Limiters, /*!< \brief Write residuals to solution file */
Wrt_SharpEdges, /*!< \brief Write residuals to solution file */
Wrt_Halo, /*!< \brief Write rind layers in solution files */
Wrt_Performance, /*!< \brief Write the performance summary at the end of a calculation. */
Wrt_AD_Statistics, /*!< \brief Write the tape statistics (discrete adjoint). */
Wrt_MeshQuality, /*!< \brief Write the mesh quality statistics to the visualization files. */
Expand Down Expand Up @@ -1010,7 +995,6 @@ class CConfig {
long ParMETIS_edgeWgt; /*!< \brief Load balancing weight given to edges. */
unsigned short DirectDiff; /*!< \brief Direct Differentation mode. */
bool DiscreteAdjoint; /*!< \brief AD-based discrete adjoint mode. */
unsigned long Wrt_Surf_Freq_DualTime; /*!< \brief Writing surface solution frequency for Dual Time. */
su2double Const_DES; /*!< \brief Detached Eddy Simulation Constant. */
unsigned short Kind_WindowFct; /*!< \brief Type of window (weight) function for objective functional. */
unsigned short Kind_HybridRANSLES; /*!< \brief Kind of Hybrid RANS/LES. */
Expand Down Expand Up @@ -3073,102 +3057,12 @@ class CConfig {
*/
su2double GetPhysicalTime(void) const { return PhysicalTime; }

/*!
* \brief Get the frequency for writing the solution file.
* \return It writes the solution file with this frequency.
*/
unsigned long GetWrt_Sol_Freq(void) const { return Wrt_Sol_Freq; }

/*!
* \brief Get the frequency for writing the solution file in Dual Time.
* \return It writes the solution file with this frequency.
*/
unsigned long GetWrt_Sol_Freq_DualTime(void) const { return Wrt_Sol_Freq_DualTime; }

/*!
* \brief Get the frequency for writing the convergence file.
* \return It writes the convergence file with this frequency.
*/
unsigned long GetWrt_Con_Freq(void) const { return Wrt_Con_Freq; }

/*!
* \brief Set the frequency for writing the convergence file.
* \return It writes the convergence file with this frequency.
*/
void SetWrt_Con_Freq(unsigned long val_freq) { Wrt_Con_Freq = val_freq; }

/*!
* \brief Get the frequency for writing the convergence file in Dual Time.
* \return It writes the convergence file with this frequency.
*/
unsigned long GetWrt_Con_Freq_DualTime(void) const { return Wrt_Con_Freq_DualTime; }

/*!
* \brief Get information about writing unsteady headers and file extensions.
* \return <code>TRUE</code> means that unsteady solution files will be written.
*/
bool GetWrt_Unsteady(void);

/*!
* \brief Get information about writing output files.
* \return <code>TRUE</code> means that output files will be written.
*/
bool GetWrt_Output(void) const { return Wrt_Output; }

/*!
* \brief Get information about writing a volume solution file.
* \return <code>TRUE</code> means that a volume solution file will be written.
*/
bool GetWrt_Vol_Sol(void) const { return Wrt_Vol_Sol; }

/*!
* \brief Get information about writing a surface solution file.
* \return <code>TRUE</code> means that a surface solution file will be written.
*/
bool GetWrt_Srf_Sol(void) const { return Wrt_Srf_Sol; }

/*!
* \brief Get information about writing a surface comma-separated values (CSV) solution file.
* \return <code>TRUE</code> means that a surface comma-separated values (CSV) solution file will be written.
*/
bool GetWrt_Csv_Sol(void) const { return Wrt_Csv_Sol; }

/*!
* \brief Get information about writing a binary coordinates file.
* \return <code>TRUE</code> means that a binary coordinates file will be written.
*/
bool GetWrt_Crd_Sol(void) const { return Wrt_Crd_Sol; }

/*!
* \brief Get information about writing residuals to volume solution file.
* \return <code>TRUE</code> means that residuals will be written to the solution file.
*/
bool GetWrt_Residuals(void) const { return Wrt_Residuals; }

/*!
* \brief Get information about writing residuals to volume solution file.
* \return <code>TRUE</code> means that residuals will be written to the solution file.
*/
bool GetWrt_Limiters(void) const { return Wrt_Limiters; }

/*!
* \brief Write solution at each surface.
* \return <code>TRUE</code> means that the solution at each surface will be written.
*/
bool GetWrt_Surface(void) const { return Wrt_Surface; }

/*!
* \brief Get information about writing residuals to volume solution file.
* \return <code>TRUE</code> means that residuals will be written to the solution file.
*/
bool GetWrt_SharpEdges(void) const { return Wrt_SharpEdges; }

/*!
* \brief Get information about writing rind layers to the solution files.
* \return <code>TRUE</code> means that rind layers will be written to the solution file.
*/
bool GetWrt_Halo(void) const { return Wrt_Halo; }

/*!
* \brief Get information about writing the performance summary at the end of a calculation.
* \return <code>TRUE</code> means that the performance summary will be written at the end of a calculation.
Expand All @@ -3187,12 +3081,6 @@ class CConfig {
*/
bool GetWrt_MeshQuality(void) const { return Wrt_MeshQuality; }

/*!
* \brief Get information about writing a 1D slice of a 2D cartesian solution.
* \return <code>TRUE</code> means that a 1D slice of a 2D cartesian solution will be written.
*/
bool GetWrt_Slice(void) const { return Wrt_Slice; }

/*!
* \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.
* \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.
Expand Down Expand Up @@ -8523,12 +8411,6 @@ class CConfig {
*/
void SetiInst(unsigned short val_iInst) { iInst = val_iInst; }

/*!
* \brief Get information about writing dynamic structural analysis headers and file extensions.
* \return <code>TRUE</code> means that dynamic structural analysis solution files will be written.
*/
bool GetWrt_Dynamic(void) const { return Wrt_Dynamic; }

/*!
* \brief Get Newmark alpha parameter.
* \return Value of the Newmark alpha parameter.
Expand Down Expand Up @@ -8908,12 +8790,6 @@ class CConfig {
*/
su2double GetRestart_Bandwidth_Agg(void) const { return Restart_Bandwidth_Agg; }

/*!
* \brief Get the frequency for writing the surface solution file in Dual Time.
* \return It writes the surface solution file with this frequency.
*/
unsigned long GetWrt_Surf_Freq_DualTime(void) const { return Wrt_Surf_Freq_DualTime; }

/*!
* \brief Get the Kind of Hybrid RANS/LES.
* \return Value of Hybrid RANS/LES method.
Expand Down Expand Up @@ -9303,6 +9179,7 @@ class CConfig {

/*!
* \brief GetScreen_Wrt_Freq_Inner
* \param[in] iter: index for Time (0), Outer (1), or Inner (2) iterations
* \return
*/
unsigned long GetScreen_Wrt_Freq(unsigned short iter) const { return ScreenWrtFreq[iter]; }
Expand Down
14 changes: 0 additions & 14 deletions Common/include/geometry/CGeometry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -856,20 +856,6 @@ class CGeometry {
*/
inline virtual void SetBoundControlVolume(CConfig *config, CGeometry *geometry, unsigned short action) {}

/*!
* \brief A virtual member.
* \param[in] config - Definition of the particular problem.
* \param[in] val_mesh_out_filename - Name of the output file.
*/
inline virtual void SetMeshFile(CConfig *config, string val_mesh_out_filename) {}

/*!
* \brief A virtual member.
* \param[in] config - Definition of the particular problem.
* \param[in] val_mesh_out_filename - Name of the output file.
*/
inline virtual void SetMeshFile(CGeometry *geometry, CConfig *config, string val_mesh_out_filename) {}

/*!
* \brief A virtual member.
* \param[in] config - Definition of the particular problem.
Expand Down
1 change: 0 additions & 1 deletion Common/include/geometry/CMultiGridGeometry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class CMultiGridGeometry final : public CGeometry {
public:
/*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
using CGeometry::SetVertex;
using CGeometry::SetMeshFile;
using CGeometry::SetControlVolume;
using CGeometry::SetBoundControlVolume;
using CGeometry::SetPoint_Connectivity;
Expand Down
8 changes: 0 additions & 8 deletions Common/include/geometry/CPhysicalGeometry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ class CPhysicalGeometry final : public CGeometry {
public:
/*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
using CGeometry::SetVertex;
using CGeometry::SetMeshFile;
using CGeometry::SetControlVolume;
using CGeometry::SetBoundControlVolume;
using CGeometry::SetPoint_Connectivity;
Expand Down Expand Up @@ -595,13 +594,6 @@ class CPhysicalGeometry final : public CGeometry {
*/
void SetCoord_Smoothing(unsigned short val_nSmooth, su2double val_smooth_coeff, CConfig *config) override;

/*!
* \brief Write the .su2 file.
* \param[in] config - Definition of the particular problem.
* \param[in] val_mesh_out_filename - Name of the output file.
*/
void SetMeshFile(CConfig *config, string val_mesh_out_filename) override;

/*!
* \brief Compute 3 grid quality metrics: orthogonality angle, dual cell aspect ratio, and dual cell volume ratio.
* \param[in] config - Definition of the particular problem.
Expand Down
Loading