Skip to content

Commit 43e3690

Browse files
TobiKattmannTobiKattmann
committed
Add Coord-XYZ to fresh CFVMOutput and therefore remove that from individual FVM outputs.
1 parent cae07a6 commit 43e3690

File tree

5 files changed

+35
-61
lines changed

5 files changed

+35
-61
lines changed

‎SU2_CFD/src/output/CFVMOutput.cpp

+14
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ CFVMOutput::~CFVMOutput(void){ }
3535

3636
void CFVMOutput::AddCommonFVMOutputs(const CConfig *config) {
3737

38+
// Grid coordinates
39+
AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
40+
AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
41+
if (nDim == 3)
42+
AddVolumeOutput("COORD-Z", "z", "COORDINATES","z-component of the coordinate vector");
43+
3844
// Mesh quality metrics
3945
AddVolumeOutput("ORTHOGONALITY", "Orthogonality", "MESH_QUALITY", "Orthogonality Angle (deg.)");
4046
AddVolumeOutput("ASPECT_RATIO", "Aspect_Ratio", "MESH_QUALITY", "CV Face Area Aspect Ratio");
@@ -52,6 +58,14 @@ void CFVMOutput::AddCommonFVMOutputs(const CConfig *config) {
5258

5359
void CFVMOutput::LoadCommonFVMOutputs(const CConfig* config, const CGeometry* geometry, unsigned long iPoint) {
5460

61+
CPoint* Node_Geo = geometry->nodes;
62+
63+
// Grid coordinates
64+
SetVolumeOutputValue("COORD-X", iPoint, Node_Geo->GetCoord(iPoint, 0));
65+
SetVolumeOutputValue("COORD-Y", iPoint, Node_Geo->GetCoord(iPoint, 1));
66+
if (nDim == 3)
67+
SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(iPoint, 2));
68+
5569
// Mesh quality metrics, computed in CPhysicalGeometry::ComputeMeshQualityStatistics.
5670
if (config->GetWrt_MeshQuality()) {
5771
SetVolumeOutputValue("ORTHOGONALITY", iPoint, geometry->Orthogonality[iPoint]);

‎SU2_CFD/src/output/CFlowCompOutput.cpp

+5-15
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,8 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
290290

291291
void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
292292

293-
// Grid coordinates
294-
AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
295-
AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
296-
if (nDim == 3)
297-
AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
293+
// Coordinates, Mesh quality metrics
294+
AddCommonFVMOutputs(config);
298295

299296
// Solution variables
300297
AddVolumeOutput("DENSITY", "Density", "SOLUTION", "Density");
@@ -422,8 +419,6 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
422419
AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION", "Value of the Q-Criterion");
423420
}
424421

425-
AddCommonFVMOutputs(config);
426-
427422
if (config->GetTime_Domain()){
428423
SetTimeAveragedFields();
429424
}
@@ -433,17 +428,14 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
433428

434429
CVariable* Node_Flow = solver[FLOW_SOL]->GetNodes();
435430
CVariable* Node_Turb = nullptr;
431+
CPoint* Node_Geo = geometry->nodes;
436432

437433
if (config->GetKind_Turb_Model() != NONE){
438434
Node_Turb = solver[TURB_SOL]->GetNodes();
439435
}
440436

441-
CPoint* Node_Geo = geometry->nodes;
442-
443-
SetVolumeOutputValue("COORD-X", iPoint, Node_Geo->GetCoord(iPoint, 0));
444-
SetVolumeOutputValue("COORD-Y", iPoint, Node_Geo->GetCoord(iPoint, 1));
445-
if (nDim == 3)
446-
SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(iPoint, 2));
437+
// Coordinates, Mesh quality metrics
438+
LoadCommonFVMOutputs(config, geometry, iPoint);
447439

448440
SetVolumeOutputValue("DENSITY", iPoint, Node_Flow->GetSolution(iPoint, 0));
449441
SetVolumeOutputValue("MOMENTUM-X", iPoint, Node_Flow->GetSolution(iPoint, 1));
@@ -568,8 +560,6 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
568560
SetVolumeOutputValue("Q_CRITERION", iPoint, GetQ_Criterion(&(Node_Flow->GetGradient_Primitive(iPoint)[1])));
569561
}
570562

