Skip to content

Allow selecting the zone used by the python wrapper (for multizone drivers) #2019

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 8 commits into from
Aug 13, 2023
Merged

Allow selecting the zone used by the python wrapper (for multizone drivers) #2019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df5838c
added compatibility for multizone driver selection
afshawnlotfi Apr 27, 2023
fdc15e0
Removed changes for non pysu2 functions
afshawnlotfi Apr 30, 2023
b83b4bb
Apply suggestions from code review
pcarruscag May 15, 2023
f58d73e
Merge branch 'develop' into develop
pcarruscag May 15, 2023
772483b
Merge branch 'develop' into develop
kursatyurt Jun 7, 2023
0089498
Merge branch 'develop' into develop
kursatyurt Jun 11, 2023
659ef3f
Merge branch 'develop' into develop
kursatyurt Jul 30, 2023
d0ac499
Merge branch 'develop' into develop
pcarruscag Aug 7, 2023
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
19 changes: 15 additions & 4 deletions SU2_CFD/include/drivers/CDriverBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class CDriverBase {
UsedTime; /*!< \brief Elapsed time between Start and Stop point of the timer. */

unsigned long TimeIter;

unsigned short selected_iZone = ZONE_0; /*!< \brief Selected zone for the driver. Defaults to ZONE_0 */
unsigned short iMesh, /*!< \brief Iterator on mesh levels. */
iZone, /*!< \brief Iterator on zones. */
nZone, /*!< \brief Total number of zones in the problem. */
Expand Down Expand Up @@ -227,7 +227,7 @@ class CDriverBase {
SU2_MPI::Error("Initial coordinates are only available with DEFORM_MESH= YES", CURRENT_FUNCTION);
}
auto* coords =
const_cast<su2activematrix*>(solver_container[ZONE_0][INST_0][MESH_0][MESH_SOL]->GetNodes()->GetMesh_Coord());
const_cast<su2activematrix*>(solver_container[selected_iZone][INST_0][MESH_0][MESH_SOL]->GetNodes()->GetMesh_Coord());
return CPyWrapperMatrixView(*coords, "InitialCoordinates", true);
}

Expand All @@ -241,7 +241,7 @@ class CDriverBase {
if (iMarker >= GetNumberMarkers()) SU2_MPI::Error("Marker index exceeds size.", CURRENT_FUNCTION);

auto* coords =
const_cast<su2activematrix*>(solver_container[ZONE_0][INST_0][MESH_0][MESH_SOL]->GetNodes()->GetMesh_Coord());
const_cast<su2activematrix*>(solver_container[selected_iZone][INST_0][MESH_0][MESH_SOL]->GetNodes()->GetMesh_Coord());
return CPyWrapperMarkerMatrixView(*coords, main_geometry->vertex[iMarker], main_geometry->GetnVertex(iMarker),
"MarkerInitialCoordinates", true);
}
Expand Down Expand Up @@ -549,6 +549,17 @@ class CDriverBase {
main_geometry->SetCustomBoundaryHeatFlux(iMarker, iVertex, WallHeatFlux);
}

/*!
* \brief Selects zone to be used for Driver operation
* \param[in] iZone - Zone identifier.
*/
inline void SelectZone(unsigned short iZone) {
if (iZone >= nZone) SU2_MPI::Error("Zone index out of range", CURRENT_FUNCTION);
selected_iZone = iZone;
main_geometry = geometry_container[selected_iZone][INST_0][MESH_0];
main_config = config_container[selected_iZone];
}

