Skip to content

Commit

Permalink
Merge pull request #699 from su2code/feature_deadcode
Browse files Browse the repository at this point in the history
Remove Dead Code 2
  • Loading branch information
economon authored Jun 5, 2019
2 parents bfa6422 + 3f3ad44 commit 9fca37e
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 1,175 deletions.
54 changes: 0 additions & 54 deletions Common/include/config_structure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6519,60 +6519,6 @@ class CConfig {
*/
string GetMarker_Analyze_TagBound(unsigned short val_marker);

/*!
* \brief Set the total number of SEND_RECEIVE periodic transformations.
* \param[in] val_index - Total number of transformations.
*/
void SetnPeriodicIndex(unsigned short val_index);

/*!
* \brief Get the total number of SEND_RECEIVE periodic transformations.
* \return Total number of transformations.
*/
unsigned short GetnPeriodicIndex(void);

/*!
* \brief Set the rotation center for a periodic transformation.
* \param[in] val_index - Index corresponding to the periodic transformation.
* \param[in] center - Pointer to a vector containing the coordinate of the center.
*/
void SetPeriodicCenter(unsigned short val_index, su2double* center);

/*!
* \brief Get the rotation center for a periodic transformation.
* \param[in] val_index - Index corresponding to the periodic transformation.
* \return A vector containing coordinates of the center point.
*/
su2double* GetPeriodicCenter(unsigned short val_index);

/*!
* \brief Set the rotation angles for a periodic transformation.
* \param[in] val_index - Index corresponding to the periodic transformation.
* \param[in] rotation - Pointer to a vector containing the rotation angles.
*/
void SetPeriodicRotation(unsigned short val_index, su2double* rotation);

/*!
* \brief Get the rotation angles for a periodic transformation.
* \param[in] val_index - Index corresponding to the periodic transformation.
* \return A vector containing the angles of rotation.
*/
su2double* GetPeriodicRotation(unsigned short val_index);

/*!
* \brief Set the translation vector for a periodic transformation.
* \param[in] val_index - Index corresponding to the periodic transformation.
* \param[in] translate - Pointer to a vector containing the coordinate of the center.
*/
void SetPeriodicTranslate(unsigned short val_index, su2double* translate);

/*!
* \brief Get the translation vector for a periodic transformation.
* \param[in] val_index - Index corresponding to the periodic transformation.
* \return The translation vector.
*/
su2double* GetPeriodicTranslate(unsigned short val_index);

/*!
* \brief Get the total temperature at a nacelle boundary.
* \param[in] val_index - Index corresponding to the inlet boundary.
Expand Down
20 changes: 0 additions & 20 deletions Common/include/config_structure.inl
Original file line number Diff line number Diff line change
Expand Up @@ -1656,26 +1656,6 @@ inline bool CConfig::GetWrite_Conv_FSI(void) { return Write_Conv_FSI; }

inline bool CConfig::GetHold_GridFixed(void) { return Hold_GridFixed; }

inline unsigned short CConfig::GetnPeriodicIndex(void) { return nPeriodic_Index; }

inline su2double* CConfig::GetPeriodicCenter(unsigned short val_index) { return Periodic_Center[val_index]; }

inline void CConfig::SetPeriodicCenter(unsigned short val_index, su2double* center) {
for (unsigned short i = 0; i < 3; i++) Periodic_Center[val_index][i] = center[i];
}

inline su2double* CConfig::GetPeriodicRotation(unsigned short val_index) { return Periodic_Rotation[val_index]; }

inline void CConfig::SetPeriodicRotation(unsigned short val_index, su2double* rotation) {
for (unsigned short i = 0; i < 3; i++) Periodic_Rotation[val_index][i] = rotation[i];
}

inline su2double* CConfig::GetPeriodicTranslate(unsigned short val_index) { return Periodic_Translate[val_index]; }

inline void CConfig::SetPeriodicTranslate(unsigned short val_index, su2double* translate) {
for (unsigned short i = 0; i < 3; i++) Periodic_Translate[val_index][i] = translate[i];
}

inline su2double CConfig::GetCyclic_Pitch(void) { return Cyclic_Pitch; }

inline su2double CConfig::GetCollective_Pitch(void) { return Collective_Pitch; }
Expand Down
45 changes: 0 additions & 45 deletions Common/include/geometry_structure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3001,51 +3001,6 @@ void SetTranslationalVelocity(CConfig *config, unsigned short val_iZone, bool pr

};

/*!
* \class CPeriodicGeometry
* \brief Class for defining a periodic boundary condition.
* \author T. Economon, F. Palacios
*/
class CPeriodicGeometry : public CGeometry {
CPrimalGrid*** newBoundPer; /*!< \brief Boundary vector for new periodic elements (primal grid information). */
unsigned long *nNewElem_BoundPer; /*!< \brief Number of new periodic elements of the boundary. */

public:

/*!
* \brief Constructor of the class.
* \param[in] geometry - Geometrical definition of the problem.
* \param[in] config - Definition of the particular problem.
*/
CPeriodicGeometry(CGeometry *geometry, CConfig *config);

/*!
* \brief Destructor of the class.
*/
~CPeriodicGeometry(void);

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

/*!
* \brief Set the Tecplot file.
* \param[in] config_filename - Name of the file where the Tecplot
* information is going to be stored.
*/
void SetTecPlot(char config_filename[MAX_STRING_SIZE], bool new_file);

/*!
* \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(CGeometry *geometry, CConfig *config, string val_mesh_out_filename);
};

/*!
* \struct CMultiGridQueue
* \brief Class for a multigrid queue system
Expand Down
17 changes: 0 additions & 17 deletions Common/include/matrix_structure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -401,23 +401,6 @@ class CSysMatrix {
*/
void DiagonalProduct(CSysVector<ScalarType> & vec, unsigned long row_i);

/*!
* \brief Send receive the solution using MPI.
* \param[in] x - Solution..
* \param[in] geometry - Geometrical definition of the problem.
* \param[in] config - Definition of the particular problem.
*/
template<class OtherType>
void SendReceive_Solution(CSysVector<OtherType> & x, CGeometry *geometry, CConfig *config);

/*!
* \brief Send receive the solution using MPI and the transposed structure of the matrix.
* \param[in] x - Solution..
* \param[in] geometry - Geometrical definition of the problem.
* \param[in] config - Definition of the particular problem.
*/
void SendReceive_SolutionTransposed(CSysVector<ScalarType> & x, CGeometry *geometry, CConfig *config);

/*!
* \brief Performs the product of i-th row of a sparse matrix by a vector.
* \param[in] vec - Vector to be multiplied by the row of the sparse matrix A.
Expand Down
32 changes: 12 additions & 20 deletions Common/src/config_structure.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*!
/*!
* \file config_structure.cpp
* \brief Main file for managing the config file
* \author F. Palacios, T. Economon, B. Tracey, H. Kline
Expand Down Expand Up @@ -4322,7 +4322,17 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
(Kind_Solver != DISC_ADJ_RANS)) {
Kind_ConductivityModel_Turb = NO_CONDUCTIVITY_TURB;
}


/*--- Check for running SU2_MSH for periodic preprocessing, and throw
an error to report that this is no longer necessary. ---*/

if ((Kind_SU2 == SU2_MSH) &&
(Kind_Adaptation == PERIODIC)) {
SU2_MPI::Error(string("For SU2 v7.0.0 and later, preprocessing of periodic grids by SU2_MSH\n") +
string("is no longer necessary. Please use the original mesh file (prior to SU2_MSH)\n") +
string("with the same MARKER_PERIODIC definition in the configuration file.") , CURRENT_FUNCTION);
}

}

void CConfig::SetMarkers(unsigned short val_software) {
Expand Down Expand Up @@ -7862,24 +7872,6 @@ unsigned short CConfig::GetMarker_CfgFile_EngineExhaust(string val_marker) {
return kMarker_All;
}

void CConfig::SetnPeriodicIndex(unsigned short val_index) {

/*--- Store total number of transformations. ---*/
nPeriodic_Index = val_index;

/*--- Allocate memory for centers, angles, translations. ---*/
Periodic_Center = new su2double*[nPeriodic_Index];
Periodic_Rotation = new su2double*[nPeriodic_Index];
Periodic_Translate = new su2double*[nPeriodic_Index];

for (unsigned long i = 0; i < nPeriodic_Index; i++) {
Periodic_Center[i] = new su2double[3];
Periodic_Rotation[i] = new su2double[3];
Periodic_Translate[i] = new su2double[3];
}

}

unsigned short CConfig::GetMarker_Moving(string val_marker) {
unsigned short iMarker_Moving;

Expand Down
Loading

0 comments on commit 9fca37e

Please sign in to comment.