571-
LoadCommonFVMOutputs(config, geometry, iPoint);
572-
573563
if (config->GetTime_Domain()){
574564
LoadTimeAveragedData(iPoint, Node_Flow);
575565
}

‎SU2_CFD/src/output/CFlowIncOutput.cpp

+5-14
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,8 @@ void CFlowIncOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolv
372372

373373
void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
374374

375-
// Grid coordinates
376-
AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
377-
AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
378-
if (nDim == 3)
379-
AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
375+
// Coordinates, Mesh quality metrics
376+
AddCommonFVMOutputs(config);
380377

381378
// SOLUTION variables
382379
AddVolumeOutput("PRESSURE", "Pressure", "SOLUTION", "Pressure");
@@ -512,7 +509,6 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
512509
AddVolumeOutput("RECOVERED_TEMPERATURE", "Recovered_Temperature", "SOLUTION", "Recovered physical temperature");
513510
}
514511

515-
AddCommonFVMOutputs(config);
516512
}
517513

518514
void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
@@ -521,6 +517,7 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
521517
CVariable* Node_Heat = nullptr;
522518
CVariable* Node_Turb = nullptr;
523519
CVariable* Node_Rad = nullptr;
520+
CPoint* Node_Geo = geometry->nodes;
524521

525522
if (config->GetKind_Turb_Model() != NONE){
526523
Node_Turb = solver[TURB_SOL]->GetNodes();
@@ -529,12 +526,8 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
529526
Node_Heat = solver[HEAT_SOL]->GetNodes();
530527
}
531528

532-
CPoint* Node_Geo = geometry->nodes;
533-
534-
SetVolumeOutputValue("COORD-X", iPoint, Node_Geo->GetCoord(iPoint, 0));
535-
SetVolumeOutputValue("COORD-Y", iPoint, Node_Geo->GetCoord(iPoint, 1));
536-
if (nDim == 3)
537-
SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(iPoint, 2));
529+
// Coordinates, Mesh quality metrics
530+
LoadCommonFVMOutputs(config, geometry, iPoint);
538531

539532
SetVolumeOutputValue("PRESSURE", iPoint, Node_Flow->GetSolution(iPoint, 0));
540533
SetVolumeOutputValue("VELOCITY-X", iPoint, Node_Flow->GetSolution(iPoint, 1));
@@ -665,8 +658,6 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
665658
if (heat && streamwisePeriodic_temperature)
666659
SetVolumeOutputValue("RECOVERED_TEMPERATURE", iPoint, Node_Flow->GetStreamwise_Periodic_RecoveredTemperature(iPoint));
667660
}
668-
669-
LoadCommonFVMOutputs(config, geometry, iPoint);
670661
}
671662

672663
void CFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){

‎SU2_CFD/src/output/CHeatOutput.cpp

+6-17
Original file line numberDiff line numberDiff line change
@@ -116,43 +116,32 @@ void CHeatOutput::SetHistoryOutputFields(CConfig *config){
116116

117117
void CHeatOutput::SetVolumeOutputFields(CConfig *config){
118118

119-
// Grid coordinates
120-
AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
121-
AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
122-
if (nDim == 3)
123-
AddVolumeOutput("COORD-Z", "z", "COORDINATES","z-component of the coordinate vector");
119+
// Coordinates, Mesh quality metrics
120+
AddCommonFVMOutputs(config);
124121

125-
// SOLUTION
122+
// Solution
126123
AddVolumeOutput("TEMPERATURE", "Temperature", "SOLUTION", "Temperature");
127124

128125
// Primitives
129126
AddVolumeOutput("HEAT_FLUX", "Heat_Flux", "PRIMITIVE", "Heatflux");
130127

131128
// Residuals
132129
AddVolumeOutput("RES_TEMPERATURE", "Residual_Temperature", "RESIDUAL", "Residual of the temperature");
133-
134-
AddCommonFVMOutputs(config);
135130
}
136131

137132

138133
void CHeatOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
139134

140135
CVariable* Node_Heat = solver[HEAT_SOL]->GetNodes();
141-
CPoint* Node_Geo = geometry->nodes;
142136

143-
// Grid coordinates
144-
SetVolumeOutputValue("COORD-X", iPoint, Node_Geo->GetCoord(iPoint, 0));
145-
SetVolumeOutputValue("COORD-Y", iPoint, Node_Geo->GetCoord(iPoint, 1));
146-
if (nDim == 3)
147-
SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(iPoint, 2));
137+
// Coordinates, Mesh quality metrics
138+
LoadCommonFVMOutputs(config, geometry, iPoint);
148139

149-
// SOLUTION
140+
// Solution
150141
SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Heat->GetSolution(iPoint, 0));
151142

