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.

Sign up for GitHub

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

Remove Dead Code 3 #701

Merged
merged 5 commits into from
Jun 7, 2019
Merged

Remove Dead Code 3 #701

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43e3f46
3rd pass at removing old geometry/MPI related dead code.
economon Jun 5, 2019
8215064
Merge branch 'develop' into feature_deadcode
vdweide Jun 6, 2019
7a89a3e
Merge branch 'develop' into feature_deadcode
economon Jun 6, 2019
7416e43
Removing deprecated CONSOLE_OUTPUT_VERBOSITY option from test case co…
economon Jun 6, 2019
0b260fd
Merge branch 'develop' into feature_deadcode
vdweide Jun 7, 2019
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
67 changes: 0 additions & 67 deletions Common/include/geometry_structure.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,12 +902,6 @@ class CGeometry {
*/
virtual void DivideConnectivity(CConfig *config, unsigned short Elem_Type);

/*!
* \brief A virtual member.
* \param[in] config - Definition of the particular problem.
*/
virtual void SetPeriodicBoundary(CConfig *config);

/*!
* \brief A virtual member.
* \param[in] geometry - Geometrical definition of the problem.
Expand Down Expand Up @@ -1001,13 +995,6 @@ class CGeometry {
*/
virtual void SetBoundSensitivity(CConfig *config);

/*!
* \brief A virtual member.
* \param[in] geometry - Geometrical definition of the problem.
* \param[in] config - Definition of the particular problem.
*/
virtual void SetPeriodicBoundary(CGeometry *geometry, CConfig *config);

/*!
* \brief Set the data containers for customized boundary conditions.
* \param[in] config - Definition of the particular problem.
Expand Down Expand Up @@ -1041,30 +1028,6 @@ class CGeometry {
*/
virtual void SetGridVelocity(CConfig *config, unsigned long iter);

/*!
* \brief A virtual member.
* \param[in] config - Definition of the particular problem.
*/
virtual void Set_MPI_Coord(CConfig *config);

/*!
* \brief A virtual member.
* \param[in] config - Definition of the particular problem.
*/
virtual void Set_MPI_GridVel(CConfig *config);

/*!
* \brief A virtual member.
* \param[in] config - Definition of the particular problem.
*/
virtual void Set_MPI_OldCoord(CConfig *config);

/*!
* \brief A virtual member.
* \param[in] config - Definition of the particular problem.
*/
virtual void Set_MPI_MaxLength(CConfig *config);

/*!
* \brief A virtual member.
* \param[in] geometry - Geometry of the fine mesh.
Expand Down Expand Up @@ -2273,36 +2236,6 @@ void UpdateTurboVertex(CConfig *config,unsigned short val_iZone, unsigned short
* \param[in] config - Definition of the particular problem.
*/
void SetGridVelocity(CConfig *config, unsigned long iter);

/*!
* \brief Perform the MPI communication for the grid coordinates (dynamic meshes).
* \param[in] config - Definition of the particular problem.
*/
void Set_MPI_Coord(CConfig *config);

/*!
* \brief Perform the MPI communication for the grid velocities.
* \param[in] config - Definition of the particular problem.
*/
void Set_MPI_GridVel(CConfig *config);

/*!
* \brief Perform the MPI communication for the grid coordinates (dynamic meshes) for restart purposes.
* \param[in] config - Definition of the particular problem.
*/
void Set_MPI_OldCoord(CConfig *config);

/*!
* \brief Perform the MPI communication for the max grid spacing.
* \param[in] config - Definition of the particular problem.
*/
void Set_MPI_MaxLength(CConfig *config);

/*!
* \brief Set the periodic boundary conditions.
* \param[in] config - Definition of the particular problem.
*/
void SetPeriodicBoundary(CConfig *config);

/*!
* \brief Do an implicit smoothing of the grid coordinates.
Expand Down
14 changes: 1 addition & 13 deletions Common/include/geometry_structure.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,7 @@ inline void CGeometry::SetTranslationalVelocity(CConfig *config, unsigned short

inline void CGeometry::SetGridVelocity(CConfig *config, unsigned long iter) { }

inline void CGeometry::SetRestricted_GridVelocity(CGeometry *fine_mesh, CConfig *config) { }

inline void CGeometry::Set_MPI_Coord(CConfig *config) { }

inline void CGeometry::Set_MPI_GridVel(CConfig *config) { }

inline void CGeometry::Set_MPI_OldCoord(CConfig *config) { }

inline void CGeometry::Set_MPI_MaxLength(CConfig *config) { }

inline void CGeometry::SetPeriodicBoundary(CConfig *config) { }

inline void CGeometry::SetPeriodicBoundary(CGeometry *geometry, CConfig *config) { }
inline void CGeometry::SetRestricted_GridVelocity(CGeometry *fine_mesh, CConfig *config) { }

inline void CGeometry::SetSendReceive(CConfig *config) { }

Expand Down
13 changes: 0 additions & 13 deletions Common/include/option_structure.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,19 +174,6 @@ enum ANSWER {
YES = 1 /*!< \brief Boolean definition of yes. */
};

/*!
* \brief Verbosity level
*/
enum VERB_LEVEL {
VERB_NONE = 0, /*!< \brief No verbosity. */
VERB_MEDIUM = 1, /*!< \brief Medium level of verbosity. */
VERB_HIGH = 2 /*!< \brief High level of verbosity. */
};
static const map<string, VERB_LEVEL> Verb_Map = CCreateMap<string, VERB_LEVEL>
("NONE", VERB_NONE)
("MEDIUM", VERB_MEDIUM)
("HIGH", VERB_HIGH);

/*!
* \brief Average method for marker analyze
*/
Expand Down
3 changes: 0 additions & 3 deletions Common/src/config_structure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,9 +1684,6 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
* Options: AREA, MASSFLUX
* \n Use with MARKER_ANALYZE. \ingroup Config*/
addEnumOption("MARKER_ANALYZE_AVERAGE", Kind_Average, Average_Map, AVERAGE_MASSFLUX);
/*!\brief CONSOLE_OUTPUT_VERBOSITY
* \n DESCRIPTION: Verbosity level for console output \ingroup Config*/
addEnumOption("CONSOLE_OUTPUT_VERBOSITY", Console_Output_Verb, Verb_Map, VERB_HIGH);
/*!\brief COMM_LEVEL
* \n DESCRIPTION: Level of MPI communications during runtime \ingroup Config*/
addEnumOption("COMM_LEVEL", Comm_Level, Comm_Map, COMM_FULL);
Expand Down
Loading