/*!
* \brief Get the wall normal heat flux at a vertex on a specified marker of the flow or heat solver.
* \note This can be the output of a heat or flow solver in a CHT setting.
Expand Down Expand Up @@ -696,7 +707,7 @@ class CDriverBase {
if (iMarker < std::numeric_limits<unsigned short>::max() && iMarker > GetNumberMarkers()) {
SU2_MPI::Error("Marker index exceeds size.", CURRENT_FUNCTION);
}
auto* solver = solver_container[ZONE_0][INST_0][MESH_0][iSolver];
auto* solver = solver_container[selected_iZone][INST_0][MESH_0][iSolver];
if (solver == nullptr) SU2_MPI::Error("The selected solver does not exist.", CURRENT_FUNCTION);
return solver;
}
Expand Down
10 changes: 5 additions & 5 deletions SU2_CFD/src/drivers/CDriverBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,14 +391,14 @@ vector<passivedouble> CDriverBase::GetMarkerVertexNormals(unsigned short iMarker
}

void CDriverBase::CommunicateMeshDisplacements() {
solver_container[ZONE_0][INST_0][MESH_0][MESH_SOL]->InitiateComms(main_geometry, main_config, MESH_DISPLACEMENTS);
solver_container[ZONE_0][INST_0][MESH_0][MESH_SOL]->CompleteComms(main_geometry, main_config, MESH_DISPLACEMENTS);
solver_container[selected_iZone][INST_0][MESH_0][MESH_SOL]->InitiateComms(main_geometry, main_config, MESH_DISPLACEMENTS);
solver_container[selected_iZone][INST_0][MESH_0][MESH_SOL]->CompleteComms(main_geometry, main_config, MESH_DISPLACEMENTS);
}

map<string, unsigned short> CDriverBase::GetSolverIndices() const {
map<string, unsigned short> indexMap;
for (auto iSol = 0u; iSol < MAX_SOLS; iSol++) {
const auto* solver = solver_container[ZONE_0][INST_0][MESH_0][iSol];
const auto* solver = solver_container[selected_iZone][INST_0][MESH_0][iSol];
if (solver != nullptr) {
if (solver->GetSolverName().empty()) SU2_MPI::Error("Solver name was not defined.", CURRENT_FUNCTION);
indexMap[solver->GetSolverName()] = iSol;
Expand All @@ -408,7 +408,7 @@ map<string, unsigned short> CDriverBase::GetSolverIndices() const {
}

std::map<string, unsigned short> CDriverBase::GetFEASolutionIndices() const {
if (solver_container[ZONE_0][INST_0][MESH_0][FEA_SOL] == nullptr) {
if (solver_container[selected_iZone][INST_0][MESH_0][FEA_SOL] == nullptr) {
SU2_MPI::Error("The FEA solver does not exist.", CURRENT_FUNCTION);
}
const auto nDim = main_geometry->GetnDim();
Expand All @@ -429,7 +429,7 @@ std::map<string, unsigned short> CDriverBase::GetFEASolutionIndices() const {
}

map<string, unsigned short> CDriverBase::GetPrimitiveIndices() const {
if (solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL] == nullptr) {
if (solver_container[selected_iZone][INST_0][MESH_0][FLOW_SOL] == nullptr) {
SU2_MPI::Error("The flow solver does not exist.", CURRENT_FUNCTION);
}
return PrimitiveNameToIndexMap(CPrimitiveIndices<unsigned short>(
Expand Down
34 changes: 17 additions & 17 deletions SU2_CFD/src/python_wrapper_structure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,38 +62,38 @@ void CDriver::PreprocessPythonInterface(CConfig** config, CGeometry**** geometry
/* Functions to obtain global parameters from SU2 (time steps, delta t, etc.) */
//////////////////////////////////////////////////////////////////////////////////

unsigned long CDriver::GetNumberTimeIter() const { return config_container[ZONE_0]->GetnTime_Iter(); }
unsigned long CDriver::GetNumberTimeIter() const { return config_container[selected_iZone]->GetnTime_Iter(); }

unsigned long CDriver::GetTimeIter() const { return TimeIter; }

passivedouble CDriver::GetUnsteadyTimeStep() const {
return SU2_TYPE::GetValue(config_container[ZONE_0]->GetTime_Step());
return SU2_TYPE::GetValue(config_container[selected_iZone]->GetTime_Step());
}

string CDriver::GetSurfaceFileName() const { return config_container[ZONE_0]->GetSurfCoeff_FileName(); }
string CDriver::GetSurfaceFileName() const { return config_container[selected_iZone]->GetSurfCoeff_FileName(); }

////////////////////////////////////////////////////////////////////////////////
/* Functions related to the management of markers */
////////////////////////////////////////////////////////////////////////////////