152143
// Residuals
153144
SetVolumeOutputValue("RES_TEMPERATURE", iPoint, solver[HEAT_SOL]->LinSysRes(iPoint, 0));
154-
155-
LoadCommonFVMOutputs(config, geometry, iPoint);
156145
}
157146

158147
void CHeatOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){

‎SU2_CFD/src/output/CNEMOCompOutput.cpp

+5-15
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,8 @@ void CNEMOCompOutput::SetVolumeOutputFields(CConfig *config){
295295

296296
unsigned short nSpecies = config->GetnSpecies();
297297

298-
// Grid coordinates
299-
AddVolumeOutput("COORD-X", "x", "COORDINATES", "x-component of the coordinate vector");
300-
AddVolumeOutput("COORD-Y", "y", "COORDINATES", "y-component of the coordinate vector");
301-
if (nDim == 3)
302-
AddVolumeOutput("COORD-Z", "z", "COORDINATES", "z-component of the coordinate vector");
298+
// Coordinates, Mesh quality metrics
299+
AddCommonFVMOutputs(config);
303300

304301
// Solution variables
305302
for(iSpecies = 0; iSpecies < nSpecies; iSpecies++)
@@ -427,8 +424,6 @@ void CNEMOCompOutput::SetVolumeOutputFields(CConfig *config){
427424
AddVolumeOutput("VORTICITY_Z", "Vorticity_z", "VORTEX_IDENTIFICATION", "z-component of the vorticity vector");
428425
}
429426

430-
AddCommonFVMOutputs(config);
431-
432427
if (config->GetTime_Domain()){
433428
SetTimeAveragedFields();
434429
}
@@ -438,18 +433,15 @@ void CNEMOCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
438433

439434
CVariable* Node_Flow = solver[FLOW_SOL]->GetNodes();
440435
CVariable* Node_Turb = NULL;
436+
auto* Node_Geo = geometry->nodes;
441437
unsigned short nSpecies = config->GetnSpecies();
442438

443439
if (config->GetKind_Turb_Model() != NONE){
444440
Node_Turb = solver[TURB_SOL]->GetNodes();
445441
}
446442

447-
auto* Node_Geo = geometry->nodes;
448-
449-
SetVolumeOutputValue("COORD-X", iPoint, Node_Geo->GetCoord(iPoint, 0));
450-
SetVolumeOutputValue("COORD-Y", iPoint, Node_Geo->GetCoord(iPoint, 1));
451-
if (nDim == 3)
452-
SetVolumeOutputValue("COORD-Z", iPoint, Node_Geo->GetCoord(iPoint, 2));
443+
// Coordinates, Mesh quality metrics
444+
LoadCommonFVMOutputs(config, geometry, iPoint);
453445

454446
for(iSpecies = 0; iSpecies < nSpecies; iSpecies++)
455447
SetVolumeOutputValue("DENSITY_" + std::to_string(iSpecies), iPoint, Node_Flow->GetSolution(iPoint, iSpecies));
@@ -565,8 +557,6 @@ void CNEMOCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
565557
SetVolumeOutputValue("ROE_DISSIPATION", iPoint, Node_Flow->GetRoe_Dissipation(iPoint));
566558
}
567559

568-
LoadCommonFVMOutputs(config, geometry, iPoint);
569-
570560
if (config->GetTime_Domain()){
571561
LoadTimeAveragedData(iPoint, Node_Flow);
572562
}

0 commit comments

Comments
 (0)