Skip to content

Commit b6e899a

Browse files
committed
merge in develop, migrated to CharacPrimVar
1 parent 70c31d5 commit b6e899a

6 files changed

Lines changed: 7 additions & 15 deletions

File tree

Common/include/CConfig.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4246,7 +4246,7 @@ class CConfig {
42464246
unsigned short GetRef_Inc_NonDim(void) const { return Ref_Inc_NonDim; }
42474247

42484248
/*!
4249-
* \brief Get the kind of SU2 software component.
4249+
* \brief Set the kind of SU2 software component.
42504250
* \return Kind of the SU2 software component.
42514251
*/
42524252
void SetKind_SU2(SU2_COMPONENT val_kind_su2) { Kind_SU2 = val_kind_su2 ; }

SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,8 @@ void CDiscAdjSinglezoneDriver::DirectRun(RECORDING kind_recording){
434434
}
435435

436436
void CDiscAdjSinglezoneDriver::MainRecording(){
437-
438-
/*--- SetRecording stores the computational graph on one iteration of the direct problem. Calling it with NONE
439-
* as argument ensures that all information from a previous recording is removed. ---*/
437+
/*--- SetRecording stores the computational graph on one iteration of the direct problem. Calling it with
438+
* RECORDING::CLEAR_INDICES as argument ensures that all information from a previous recording is removed. ---*/
440439

441440
SetRecording(RECORDING::CLEAR_INDICES);
442441

@@ -447,9 +446,8 @@ void CDiscAdjSinglezoneDriver::MainRecording(){
447446
}
448447

449448
void CDiscAdjSinglezoneDriver::SecondaryRecording(){
450-
451-
/*--- SetRecording stores the computational graph on one iteration of the direct problem. Calling it with NONE
452-
* as argument ensures that all information from a previous recording is removed. ---*/
449+
/*--- SetRecording stores the computational graph on one iteration of the direct problem. Calling it with
450+
* RECORDING::CLEAR_INDICES as argument ensures that all information from a previous recording is removed. ---*/
453451

454452
SetRecording(RECORDING::CLEAR_INDICES);
455453

SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ void CDiscAdjFluidIteration::RegisterInput(CSolver***** solver, CGeometry**** ge
507507
}
508508
}
509509

510-
if (kind_recording == RECORDING::MESH_COORDS) {
510+
if (kind_recording == RECORDING::MESH_COORDS || kind_recording == RECORDING::SOLUTION_AND_MESH) {
511511
/*--- Register node coordinates as input ---*/
512512

513513
geometry[iZone][iInst][MESH_0]->RegisterCoordinates();

SU2_CFD/src/solvers/CEulerSolver.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8434,8 +8434,6 @@ void CEulerSolver::SetFreeStream_TurboSolution(CConfig *config) {
84348434

84358435
}
84368436

8437-
8438-
84398437
void CEulerSolver::PreprocessAverage(CSolver **solver, CGeometry *geometry, CConfig *config, unsigned short marker_flag) {
84408438

84418439
unsigned long iVertex, iPoint;
@@ -8507,7 +8505,6 @@ void CEulerSolver::PreprocessAverage(CSolver **solver, CGeometry *geometry, CCon
85078505
}
85088506
}
85098507

8510-
85118508
#ifdef HAVE_MPI
85128509

85138510
/*--- Add information using all the nodes ---*/

SU2_CFD/src/solvers/CNEMOEulerSolver.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,6 @@ void CNEMOEulerSolver::SetNondimensionalization(CConfig *config, unsigned short
10261026

10271027
bool unsteady = (config->GetTime_Marching() != TIME_MARCHING::STEADY);
10281028
bool viscous = config->GetViscous();
1029-
bool dynamic_grid = config->GetGrid_Movement();
10301029
bool gravity = config->GetGravityForce();
10311030
bool turbulent = false;
10321031
bool tkeNeeded = ((turbulent) && (config->GetKind_Turb_Model() == TURB_MODEL::SST));
@@ -2400,7 +2399,6 @@ void CNEMOEulerSolver::BC_Supersonic_Outlet(CGeometry *geometry, CSolver **solve
24002399
su2double *V_outlet, *V_domain;
24012400

24022401
bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
2403-
bool dynamic_grid = config->GetGrid_Movement();
24042402
string Marker_Tag = config->GetMarker_All_TagBound(val_marker);
24052403

24062404
su2double *Normal = new su2double[nDim];
@@ -2420,6 +2418,7 @@ void CNEMOEulerSolver::BC_Supersonic_Outlet(CGeometry *geometry, CSolver **solve
24202418
V_domain = nodes->GetPrimitive(iPoint);
24212419

24222420
/*--- Allocate the value at the outlet ---*/
2421+
V_outlet = GetCharacPrimVar(val_marker, iVertex);
24232422
V_outlet = V_domain;
24242423

24252424
/*--- Normal vector for this vertex (negate for outward convention) ---*/

SU2_CFD/src/variables/CNEMONSVariable.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ CNEMONSVariable::CNEMONSVariable(su2double val_pressure,
7878

7979
bool CNEMONSVariable::SetPrimVar(unsigned long iPoint, CFluidModel *FluidModel) {
8080

81-
82-
8381
fluidmodel = static_cast<CNEMOGas*>(FluidModel);
8482

8583
/*--- Convert conserved to primitive variables ---*/

0 commit comments

Comments
 (0)