Skip to content

Commit 1e57b74

Browse files
oleburghardtoleburghardt
committed
Small rework of debug mode recording w.r.t. mesh coordinates, improve namings.
1 parent f30b478 commit 1e57b74

File tree

3 files changed

+34
-29
lines changed

3 files changed

+34
-29
lines changed

‎Common/include/option_structure.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,11 +2560,11 @@ static const MapType<std::string, ENUM_CHECK_TAPE_TYPE> CheckTapeType_Map = {
25602560
*/
25612561
enum ENUM_CHECK_TAPE_VARIABLES {
25622562
SOLVER_VARIABLES = 0, /*!< \brief A (debug) tag will be assigned to solver/conservative variables. */
2563-
MESH_COORDINATES = 1 /*!< \brief A (debug) tag will be assigned to mesh coordinates. */
2563+
MESH_COORDINATES = 1 /*!< \brief A (debug) tag will be assigned to solver/conservative variables and mesh coordinates. */
25642564
};
25652565
static const MapType<std::string, ENUM_CHECK_TAPE_VARIABLES> CheckTapeVariables_Map = {
25662566
MakePair("SOLVER_VARIABLES", SOLVER_VARIABLES)
2567-
MakePair("MESH_COORDINATES", MESH_COORDINATES)
2567+
MakePair("SOLVER_VARIABLES_AND_MESH_COORDINATES", MESH_COORDINATES)
25682568
};
25692569

25702570
enum class RECORDING {
@@ -2573,10 +2573,10 @@ enum class RECORDING {
25732573
MESH_COORDS,
25742574
MESH_DEFORM,
25752575
SOLUTION_AND_MESH,
2576-
TAG_INIT_SOLUTION_VARIABLES,
2577-
TAG_CHECK_SOLUTION_VARIABLES,
2578-
TAG_INIT_MESH_COORDINATES,
2579-
TAG_CHECK_MESH_COORDINATES
2576+
TAG_INIT_SOLVER_VARIABLES,
2577+
TAG_CHECK_SOLVER_VARIABLES,
2578+
TAG_INIT_SOLVER_AND_MESH,
2579+
TAG_CHECK_SOLVER_AND_MESH
25802580
};
25812581

25822582
/*!

‎SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -239,22 +239,22 @@ void CDiscAdjMultizoneDriver::DebugRun() {
239239
* During the recording, each dependent variable will be assigned the same tag. ---*/
240240
if(driver_config->GetAD_CheckTapeType() == OBJECTIVE_FUNCTION_TAPE) {
241241
if(driver_config->GetAD_CheckTapeVariables() == MESH_COORDINATES) {
242-
if (rank == MASTER_NODE) cout << "\nChecking OBJECTIVE_FUNCTION_TAPE for MESH_COORDINATES." << endl;
243-
SetRecording(RECORDING::TAG_INIT_MESH_COORDINATES, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
242+
if (rank == MASTER_NODE) cout << "\nChecking OBJECTIVE_FUNCTION_TAPE for SOLVER_VARIABLES_AND_MESH_COORDINATES." << endl;
243+
SetRecording(RECORDING::TAG_INIT_SOLVER_AND_MESH, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
244244
}
245245
else {
246-
if (rank == MASTER_NODE) cout << "\nChecking OBJECTIVE_FUNCTION_TAPE for SOLUTION_VARIABLES." << endl;
247-
SetRecording(RECORDING::TAG_INIT_SOLUTION_VARIABLES, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
246+
if (rank == MASTER_NODE) cout << "\nChecking OBJECTIVE_FUNCTION_TAPE for SOLVER_VARIABLES." << endl;
247+
SetRecording(RECORDING::TAG_INIT_SOLVER_VARIABLES, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
248248
}
249249
}
250250
else {
251251
if(driver_config->GetAD_CheckTapeVariables() == MESH_COORDINATES) {
252-
if (rank == MASTER_NODE) cout << "\nChecking FULL_SOLVER_TAPE for MESH_COORDINATES." << endl;
253-
SetRecording(RECORDING::TAG_INIT_MESH_COORDINATES, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
252+
if (rank == MASTER_NODE) cout << "\nChecking FULL_SOLVER_TAPE for SOLVER_VARIABLES_AND_MESH_COORDINATES." << endl;
253+
SetRecording(RECORDING::TAG_INIT_SOLVER_AND_MESH, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
254254
}
255255
else {
256-
if (rank == MASTER_NODE) cout << "\nChecking FULL_SOLVER_TAPE for SOLUTION_VARIABLES." << endl;
257-
SetRecording(RECORDING::TAG_INIT_SOLUTION_VARIABLES, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
256+
if (rank == MASTER_NODE) cout << "\nChecking FULL_SOLVER_TAPE for SOLVER_VARIABLES." << endl;
257+
SetRecording(RECORDING::TAG_INIT_SOLVER_VARIABLES, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
258258
}
259259
}
260260

@@ -265,15 +265,15 @@ void CDiscAdjMultizoneDriver::DebugRun() {
265265
* for a mathematically correct recording this dependency must be included earlier. ---*/
266266
if(driver_config->GetAD_CheckTapeType() == OBJECTIVE_FUNCTION_TAPE) {
267267
if(driver_config->GetAD_CheckTapeVariables() == MESH_COORDINATES)
268-
SetRecording(RECORDING::TAG_CHECK_MESH_COORDINATES, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
268+
SetRecording(RECORDING::TAG_CHECK_SOLVER_AND_MESH, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
269269
else
270-
SetRecording(RECORDING::TAG_CHECK_SOLUTION_VARIABLES, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
270+
SetRecording(RECORDING::TAG_CHECK_SOLVER_VARIABLES, Kind_Tape::OBJECTIVE_FUNCTION_TAPE, ZONE_0);
271271
}
272272
else {
273273
if(driver_config->GetAD_CheckTapeVariables() == MESH_COORDINATES)
274-
SetRecording(RECORDING::TAG_CHECK_MESH_COORDINATES, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
274+
SetRecording(RECORDING::TAG_CHECK_SOLVER_AND_MESH, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
275275
else
276-
SetRecording(RECORDING::TAG_CHECK_SOLUTION_VARIABLES, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
276+
SetRecording(RECORDING::TAG_CHECK_SOLVER_VARIABLES, Kind_Tape::FULL_SOLVER_TAPE, ZONE_0);
277277
}
278278

279279
if (rank == MASTER_NODE) {
@@ -668,10 +668,10 @@ void CDiscAdjMultizoneDriver::SetRecording(RECORDING kind_recording, Kind_Tape t
668668
case RECORDING::CLEAR_INDICES: cout << "Clearing the computational graph." << endl; break;
669669
case RECORDING::MESH_COORDS: cout << "Storing computational graph wrt MESH COORDINATES." << endl; break;
670670
case RECORDING::SOLUTION_VARIABLES: cout << "Storing computational graph wrt CONSERVATIVE VARIABLES." << endl; break;
671-
case RECORDING::TAG_INIT_SOLUTION_VARIABLES: cout << "Simulating recording with tag 1 on conservative variables." << endl; AD::SetTag(1); break;
672-
case RECORDING::TAG_CHECK_SOLUTION_VARIABLES: cout << "Checking first recording with tag 2 on conservative variables." << endl; AD::SetTag(2); break;
673-
case RECORDING::TAG_INIT_MESH_COORDINATES: cout << "Simulating recording with tag 1 on mesh coordinates." << endl; AD::SetTag(1); break;
674-
case RECORDING::TAG_CHECK_MESH_COORDINATES: cout << "Checking first recording with tag 2 on mesh coordinates." << endl; AD::SetTag(2); break;
671+
case RECORDING::TAG_INIT_SOLVER_VARIABLES: cout << "Simulating recording with tag 1 on conservative variables." << endl; AD::SetTag(1); break;
672+
case RECORDING::TAG_CHECK_SOLVER_VARIABLES: cout << "Checking first recording with tag 2 on conservative variables." << endl; AD::SetTag(2); break;
673+
case RECORDING::TAG_INIT_SOLVER_AND_MESH: cout << "Simulating recording with tag 1 on mesh coordinates." << endl; AD::SetTag(1); break;
674+
case RECORDING::TAG_CHECK_SOLVER_AND_MESH: cout << "Checking first recording with tag 2 on mesh coordinates." << endl; AD::SetTag(2); break;
675675
default: break;
676676
}
677677
}
@@ -827,8 +827,10 @@ void CDiscAdjMultizoneDriver::SetObjFunction(RECORDING kind_recording) {
827827
AD::RegisterOutput(ObjFunc);
828828
AD::SetIndex(ObjFunc_Index, ObjFunc);
829829
if (kind_recording == RECORDING::SOLUTION_VARIABLES ||
830-
kind_recording == RECORDING::TAG_INIT_SOLUTION_VARIABLES ||
831-
kind_recording == RECORDING::TAG_CHECK_SOLUTION_VARIABLES) {
830+
kind_recording == RECORDING::TAG_INIT_SOLVER_VARIABLES ||
831+
kind_recording == RECORDING::TAG_CHECK_SOLVER_VARIABLES ||
832+
kind_recording == RECORDING::TAG_INIT_SOLVER_AND_MESH ||
833+
kind_recording == RECORDING::TAG_CHECK_SOLVER_AND_MESH) {
832834
cout << " Objective function : " << ObjFunc << endl;
833835
}
834836
}

‎SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,12 @@ void CDiscAdjFluidIteration::RegisterInput(CSolver***** solver, CGeometry**** ge
405405
SU2_OMP_PARALLEL_(if(solvers0[ADJFLOW_SOL]->GetHasHybridParallel())) {
406406

407407
if (kind_recording == RECORDING::SOLUTION_VARIABLES ||
408-
kind_recording == RECORDING::TAG_INIT_SOLUTION_VARIABLES ||
409-
kind_recording == RECORDING::TAG_CHECK_SOLUTION_VARIABLES ||
408+
kind_recording == RECORDING::TAG_INIT_SOLVER_VARIABLES ||
409+
kind_recording == RECORDING::TAG_CHECK_SOLVER_VARIABLES ||
410+
kind_recording == RECORDING::TAG_INIT_SOLVER_AND_MESH ||
411+
kind_recording == RECORDING::TAG_CHECK_SOLVER_AND_MESH ||
410412
kind_recording == RECORDING::SOLUTION_AND_MESH) {
413+
411414
/*--- Register flow and turbulent variables as input ---*/
412415

413416
if (config[iZone]->GetFluidProblem()) {
@@ -434,10 +437,10 @@ void CDiscAdjFluidIteration::RegisterInput(CSolver***** solver, CGeometry**** ge
434437

435438
if (kind_recording == RECORDING::MESH_COORDS ||
436439
kind_recording == RECORDING::SOLUTION_AND_MESH ||
437-
kind_recording == RECORDING::TAG_INIT_MESH_COORDINATES ||
438-
kind_recording == RECORDING::TAG_CHECK_MESH_COORDINATES) {
439-
/*--- Register node coordinates as input ---*/
440+
kind_recording == RECORDING::TAG_INIT_SOLVER_AND_MESH ||
441+
kind_recording == RECORDING::TAG_CHECK_SOLVER_AND_MESH) {
440442

443+
/*--- Register node coordinates as input ---*/
441444
geometry0->RegisterCoordinates();
442445
}
443446

0 commit comments

Comments
 (0)