Skip to content

Remove mapping of global<->local marker IDs #1169

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

Merged
pcarruscag merged 1 commit into from
Jan 18, 2021
Merged

Remove mapping of global<->local marker IDs #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions Common/include/geometry/CGeometry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,13 +1072,6 @@ class CGeometry {
*/
inline virtual long GetGlobal_to_Local_Point(unsigned long val_ipoint) const { return 0; }

/*!
* \brief A virtual member.
* \param[in] val_ipoint - Global marker.
* \return Local marker that correspond with the global index.
*/
inline virtual unsigned short GetGlobal_to_Local_Marker(unsigned short val_imarker) const { return 0; }

/*!
* \brief Retrieve total number of elements in a simulation across all processors.
* \return Total number of elements in a simulation across all processors.
Expand Down
11 changes: 0 additions & 11 deletions Common/include/geometry/CPhysicalGeometry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ class CPhysicalGeometry final : public CGeometry {
unordered_map<unsigned long, unsigned long>
Global_to_Local_Point; /*!< \brief Global-local indexation for the points. */
long *Local_to_Global_Point{nullptr}; /*!< \brief Local-global indexation for the points. */
unsigned short *Local_to_Global_Marker{nullptr}; /*!< \brief Local to Global marker. */
unsigned short *Global_to_Local_Marker{nullptr}; /*!< \brief Global to Local marker. */
unsigned long *adj_counter{nullptr}; /*!< \brief Adjacency counter. */
unsigned long **adjacent_elem{nullptr}; /*!< \brief Adjacency element list. */
su2activematrix Sensitivity; /*!< \brief Matrix holding the sensitivities at each point. */
Expand Down Expand Up @@ -303,15 +301,6 @@ class CPhysicalGeometry final : public CGeometry {
return -1;
}

/*!
* \brief Get the local marker that correspond with the global marker.
* \param[in] val_ipoint - Global marker.
* \return Local marker that correspond with the global index.
*/
inline unsigned short GetGlobal_to_Local_Marker(unsigned short val_imarker) const override {
return Global_to_Local_Marker[val_imarker];
}

/*!
* \brief Reads the geometry of the grid and adjust the boundary
* conditions with the configuration file in parallel (for parmetis).
Expand Down
2 changes: 0 additions & 2 deletions Common/src/geometry/CPhysicalGeometry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,6 @@ CPhysicalGeometry::CPhysicalGeometry(CGeometry *geometry,
CPhysicalGeometry::~CPhysicalGeometry(void) {

delete [] Local_to_Global_Point;
delete [] Global_to_Local_Marker;
delete [] Local_to_Global_Marker;

/*--- Free up memory from turbomachinery performance computation ---*/

Expand Down