void CDriver::SetHeatSourcePosition(passivedouble alpha, passivedouble pos_x, passivedouble pos_y,
passivedouble pos_z) {
CSolver* solver = solver_container[ZONE_0][INST_0][MESH_0][RAD_SOL];
CSolver* solver = solver_container[selected_iZone][INST_0][MESH_0][RAD_SOL];

config_container[ZONE_0]->SetHeatSource_Rot_Z(alpha);
config_container[ZONE_0]->SetHeatSource_Center(pos_x, pos_y, pos_z);
config_container[selected_iZone]->SetHeatSource_Rot_Z(alpha);
config_container[selected_iZone]->SetHeatSource_Center(pos_x, pos_y, pos_z);

solver->SetVolumetricHeatSource(geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0]);
solver->SetVolumetricHeatSource(geometry_container[selected_iZone][INST_0][MESH_0], config_container[selected_iZone]);
}

void CDriver::SetInletAngle(unsigned short iMarker, passivedouble alpha) {
su2double alpha_rad = alpha * PI_NUMBER / 180.0;

unsigned long iVertex;

for (iVertex = 0; iVertex < geometry_container[ZONE_0][INST_0][MESH_0]->nVertex[iMarker]; iVertex++) {
solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL]->SetInlet_FlowDir(iMarker, iVertex, 0, cos(alpha_rad));
solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL]->SetInlet_FlowDir(iMarker, iVertex, 1, sin(alpha_rad));
for (iVertex = 0; iVertex < geometry_container[selected_iZone][INST_0][MESH_0]->nVertex[iMarker]; iVertex++) {
solver_container[selected_iZone][INST_0][MESH_0][FLOW_SOL]->SetInlet_FlowDir(iMarker, iVertex, 0, cos(alpha_rad));
solver_container[selected_iZone][INST_0][MESH_0][FLOW_SOL]->SetInlet_FlowDir(iMarker, iVertex, 1, sin(alpha_rad));
}
}

Expand All @@ -116,22 +116,22 @@ void CSinglezoneDriver::SetInitialMesh() {

SU2_OMP_PARALLEL {
for (iMesh = 0u; iMesh <= main_config->GetnMGLevels(); iMesh++) {
SU2_OMP_FOR_STAT(roundUpDiv(geometry_container[ZONE_0][INST_0][iMesh]->GetnPoint(), omp_get_max_threads()))
for (auto iPoint = 0ul; iPoint < geometry_container[ZONE_0][INST_0][iMesh]->GetnPoint(); iPoint++) {
SU2_OMP_FOR_STAT(roundUpDiv(geometry_container[selected_iZone][INST_0][iMesh]->GetnPoint(), omp_get_max_threads()))
for (auto iPoint = 0ul; iPoint < geometry_container[selected_iZone][INST_0][iMesh]->GetnPoint(); iPoint++) {
/*--- Overwrite fictitious velocities. ---*/
su2double Grid_Vel[3] = {0.0, 0.0, 0.0};

/*--- Set the grid velocity for this coarse node. ---*/
geometry_container[ZONE_0][INST_0][iMesh]->nodes->SetGridVel(iPoint, Grid_Vel);
geometry_container[selected_iZone][INST_0][iMesh]->nodes->SetGridVel(iPoint, Grid_Vel);
}
END_SU2_OMP_FOR
/*--- Push back the volume. ---*/
geometry_container[ZONE_0][INST_0][iMesh]->nodes->SetVolume_n();
geometry_container[ZONE_0][INST_0][iMesh]->nodes->SetVolume_nM1();
geometry_container[selected_iZone][INST_0][iMesh]->nodes->SetVolume_n();
geometry_container[selected_iZone][INST_0][iMesh]->nodes->SetVolume_nM1();
}
/*--- Push back the solution so that there is no fictitious velocity at the next step. ---*/
solver_container[ZONE_0][INST_0][MESH_0][MESH_SOL]->GetNodes()->Set_Solution_time_n();
solver_container[ZONE_0][INST_0][MESH_0][MESH_SOL]->GetNodes()->Set_Solution_time_n1();
solver_container[selected_iZone][INST_0][MESH_0][MESH_SOL]->GetNodes()->Set_Solution_time_n();
solver_container[selected_iZone][INST_0][MESH_0][MESH_SOL]->GetNodes()->Set_Solution_time_n1();
}
END_SU2_OMP_PARALLEL
}
Expand Down