From 4d3ef7fc92f7a4bcfa1e05f0b1a1ee7cf0dd3067 Mon Sep 17 00:00:00 2001 From: ercanumut60 Date: Fri, 10 Oct 2025 12:25:05 +0300 Subject: [PATCH 1/8] Fix: Making Custom Objective Function work with shape_optimization.py script. --- SU2_PY/SU2/io/historyMap.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index a477478359c0..a7d4de9606b0 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -298,6 +298,12 @@ "HEADER": "ComboObj", "TYPE": "COEFFICIENT", }, + "CUSTOM_OBJFUNC": { + "DESCRIPTION": "Custom objective function.", + "GROUP": "COMBO", + "HEADER": "ComboObj", + "TYPE": "COEFFICIENT", + }, "DEFORM_ITER": { "DESCRIPTION": "Linear solver iterations for the mesh " "deformation", "GROUP": "DEFORM", @@ -1408,6 +1414,12 @@ "HEADER": "tavg[ComboObj]", "TYPE": "TAVG_COEFFICIENT", }, + "TAVG_CUSTOM_OBJFUNC": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_COMBO", + "HEADER": "tavg[ComboObj]", + "TYPE": "TAVG_COEFFICIENT", + }, "TAVG_DELTA_CL": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FIXED_CL", From 32bc8b53d238b8081fd09d3c815985d9fa6e0731 Mon Sep 17 00:00:00 2001 From: Ercan Umut Date: Fri, 10 Oct 2025 21:34:18 +0300 Subject: [PATCH 2/8] Update CFlowOutput.cpp --- SU2_CFD/src/output/CFlowOutput.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp index b355c0698afb..a75f3714c868 100644 --- a/SU2_CFD/src/output/CFlowOutput.cpp +++ b/SU2_CFD/src/output/CFlowOutput.cpp @@ -1719,7 +1719,8 @@ void CFlowOutput::AddAerodynamicCoefficients(const CConfig* config) { /// DESCRIPTION: Angle of attack AddHistoryOutput("AOA", "AoA", ScreenOutputFormat::FIXED, "AOA", "Angle of attack"); - + + AddHistoryOutput("CUSTOM_OBJFUNC", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Custom obj. function value.", HistoryFieldType::COEFFICIENT); AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT); } From f6e3a44f50c5b1633ead233aa6208b541609424f Mon Sep 17 00:00:00 2001 From: ercanumut60 Date: Fri, 17 Oct 2025 11:35:58 +0300 Subject: [PATCH 3/8] CFlowOutput.cpp is updated so updateHistoryMap.py can read custom obj. function and write it into historyMap.py --- SU2_PY/SU2/io/historyMap.py | 807 +++++++++++++++++++++++++----------- SU2_PY/updateHistoryMap.py | 28 +- 2 files changed, 598 insertions(+), 237 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index a7d4de9606b0..fb92d16c15e2 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -1,27 +1,24 @@ history_header_map = { "ADJOINT_DISP_X": { - "DESCRIPTION": "Root-mean square residual of the adjoint " - "of the X displacements.", + "DESCRIPTION": "Root-mean square residual of the adjoint of the X displacements.", "GROUP": "RMS_RES", "HEADER": "rms[Ux_adj]", "TYPE": "RESIDUAL", }, "ADJOINT_DISP_Y": { - "DESCRIPTION": "Root-mean square residual of the adjoint " - "of the Y displacements.", + "DESCRIPTION": "Root-mean square residual of the adjoint of the Y displacements.", "GROUP": "RMS_RES", "HEADER": "rms[Uy_adj]", "TYPE": "RESIDUAL", }, "ADJOINT_DISP_Z": { - "DESCRIPTION": "Root-mean square residual of the adjoint " - "of the Z displacements.", + "DESCRIPTION": "Root-mean square residual of the adjoint of the Z displacements.", "GROUP": "RMS_RES", "HEADER": "rms[Uz_adj]", "TYPE": "RESIDUAL", }, "ADJOINT_SOLEXTRA": { - "DESCRIPTION": "Adjoint value of the first extra " "Solution.", + "DESCRIPTION": "Adjoint value of the first extra Solution.", "GROUP": "ADJOINT_SOLEXTRA", "HEADER": "Adjoint_SolExtra", "TYPE": "COEFFICIENT", @@ -39,31 +36,65 @@ "TYPE": "DEFAULT", }, "AVG_DENSITY": { - "DESCRIPTION": "Total average density on all markers set in " "MARKER_ANALYZE", + "DESCRIPTION": "Total average density on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_Density", "TYPE": "COEFFICIENT", }, "AVG_ENTHALPY": { - "DESCRIPTION": "Total average enthalpy on all markers set in " "MARKER_ANALYZE", + "DESCRIPTION": "Total average enthalpy on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_Enthalpy", "TYPE": "COEFFICIENT", }, "AVG_NORMALVEL": { - "DESCRIPTION": "Total average normal velocity on all " - "markers set in MARKER_ANALYZE", + "DESCRIPTION": "Total average normal velocity on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_NormalVel", "TYPE": "COEFFICIENT", }, "AVG_TEMPERATURE": { - "DESCRIPTION": "Average temperature on all surfaces " - "defined in MARKER_MONITORING", + "DESCRIPTION": "Average temperature on all surfaces set with MARKER_MONITORING.", "GROUP": "HEAT", - "HEADER": "AvgTemp", + "HEADER": "Temp", "TYPE": "COEFFICIENT", }, + "AbsFlowAngleIn_\" + tag": { + "DESCRIPTION": "Absolute flow angle in \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "AbsFlowAngleIn_\" + tag", + "TYPE": "DEFAULT", + }, + "AbsFlowAngleOut_\" + tag": { + "DESCRIPTION": "Absolute flow angle out \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "AbsFlowAngleOut_\" + tag", + "TYPE": "DEFAULT", + }, + "BGS_\" + cv_name": { + "DESCRIPTION": "BGS residual of the \" + cv_name + \" controlling variable equation.", + "GROUP": "BGS_RES", + "HEADER": "bgs[\" + cv_name + \"]", + "TYPE": "RESIDUAL", + }, + "BGS_\"+scalar_name": { + "DESCRIPTION": "BGS residual of the \"+scalar_name+\" mass fraction equation.", + "GROUP": "BGS_RES", + "HEADER": "bgs[\"+scalar_name+\"]", + "TYPE": "RESIDUAL", + }, + "BGS_ADJ_\" + cv_name": { + "DESCRIPTION": "BGS residual of the adjoint \" + cv_name", + "GROUP": "BGS_RES", + "HEADER": "bgs[\" + cv_name + \"]", + "TYPE": "RESIDUAL", + }, + "BGS_ADJ_\" + scalar_name": { + "DESCRIPTION": "BGS residual of the adjoint of \" + scalar_name + \" .", + "GROUP": "BGS_RES", + "HEADER": "bgs[\" + scalar_name + \"]", + "TYPE": "RESIDUAL", + }, "BGS_ADJ_DENSITY": { "DESCRIPTION": "BGS residual of the adjoint density.", "GROUP": "BGS_RES", @@ -71,25 +102,25 @@ "TYPE": "RESIDUAL", }, "BGS_ADJ_DISP_X": { - "DESCRIPTION": "BGS residual of the adjoint X " "displacement.", + "DESCRIPTION": "BGS residual of the adjoint X displacement.", "GROUP": "BGS_RES", "HEADER": "bgs[A_Ux]", "TYPE": "RESIDUAL", }, "BGS_ADJ_DISP_Y": { - "DESCRIPTION": "BGS residual of the adjoint Y " "displacement.", + "DESCRIPTION": "BGS residual of the adjoint Y displacement.", "GROUP": "BGS_RES", "HEADER": "bgs[A_Uy]", "TYPE": "RESIDUAL", }, "BGS_ADJ_DISP_Z": { - "DESCRIPTION": "BGS residual of the adjoint Z " "displacement.", + "DESCRIPTION": "BGS residual of the adjoint Z displacement.", "GROUP": "BGS_RES", "HEADER": "bgs[A_Uz]", "TYPE": "RESIDUAL", }, "BGS_ADJ_DISSIPATION": { - "DESCRIPTION": "BGS residual of the adjoint " "dissipation.", + "DESCRIPTION": "BGS residual of the adjoint dissipation.", "GROUP": "BGS_RES", "HEADER": "bgs[A_w]", "TYPE": "RESIDUAL", @@ -101,19 +132,19 @@ "TYPE": "RESIDUAL", }, "BGS_ADJ_MOMENTUM-X": { - "DESCRIPTION": "BGS residual of the adjoint momentum " "x-component", + "DESCRIPTION": "BGS residual of the adjoint momentum x-component", "GROUP": "BGS_RES", "HEADER": "bgs[A_RhoU]", "TYPE": "RESIDUAL", }, "BGS_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "BGS residual of the adjoint momentum " "y-component", + "DESCRIPTION": "BGS residual of the adjoint momentum y-component", "GROUP": "BGS_RES", "HEADER": "bgs[A_RhoV]", "TYPE": "RESIDUAL", }, "BGS_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "BGS residual of the adjoint momentum " "z-component", + "DESCRIPTION": "BGS residual of the adjoint momentum z-component", "GROUP": "BGS_RES", "HEADER": "bgs[A_RhoW]", "TYPE": "RESIDUAL", @@ -131,19 +162,19 @@ "TYPE": "RESIDUAL", }, "BGS_ADJ_RAD_ENERGY": { - "DESCRIPTION": "BGS residual of the P1 radiative " "energy.", + "DESCRIPTION": "BGS residual of the P1 radiative energy.", "GROUP": "BGS_RES", "HEADER": "bgs[A_P1]", "TYPE": "RESIDUAL", }, - 'BGS_ADJ_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "BGS residual of " "the adjoint " "transported " "species.", + "BGS_ADJ_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "BGS residual of the adjoint transported species.", "GROUP": "BGS_RES", - "HEADER": 'bgs[A_rho*Y_" + ' "std::to_string(iVar) + " '"]', + "HEADER": "bgs[A_rho*Y_\" + std::to_string(iVar) + \"]", "TYPE": "RESIDUAL", }, "BGS_ADJ_TEMPERATURE": { - "DESCRIPTION": "BGS residual of the adjoint " "temperature.", + "DESCRIPTION": "BGS residual of the adjoint temperature.", "GROUP": "BGS_RES", "HEADER": "bgs[A_T]", "TYPE": "RESIDUAL", @@ -155,19 +186,19 @@ "TYPE": "RESIDUAL", }, "BGS_ADJ_VELOCITY-X": { - "DESCRIPTION": "BGS residual of the adjoint Velocity " "x-component", + "DESCRIPTION": "BGS residual of the adjoint Velocity x-component", "GROUP": "BGS_RES", "HEADER": "bgs[A_RhoU]", "TYPE": "RESIDUAL", }, "BGS_ADJ_VELOCITY-Y": { - "DESCRIPTION": "BGS residual of the adjoint Velocity " "y-component", + "DESCRIPTION": "BGS residual of the adjoint Velocity y-component", "GROUP": "BGS_RES", "HEADER": "bgs[A_RhoV]", "TYPE": "RESIDUAL", }, "BGS_ADJ_VELOCITY-Z": { - "DESCRIPTION": "BGS residual of the adjoint Velocity " "z-component", + "DESCRIPTION": "BGS residual of the adjoint Velocity z-component", "GROUP": "BGS_RES", "HEADER": "bgs[A_RhoW]", "TYPE": "RESIDUAL", @@ -208,6 +239,12 @@ "HEADER": "bgs[RhoE]", "TYPE": "RESIDUAL", }, + "BGS_INTERMITTENCY": { + "DESCRIPTION": "BGS residual of the intermittency (LM model).", + "GROUP": "BGS_RES", + "HEADER": "bgs[LM_1]", + "TYPE": "RESIDUAL", + }, "BGS_MOMENTUM-X": { "DESCRIPTION": "BGS residual of the momentum x-component.", "GROUP": "BGS_RES", @@ -232,14 +269,20 @@ "HEADER": "bgs[P]", "TYPE": "RESIDUAL", }, - 'BGS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "BGS residual of " "transported species.", + "BGS_RE_THETA_T": { + "DESCRIPTION": "BGS residual of the momentum thickness Reynolds number (LM model).", "GROUP": "BGS_RES", - "HEADER": 'bgs[rho*Y_" + ' 'std::to_string(iVar)+"]', + "HEADER": "bgs[LM_2]", + "TYPE": "RESIDUAL", + }, + "BGS_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Maximum residual of transported species.", + "GROUP": "BGS_RES", + "HEADER": "bgs[rho*Y_\" + std::to_string(iVar)+\"]", "TYPE": "RESIDUAL", }, "BGS_TEMPERATURE": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the " "temperature", + "DESCRIPTION": "BGS residual of the temperature.", "GROUP": "BGS_RES", "HEADER": "bgs[T]", "TYPE": "RESIDUAL", @@ -281,7 +324,7 @@ "TYPE": "DEFAULT", }, "CHANGE_IN_AOA": { - "DESCRIPTION": "Last change in Angle of Attack by Fixed CL " "Driver", + "DESCRIPTION": "Last change in Angle of Attack by Fixed CL Driver", "GROUP": "FIXED_CL", "HEADER": "Change_in_AOA", "TYPE": "RESIDUAL", @@ -299,13 +342,13 @@ "TYPE": "COEFFICIENT", }, "CUSTOM_OBJFUNC": { - "DESCRIPTION": "Custom objective function.", + "DESCRIPTION": "Custom obj. function value.", "GROUP": "COMBO", "HEADER": "ComboObj", "TYPE": "COEFFICIENT", }, "DEFORM_ITER": { - "DESCRIPTION": "Linear solver iterations for the mesh " "deformation", + "DESCRIPTION": "Linear solver iterations for the mesh deformation", "GROUP": "DEFORM", "HEADER": "DeformIter", "TYPE": "DEFAULT", @@ -323,7 +366,7 @@ "TYPE": "DEFAULT", }, "DEFORM_RESIDUAL": { - "DESCRIPTION": "Residual of the linear solver for the " "mesh deformation", + "DESCRIPTION": "Residual of the linear solver for the mesh deformation", "GROUP": "DEFORM", "HEADER": "DeformRes", "TYPE": "DEFAULT", @@ -335,8 +378,7 @@ "TYPE": "COEFFICIENT", }, "DRAG": { - "DESCRIPTION": "Total drag coefficient on all surfaces set with " - "MARKER_MONITORING", + "DESCRIPTION": "Total drag coefficient on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CD", "TYPE": "COEFFICIENT", @@ -368,7 +410,7 @@ "D_AVG_TEMPERATURE": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[AvgTemp]", + "HEADER": "d[Temp]", "TYPE": "D_COEFFICIENT", }, "D_BUFFET": { @@ -383,6 +425,12 @@ "HEADER": "d[ComboObj]", "TYPE": "D_COEFFICIENT", }, + "D_CUSTOM_OBJFUNC": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_COMBO", + "HEADER": "d[ComboObj]", + "TYPE": "D_COEFFICIENT", + }, "D_DELTA_CL": { "DESCRIPTION": "Derivative value", "GROUP": "D_FIXED_CL", @@ -446,7 +494,7 @@ "D_MAXIMUM_HEATFLUX": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[MaxHF]", + "HEADER": "d[maxHF]", "TYPE": "D_COEFFICIENT", }, "D_MOMENT_X": { @@ -467,6 +515,12 @@ "HEADER": "d[CMz]", "TYPE": "D_COEFFICIENT", }, + "D_REFERENCE_FORCE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[RefForce]", + "TYPE": "D_COEFFICIENT", + }, "D_REFERENCE_GEOMETRY": { "DESCRIPTION": "Derivative value", "GROUP": "D_STRUCT_COEFF", @@ -569,10 +623,10 @@ "HEADER": "d[Secondary_Over_Uniformity]", "TYPE": "D_COEFFICIENT", }, - 'D_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Derivative " "value", + "D_SURFACE_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Derivative value", "GROUP": "D_SPECIES_COEFF", - "HEADER": 'd[Avg_Species_" + ' "std::to_string(iVar]", + "HEADER": "d[Avg_Species_\" + std::to_string(iVar]", "TYPE": "D_COEFFICIENT", }, "D_SURFACE_STATIC_PRESSURE": { @@ -641,9 +695,20 @@ "HEADER": "d[VolFrac]", "TYPE": "D_COEFFICIENT", }, + "DensityIn_\" + tag": { + "DESCRIPTION": "Flow angle out \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "DensityIn_\" + tag", + "TYPE": "DEFAULT", + }, + "DensityOut_\" + tag": { + "DESCRIPTION": "Absolute flow angle in \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "DensityOut_\" + tag", + "TYPE": "DEFAULT", + }, "EFFICIENCY": { - "DESCRIPTION": "Total lift-to-drag ratio on all surfaces set " - "with MARKER_MONITORING", + "DESCRIPTION": "Total lift-to-drag ratio on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CEff", "TYPE": "COEFFICIENT", @@ -654,6 +719,30 @@ "HEADER": "CEquiv_Area", "TYPE": "COEFFICIENT", }, + "EntropyGeneration": { + "DESCRIPTION": "Machine entropy generation", + "GROUP": "TURBO_PERF", + "HEADER": "EntropyGen", + "TYPE": "DEFAULT", + }, + "EntropyIn_\" + tag": { + "DESCRIPTION": "Total pressure loss \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "EntropyIn_\" + tag", + "TYPE": "DEFAULT", + }, + "EntropyOut_\" + tag": { + "DESCRIPTION": "Kinetic energy loss \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "EntropyOut_\" + tag", + "TYPE": "DEFAULT", + }, + "EulerianWork": { + "DESCRIPTION": "Machine Eulerian work", + "GROUP": "TURBO_PERF", + "HEADER": "EulerianWork", + "TYPE": "DEFAULT", + }, "FIGURE_OF_MERIT": { "DESCRIPTION": "Thrust over torque", "GROUP": "ROTATING_FRAME", @@ -661,22 +750,19 @@ "TYPE": "COEFFICIENT", }, "FORCE_X": { - "DESCRIPTION": "Total force x-component on all surfaces set with " - "MARKER_MONITORING", + "DESCRIPTION": "Total force x-component on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CFx", "TYPE": "COEFFICIENT", }, "FORCE_Y": { - "DESCRIPTION": "Total force y-component on all surfaces set with " - "MARKER_MONITORING", + "DESCRIPTION": "Total force y-component on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CFy", "TYPE": "COEFFICIENT", }, "FORCE_Z": { - "DESCRIPTION": "Total force z-component on all surfaces set with " - "MARKER_MONITORING", + "DESCRIPTION": "Total force z-component on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CFz", "TYPE": "COEFFICIENT", @@ -687,9 +773,20 @@ "HEADER": "Cp_Diff", "TYPE": "COEFFICIENT", }, + "KineticEnergyLoss_\" + tag": { + "DESCRIPTION": "Blade Kinetic Energy Loss Coefficient", + "GROUP": "TURBO_PERF", + "HEADER": "KELC_\" + tag", + "TYPE": "DEFAULT", + }, + "KineticEnergyLoss_Stage": { + "DESCRIPTION": "Machine Kinetic Energy Loss Coefficient", + "GROUP": "TURBO_PERF", + "HEADER": "KELC_all", + "TYPE": "DEFAULT", + }, "LIFT": { - "DESCRIPTION": "Total lift coefficient on all surfaces set with " - "MARKER_MONITORING", + "DESCRIPTION": "Total lift coefficient on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CL", "TYPE": "COEFFICIENT", @@ -700,15 +797,32 @@ "HEADER": "LinSolIter", "TYPE": "DEFAULT", }, + "LINSOL_ITER_FLAMELET": { + "DESCRIPTION": "Number of iterations of the linear solver for scalar solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterScalar", + "TYPE": "DEFAULT", + }, + "LINSOL_ITER_HEAT": { + "DESCRIPTION": "Number of iterations of the linear solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterHeat", + "TYPE": "DEFAULT", + }, "LINSOL_ITER_SPECIES": { - "DESCRIPTION": "Number of iterations of the linear " - "solver for species solver.", + "DESCRIPTION": "Number of iterations of the linear solver for species solver.", "GROUP": "LINSOL", "HEADER": "LinSolIterSpecies", "TYPE": "DEFAULT", }, + "LINSOL_ITER_TRANS": { + "DESCRIPTION": "Number of iterations of the linear solver for transition solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterTrans", + "TYPE": "DEFAULT", + }, "LINSOL_ITER_TURB": { - "DESCRIPTION": "Number of iterations of the linear " "solver for turbulence.", + "DESCRIPTION": "Number of iterations of the linear solver for turbulence.", "GROUP": "LINSOL", "HEADER": "LinSolIterTurb", "TYPE": "DEFAULT", @@ -719,14 +833,32 @@ "HEADER": "LinSolRes", "TYPE": "DEFAULT", }, + "LINSOL_RESIDUAL_FLAMELET": { + "DESCRIPTION": "Residual of the linear solver for scalar solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolResScalar", + "TYPE": "DEFAULT", + }, + "LINSOL_RESIDUAL_HEAT": { + "DESCRIPTION": "Residual of the linear solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolResHeat", + "TYPE": "DEFAULT", + }, "LINSOL_RESIDUAL_SPECIES": { - "DESCRIPTION": "Residual of the linear solver for " "species solver.", + "DESCRIPTION": "Residual of the linear solver for species solver.", "GROUP": "LINSOL", "HEADER": "LinSolResSpecies", "TYPE": "DEFAULT", }, + "LINSOL_RESIDUAL_TRANS": { + "DESCRIPTION": "Residual of the linear solver for transition solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolResTrans", + "TYPE": "DEFAULT", + }, "LINSOL_RESIDUAL_TURB": { - "DESCRIPTION": "Residual of the linear solver for " "turbulence.", + "DESCRIPTION": "Residual of the linear solver for turbulence.", "GROUP": "LINSOL", "HEADER": "LinSolResTurb", "TYPE": "DEFAULT", @@ -744,12 +876,35 @@ "TYPE": "DEFAULT", }, "MAXIMUM_HEATFLUX": { - "DESCRIPTION": "Maximum heatflux on all surfaces defined " - "in MARKER_MONITORING", + "DESCRIPTION": "Maximum heatflux across all surfaces set with MARKER_MONITORING.", "GROUP": "HEAT", - "HEADER": "MaxHF", + "HEADER": "maxHF", "TYPE": "COEFFICIENT", }, + "MAX_\" + cv_name": { + "DESCRIPTION": "Maximum residual of the \" + cv_name + \" equation.", + "GROUP": "MAX_RES", + "HEADER": "max[\" + cv_name + \"]", + "TYPE": "RESIDUAL", + }, + "MAX_\" + scalar_name": { + "DESCRIPTION": "Maximum residual of the \" + scalar_name + \" mass fraction equation.", + "GROUP": "MAX_RES", + "HEADER": "max[\" + scalar_name + \"]", + "TYPE": "RESIDUAL", + }, + "MAX_ADJ_\" + cv_name": { + "DESCRIPTION": "Maximum residual of the adjoint \" + cv_name", + "GROUP": "MAX_RES", + "HEADER": "max[\"+cv_name +\"]", + "TYPE": "RESIDUAL", + }, + "MAX_ADJ_\" + scalar_name": { + "DESCRIPTION": "Maximum residual of the adjoint of \" + scalar_name + \" .", + "GROUP": "MAX_RES", + "HEADER": "max[scalar_\" + scalar_name + \"]", + "TYPE": "RESIDUAL", + }, "MAX_ADJ_DENSITY": { "DESCRIPTION": "Maximum residual of the adjoint density.", "GROUP": "MAX_RES", @@ -757,7 +912,7 @@ "TYPE": "RESIDUAL", }, "MAX_ADJ_DISSIPATION": { - "DESCRIPTION": "Maximum residual of the adjoint " "dissipation.", + "DESCRIPTION": "Maximum residual of the adjoint dissipation.", "GROUP": "MAX_RES", "HEADER": "max[A_w]", "TYPE": "RESIDUAL", @@ -769,39 +924,39 @@ "TYPE": "RESIDUAL", }, "MAX_ADJ_MOMENTUM-X": { - "DESCRIPTION": "Maximum residual of the adjoint " "momentum x-component", + "DESCRIPTION": "Maximum residual of the adjoint momentum x-component", "GROUP": "MAX_RES", "HEADER": "max[A_RhoU]", "TYPE": "RESIDUAL", }, "MAX_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "Maximum residual of the adjoint " "momentum y-component", + "DESCRIPTION": "Maximum residual of the adjoint momentum y-component", "GROUP": "MAX_RES", "HEADER": "max[A_RhoV]", "TYPE": "RESIDUAL", }, "MAX_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "Maximum residual of the adjoint " "momentum z-component", + "DESCRIPTION": "Maximum residual of the adjoint momentum z-component", "GROUP": "MAX_RES", "HEADER": "max[A_RhoW]", "TYPE": "RESIDUAL", }, "MAX_ADJ_NU_TILDE": { - "DESCRIPTION": "Maximum residual of the adjoint nu " "tilde.", + "DESCRIPTION": "Maximum residual of the adjoint nu tilde.", "GROUP": "MAX_RES", "HEADER": "max[A_nu]", "TYPE": "RESIDUAL", }, "MAX_ADJ_PRESSURE": { - "DESCRIPTION": "Maximum residual of the adjoint " "Pressure.", + "DESCRIPTION": "Maximum residual of the adjoint Pressure.", "GROUP": "MAX_RES", "HEADER": "max[A_Rho]", "TYPE": "RESIDUAL", }, - 'MAX_ADJ_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Maximum residual " "of the adjoint " "transported " "species.", + "MAX_ADJ_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Maximum residual of the adjoint transported species.", "GROUP": "MAX_RES", - "HEADER": 'max[A_rho*Y_" + ' "std::to_string(iVar) + " '"]', + "HEADER": "max[A_rho*Y_\" + std::to_string(iVar) + \"]", "TYPE": "RESIDUAL", }, "MAX_ADJ_TEMPERATURE": { @@ -811,25 +966,25 @@ "TYPE": "RESIDUAL", }, "MAX_ADJ_TKE": { - "DESCRIPTION": "Maximum residual of the adjoint kinetic " "energy.", + "DESCRIPTION": "Maximum residual of the adjoint kinetic energy.", "GROUP": "MAX_RES", "HEADER": "max[A_k]", "TYPE": "RESIDUAL", }, "MAX_ADJ_VELOCITY-X": { - "DESCRIPTION": "Maximum residual of the adjoint " "Velocity x-component", + "DESCRIPTION": "Maximum residual of the adjoint Velocity x-component", "GROUP": "MAX_RES", "HEADER": "max[A_RhoU]", "TYPE": "RESIDUAL", }, "MAX_ADJ_VELOCITY-Y": { - "DESCRIPTION": "Maximum residual of the adjoint " "Velocity y-component", + "DESCRIPTION": "Maximum residual of the adjoint Velocity y-component", "GROUP": "MAX_RES", "HEADER": "max[A_RhoV]", "TYPE": "RESIDUAL", }, "MAX_ADJ_VELOCITY-Z": { - "DESCRIPTION": "Maximum residual of the adjoint " "Velocity z-component", + "DESCRIPTION": "Maximum residual of the adjoint Velocity z-component", "GROUP": "MAX_RES", "HEADER": "max[A_RhoW]", "TYPE": "RESIDUAL", @@ -853,7 +1008,7 @@ "TYPE": "RESIDUAL", }, "MAX_DISSIPATION": { - "DESCRIPTION": "Maximum residual of dissipation (SST " "model).", + "DESCRIPTION": "Maximum residual of dissipation (SST model).", "GROUP": "MAX_RES", "HEADER": "max[w]", "TYPE": "RESIDUAL", @@ -864,14 +1019,20 @@ "HEADER": "max[RhoE]", "TYPE": "RESIDUAL", }, + "MAX_INTERMITTENCY": { + "DESCRIPTION": "Maximum residual of the intermittency (LM model).", + "GROUP": "MAX_RES", + "HEADER": "max[LM_1]", + "TYPE": "RESIDUAL", + }, "MAX_MOMENTUM-X": { - "DESCRIPTION": "Maximum square residual of the momentum " "x-component.", + "DESCRIPTION": "Maximum square residual of the momentum x-component.", "GROUP": "MAX_RES", "HEADER": "max[RhoU]", "TYPE": "RESIDUAL", }, "MAX_MOMENTUM-Y": { - "DESCRIPTION": "Maximum square residual of the momentum " "y-component.", + "DESCRIPTION": "Maximum square residual of the momentum y-component.", "GROUP": "MAX_RES", "HEADER": "max[RhoV]", "TYPE": "RESIDUAL", @@ -888,14 +1049,20 @@ "HEADER": "max[P]", "TYPE": "RESIDUAL", }, - 'MAX_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Maximum residual of " "transported species.", + "MAX_RE_THETA_T": { + "DESCRIPTION": "Maximum residual of the momentum thickness Reynolds number (LM model).", "GROUP": "MAX_RES", - "HEADER": 'max[rho*Y_" + ' 'std::to_string(iVar)+"]', + "HEADER": "max[LM_2]", + "TYPE": "RESIDUAL", + }, + "MAX_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Maximum residual of transported species.", + "GROUP": "MAX_RES", + "HEADER": "max[rho*Y_\" + std::to_string(iVar)+\"]", "TYPE": "RESIDUAL", }, "MAX_TEMPERATURE": { - "DESCRIPTION": "Maximum residual of the temperature", + "DESCRIPTION": "Root-mean square residual of the temperature.", "GROUP": "MAX_RES", "HEADER": "max[T]", "TYPE": "RESIDUAL", @@ -907,19 +1074,19 @@ "TYPE": "RESIDUAL", }, "MAX_VELOCITY-X": { - "DESCRIPTION": "Maximum residual of the velocity " "x-component.", + "DESCRIPTION": "Maximum residual of the velocity x-component.", "GROUP": "MAX_RES", "HEADER": "max[U]", "TYPE": "RESIDUAL", }, "MAX_VELOCITY-Y": { - "DESCRIPTION": "Maximum residual of the velocity " "y-component.", + "DESCRIPTION": "Maximum residual of the velocity y-component.", "GROUP": "MAX_RES", "HEADER": "max[V]", "TYPE": "RESIDUAL", }, "MAX_VELOCITY-Z": { - "DESCRIPTION": "Maximum residual of the velocity " "z-component.", + "DESCRIPTION": "Maximum residual of the velocity z-component.", "GROUP": "MAX_RES", "HEADER": "max[W]", "TYPE": "RESIDUAL", @@ -937,35 +1104,97 @@ "TYPE": "DEFAULT", }, "MOMENT_X": { - "DESCRIPTION": "Total momentum x-component on all surfaces set " - "with MARKER_MONITORING", + "DESCRIPTION": "Total momentum x-component on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CMx", "TYPE": "COEFFICIENT", }, "MOMENT_Y": { - "DESCRIPTION": "Total momentum y-component on all surfaces set " - "with MARKER_MONITORING", + "DESCRIPTION": "Total momentum y-component on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CMy", "TYPE": "COEFFICIENT", }, "MOMENT_Z": { - "DESCRIPTION": "Total momentum z-component on all surfaces set " - "with MARKER_MONITORING", + "DESCRIPTION": "Total momentum z-component on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CMz", "TYPE": "COEFFICIENT", }, + "MachIn_\" + tag": { + "DESCRIPTION": "Total-to-Static efficiency \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "MachIn_\" + tag", + "TYPE": "DEFAULT", + }, + "MachOut_\" + tag": { + "DESCRIPTION": "Total-to-Static efficiency \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "MachOut_\" + tag", + "TYPE": "DEFAULT", + }, + "MassFlowIn_\" + tag": { + "DESCRIPTION": "Mach out \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "MassFlowIn_\" + tag", + "TYPE": "DEFAULT", + }, + "MassFlowOut_\" + tag": { + "DESCRIPTION": "Total efficiency \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "MassFlowOut_\" + tag", + "TYPE": "DEFAULT", + }, + "NormalVelocityIn_\" + tag": { + "DESCRIPTION": "Absolute flow angle out \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "NormalVelocityIn_\" + tag", + "TYPE": "DEFAULT", + }, + "NormalVelocityOut_\" + tag": { + "DESCRIPTION": "Mass flow in \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "NormalVelocityOut_\" + tag", + "TYPE": "DEFAULT", + }, "PREV_AOA": { - "DESCRIPTION": "Angle of Attack at the previous iteration of the " - "Fixed CL driver", + "DESCRIPTION": "Angle of Attack at the previous iteration of the Fixed CL driver", "GROUP": "FIXED_CL", "HEADER": "Previous_AOA", "TYPE": "DEFAULT", }, + "PressureIn_\" + tag": { + "DESCRIPTION": "Pressure ratio \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "PressureIn_\" + tag", + "TYPE": "DEFAULT", + }, + "PressureOut_\" + tag": { + "DESCRIPTION": "Flow angle in \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "PressureOut_\" + tag", + "TYPE": "DEFAULT", + }, + "PressureRatioTS": { + "DESCRIPTION": "Machine total-to-static pressure ratio", + "GROUP": "TURBO_PERF", + "HEADER": "PRTS", + "TYPE": "DEFAULT", + }, + "PressureRatioTT": { + "DESCRIPTION": "Machine total-to-toal pressure ratio", + "GROUP": "TURBO_PERF", + "HEADER": "PRTT", + "TYPE": "DEFAULT", + }, + "REFERENCE_FORCE": { + "DESCRIPTION": "Reference force used to compute aerodynamic coefficients", + "GROUP": "AERO_COEFF", + "HEADER": "RefForce", + "TYPE": "COEFFICIENT", + }, "REFERENCE_GEOMETRY": { - "DESCRIPTION": "L2 norm of difference wrt reference " "geometry", + "DESCRIPTION": "L2 norm of difference wrt reference geometry", "GROUP": "STRUCT_COEFF", "HEADER": "RefGeom", "TYPE": "COEFFICIENT", @@ -976,102 +1205,116 @@ "HEADER": "RefNode", "TYPE": "COEFFICIENT", }, + "RMS_\"+CV_name": { + "DESCRIPTION": "Root-mean squared residual of \" + CV_name + \" controlling variable equation.", + "GROUP": "RMS_RES", + "HEADER": "rms[\"+CV_name+\"]", + "TYPE": "RESIDUAL", + }, + "RMS_\"+scalar_name": { + "DESCRIPTION": "Root-mean squared residual of the \"+scalar_name+\" mass fraction equation.", + "GROUP": "RMS_RES", + "HEADER": "rms[\"+scalar_name+\"]", + "TYPE": "RESIDUAL", + }, + "RMS_ADJ_\" + scalar_name": { + "DESCRIPTION": "Root-mean square residual of the adjoint of \" + scalar_name + \" .", + "GROUP": "RMS_RES", + "HEADER": "rms[\" + scalar_name + \"]", + "TYPE": "RESIDUAL", + }, + "RMS_ADJ_\"+cv_name": { + "DESCRIPTION": "Root-mean square residual of the adjoint \" + cv_name", + "GROUP": "RMS_RES", + "HEADER": "rms[\" + cv_name + \"]", + "TYPE": "RESIDUAL", + }, "RMS_ADJ_DENSITY": { - "DESCRIPTION": "Root-mean square residual of the adjoint " "density.", + "DESCRIPTION": "Root-mean square residual of the adjoint density.", "GROUP": "RMS_RES", "HEADER": "rms[A_Rho]", "TYPE": "RESIDUAL", }, "RMS_ADJ_DISSIPATION": { - "DESCRIPTION": "Root-mean square residual of the " "adjoint dissipation.", + "DESCRIPTION": "Root-mean square residual of the adjoint dissipation.", "GROUP": "RMS_RES", "HEADER": "rms[A_w]", "TYPE": "RESIDUAL", }, "RMS_ADJ_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the adjoint " "energy.", + "DESCRIPTION": "Root-mean square residual of the adjoint energy.", "GROUP": "RMS_RES", "HEADER": "rms[A_E]", "TYPE": "RESIDUAL", }, "RMS_ADJ_MOMENTUM-X": { - "DESCRIPTION": "Root-mean square residual of the " - "adjoint momentum x-component.", + "DESCRIPTION": "Root-mean square residual of the adjoint momentum x-component.", "GROUP": "RMS_RES", "HEADER": "rms[A_RhoU]", "TYPE": "RESIDUAL", }, "RMS_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "Root-mean square residual of the " - "adjoint momentum y-component.", + "DESCRIPTION": "Root-mean square residual of the adjoint momentum y-component.", "GROUP": "RMS_RES", "HEADER": "rms[A_RhoV]", "TYPE": "RESIDUAL", }, "RMS_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "Root-mean square residual of the " - "adjoint momentum z-component.", + "DESCRIPTION": "Root-mean square residual of the adjoint momentum z-component.", "GROUP": "RMS_RES", "HEADER": "rms[A_RhoW]", "TYPE": "RESIDUAL", }, "RMS_ADJ_NU_TILDE": { - "DESCRIPTION": "Root-mean square residual of the adjoint " "nu tilde.", + "DESCRIPTION": "Root-mean square residual of the adjoint nu tilde.", "GROUP": "RMS_RES", "HEADER": "rms[A_nu]", "TYPE": "RESIDUAL", }, "RMS_ADJ_PRESSURE": { - "DESCRIPTION": "Root-mean square residual of the adjoint " "Pressure.", + "DESCRIPTION": "Root-mean square residual of the adjoint Pressure.", "GROUP": "RMS_RES", "HEADER": "rms[A_P]", "TYPE": "RESIDUAL", }, "RMS_ADJ_RAD_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the P1 " "radiative energy.", + "DESCRIPTION": "Root-mean square residual of the P1 radiative energy.", "GROUP": "RMS_RES", "HEADER": "rms[A_P1]", "TYPE": "RESIDUAL", }, - 'RMS_ADJ_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Root-mean square " - "residual of the " - "adjoint " - "transported " - "species.", + "RMS_ADJ_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Root-mean square residual of the adjoint transported species.", "GROUP": "RMS_RES", - "HEADER": 'rms[A_rho*Y_" + ' "std::to_string(iVar) + " '"]', + "HEADER": "rms[A_rho*Y_\" + std::to_string(iVar) + \"]", "TYPE": "RESIDUAL", }, "RMS_ADJ_TEMPERATURE": { - "DESCRIPTION": "Root-mean square residual of the " "adjoint temperature.", + "DESCRIPTION": "Root-mean square residual of the adjoint temperature.", "GROUP": "RMS_RES", "HEADER": "rms[A_T]", "TYPE": "RESIDUAL", }, "RMS_ADJ_TKE": { - "DESCRIPTION": "Root-mean square residual of the adjoint " "kinetic energy.", + "DESCRIPTION": "Root-mean square residual of the adjoint kinetic energy.", "GROUP": "RMS_RES", "HEADER": "rms[A_k]", "TYPE": "RESIDUAL", }, "RMS_ADJ_VELOCITY-X": { - "DESCRIPTION": "Root-mean square residual of the " - "adjoint Velocity x-component.", + "DESCRIPTION": "Root-mean square residual of the adjoint Velocity x-component.", "GROUP": "RMS_RES", "HEADER": "rms[A_U]", "TYPE": "RESIDUAL", }, "RMS_ADJ_VELOCITY-Y": { - "DESCRIPTION": "Root-mean square residual of the " - "adjoint Velocity y-component.", + "DESCRIPTION": "Root-mean square residual of the adjoint Velocity y-component.", "GROUP": "RMS_RES", "HEADER": "rms[A_V]", "TYPE": "RESIDUAL", }, "RMS_ADJ_VELOCITY-Z": { - "DESCRIPTION": "Root-mean square residual of the " - "adjoint Velocity z-component.", + "DESCRIPTION": "Root-mean square residual of the adjoint Velocity z-component.", "GROUP": "RMS_RES", "HEADER": "rms[A_W]", "TYPE": "RESIDUAL", @@ -1101,7 +1344,7 @@ "TYPE": "RESIDUAL", }, "RMS_DISSIPATION": { - "DESCRIPTION": "Root-mean square residual of dissipation " "(SST model).", + "DESCRIPTION": "Root-mean square residual of dissipation (SST model).", "GROUP": "RMS_RES", "HEADER": "rms[w]", "TYPE": "RESIDUAL", @@ -1118,20 +1361,26 @@ "HEADER": "rms[E]", "TYPE": "RESIDUAL", }, + "RMS_INTERMITTENCY": { + "DESCRIPTION": "Root-mean square residual of intermittency (LM model).", + "GROUP": "RMS_RES", + "HEADER": "rms[LM_1]", + "TYPE": "RESIDUAL", + }, "RMS_MOMENTUM-X": { - "DESCRIPTION": "Root-mean square residual of the momentum " "x-component.", + "DESCRIPTION": "Root-mean square residual of the momentum x-component.", "GROUP": "RMS_RES", "HEADER": "rms[RhoU]", "TYPE": "RESIDUAL", }, "RMS_MOMENTUM-Y": { - "DESCRIPTION": "Root-mean square residual of the momentum " "y-component.", + "DESCRIPTION": "Root-mean square residual of the momentum y-component.", "GROUP": "RMS_RES", "HEADER": "rms[RhoV]", "TYPE": "RESIDUAL", }, "RMS_NU_TILDE": { - "DESCRIPTION": "Root-mean square residual of nu tilde (SA " "model).", + "DESCRIPTION": "Root-mean square residual of nu tilde (SA model).", "GROUP": "RMS_RES", "HEADER": "rms[nu]", "TYPE": "RESIDUAL", @@ -1142,26 +1391,26 @@ "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, - "RMS_RTOL": { - "DESCRIPTION": "Norm of residual", + "RMS_RE_THETA_T": { + "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", "GROUP": "RMS_RES", - "HEADER": "rms[R]", + "HEADER": "rms[LM_2]", "TYPE": "RESIDUAL", }, - 'RMS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Root-mean square " "residual of " "transported species.", + "RMS_RTOL": { + "DESCRIPTION": "Norm of residual", "GROUP": "RMS_RES", - "HEADER": 'rms[rho*Y_" + ' 'std::to_string(iVar)+"]', + "HEADER": "rms[R]", "TYPE": "RESIDUAL", }, - "RMS_TEMPERATURE": { - "DESCRIPTION": "Root mean square residual of the " "temperature", + "RMS_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Root-mean square residual of transported species.", "GROUP": "RMS_RES", - "HEADER": "rms[T]", + "HEADER": "rms[rho*Y_\" + std::to_string(iVar)+\"]", "TYPE": "RESIDUAL", }, "RMS_TKE": { - "DESCRIPTION": "Root-mean square residual of kinetic energy (SST " "model).", + "DESCRIPTION": "Root-mean square residual of kinetic energy (SST model).", "GROUP": "RMS_RES", "HEADER": "rms[k]", "TYPE": "RESIDUAL", @@ -1173,83 +1422,91 @@ "TYPE": "RESIDUAL", }, "RMS_VELOCITY-X": { - "DESCRIPTION": "Root-mean square residual of the velocity " "x-component.", + "DESCRIPTION": "Root-mean square residual of the velocity x-component.", "GROUP": "RMS_RES", "HEADER": "rms[U]", "TYPE": "RESIDUAL", }, "RMS_VELOCITY-Y": { - "DESCRIPTION": "Root-mean square residual of the velocity " "y-component.", + "DESCRIPTION": "Root-mean square residual of the velocity y-component.", "GROUP": "RMS_RES", "HEADER": "rms[V]", "TYPE": "RESIDUAL", }, "SENS_AOA": { - "DESCRIPTION": "Sensitivity of the objective function with " - "respect to the angle of attack (only for " - "compressible solver).", + "DESCRIPTION": "Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).", "GROUP": "SENSITIVITY", "HEADER": "Sens_AoA", "TYPE": "COEFFICIENT", }, - "SENS_E_0": { + "SENS_EFIELD_\" + iVarS": { + "DESCRIPTION": "d Objective / d Electric field", + "GROUP": "SENSITIVITY", + "HEADER": "Sens[EField\" + iVarS + ']'", + "TYPE": "DEFAULT", + }, + "SENS_E_\" + iVarS": { "DESCRIPTION": "d Objective / d Elasticity modulus", "GROUP": "SENSITIVITY", - "HEADER": "Sens[E_0]", + "HEADER": "Sens[E\" + iVarS + ']'", "TYPE": "DEFAULT", }, "SENS_GEO": { - "DESCRIPTION": "Sum of the geometrical sensitivities on all " - "markers set in MARKER_MONITORING.", + "DESCRIPTION": "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", "GROUP": "SENSITIVITY", "HEADER": "Sens_Geo", "TYPE": "COEFFICIENT", }, "SENS_MACH": { - "DESCRIPTION": "Sensitivity of the objective function with " - "respect to the Mach number (only of " - "compressible solver).", + "DESCRIPTION": "Sensitivity of the objective function with respect to the Mach number (only of compressible solver).", "GROUP": "SENSITIVITY", "HEADER": "Sens_Mach", "TYPE": "COEFFICIENT", }, - "SENS_NU_0": { + "SENS_NU_\" + iVarS": { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", - "HEADER": "Sens[Nu_0]", + "HEADER": "Sens[Nu\" + iVarS + ']'", "TYPE": "DEFAULT", }, "SENS_PRESS": { - "DESCRIPTION": "Sensitivity of the objective function with " - "respect to the far-field pressure.", + "DESCRIPTION": "Sensitivity of the objective function with respect to the far-field pressure.", "GROUP": "SENSITIVITY", "HEADER": "Sens_Press", "TYPE": "COEFFICIENT", }, "SENS_PRESS_OUT": { - "DESCRIPTION": "Sensitivity of the objective function with " - "respect to the outlet pressure.", + "DESCRIPTION": "Sensitivity of the objective function with respect to the outlet pressure.", "GROUP": "SENSITIVITY", "HEADER": "Sens_Pout", "TYPE": "COEFFICIENT", }, + "SENS_RHO_\" + iVarS": { + "DESCRIPTION": "d Objective / d Material density", + "GROUP": "SENSITIVITY", + "HEADER": "Sens[Rho\" + iVarS + ']'", + "TYPE": "DEFAULT", + }, + "SENS_RHO_DL_\" + iVarS": { + "DESCRIPTION": "d Objective / d Dead load density", + "GROUP": "SENSITIVITY", + "HEADER": "Sens[RhoDL\" + iVarS + ']'", + "TYPE": "DEFAULT", + }, "SENS_TEMP": { - "DESCRIPTION": "Sensitivity of the objective function with " - "respect to the far-field temperature.", + "DESCRIPTION": "Sensitivity of the objective function with respect to the far-field temperature.", "GROUP": "SENSITIVITY", "HEADER": "Sens_Temp", "TYPE": "COEFFICIENT", }, "SENS_VEL_IN": { - "DESCRIPTION": "Sensitivity of the objective function with " - "respect to the inlet velocity.", + "DESCRIPTION": "Sensitivity of the objective function with respect to the inlet velocity.", "GROUP": "SENSITIVITY", "HEADER": "Sens_Vin", "TYPE": "COEFFICIENT", }, "SIDEFORCE": { - "DESCRIPTION": "Total sideforce coefficient on all surfaces set " - "with MARKER_MONITORING", + "DESCRIPTION": "Total sideforce coefficient on all surfaces set with MARKER_MONITORING", "GROUP": "AERO_COEFF", "HEADER": "CSF", "TYPE": "COEFFICIENT", @@ -1261,7 +1518,7 @@ "TYPE": "DEFAULT", }, "STREAMWISE_HEAT": { - "DESCRIPTION": "Integrated heat for streamwise periodic " "flow", + "DESCRIPTION": "Integrated heat for streamwise periodic flow", "GROUP": "STREAMWISE_PERIODIC", "HEADER": "SWHeat", "TYPE": "DEFAULT", @@ -1279,56 +1536,45 @@ "TYPE": "COEFFICIENT", }, "SURFACE_MACH": { - "DESCRIPTION": "Total average mach number on all markers set " - "in MARKER_ANALYZE", + "DESCRIPTION": "Total average mach number on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_Mach", "TYPE": "COEFFICIENT", }, "SURFACE_MASSFLOW": { - "DESCRIPTION": "Total average mass flow on all markers " - "set in MARKER_ANALYZE", + "DESCRIPTION": "Total average mass flow on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_Massflow", "TYPE": "COEFFICIENT", }, "SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "Total momentum distortion on all " - "markers set in MARKER_ANALYZE", + "DESCRIPTION": "Total momentum distortion on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Momentum_Distortion", "TYPE": "COEFFICIENT", }, "SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "Total pressure drop on all markers " "set in MARKER_ANALYZE", + "DESCRIPTION": "Total pressure drop on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Pressure_Drop", "TYPE": "COEFFICIENT", }, "SURFACE_SECONDARY": { - "DESCRIPTION": "Total secondary strength on all markers " - "set in MARKER_ANALYZE", + "DESCRIPTION": "Total secondary strength on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Secondary_Strength", "TYPE": "COEFFICIENT", }, "SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "Total secondary over " - "uniformity on all markers set " - "in MARKER_ANALYZE", + "DESCRIPTION": "Total secondary over uniformity on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Secondary_Over_Uniformity", "TYPE": "COEFFICIENT", }, - 'SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Total average " - 'species " + ' - "std::to_string(iVar) " - '+ " on all ' - "markers set in " - "MARKER_ANALYZE", + "SURFACE_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Total average species \" + std::to_string(iVar) + \" on all markers set in MARKER_ANALYZE", "GROUP": "SPECIES_COEFF", - "HEADER": 'Avg_Species_" + ' "std::to_string(iVar", + "HEADER": "Avg_Species_\" + std::to_string(iVar", "TYPE": "COEFFICIENT", }, "SURFACE_SPECIES_VARIANCE": { @@ -1338,36 +1584,31 @@ "TYPE": "DEFAULT", }, "SURFACE_STATIC_PRESSURE": { - "DESCRIPTION": "Total average pressure on all " "markers set in MARKER_ANALYZE", + "DESCRIPTION": "Total average pressure on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_Press", "TYPE": "COEFFICIENT", }, "SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "Total average temperature on " - "all markers set in " - "MARKER_ANALYZE", + "DESCRIPTION": "Total average temperature on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_Temp", "TYPE": "COEFFICIENT", }, "SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "Total average total pressure on " - "all markers set in MARKER_ANALYZE", + "DESCRIPTION": "Total average total pressure on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_TotalPress", "TYPE": "COEFFICIENT", }, "SURFACE_TOTAL_TEMPERATURE": { - "DESCRIPTION": "Total average total temperature " - "all markers set in " - "MARKER_ANALYZE", + "DESCRIPTION": "Total average total temperature all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Avg_TotalTemp", "TYPE": "COEFFICIENT", }, "SURFACE_UNIFORMITY": { - "DESCRIPTION": "Total flow uniformity on all markers " "set in MARKER_ANALYZE", + "DESCRIPTION": "Total flow uniformity on all markers set in MARKER_ANALYZE", "GROUP": "FLOW_COEFF", "HEADER": "Uniformity", "TYPE": "COEFFICIENT", @@ -1399,7 +1640,7 @@ "TAVG_AVG_TEMPERATURE": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[AvgTemp]", + "HEADER": "tavg[Temp]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_BUFFET": { @@ -1433,7 +1674,7 @@ "TYPE": "TAVG_COEFFICIENT", }, "TAVG_D_ADJOINT_SOLEXTRA": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_ADJOINT_SOLEXTRA", "HEADER": "dtavg[Adjoint_SolExtra]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1445,21 +1686,21 @@ "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_AVG_ENTHALPY": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Avg_Enthalpy]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_AVG_NORMALVEL": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Avg_NormalVel]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_AVG_TEMPERATURE": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_HEAT", - "HEADER": "dtavg[AvgTemp]", + "HEADER": "dtavg[Temp]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_BUFFET": { @@ -1474,6 +1715,12 @@ "HEADER": "dtavg[ComboObj]", "TYPE": "TAVG_D_COEFFICIENT", }, + "TAVG_D_CUSTOM_OBJFUNC": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_COMBO", + "HEADER": "dtavg[ComboObj]", + "TYPE": "TAVG_D_COEFFICIENT", + }, "TAVG_D_DELTA_CL": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FIXED_CL", @@ -1493,13 +1740,13 @@ "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_EQUIVALENT_AREA": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_EQUIVALENT_AREA", "HEADER": "dtavg[CEquiv_Area]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_FIGURE_OF_MERIT": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_ROTATING_FRAME", "HEADER": "dtavg[CMerit]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1523,7 +1770,7 @@ "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_CP_DIFF", "HEADER": "dtavg[Cp_Diff]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1535,9 +1782,9 @@ "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_MAXIMUM_HEATFLUX": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_HEAT", - "HEADER": "dtavg[MaxHF]", + "HEADER": "dtavg[maxHF]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_MOMENT_X": { @@ -1558,14 +1805,20 @@ "HEADER": "dtavg[CMz]", "TYPE": "TAVG_D_COEFFICIENT", }, + "TAVG_D_REFERENCE_FORCE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[RefForce]", + "TYPE": "TAVG_D_COEFFICIENT", + }, "TAVG_D_REFERENCE_GEOMETRY": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_STRUCT_COEFF", "HEADER": "dtavg[RefGeom]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_REFERENCE_NODE": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_STRUCT_COEFF", "HEADER": "dtavg[RefNode]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1595,7 +1848,7 @@ "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SENS_PRESS_OUT": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_SENSITIVITY", "HEADER": "dtavg[Sens_Pout]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1619,79 +1872,79 @@ "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_STRESS_PENALTY": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_STRUCT_COEFF", "HEADER": "dtavg[StressPen]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_MACH": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Avg_Mach]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_MASSFLOW": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Avg_Massflow]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Momentum_Distortion]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Pressure_Drop]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_SECONDARY": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Secondary_Strength]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Secondary_Over_Uniformity]", "TYPE": "TAVG_D_COEFFICIENT", }, - 'TAVG_D_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "weighted " "time " "average " "derivative " "value", + "TAVG_D_SURFACE_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_SPECIES_COEFF", - "HEADER": 'dtavg[Avg_Species_" ' "+ " "std::to_string(iVar]", + "HEADER": "dtavg[Avg_Species_\" + std::to_string(iVar]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_STATIC_PRESSURE": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Avg_Press]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Avg_Temp]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Avg_TotalPress]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_TOTAL_TEMPERATURE": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Avg_TotalTemp]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_UNIFORMITY": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", "HEADER": "dtavg[Uniformity]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1703,13 +1956,13 @@ "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_TOPOL_COMPLIANCE": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_STRUCT_COEFF", "HEADER": "dtavg[TopComp]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_TOPOL_DISCRETENESS": { - "DESCRIPTION": "weighted time average " "derivative value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_STRUCT_COEFF", "HEADER": "dtavg[TopDisc]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1721,13 +1974,13 @@ "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_TOTAL_HEATFLUX": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_HEAT", "HEADER": "dtavg[HF]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_VOLUME_FRACTION": { - "DESCRIPTION": "weighted time average derivative " "value", + "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_STRUCT_COEFF", "HEADER": "dtavg[VolFrac]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1783,7 +2036,7 @@ "TAVG_MAXIMUM_HEATFLUX": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[MaxHF]", + "HEADER": "tavg[maxHF]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_MOMENT_X": { @@ -1804,6 +2057,12 @@ "HEADER": "tavg[CMz]", "TYPE": "TAVG_COEFFICIENT", }, + "TAVG_REFERENCE_FORCE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[RefForce]", + "TYPE": "TAVG_COEFFICIENT", + }, "TAVG_REFERENCE_GEOMETRY": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_STRUCT_COEFF", @@ -1901,15 +2160,15 @@ "TYPE": "TAVG_COEFFICIENT", }, "TAVG_SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "weighted time average " "value", + "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Secondary_Over_Uniformity]", "TYPE": "TAVG_COEFFICIENT", }, - 'TAVG_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "weighted " "time average " "value", + "TAVG_SURFACE_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_SPECIES_COEFF", - "HEADER": 'tavg[Avg_Species_" ' "+ " "std::to_string(iVar]", + "HEADER": "tavg[Avg_Species_\" + std::to_string(iVar]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_SURFACE_STATIC_PRESSURE": { @@ -1919,7 +2178,7 @@ "TYPE": "TAVG_COEFFICIENT", }, "TAVG_SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "weighted time average " "value", + "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Avg_Temp]", "TYPE": "TAVG_COEFFICIENT", @@ -1931,7 +2190,7 @@ "TYPE": "TAVG_COEFFICIENT", }, "TAVG_SURFACE_TOTAL_TEMPERATURE": { - "DESCRIPTION": "weighted time average " "value", + "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Avg_TotalTemp]", "TYPE": "TAVG_COEFFICIENT", @@ -1991,7 +2250,7 @@ "TYPE": "COEFFICIENT", }, "TOPOL_DISCRETENESS": { - "DESCRIPTION": "Discreteness of the material " "distribution", + "DESCRIPTION": "Discreteness of the material distribution", "GROUP": "STRUCT_COEFF", "HEADER": "TopDisc", "TYPE": "COEFFICIENT", @@ -2003,11 +2262,95 @@ "TYPE": "COEFFICIENT", }, "TOTAL_HEATFLUX": { - "DESCRIPTION": "Total heatflux on all surfaces defined in " "MARKER_MONITORING", + "DESCRIPTION": "Total heatflux on all surfaces set with MARKER_MONITORING.", "GROUP": "HEAT", "HEADER": "HF", "TYPE": "COEFFICIENT", }, + "TangentialVelocityIn_\" + tag": { + "DESCRIPTION": "Mass flow out \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TangentialVelocityIn_\" + tag", + "TYPE": "DEFAULT", + }, + "TangentialVelocityOut_\" + tag": { + "DESCRIPTION": "Mach in \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TangentialVelocityOut_\" + tag", + "TYPE": "DEFAULT", + }, + "TemperatureIn_\" + tag": { + "DESCRIPTION": "Temperature ratio \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TemperatureIn_\" + tag", + "TYPE": "DEFAULT", + }, + "TemperatureOut_\" + tag": { + "DESCRIPTION": "Flow angle in \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TemperatureOut_\" + tag", + "TYPE": "DEFAULT", + }, + "TotPressureLoss_\" + tag": { + "DESCRIPTION": "Blade Pressure Loss Coefficient", + "GROUP": "TURBO_PERF", + "HEADER": "TPLC_\" + tag", + "TYPE": "DEFAULT", + }, + "TotPressureLoss_Stage": { + "DESCRIPTION": "Machine Pressure Loss Coefficient", + "GROUP": "TURBO_PERF", + "HEADER": "TPLC_all", + "TYPE": "DEFAULT", + }, + "TotalEntahalpyIn_\" + tag": { + "DESCRIPTION": "Entropy generation \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TotalEntahalpyIn_\" + tag", + "TYPE": "DEFAULT", + }, + "TotalEnthalpyOut_\" + tag": { + "DESCRIPTION": "Eulerian work \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TotalEnthalpyOut_\" + tag", + "TYPE": "DEFAULT", + }, + "TotalPressureIn_\" + tag": { + "DESCRIPTION": "Pressure ratio \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TotPressureIn_\" + tag", + "TYPE": "DEFAULT", + }, + "TotalPressureOut_\" + tag": { + "DESCRIPTION": "Flow angle in \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TotPressureOut_\" + tag", + "TYPE": "DEFAULT", + }, + "TotalStaticEfficiency": { + "DESCRIPTION": "Machine total-to-static efficiency", + "GROUP": "TURBO_PERF", + "HEADER": "TotStaticEff", + "TYPE": "DEFAULT", + }, + "TotalTemperatureIn_\" + tag": { + "DESCRIPTION": "Temperature ratio \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TotTemperatureIn_\" + tag", + "TYPE": "DEFAULT", + }, + "TotalTemperatureOut_\" + tag": { + "DESCRIPTION": "Flow angle in \" + tag", + "GROUP": "TURBO_PERF", + "HEADER": "TotTemperatureOut_\" + tag", + "TYPE": "DEFAULT", + }, + "TotalTotalEfficiency": { + "DESCRIPTION": "Machine total-to-total efficiency", + "GROUP": "TURBO_PERF", + "HEADER": "TotTotEff", + "TYPE": "DEFAULT", + }, "VMS": { "DESCRIPTION": "VMS", "GROUP": "Maximum Von-Misses stress", diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py index f7df492fa0e4..68c668ab91a0 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -24,7 +24,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with SU2. If not, see . -import os, pprint +import os, json su2_home = os.environ["SU2_HOME"] @@ -98,10 +98,28 @@ def parse_output(files): addedOutputFields[name] = curOutputField outputFields.update(addedOutputFields) - f = open(os.path.join(su2_home, "SU2_PY/SU2/io/historyMap.py"), "w") - f.write("history_header_map = ") - pprint.pprint(outputFields, f) - f.close() + out_path = os.path.join(su2_home, "SU2_PY/SU2/io/historyMap.py") + + def _dq(s): + if not isinstance(s, str): + s = str(s) + s = s.replace("\\", "\\\\").replace("\"", "\\\"") + return f"\"{s}\"" + + _field_order = ("DESCRIPTION", "GROUP", "HEADER", "TYPE") + + with open(out_path, "w", encoding="utf-8") as f: + f.write("history_header_map = {\n") + for key in sorted(outputFields.keys()): + val = outputFields[key] + f.write(f" {_dq(key)}: {{\n") + for name in _field_order: + if name in val: + f.write(f" {_dq(name)}: {_dq(val[name])},\n") + f.write(" },\n") + f.write("}\n") + + parse_output(fileList) From 5baca6b988f48ac2344f3ebff05636143818c489 Mon Sep 17 00:00:00 2001 From: Ercan Umut Date: Thu, 23 Oct 2025 11:32:27 +0300 Subject: [PATCH 4/8] Update updateHistoryMap.py removing json from import. --- SU2_PY/updateHistoryMap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py index 68c668ab91a0..84c6cd0def66 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -24,7 +24,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with SU2. If not, see . -import os, json +import os su2_home = os.environ["SU2_HOME"] From 6b6a86bcb9202aa4db208f936bce17d83b73ed6c Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Thu, 23 Oct 2025 06:58:05 -0700 Subject: [PATCH 5/8] Update SU2_CFD/src/output/CFlowOutput.cpp --- SU2_CFD/src/output/CFlowOutput.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp index a75f3714c868..0282c3808bfb 100644 --- a/SU2_CFD/src/output/CFlowOutput.cpp +++ b/SU2_CFD/src/output/CFlowOutput.cpp @@ -1720,6 +1720,7 @@ void CFlowOutput::AddAerodynamicCoefficients(const CConfig* config) { /// DESCRIPTION: Angle of attack AddHistoryOutput("AOA", "AoA", ScreenOutputFormat::FIXED, "AOA", "Angle of attack"); + // CUSTOM_OBJFUNC is added here so historyMap.py knows how to get its value, the actual output is COMBO. AddHistoryOutput("CUSTOM_OBJFUNC", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Custom obj. function value.", HistoryFieldType::COEFFICIENT); AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT); } From 12dd8627485641381db3037ca703a51a64de9f5a Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Sat, 25 Oct 2025 21:43:50 -0700 Subject: [PATCH 6/8] Update SU2_CFD/src/output/CFlowOutput.cpp --- SU2_CFD/src/output/CFlowOutput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp index 0282c3808bfb..925203ad58a6 100644 --- a/SU2_CFD/src/output/CFlowOutput.cpp +++ b/SU2_CFD/src/output/CFlowOutput.cpp @@ -1721,7 +1721,7 @@ void CFlowOutput::AddAerodynamicCoefficients(const CConfig* config) { AddHistoryOutput("AOA", "AoA", ScreenOutputFormat::FIXED, "AOA", "Angle of attack"); // CUSTOM_OBJFUNC is added here so historyMap.py knows how to get its value, the actual output is COMBO. - AddHistoryOutput("CUSTOM_OBJFUNC", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Custom obj. function value.", HistoryFieldType::COEFFICIENT); + if (false) AddHistoryOutput("CUSTOM_OBJFUNC", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Custom obj. function value.", HistoryFieldType::COEFFICIENT); AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT); } From 331a27ca1934c9b4714bbe0bbb65194f16224e97 Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Sun, 26 Oct 2025 09:52:10 -0700 Subject: [PATCH 7/8] Apply suggestions from code review --- SU2_PY/SU2/io/historyMap.py | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index fb92d16c15e2..4edff56d89ed 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -515,12 +515,6 @@ "HEADER": "d[CMz]", "TYPE": "D_COEFFICIENT", }, - "D_REFERENCE_FORCE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[RefForce]", - "TYPE": "D_COEFFICIENT", - }, "D_REFERENCE_GEOMETRY": { "DESCRIPTION": "Derivative value", "GROUP": "D_STRUCT_COEFF", @@ -1187,12 +1181,6 @@ "HEADER": "PRTT", "TYPE": "DEFAULT", }, - "REFERENCE_FORCE": { - "DESCRIPTION": "Reference force used to compute aerodynamic coefficients", - "GROUP": "AERO_COEFF", - "HEADER": "RefForce", - "TYPE": "COEFFICIENT", - }, "REFERENCE_GEOMETRY": { "DESCRIPTION": "L2 norm of difference wrt reference geometry", "GROUP": "STRUCT_COEFF", @@ -1805,12 +1793,6 @@ "HEADER": "dtavg[CMz]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_REFERENCE_FORCE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[RefForce]", - "TYPE": "TAVG_D_COEFFICIENT", - }, "TAVG_D_REFERENCE_GEOMETRY": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_STRUCT_COEFF", @@ -2057,12 +2039,6 @@ "HEADER": "tavg[CMz]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_REFERENCE_FORCE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[RefForce]", - "TYPE": "TAVG_COEFFICIENT", - }, "TAVG_REFERENCE_GEOMETRY": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_STRUCT_COEFF", From 919787b695da1a53312fc41979e805b4868ecd66 Mon Sep 17 00:00:00 2001 From: ercanumut60 Date: Thu, 30 Oct 2025 11:47:23 +0300 Subject: [PATCH 8/8] style: apply black formatting --- SU2_PY/SU2/io/historyMap.py | 276 ++++++++++++++++++------------------ SU2_PY/updateHistoryMap.py | 6 +- 2 files changed, 140 insertions(+), 142 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 4edff56d89ed..c9904fe35d16 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -59,40 +59,40 @@ "HEADER": "Temp", "TYPE": "COEFFICIENT", }, - "AbsFlowAngleIn_\" + tag": { - "DESCRIPTION": "Absolute flow angle in \" + tag", + 'AbsFlowAngleIn_" + tag': { + "DESCRIPTION": 'Absolute flow angle in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "AbsFlowAngleIn_\" + tag", + "HEADER": 'AbsFlowAngleIn_" + tag', "TYPE": "DEFAULT", }, - "AbsFlowAngleOut_\" + tag": { - "DESCRIPTION": "Absolute flow angle out \" + tag", + 'AbsFlowAngleOut_" + tag': { + "DESCRIPTION": 'Absolute flow angle out " + tag', "GROUP": "TURBO_PERF", - "HEADER": "AbsFlowAngleOut_\" + tag", + "HEADER": 'AbsFlowAngleOut_" + tag', "TYPE": "DEFAULT", }, - "BGS_\" + cv_name": { - "DESCRIPTION": "BGS residual of the \" + cv_name + \" controlling variable equation.", + 'BGS_" + cv_name': { + "DESCRIPTION": 'BGS residual of the " + cv_name + " controlling variable equation.', "GROUP": "BGS_RES", - "HEADER": "bgs[\" + cv_name + \"]", + "HEADER": 'bgs[" + cv_name + "]', "TYPE": "RESIDUAL", }, - "BGS_\"+scalar_name": { - "DESCRIPTION": "BGS residual of the \"+scalar_name+\" mass fraction equation.", + 'BGS_"+scalar_name': { + "DESCRIPTION": 'BGS residual of the "+scalar_name+" mass fraction equation.', "GROUP": "BGS_RES", - "HEADER": "bgs[\"+scalar_name+\"]", + "HEADER": 'bgs["+scalar_name+"]', "TYPE": "RESIDUAL", }, - "BGS_ADJ_\" + cv_name": { - "DESCRIPTION": "BGS residual of the adjoint \" + cv_name", + 'BGS_ADJ_" + cv_name': { + "DESCRIPTION": 'BGS residual of the adjoint " + cv_name', "GROUP": "BGS_RES", - "HEADER": "bgs[\" + cv_name + \"]", + "HEADER": 'bgs[" + cv_name + "]', "TYPE": "RESIDUAL", }, - "BGS_ADJ_\" + scalar_name": { - "DESCRIPTION": "BGS residual of the adjoint of \" + scalar_name + \" .", + 'BGS_ADJ_" + scalar_name': { + "DESCRIPTION": 'BGS residual of the adjoint of " + scalar_name + " .', "GROUP": "BGS_RES", - "HEADER": "bgs[\" + scalar_name + \"]", + "HEADER": 'bgs[" + scalar_name + "]', "TYPE": "RESIDUAL", }, "BGS_ADJ_DENSITY": { @@ -167,10 +167,10 @@ "HEADER": "bgs[A_P1]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_SPECIES_\" + std::to_string(iVar": { + 'BGS_ADJ_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "BGS residual of the adjoint transported species.", "GROUP": "BGS_RES", - "HEADER": "bgs[A_rho*Y_\" + std::to_string(iVar) + \"]", + "HEADER": 'bgs[A_rho*Y_" + std::to_string(iVar) + "]', "TYPE": "RESIDUAL", }, "BGS_ADJ_TEMPERATURE": { @@ -275,10 +275,10 @@ "HEADER": "bgs[LM_2]", "TYPE": "RESIDUAL", }, - "BGS_SPECIES_\" + std::to_string(iVar": { + 'BGS_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "Maximum residual of transported species.", "GROUP": "BGS_RES", - "HEADER": "bgs[rho*Y_\" + std::to_string(iVar)+\"]", + "HEADER": 'bgs[rho*Y_" + std::to_string(iVar)+"]', "TYPE": "RESIDUAL", }, "BGS_TEMPERATURE": { @@ -617,10 +617,10 @@ "HEADER": "d[Secondary_Over_Uniformity]", "TYPE": "D_COEFFICIENT", }, - "D_SURFACE_SPECIES_\" + std::to_string(iVar": { + 'D_SURFACE_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "Derivative value", "GROUP": "D_SPECIES_COEFF", - "HEADER": "d[Avg_Species_\" + std::to_string(iVar]", + "HEADER": 'd[Avg_Species_" + std::to_string(iVar]', "TYPE": "D_COEFFICIENT", }, "D_SURFACE_STATIC_PRESSURE": { @@ -689,16 +689,16 @@ "HEADER": "d[VolFrac]", "TYPE": "D_COEFFICIENT", }, - "DensityIn_\" + tag": { - "DESCRIPTION": "Flow angle out \" + tag", + 'DensityIn_" + tag': { + "DESCRIPTION": 'Flow angle out " + tag', "GROUP": "TURBO_PERF", - "HEADER": "DensityIn_\" + tag", + "HEADER": 'DensityIn_" + tag', "TYPE": "DEFAULT", }, - "DensityOut_\" + tag": { - "DESCRIPTION": "Absolute flow angle in \" + tag", + 'DensityOut_" + tag': { + "DESCRIPTION": 'Absolute flow angle in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "DensityOut_\" + tag", + "HEADER": 'DensityOut_" + tag', "TYPE": "DEFAULT", }, "EFFICIENCY": { @@ -719,16 +719,16 @@ "HEADER": "EntropyGen", "TYPE": "DEFAULT", }, - "EntropyIn_\" + tag": { - "DESCRIPTION": "Total pressure loss \" + tag", + 'EntropyIn_" + tag': { + "DESCRIPTION": 'Total pressure loss " + tag', "GROUP": "TURBO_PERF", - "HEADER": "EntropyIn_\" + tag", + "HEADER": 'EntropyIn_" + tag', "TYPE": "DEFAULT", }, - "EntropyOut_\" + tag": { - "DESCRIPTION": "Kinetic energy loss \" + tag", + 'EntropyOut_" + tag': { + "DESCRIPTION": 'Kinetic energy loss " + tag', "GROUP": "TURBO_PERF", - "HEADER": "EntropyOut_\" + tag", + "HEADER": 'EntropyOut_" + tag', "TYPE": "DEFAULT", }, "EulerianWork": { @@ -767,10 +767,10 @@ "HEADER": "Cp_Diff", "TYPE": "COEFFICIENT", }, - "KineticEnergyLoss_\" + tag": { + 'KineticEnergyLoss_" + tag': { "DESCRIPTION": "Blade Kinetic Energy Loss Coefficient", "GROUP": "TURBO_PERF", - "HEADER": "KELC_\" + tag", + "HEADER": 'KELC_" + tag', "TYPE": "DEFAULT", }, "KineticEnergyLoss_Stage": { @@ -875,28 +875,28 @@ "HEADER": "maxHF", "TYPE": "COEFFICIENT", }, - "MAX_\" + cv_name": { - "DESCRIPTION": "Maximum residual of the \" + cv_name + \" equation.", + 'MAX_" + cv_name': { + "DESCRIPTION": 'Maximum residual of the " + cv_name + " equation.', "GROUP": "MAX_RES", - "HEADER": "max[\" + cv_name + \"]", + "HEADER": 'max[" + cv_name + "]', "TYPE": "RESIDUAL", }, - "MAX_\" + scalar_name": { - "DESCRIPTION": "Maximum residual of the \" + scalar_name + \" mass fraction equation.", + 'MAX_" + scalar_name': { + "DESCRIPTION": 'Maximum residual of the " + scalar_name + " mass fraction equation.', "GROUP": "MAX_RES", - "HEADER": "max[\" + scalar_name + \"]", + "HEADER": 'max[" + scalar_name + "]', "TYPE": "RESIDUAL", }, - "MAX_ADJ_\" + cv_name": { - "DESCRIPTION": "Maximum residual of the adjoint \" + cv_name", + 'MAX_ADJ_" + cv_name': { + "DESCRIPTION": 'Maximum residual of the adjoint " + cv_name', "GROUP": "MAX_RES", - "HEADER": "max[\"+cv_name +\"]", + "HEADER": 'max["+cv_name +"]', "TYPE": "RESIDUAL", }, - "MAX_ADJ_\" + scalar_name": { - "DESCRIPTION": "Maximum residual of the adjoint of \" + scalar_name + \" .", + 'MAX_ADJ_" + scalar_name': { + "DESCRIPTION": 'Maximum residual of the adjoint of " + scalar_name + " .', "GROUP": "MAX_RES", - "HEADER": "max[scalar_\" + scalar_name + \"]", + "HEADER": 'max[scalar_" + scalar_name + "]', "TYPE": "RESIDUAL", }, "MAX_ADJ_DENSITY": { @@ -947,10 +947,10 @@ "HEADER": "max[A_Rho]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_SPECIES_\" + std::to_string(iVar": { + 'MAX_ADJ_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "Maximum residual of the adjoint transported species.", "GROUP": "MAX_RES", - "HEADER": "max[A_rho*Y_\" + std::to_string(iVar) + \"]", + "HEADER": 'max[A_rho*Y_" + std::to_string(iVar) + "]', "TYPE": "RESIDUAL", }, "MAX_ADJ_TEMPERATURE": { @@ -1049,10 +1049,10 @@ "HEADER": "max[LM_2]", "TYPE": "RESIDUAL", }, - "MAX_SPECIES_\" + std::to_string(iVar": { + 'MAX_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "Maximum residual of transported species.", "GROUP": "MAX_RES", - "HEADER": "max[rho*Y_\" + std::to_string(iVar)+\"]", + "HEADER": 'max[rho*Y_" + std::to_string(iVar)+"]', "TYPE": "RESIDUAL", }, "MAX_TEMPERATURE": { @@ -1115,40 +1115,40 @@ "HEADER": "CMz", "TYPE": "COEFFICIENT", }, - "MachIn_\" + tag": { - "DESCRIPTION": "Total-to-Static efficiency \" + tag", + 'MachIn_" + tag': { + "DESCRIPTION": 'Total-to-Static efficiency " + tag', "GROUP": "TURBO_PERF", - "HEADER": "MachIn_\" + tag", + "HEADER": 'MachIn_" + tag', "TYPE": "DEFAULT", }, - "MachOut_\" + tag": { - "DESCRIPTION": "Total-to-Static efficiency \" + tag", + 'MachOut_" + tag': { + "DESCRIPTION": 'Total-to-Static efficiency " + tag', "GROUP": "TURBO_PERF", - "HEADER": "MachOut_\" + tag", + "HEADER": 'MachOut_" + tag', "TYPE": "DEFAULT", }, - "MassFlowIn_\" + tag": { - "DESCRIPTION": "Mach out \" + tag", + 'MassFlowIn_" + tag': { + "DESCRIPTION": 'Mach out " + tag', "GROUP": "TURBO_PERF", - "HEADER": "MassFlowIn_\" + tag", + "HEADER": 'MassFlowIn_" + tag', "TYPE": "DEFAULT", }, - "MassFlowOut_\" + tag": { - "DESCRIPTION": "Total efficiency \" + tag", + 'MassFlowOut_" + tag': { + "DESCRIPTION": 'Total efficiency " + tag', "GROUP": "TURBO_PERF", - "HEADER": "MassFlowOut_\" + tag", + "HEADER": 'MassFlowOut_" + tag', "TYPE": "DEFAULT", }, - "NormalVelocityIn_\" + tag": { - "DESCRIPTION": "Absolute flow angle out \" + tag", + 'NormalVelocityIn_" + tag': { + "DESCRIPTION": 'Absolute flow angle out " + tag', "GROUP": "TURBO_PERF", - "HEADER": "NormalVelocityIn_\" + tag", + "HEADER": 'NormalVelocityIn_" + tag', "TYPE": "DEFAULT", }, - "NormalVelocityOut_\" + tag": { - "DESCRIPTION": "Mass flow in \" + tag", + 'NormalVelocityOut_" + tag': { + "DESCRIPTION": 'Mass flow in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "NormalVelocityOut_\" + tag", + "HEADER": 'NormalVelocityOut_" + tag', "TYPE": "DEFAULT", }, "PREV_AOA": { @@ -1157,16 +1157,16 @@ "HEADER": "Previous_AOA", "TYPE": "DEFAULT", }, - "PressureIn_\" + tag": { - "DESCRIPTION": "Pressure ratio \" + tag", + 'PressureIn_" + tag': { + "DESCRIPTION": 'Pressure ratio " + tag', "GROUP": "TURBO_PERF", - "HEADER": "PressureIn_\" + tag", + "HEADER": 'PressureIn_" + tag', "TYPE": "DEFAULT", }, - "PressureOut_\" + tag": { - "DESCRIPTION": "Flow angle in \" + tag", + 'PressureOut_" + tag': { + "DESCRIPTION": 'Flow angle in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "PressureOut_\" + tag", + "HEADER": 'PressureOut_" + tag', "TYPE": "DEFAULT", }, "PressureRatioTS": { @@ -1193,28 +1193,28 @@ "HEADER": "RefNode", "TYPE": "COEFFICIENT", }, - "RMS_\"+CV_name": { - "DESCRIPTION": "Root-mean squared residual of \" + CV_name + \" controlling variable equation.", + 'RMS_"+CV_name': { + "DESCRIPTION": 'Root-mean squared residual of " + CV_name + " controlling variable equation.', "GROUP": "RMS_RES", - "HEADER": "rms[\"+CV_name+\"]", + "HEADER": 'rms["+CV_name+"]', "TYPE": "RESIDUAL", }, - "RMS_\"+scalar_name": { - "DESCRIPTION": "Root-mean squared residual of the \"+scalar_name+\" mass fraction equation.", + 'RMS_"+scalar_name': { + "DESCRIPTION": 'Root-mean squared residual of the "+scalar_name+" mass fraction equation.', "GROUP": "RMS_RES", - "HEADER": "rms[\"+scalar_name+\"]", + "HEADER": 'rms["+scalar_name+"]', "TYPE": "RESIDUAL", }, - "RMS_ADJ_\" + scalar_name": { - "DESCRIPTION": "Root-mean square residual of the adjoint of \" + scalar_name + \" .", + 'RMS_ADJ_" + scalar_name': { + "DESCRIPTION": 'Root-mean square residual of the adjoint of " + scalar_name + " .', "GROUP": "RMS_RES", - "HEADER": "rms[\" + scalar_name + \"]", + "HEADER": 'rms[" + scalar_name + "]', "TYPE": "RESIDUAL", }, - "RMS_ADJ_\"+cv_name": { - "DESCRIPTION": "Root-mean square residual of the adjoint \" + cv_name", + 'RMS_ADJ_"+cv_name': { + "DESCRIPTION": 'Root-mean square residual of the adjoint " + cv_name', "GROUP": "RMS_RES", - "HEADER": "rms[\" + cv_name + \"]", + "HEADER": 'rms[" + cv_name + "]', "TYPE": "RESIDUAL", }, "RMS_ADJ_DENSITY": { @@ -1271,10 +1271,10 @@ "HEADER": "rms[A_P1]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_SPECIES_\" + std::to_string(iVar": { + 'RMS_ADJ_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "Root-mean square residual of the adjoint transported species.", "GROUP": "RMS_RES", - "HEADER": "rms[A_rho*Y_\" + std::to_string(iVar) + \"]", + "HEADER": 'rms[A_rho*Y_" + std::to_string(iVar) + "]', "TYPE": "RESIDUAL", }, "RMS_ADJ_TEMPERATURE": { @@ -1391,10 +1391,10 @@ "HEADER": "rms[R]", "TYPE": "RESIDUAL", }, - "RMS_SPECIES_\" + std::to_string(iVar": { + 'RMS_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "Root-mean square residual of transported species.", "GROUP": "RMS_RES", - "HEADER": "rms[rho*Y_\" + std::to_string(iVar)+\"]", + "HEADER": 'rms[rho*Y_" + std::to_string(iVar)+"]', "TYPE": "RESIDUAL", }, "RMS_TKE": { @@ -1427,13 +1427,13 @@ "HEADER": "Sens_AoA", "TYPE": "COEFFICIENT", }, - "SENS_EFIELD_\" + iVarS": { + 'SENS_EFIELD_" + iVarS': { "DESCRIPTION": "d Objective / d Electric field", "GROUP": "SENSITIVITY", "HEADER": "Sens[EField\" + iVarS + ']'", "TYPE": "DEFAULT", }, - "SENS_E_\" + iVarS": { + 'SENS_E_" + iVarS': { "DESCRIPTION": "d Objective / d Elasticity modulus", "GROUP": "SENSITIVITY", "HEADER": "Sens[E\" + iVarS + ']'", @@ -1451,7 +1451,7 @@ "HEADER": "Sens_Mach", "TYPE": "COEFFICIENT", }, - "SENS_NU_\" + iVarS": { + 'SENS_NU_" + iVarS': { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", "HEADER": "Sens[Nu\" + iVarS + ']'", @@ -1469,13 +1469,13 @@ "HEADER": "Sens_Pout", "TYPE": "COEFFICIENT", }, - "SENS_RHO_\" + iVarS": { + 'SENS_RHO_" + iVarS': { "DESCRIPTION": "d Objective / d Material density", "GROUP": "SENSITIVITY", "HEADER": "Sens[Rho\" + iVarS + ']'", "TYPE": "DEFAULT", }, - "SENS_RHO_DL_\" + iVarS": { + 'SENS_RHO_DL_" + iVarS': { "DESCRIPTION": "d Objective / d Dead load density", "GROUP": "SENSITIVITY", "HEADER": "Sens[RhoDL\" + iVarS + ']'", @@ -1559,10 +1559,10 @@ "HEADER": "Secondary_Over_Uniformity", "TYPE": "COEFFICIENT", }, - "SURFACE_SPECIES_\" + std::to_string(iVar": { - "DESCRIPTION": "Total average species \" + std::to_string(iVar) + \" on all markers set in MARKER_ANALYZE", + 'SURFACE_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": 'Total average species " + std::to_string(iVar) + " on all markers set in MARKER_ANALYZE', "GROUP": "SPECIES_COEFF", - "HEADER": "Avg_Species_\" + std::to_string(iVar", + "HEADER": 'Avg_Species_" + std::to_string(iVar', "TYPE": "COEFFICIENT", }, "SURFACE_SPECIES_VARIANCE": { @@ -1895,10 +1895,10 @@ "HEADER": "dtavg[Secondary_Over_Uniformity]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SURFACE_SPECIES_\" + std::to_string(iVar": { + 'TAVG_D_SURFACE_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_SPECIES_COEFF", - "HEADER": "dtavg[Avg_Species_\" + std::to_string(iVar]", + "HEADER": 'dtavg[Avg_Species_" + std::to_string(iVar]', "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_SURFACE_STATIC_PRESSURE": { @@ -2141,10 +2141,10 @@ "HEADER": "tavg[Secondary_Over_Uniformity]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SURFACE_SPECIES_\" + std::to_string(iVar": { + 'TAVG_SURFACE_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_SPECIES_COEFF", - "HEADER": "tavg[Avg_Species_\" + std::to_string(iVar]", + "HEADER": 'tavg[Avg_Species_" + std::to_string(iVar]', "TYPE": "TAVG_COEFFICIENT", }, "TAVG_SURFACE_STATIC_PRESSURE": { @@ -2243,34 +2243,34 @@ "HEADER": "HF", "TYPE": "COEFFICIENT", }, - "TangentialVelocityIn_\" + tag": { - "DESCRIPTION": "Mass flow out \" + tag", + 'TangentialVelocityIn_" + tag': { + "DESCRIPTION": 'Mass flow out " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TangentialVelocityIn_\" + tag", + "HEADER": 'TangentialVelocityIn_" + tag', "TYPE": "DEFAULT", }, - "TangentialVelocityOut_\" + tag": { - "DESCRIPTION": "Mach in \" + tag", + 'TangentialVelocityOut_" + tag': { + "DESCRIPTION": 'Mach in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TangentialVelocityOut_\" + tag", + "HEADER": 'TangentialVelocityOut_" + tag', "TYPE": "DEFAULT", }, - "TemperatureIn_\" + tag": { - "DESCRIPTION": "Temperature ratio \" + tag", + 'TemperatureIn_" + tag': { + "DESCRIPTION": 'Temperature ratio " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TemperatureIn_\" + tag", + "HEADER": 'TemperatureIn_" + tag', "TYPE": "DEFAULT", }, - "TemperatureOut_\" + tag": { - "DESCRIPTION": "Flow angle in \" + tag", + 'TemperatureOut_" + tag': { + "DESCRIPTION": 'Flow angle in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TemperatureOut_\" + tag", + "HEADER": 'TemperatureOut_" + tag', "TYPE": "DEFAULT", }, - "TotPressureLoss_\" + tag": { + 'TotPressureLoss_" + tag': { "DESCRIPTION": "Blade Pressure Loss Coefficient", "GROUP": "TURBO_PERF", - "HEADER": "TPLC_\" + tag", + "HEADER": 'TPLC_" + tag', "TYPE": "DEFAULT", }, "TotPressureLoss_Stage": { @@ -2279,28 +2279,28 @@ "HEADER": "TPLC_all", "TYPE": "DEFAULT", }, - "TotalEntahalpyIn_\" + tag": { - "DESCRIPTION": "Entropy generation \" + tag", + 'TotalEntahalpyIn_" + tag': { + "DESCRIPTION": 'Entropy generation " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TotalEntahalpyIn_\" + tag", + "HEADER": 'TotalEntahalpyIn_" + tag', "TYPE": "DEFAULT", }, - "TotalEnthalpyOut_\" + tag": { - "DESCRIPTION": "Eulerian work \" + tag", + 'TotalEnthalpyOut_" + tag': { + "DESCRIPTION": 'Eulerian work " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TotalEnthalpyOut_\" + tag", + "HEADER": 'TotalEnthalpyOut_" + tag', "TYPE": "DEFAULT", }, - "TotalPressureIn_\" + tag": { - "DESCRIPTION": "Pressure ratio \" + tag", + 'TotalPressureIn_" + tag': { + "DESCRIPTION": 'Pressure ratio " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TotPressureIn_\" + tag", + "HEADER": 'TotPressureIn_" + tag', "TYPE": "DEFAULT", }, - "TotalPressureOut_\" + tag": { - "DESCRIPTION": "Flow angle in \" + tag", + 'TotalPressureOut_" + tag': { + "DESCRIPTION": 'Flow angle in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TotPressureOut_\" + tag", + "HEADER": 'TotPressureOut_" + tag', "TYPE": "DEFAULT", }, "TotalStaticEfficiency": { @@ -2309,16 +2309,16 @@ "HEADER": "TotStaticEff", "TYPE": "DEFAULT", }, - "TotalTemperatureIn_\" + tag": { - "DESCRIPTION": "Temperature ratio \" + tag", + 'TotalTemperatureIn_" + tag': { + "DESCRIPTION": 'Temperature ratio " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TotTemperatureIn_\" + tag", + "HEADER": 'TotTemperatureIn_" + tag', "TYPE": "DEFAULT", }, - "TotalTemperatureOut_\" + tag": { - "DESCRIPTION": "Flow angle in \" + tag", + 'TotalTemperatureOut_" + tag': { + "DESCRIPTION": 'Flow angle in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "TotTemperatureOut_\" + tag", + "HEADER": 'TotTemperatureOut_" + tag', "TYPE": "DEFAULT", }, "TotalTotalEfficiency": { diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py index 84c6cd0def66..610ab00c3dea 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -103,8 +103,8 @@ def parse_output(files): def _dq(s): if not isinstance(s, str): s = str(s) - s = s.replace("\\", "\\\\").replace("\"", "\\\"") - return f"\"{s}\"" + s = s.replace("\\", "\\\\").replace('"', '\\"') + return f'"{s}"' _field_order = ("DESCRIPTION", "GROUP", "HEADER", "TYPE") @@ -120,6 +120,4 @@ def _dq(s): f.write("}\n") - - parse_output(fileList)