From b9d935fc06f20fb04cb9dd321e85ac8671605d17 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sun, 28 Dec 2025 12:08:42 +0530 Subject: [PATCH 01/14] fix(SU2_PY): Fix Custom Objective Function for Unsteady Adjoint Rebased fix from PR #2587 with additional compatibility patch. Signed-off-by: shbhmexe --- SU2_CFD/src/output/CFlowOutput.cpp | 4 +- SU2_PY/SU2/io/historyMap.py | 855 ++++++++++++++++++++--------- SU2_PY/updateHistoryMap.py | 31 +- 3 files changed, 618 insertions(+), 272 deletions(-) diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp index 696a4c595475..03cf27e2476a 100644 --- a/SU2_CFD/src/output/CFlowOutput.cpp +++ b/SU2_CFD/src/output/CFlowOutput.cpp @@ -1719,7 +1719,9 @@ 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. + 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); } diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 93a49a2ce0f5..dddc929a3e6e 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", @@ -100,20 +131,26 @@ "HEADER": "bgs[A_E]", "TYPE": "RESIDUAL", }, + "BGS_ADJ_ENTHALPY": { + "DESCRIPTION": "BGS residual of the adjoint enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_h]", + "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,29 +168,23 @@ "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", }, - "BGS_ADJ_ENTHALPY": { - "DESCRIPTION": "BGS residual of the adjoint " "enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_h]", - "TYPE": "RESIDUAL", - }, "BGS_ADJ_TKE": { "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", "GROUP": "BGS_RES", @@ -161,19 +192,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", @@ -214,6 +245,18 @@ "HEADER": "bgs[RhoE]", "TYPE": "RESIDUAL", }, + "BGS_ENTHALPY": { + "DESCRIPTION": "BGS residual of the enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[h]", + "TYPE": "", + }, + "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", @@ -238,22 +281,22 @@ "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_TEMPERATURE": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the " "temperature", + "BGS_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Maximum residual of transported species.", "GROUP": "BGS_RES", - "HEADER": "bgs[T]", + "HEADER": "bgs[rho*Y_\" + std::to_string(iVar)+\"]", "TYPE": "RESIDUAL", }, - "BGS_ENTHALPY": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the " "enthalpy", + "BGS_TEMPERATURE": { + "DESCRIPTION": "BGS residual of the temperature.", "GROUP": "BGS_RES", - "HEADER": "bgs[h]", + "HEADER": "bgs[T]", "TYPE": "RESIDUAL", }, "BGS_TKE": { @@ -293,7 +336,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", @@ -311,7 +354,7 @@ "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", @@ -329,7 +372,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", @@ -341,8 +384,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", @@ -374,7 +416,7 @@ "D_AVG_TEMPERATURE": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[AvgTemp]", + "HEADER": "d[Temp]", "TYPE": "D_COEFFICIENT", }, "D_BUFFET": { @@ -452,7 +494,7 @@ "D_MAXIMUM_HEATFLUX": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[MaxHF]", + "HEADER": "d[maxHF]", "TYPE": "D_COEFFICIENT", }, "D_MOMENT_X": { @@ -473,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", @@ -575,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": { @@ -647,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", @@ -660,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", @@ -667,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", @@ -693,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", @@ -706,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", @@ -725,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", @@ -750,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", @@ -763,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", @@ -774,40 +923,46 @@ "HEADER": "max[A_E]", "TYPE": "RESIDUAL", }, + "MAX_ADJ_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_h]", + "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": { @@ -816,32 +971,26 @@ "HEADER": "max[A_T]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_h]", - "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", @@ -865,7 +1014,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", @@ -876,14 +1025,26 @@ "HEADER": "max[RhoE]", "TYPE": "RESIDUAL", }, + "MAX_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[h]", + "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", @@ -900,22 +1061,22 @@ "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_TEMPERATURE": { - "DESCRIPTION": "Maximum residual of the temperature", + "MAX_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Maximum residual of transported species.", "GROUP": "MAX_RES", - "HEADER": "max[T]", + "HEADER": "max[rho*Y_\" + std::to_string(iVar)+\"]", "TYPE": "RESIDUAL", }, - "MAX_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy", + "MAX_TEMPERATURE": { + "DESCRIPTION": "Root-mean square residual of the temperature.", "GROUP": "MAX_RES", - "HEADER": "max[h]", + "HEADER": "max[T]", "TYPE": "RESIDUAL", }, "MAX_TKE": { @@ -925,19 +1086,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", @@ -955,35 +1116,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", @@ -994,108 +1217,122 @@ "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_ENTHALPY": { + "DESCRIPTION": "Root-mean square residual of the enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_h]", + "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_ENTHALPY": { - "DESCRIPTION": "Root mean square residual of the " "adjoint enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_h]", - "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", @@ -1125,7 +1362,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", @@ -1142,20 +1379,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", @@ -1166,32 +1409,26 @@ "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, - "RMS_RTOL": { - "DESCRIPTION": "Norm of residual", - "GROUP": "RMS_RES", - "HEADER": "rms[R]", - "TYPE": "RESIDUAL", - }, - 'RMS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Root-mean square " "residual of " "transported species.", + "RMS_RE_THETA_T": { + "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", "GROUP": "RMS_RES", - "HEADER": 'rms[rho*Y_" + ' 'std::to_string(iVar)+"]', + "HEADER": "rms[LM_2]", "TYPE": "RESIDUAL", }, - "RMS_TEMPERATURE": { - "DESCRIPTION": "Root mean square residual of the " "temperature", + "RMS_RTOL": { + "DESCRIPTION": "Norm of residual", "GROUP": "RMS_RES", - "HEADER": "rms[T]", + "HEADER": "rms[R]", "TYPE": "RESIDUAL", }, - "RMS_ENTHALPY": { - "DESCRIPTION": "Root mean square residual of the " "enthalpy", + "RMS_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Root-mean square residual of transported species.", "GROUP": "RMS_RES", - "HEADER": "rms[h]", + "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", @@ -1203,83 +1440,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", @@ -1291,7 +1536,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", @@ -1309,56 +1554,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": { @@ -1368,36 +1602,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", @@ -1429,7 +1658,7 @@ "TAVG_AVG_TEMPERATURE": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[AvgTemp]", + "HEADER": "tavg[Temp]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_BUFFET": { @@ -1457,7 +1686,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", @@ -1469,21 +1698,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": { @@ -1517,13 +1746,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", @@ -1547,7 +1776,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", @@ -1559,9 +1788,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": { @@ -1582,14 +1811,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", @@ -1619,7 +1854,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", @@ -1643,79 +1878,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", @@ -1727,13 +1962,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", @@ -1745,13 +1980,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", @@ -1807,7 +2042,7 @@ "TAVG_MAXIMUM_HEATFLUX": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[MaxHF]", + "HEADER": "tavg[maxHF]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_MOMENT_X": { @@ -1828,6 +2063,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", @@ -1925,15 +2166,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": { @@ -1943,7 +2184,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", @@ -1955,7 +2196,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", @@ -2015,7 +2256,7 @@ "TYPE": "COEFFICIENT", }, "TOPOL_DISCRETENESS": { - "DESCRIPTION": "Discreteness of the material " "distribution", + "DESCRIPTION": "Discreteness of the material distribution", "GROUP": "STRUCT_COEFF", "HEADER": "TopDisc", "TYPE": "COEFFICIENT", @@ -2027,11 +2268,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..c3b79d59fd75 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 su2_home = os.environ["SU2_HOME"] @@ -63,7 +63,10 @@ def parse_output(files): curOutputField["GROUP"] = s[3].strip(' ()"\n;') curOutputField["DESCRIPTION"] = s[4].strip(' ()"\n;') if len(s) == 6: - curOutputField["TYPE"] = s[5].strip(' ()"\n;').split("::")[1] + if "::" in s[5]: + curOutputField["TYPE"] = s[5].strip(' ()"\n;').split("::")[1] + else: + curOutputField["TYPE"] = s[5].strip(' ()"\n;') else: curOutputField["TYPE"] = "DEFAULT" outputFields[name] = curOutputField @@ -98,10 +101,26 @@ 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 e50bd9505a38f53e0ed69fe82a543fe6382dc882 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sun, 28 Dec 2025 12:20:22 +0530 Subject: [PATCH 02/14] Update historyMap.py --- SU2_PY/SU2/io/historyMap.py | 276 ++++++++++++++++++------------------ 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index dddc929a3e6e..e46b3e9b2943 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": { @@ -173,10 +173,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": { @@ -287,10 +287,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": { @@ -623,10 +623,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": { @@ -695,16 +695,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": { @@ -725,16 +725,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": { @@ -773,10 +773,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": { @@ -881,28 +881,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": { @@ -959,10 +959,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": { @@ -1067,10 +1067,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": { @@ -1133,40 +1133,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": { @@ -1175,16 +1175,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": { @@ -1217,28 +1217,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": { @@ -1301,10 +1301,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": { @@ -1421,10 +1421,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": { @@ -1457,13 +1457,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 + ']'", @@ -1481,7 +1481,7 @@ "HEADER": "Sens_Mach", "TYPE": "COEFFICIENT", }, - "SENS_NU_\" + iVarS": { + 'SENS_NU_" + iVarS': { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", "HEADER": "Sens[Nu\" + iVarS + ']'", @@ -1499,13 +1499,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 + ']'", @@ -1589,10 +1589,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": { @@ -1919,10 +1919,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": { @@ -2171,10 +2171,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": { @@ -2273,34 +2273,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": { @@ -2309,28 +2309,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": { @@ -2339,16 +2339,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": { From 840dfffd7d21bb6a328b47ce1f57a310033d0b3a Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sun, 28 Dec 2025 18:48:14 +0530 Subject: [PATCH 03/14] fix(SU2_CFD,SU2_PY): Fix Custom Objective Function for Unsteady Adjoint Add CUSTOM_OBJFUNC output field support for shape_optimization.py. Fix updateHistoryMap.py parsing for field types without :: separator. Rebased from PR #2587 (ErcanUmut60). Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 839 +++++++++++------------------------- SU2_PY/updateHistoryMap.py | 5 +- 2 files changed, 258 insertions(+), 586 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index e46b3e9b2943..93a49a2ce0f5 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -1,24 +1,27 @@ 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", @@ -36,65 +39,31 @@ "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 set with MARKER_MONITORING.", + "DESCRIPTION": "Average temperature on all surfaces " + "defined in MARKER_MONITORING", "GROUP": "HEAT", - "HEADER": "Temp", + "HEADER": "AvgTemp", "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", @@ -102,25 +71,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", @@ -131,26 +100,20 @@ "HEADER": "bgs[A_E]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_ENTHALPY": { - "DESCRIPTION": "BGS residual of the adjoint enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_h]", - "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", @@ -168,23 +131,29 @@ "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.", + "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", }, + "BGS_ADJ_ENTHALPY": { + "DESCRIPTION": "BGS residual of the adjoint " "enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_h]", + "TYPE": "RESIDUAL", + }, "BGS_ADJ_TKE": { "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", "GROUP": "BGS_RES", @@ -192,19 +161,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", @@ -245,18 +214,6 @@ "HEADER": "bgs[RhoE]", "TYPE": "RESIDUAL", }, - "BGS_ENTHALPY": { - "DESCRIPTION": "BGS residual of the enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[h]", - "TYPE": "", - }, - "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", @@ -281,24 +238,24 @@ "HEADER": "bgs[P]", "TYPE": "RESIDUAL", }, - "BGS_RE_THETA_T": { - "DESCRIPTION": "BGS residual of the momentum thickness Reynolds number (LM model).", - "GROUP": "BGS_RES", - "HEADER": "bgs[LM_2]", - "TYPE": "RESIDUAL", - }, 'BGS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Maximum residual of transported species.", + "DESCRIPTION": "BGS 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": { - "DESCRIPTION": "BGS residual of the temperature.", + "DESCRIPTION": "Block-Gauss-Seidel residual of the " "temperature", "GROUP": "BGS_RES", "HEADER": "bgs[T]", "TYPE": "RESIDUAL", }, + "BGS_ENTHALPY": { + "DESCRIPTION": "Block-Gauss-Seidel residual of the " "enthalpy", + "GROUP": "BGS_RES", + "HEADER": "bgs[h]", + "TYPE": "RESIDUAL", + }, "BGS_TKE": { "DESCRIPTION": "BGS residual of kinetic energy (SST model).", "GROUP": "BGS_RES", @@ -336,7 +293,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", @@ -354,7 +311,7 @@ "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", @@ -372,7 +329,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", @@ -384,7 +341,8 @@ "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", @@ -416,7 +374,7 @@ "D_AVG_TEMPERATURE": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[Temp]", + "HEADER": "d[AvgTemp]", "TYPE": "D_COEFFICIENT", }, "D_BUFFET": { @@ -494,7 +452,7 @@ "D_MAXIMUM_HEATFLUX": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[maxHF]", + "HEADER": "d[MaxHF]", "TYPE": "D_COEFFICIENT", }, "D_MOMENT_X": { @@ -515,12 +473,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", @@ -624,9 +576,9 @@ "TYPE": "D_COEFFICIENT", }, 'D_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Derivative value", + "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": { @@ -695,20 +647,9 @@ "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", @@ -719,30 +660,6 @@ "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", @@ -750,19 +667,22 @@ "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", @@ -773,20 +693,9 @@ "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", @@ -797,32 +706,15 @@ "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", @@ -833,32 +725,14 @@ "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", @@ -876,35 +750,12 @@ "TYPE": "DEFAULT", }, "MAXIMUM_HEATFLUX": { - "DESCRIPTION": "Maximum heatflux across all surfaces set with MARKER_MONITORING.", + "DESCRIPTION": "Maximum heatflux on all surfaces defined " + "in 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", @@ -912,7 +763,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", @@ -923,46 +774,40 @@ "HEADER": "max[A_E]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_h]", - "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.", + "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": { @@ -971,26 +816,32 @@ "HEADER": "max[A_T]", "TYPE": "RESIDUAL", }, + "MAX_ADJ_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_h]", + "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", @@ -1014,7 +865,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", @@ -1025,26 +876,14 @@ "HEADER": "max[RhoE]", "TYPE": "RESIDUAL", }, - "MAX_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[h]", - "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", @@ -1061,24 +900,24 @@ "HEADER": "max[P]", "TYPE": "RESIDUAL", }, - "MAX_RE_THETA_T": { - "DESCRIPTION": "Maximum residual of the momentum thickness Reynolds number (LM model).", - "GROUP": "MAX_RES", - "HEADER": "max[LM_2]", - "TYPE": "RESIDUAL", - }, 'MAX_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Maximum residual of transported species.", + "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": { - "DESCRIPTION": "Root-mean square residual of the temperature.", + "DESCRIPTION": "Maximum residual of the temperature", "GROUP": "MAX_RES", "HEADER": "max[T]", "TYPE": "RESIDUAL", }, + "MAX_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy", + "GROUP": "MAX_RES", + "HEADER": "max[h]", + "TYPE": "RESIDUAL", + }, "MAX_TKE": { "DESCRIPTION": "Maximum residual of kinetic energy (SST model).", "GROUP": "MAX_RES", @@ -1086,19 +925,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", @@ -1116,97 +955,35 @@ "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", @@ -1217,122 +994,108 @@ "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_ENTHALPY": { - "DESCRIPTION": "Root-mean square residual of the enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_h]", - "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.", + "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_ENTHALPY": { + "DESCRIPTION": "Root mean square residual of the " "adjoint enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_h]", + "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", @@ -1362,7 +1125,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", @@ -1379,26 +1142,20 @@ "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", @@ -1409,12 +1166,6 @@ "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, - "RMS_RE_THETA_T": { - "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", - "GROUP": "RMS_RES", - "HEADER": "rms[LM_2]", - "TYPE": "RESIDUAL", - }, "RMS_RTOL": { "DESCRIPTION": "Norm of residual", "GROUP": "RMS_RES", @@ -1422,13 +1173,25 @@ "TYPE": "RESIDUAL", }, 'RMS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Root-mean square residual of transported species.", + "DESCRIPTION": "Root-mean square " "residual of " "transported species.", + "GROUP": "RMS_RES", + "HEADER": 'rms[rho*Y_" + ' 'std::to_string(iVar)+"]', + "TYPE": "RESIDUAL", + }, + "RMS_TEMPERATURE": { + "DESCRIPTION": "Root mean square residual of the " "temperature", "GROUP": "RMS_RES", - "HEADER": 'rms[rho*Y_" + std::to_string(iVar)+"]', + "HEADER": "rms[T]", + "TYPE": "RESIDUAL", + }, + "RMS_ENTHALPY": { + "DESCRIPTION": "Root mean square residual of the " "enthalpy", + "GROUP": "RMS_RES", + "HEADER": "rms[h]", "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", @@ -1440,91 +1203,83 @@ "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_EFIELD_" + iVarS': { - "DESCRIPTION": "d Objective / d Electric field", - "GROUP": "SENSITIVITY", - "HEADER": "Sens[EField\" + iVarS + ']'", - "TYPE": "DEFAULT", - }, - 'SENS_E_" + iVarS': { + "SENS_E_0": { "DESCRIPTION": "d Objective / d Elasticity modulus", "GROUP": "SENSITIVITY", - "HEADER": "Sens[E\" + iVarS + ']'", + "HEADER": "Sens[E_0]", "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_" + iVarS': { + "SENS_NU_0": { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", - "HEADER": "Sens[Nu\" + iVarS + ']'", + "HEADER": "Sens[Nu_0]", "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", @@ -1536,7 +1291,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", @@ -1554,45 +1309,56 @@ "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', + "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": { @@ -1602,31 +1368,36 @@ "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", @@ -1658,7 +1429,7 @@ "TAVG_AVG_TEMPERATURE": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[Temp]", + "HEADER": "tavg[AvgTemp]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_BUFFET": { @@ -1686,7 +1457,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", @@ -1698,21 +1469,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[Temp]", + "HEADER": "dtavg[AvgTemp]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_BUFFET": { @@ -1746,13 +1517,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", @@ -1776,7 +1547,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", @@ -1788,9 +1559,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": { @@ -1811,20 +1582,14 @@ "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", @@ -1854,7 +1619,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", @@ -1878,79 +1643,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", + "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", @@ -1962,13 +1727,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", @@ -1980,13 +1745,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", @@ -2042,7 +1807,7 @@ "TAVG_MAXIMUM_HEATFLUX": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[maxHF]", + "HEADER": "tavg[MaxHF]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_MOMENT_X": { @@ -2063,12 +1828,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", @@ -2166,15 +1925,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", + "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": { @@ -2184,7 +1943,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", @@ -2196,7 +1955,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", @@ -2256,7 +2015,7 @@ "TYPE": "COEFFICIENT", }, "TOPOL_DISCRETENESS": { - "DESCRIPTION": "Discreteness of the material distribution", + "DESCRIPTION": "Discreteness of the material " "distribution", "GROUP": "STRUCT_COEFF", "HEADER": "TopDisc", "TYPE": "COEFFICIENT", @@ -2268,95 +2027,11 @@ "TYPE": "COEFFICIENT", }, "TOTAL_HEATFLUX": { - "DESCRIPTION": "Total heatflux on all surfaces set with MARKER_MONITORING.", + "DESCRIPTION": "Total heatflux on all surfaces defined in " "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 c3b79d59fd75..610ab00c3dea 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -63,10 +63,7 @@ def parse_output(files): curOutputField["GROUP"] = s[3].strip(' ()"\n;') curOutputField["DESCRIPTION"] = s[4].strip(' ()"\n;') if len(s) == 6: - if "::" in s[5]: - curOutputField["TYPE"] = s[5].strip(' ()"\n;').split("::")[1] - else: - curOutputField["TYPE"] = s[5].strip(' ()"\n;') + curOutputField["TYPE"] = s[5].strip(' ()"\n;').split("::")[1] else: curOutputField["TYPE"] = "DEFAULT" outputFields[name] = curOutputField From aa0056c3d68b6ea762df17d30a08df32462bd985 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Mon, 29 Dec 2025 14:55:34 +0530 Subject: [PATCH 04/14] fix(SU2_PY): Regenerate historyMap.py with updated script Run updateHistoryMap.py to regenerate historyMap.py. Fix script to handle HistoryFieldType passed as variable (without ::). Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 839 +++++++++++++++++++++++++----------- SU2_PY/updateHistoryMap.py | 6 +- 2 files changed, 587 insertions(+), 258 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 93a49a2ce0f5..e46b3e9b2943 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", @@ -100,20 +131,26 @@ "HEADER": "bgs[A_E]", "TYPE": "RESIDUAL", }, + "BGS_ADJ_ENTHALPY": { + "DESCRIPTION": "BGS residual of the adjoint enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_h]", + "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,29 +168,23 @@ "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.", + "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", }, - "BGS_ADJ_ENTHALPY": { - "DESCRIPTION": "BGS residual of the adjoint " "enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_h]", - "TYPE": "RESIDUAL", - }, "BGS_ADJ_TKE": { "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", "GROUP": "BGS_RES", @@ -161,19 +192,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", @@ -214,6 +245,18 @@ "HEADER": "bgs[RhoE]", "TYPE": "RESIDUAL", }, + "BGS_ENTHALPY": { + "DESCRIPTION": "BGS residual of the enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[h]", + "TYPE": "", + }, + "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", @@ -238,22 +281,22 @@ "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_TEMPERATURE": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the " "temperature", + 'BGS_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": "Maximum residual of transported species.", "GROUP": "BGS_RES", - "HEADER": "bgs[T]", + "HEADER": 'bgs[rho*Y_" + std::to_string(iVar)+"]', "TYPE": "RESIDUAL", }, - "BGS_ENTHALPY": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the " "enthalpy", + "BGS_TEMPERATURE": { + "DESCRIPTION": "BGS residual of the temperature.", "GROUP": "BGS_RES", - "HEADER": "bgs[h]", + "HEADER": "bgs[T]", "TYPE": "RESIDUAL", }, "BGS_TKE": { @@ -293,7 +336,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", @@ -311,7 +354,7 @@ "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", @@ -329,7 +372,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", @@ -341,8 +384,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", @@ -374,7 +416,7 @@ "D_AVG_TEMPERATURE": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[AvgTemp]", + "HEADER": "d[Temp]", "TYPE": "D_COEFFICIENT", }, "D_BUFFET": { @@ -452,7 +494,7 @@ "D_MAXIMUM_HEATFLUX": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[MaxHF]", + "HEADER": "d[maxHF]", "TYPE": "D_COEFFICIENT", }, "D_MOMENT_X": { @@ -473,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", @@ -576,9 +624,9 @@ "TYPE": "D_COEFFICIENT", }, 'D_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Derivative " "value", + "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": { @@ -647,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", @@ -660,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", @@ -667,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", @@ -693,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", @@ -706,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", @@ -725,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", @@ -750,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", @@ -763,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", @@ -774,40 +923,46 @@ "HEADER": "max[A_E]", "TYPE": "RESIDUAL", }, + "MAX_ADJ_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_h]", + "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.", + "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": { @@ -816,32 +971,26 @@ "HEADER": "max[A_T]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_h]", - "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", @@ -865,7 +1014,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", @@ -876,14 +1025,26 @@ "HEADER": "max[RhoE]", "TYPE": "RESIDUAL", }, + "MAX_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[h]", + "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", @@ -900,22 +1061,22 @@ "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_TEMPERATURE": { - "DESCRIPTION": "Maximum residual of the temperature", + 'MAX_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": "Maximum residual of transported species.", "GROUP": "MAX_RES", - "HEADER": "max[T]", + "HEADER": 'max[rho*Y_" + std::to_string(iVar)+"]', "TYPE": "RESIDUAL", }, - "MAX_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy", + "MAX_TEMPERATURE": { + "DESCRIPTION": "Root-mean square residual of the temperature.", "GROUP": "MAX_RES", - "HEADER": "max[h]", + "HEADER": "max[T]", "TYPE": "RESIDUAL", }, "MAX_TKE": { @@ -925,19 +1086,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", @@ -955,35 +1116,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", @@ -994,108 +1217,122 @@ "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_ENTHALPY": { + "DESCRIPTION": "Root-mean square residual of the enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_h]", + "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.", + "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_ENTHALPY": { - "DESCRIPTION": "Root mean square residual of the " "adjoint enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_h]", - "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", @@ -1125,7 +1362,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", @@ -1142,20 +1379,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", @@ -1166,6 +1409,12 @@ "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, + "RMS_RE_THETA_T": { + "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", + "GROUP": "RMS_RES", + "HEADER": "rms[LM_2]", + "TYPE": "RESIDUAL", + }, "RMS_RTOL": { "DESCRIPTION": "Norm of residual", "GROUP": "RMS_RES", @@ -1173,25 +1422,13 @@ "TYPE": "RESIDUAL", }, '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)+"]', - "TYPE": "RESIDUAL", - }, - "RMS_TEMPERATURE": { - "DESCRIPTION": "Root mean square residual of the " "temperature", + "DESCRIPTION": "Root-mean square residual of transported species.", "GROUP": "RMS_RES", - "HEADER": "rms[T]", - "TYPE": "RESIDUAL", - }, - "RMS_ENTHALPY": { - "DESCRIPTION": "Root mean square residual of the " "enthalpy", - "GROUP": "RMS_RES", - "HEADER": "rms[h]", + "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", @@ -1203,83 +1440,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", @@ -1291,7 +1536,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", @@ -1309,56 +1554,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", + "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": { @@ -1368,36 +1602,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", @@ -1429,7 +1658,7 @@ "TAVG_AVG_TEMPERATURE": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[AvgTemp]", + "HEADER": "tavg[Temp]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_BUFFET": { @@ -1457,7 +1686,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", @@ -1469,21 +1698,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": { @@ -1517,13 +1746,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", @@ -1547,7 +1776,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", @@ -1559,9 +1788,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": { @@ -1582,14 +1811,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", @@ -1619,7 +1854,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", @@ -1643,79 +1878,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", + "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", @@ -1727,13 +1962,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", @@ -1745,13 +1980,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", @@ -1807,7 +2042,7 @@ "TAVG_MAXIMUM_HEATFLUX": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[MaxHF]", + "HEADER": "tavg[maxHF]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_MOMENT_X": { @@ -1828,6 +2063,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", @@ -1925,15 +2166,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", + "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": { @@ -1943,7 +2184,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", @@ -1955,7 +2196,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", @@ -2015,7 +2256,7 @@ "TYPE": "COEFFICIENT", }, "TOPOL_DISCRETENESS": { - "DESCRIPTION": "Discreteness of the material " "distribution", + "DESCRIPTION": "Discreteness of the material distribution", "GROUP": "STRUCT_COEFF", "HEADER": "TopDisc", "TYPE": "COEFFICIENT", @@ -2027,11 +2268,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 610ab00c3dea..b718a0433fab 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -63,7 +63,11 @@ def parse_output(files): curOutputField["GROUP"] = s[3].strip(' ()"\n;') curOutputField["DESCRIPTION"] = s[4].strip(' ()"\n;') if len(s) == 6: - curOutputField["TYPE"] = s[5].strip(' ()"\n;').split("::")[1] + type_str = s[5].strip(' ()"\n;') + if "::" in type_str: + curOutputField["TYPE"] = type_str.split("::")[1] + else: + curOutputField["TYPE"] = type_str else: curOutputField["TYPE"] = "DEFAULT" outputFields[name] = curOutputField From 1d060f22ab2360ba056f5d7d7794bddc0e353af3 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Tue, 30 Dec 2025 12:47:53 +0530 Subject: [PATCH 05/14] fix(SU2_PY): Regenerate historyMap.py with fixed custom writer logic Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 88 +++++++++++++++++++++++++++++++++---- SU2_PY/updateHistoryMap.py | 9 +++- 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index e46b3e9b2943..37903e99be68 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -54,9 +54,9 @@ "TYPE": "COEFFICIENT", }, "AVG_TEMPERATURE": { - "DESCRIPTION": "Average temperature on all surfaces set with MARKER_MONITORING.", + "DESCRIPTION": "Average temperature on all surfaces defined in MARKER_MONITORING", "GROUP": "HEAT", - "HEADER": "Temp", + "HEADER": "AvgTemp", "TYPE": "COEFFICIENT", }, 'AbsFlowAngleIn_" + tag': { @@ -269,6 +269,12 @@ "HEADER": "bgs[RhoV]", "TYPE": "RESIDUAL", }, + "BGS_MOMENTUM-Z": { + "DESCRIPTION": "BGS residual of the z-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[RhoW]", + "TYPE": "RESIDUAL", + }, "BGS_NU_TILDE": { "DESCRIPTION": "BGS residual of nu tilde (SA model).", "GROUP": "BGS_RES", @@ -281,6 +287,12 @@ "HEADER": "bgs[P]", "TYPE": "RESIDUAL", }, + "BGS_RAD_ENERGY": { + "DESCRIPTION": "BGS residual of the radiative energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[E_Rad]", + "TYPE": "RESIDUAL", + }, "BGS_RE_THETA_T": { "DESCRIPTION": "BGS residual of the momentum thickness Reynolds number (LM model).", "GROUP": "BGS_RES", @@ -294,7 +306,7 @@ "TYPE": "RESIDUAL", }, "BGS_TEMPERATURE": { - "DESCRIPTION": "BGS residual of the temperature.", + "DESCRIPTION": "Block-Gauss-Seidel residual of the temperature", "GROUP": "BGS_RES", "HEADER": "bgs[T]", "TYPE": "RESIDUAL", @@ -353,6 +365,12 @@ "HEADER": "ComboObj", "TYPE": "COEFFICIENT", }, + "CUSTOM_OBJFUNC": { + "DESCRIPTION": "Custom obj. function value.", + "GROUP": "COMBO", + "HEADER": "ComboObj", + "TYPE": "COEFFICIENT", + }, "DEFORM_ITER": { "DESCRIPTION": "Linear solver iterations for the mesh deformation", "GROUP": "DEFORM", @@ -416,7 +434,7 @@ "D_AVG_TEMPERATURE": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[Temp]", + "HEADER": "d[AvgTemp]", "TYPE": "D_COEFFICIENT", }, "D_BUFFET": { @@ -431,6 +449,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", @@ -1049,6 +1073,12 @@ "HEADER": "max[RhoV]", "TYPE": "RESIDUAL", }, + "MAX_MOMENTUM-Z": { + "DESCRIPTION": "Maximum residual of the z-component.", + "GROUP": "MAX_RES", + "HEADER": "max[RhoW]", + "TYPE": "RESIDUAL", + }, "MAX_NU_TILDE": { "DESCRIPTION": "Maximum residual of nu tilde (SA model).", "GROUP": "MAX_RES", @@ -1074,7 +1104,7 @@ "TYPE": "RESIDUAL", }, "MAX_TEMPERATURE": { - "DESCRIPTION": "Root-mean square residual of the temperature.", + "DESCRIPTION": "Maximum residual of the temperature", "GROUP": "MAX_RES", "HEADER": "max[T]", "TYPE": "RESIDUAL", @@ -1373,6 +1403,12 @@ "HEADER": "rms[RhoE]", "TYPE": "RESIDUAL", }, + "RMS_ENTHALPY": { + "DESCRIPTION": "Root-mean square residual of the enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[h]", + "TYPE": "RESIDUAL", + }, "RMS_ETOL": { "DESCRIPTION": "Norm of energy/work increment", "GROUP": "RMS_RES", @@ -1397,6 +1433,12 @@ "HEADER": "rms[RhoV]", "TYPE": "RESIDUAL", }, + "RMS_MOMENTUM-Z": { + "DESCRIPTION": "Root-mean square residual of the momentum z-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[RhoW]", + "TYPE": "RESIDUAL", + }, "RMS_NU_TILDE": { "DESCRIPTION": "Root-mean square residual of nu tilde (SA model).", "GROUP": "RMS_RES", @@ -1409,6 +1451,12 @@ "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, + "RMS_RAD_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the radiative energy.", + "GROUP": "RMS_RES", + "HEADER": "rms[E_Rad]", + "TYPE": "RESIDUAL", + }, "RMS_RE_THETA_T": { "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", "GROUP": "RMS_RES", @@ -1427,6 +1475,12 @@ "HEADER": 'rms[rho*Y_" + std::to_string(iVar)+"]', "TYPE": "RESIDUAL", }, + "RMS_TEMPERATURE": { + "DESCRIPTION": "Root mean square residual of the temperature", + "GROUP": "RMS_RES", + "HEADER": "rms[T]", + "TYPE": "RESIDUAL", + }, "RMS_TKE": { "DESCRIPTION": "Root-mean square residual of kinetic energy (SST model).", "GROUP": "RMS_RES", @@ -1451,6 +1505,12 @@ "HEADER": "rms[V]", "TYPE": "RESIDUAL", }, + "RMS_VELOCITY-Z": { + "DESCRIPTION": "Root-mean square residual of the velocity z-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[W]", + "TYPE": "RESIDUAL", + }, "SENS_AOA": { "DESCRIPTION": "Sensitivity of the objective function with respect to the angle of attack (only for compressible solver).", "GROUP": "SENSITIVITY", @@ -1658,7 +1718,7 @@ "TAVG_AVG_TEMPERATURE": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[Temp]", + "HEADER": "tavg[AvgTemp]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_BUFFET": { @@ -1673,6 +1733,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", @@ -1712,7 +1778,7 @@ "TAVG_D_AVG_TEMPERATURE": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_HEAT", - "HEADER": "dtavg[Temp]", + "HEADER": "dtavg[AvgTemp]", "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_BUFFET": { @@ -1727,6 +1793,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", @@ -2268,7 +2340,7 @@ "TYPE": "COEFFICIENT", }, "TOTAL_HEATFLUX": { - "DESCRIPTION": "Total heatflux on all surfaces set with MARKER_MONITORING.", + "DESCRIPTION": "Total heatflux on all surfaces defined in MARKER_MONITORING", "GROUP": "HEAT", "HEADER": "HF", "TYPE": "COEFFICIENT", diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py index b718a0433fab..0e1c5d728daf 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -55,8 +55,13 @@ def parse_output(files): s = f.readline().strip(" ") if not s: break - if s.startswith("AddHistoryOutput("): - s = s.replace("AddHistoryOutput", "").strip("()").split(",") + if "AddHistoryOutput(" in s: + # Extract the AddHistoryOutput(...) portion + idx = s.find("AddHistoryOutput(") + s = s[idx:].replace("AddHistoryOutput", "").strip("()").split(",") + # Skip lines with insufficient arguments (e.g., comments mentioning AddHistoryOutput) + if len(s) < 5: + continue curOutputField = dict() name = s[0].strip(' ()"\n;') curOutputField["HEADER"] = s[1].strip(' ()"\n;') From cc53b11b337a3477069e1a3d573fec35323026d4 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Tue, 30 Dec 2025 14:08:44 +0530 Subject: [PATCH 06/14] revert: Restore updateHistoryMap.py and historyMap.py to develop version Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 891 ++++++++++-------------------------- SU2_PY/updateHistoryMap.py | 41 +- 2 files changed, 255 insertions(+), 677 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 37903e99be68..93a49a2ce0f5 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -1,24 +1,27 @@ 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", @@ -36,65 +39,31 @@ "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 " + "defined in MARKER_MONITORING", "GROUP": "HEAT", "HEADER": "AvgTemp", "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", @@ -102,25 +71,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", @@ -131,26 +100,20 @@ "HEADER": "bgs[A_E]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_ENTHALPY": { - "DESCRIPTION": "BGS residual of the adjoint enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_h]", - "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", @@ -168,23 +131,29 @@ "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.", + "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", }, + "BGS_ADJ_ENTHALPY": { + "DESCRIPTION": "BGS residual of the adjoint " "enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_h]", + "TYPE": "RESIDUAL", + }, "BGS_ADJ_TKE": { "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", "GROUP": "BGS_RES", @@ -192,19 +161,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", @@ -245,18 +214,6 @@ "HEADER": "bgs[RhoE]", "TYPE": "RESIDUAL", }, - "BGS_ENTHALPY": { - "DESCRIPTION": "BGS residual of the enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[h]", - "TYPE": "", - }, - "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", @@ -269,12 +226,6 @@ "HEADER": "bgs[RhoV]", "TYPE": "RESIDUAL", }, - "BGS_MOMENTUM-Z": { - "DESCRIPTION": "BGS residual of the z-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[RhoW]", - "TYPE": "RESIDUAL", - }, "BGS_NU_TILDE": { "DESCRIPTION": "BGS residual of nu tilde (SA model).", "GROUP": "BGS_RES", @@ -287,30 +238,24 @@ "HEADER": "bgs[P]", "TYPE": "RESIDUAL", }, - "BGS_RAD_ENERGY": { - "DESCRIPTION": "BGS residual of the radiative energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[E_Rad]", - "TYPE": "RESIDUAL", - }, - "BGS_RE_THETA_T": { - "DESCRIPTION": "BGS residual of the momentum thickness Reynolds number (LM model).", - "GROUP": "BGS_RES", - "HEADER": "bgs[LM_2]", - "TYPE": "RESIDUAL", - }, 'BGS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Maximum residual of transported species.", + "DESCRIPTION": "BGS 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": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the temperature", + "DESCRIPTION": "Block-Gauss-Seidel residual of the " "temperature", "GROUP": "BGS_RES", "HEADER": "bgs[T]", "TYPE": "RESIDUAL", }, + "BGS_ENTHALPY": { + "DESCRIPTION": "Block-Gauss-Seidel residual of the " "enthalpy", + "GROUP": "BGS_RES", + "HEADER": "bgs[h]", + "TYPE": "RESIDUAL", + }, "BGS_TKE": { "DESCRIPTION": "BGS residual of kinetic energy (SST model).", "GROUP": "BGS_RES", @@ -348,7 +293,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", @@ -365,14 +310,8 @@ "HEADER": "ComboObj", "TYPE": "COEFFICIENT", }, - "CUSTOM_OBJFUNC": { - "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", @@ -390,7 +329,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", @@ -402,7 +341,8 @@ "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", @@ -449,12 +389,6 @@ "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", @@ -518,7 +452,7 @@ "D_MAXIMUM_HEATFLUX": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[maxHF]", + "HEADER": "d[MaxHF]", "TYPE": "D_COEFFICIENT", }, "D_MOMENT_X": { @@ -539,12 +473,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", @@ -648,9 +576,9 @@ "TYPE": "D_COEFFICIENT", }, 'D_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Derivative value", + "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": { @@ -719,20 +647,9 @@ "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", @@ -743,30 +660,6 @@ "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", @@ -774,19 +667,22 @@ "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", @@ -797,20 +693,9 @@ "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", @@ -821,32 +706,15 @@ "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", @@ -857,32 +725,14 @@ "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", @@ -900,35 +750,12 @@ "TYPE": "DEFAULT", }, "MAXIMUM_HEATFLUX": { - "DESCRIPTION": "Maximum heatflux across all surfaces set with MARKER_MONITORING.", + "DESCRIPTION": "Maximum heatflux on all surfaces defined " + "in 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", @@ -936,7 +763,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", @@ -947,46 +774,40 @@ "HEADER": "max[A_E]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_h]", - "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.", + "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": { @@ -995,26 +816,32 @@ "HEADER": "max[A_T]", "TYPE": "RESIDUAL", }, + "MAX_ADJ_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_h]", + "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", @@ -1038,7 +865,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", @@ -1049,36 +876,18 @@ "HEADER": "max[RhoE]", "TYPE": "RESIDUAL", }, - "MAX_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[h]", - "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", }, - "MAX_MOMENTUM-Z": { - "DESCRIPTION": "Maximum residual of the z-component.", - "GROUP": "MAX_RES", - "HEADER": "max[RhoW]", - "TYPE": "RESIDUAL", - }, "MAX_NU_TILDE": { "DESCRIPTION": "Maximum residual of nu tilde (SA model).", "GROUP": "MAX_RES", @@ -1091,16 +900,10 @@ "HEADER": "max[P]", "TYPE": "RESIDUAL", }, - "MAX_RE_THETA_T": { - "DESCRIPTION": "Maximum residual of the momentum thickness Reynolds number (LM model).", - "GROUP": "MAX_RES", - "HEADER": "max[LM_2]", - "TYPE": "RESIDUAL", - }, 'MAX_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Maximum residual of transported species.", + "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": { @@ -1109,6 +912,12 @@ "HEADER": "max[T]", "TYPE": "RESIDUAL", }, + "MAX_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy", + "GROUP": "MAX_RES", + "HEADER": "max[h]", + "TYPE": "RESIDUAL", + }, "MAX_TKE": { "DESCRIPTION": "Maximum residual of kinetic energy (SST model).", "GROUP": "MAX_RES", @@ -1116,19 +925,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", @@ -1146,97 +955,35 @@ "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", @@ -1247,122 +994,108 @@ "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_ENTHALPY": { - "DESCRIPTION": "Root-mean square residual of the enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_h]", - "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.", + "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_ENTHALPY": { + "DESCRIPTION": "Root mean square residual of the " "adjoint enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_h]", + "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", @@ -1392,7 +1125,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", @@ -1403,44 +1136,26 @@ "HEADER": "rms[RhoE]", "TYPE": "RESIDUAL", }, - "RMS_ENTHALPY": { - "DESCRIPTION": "Root-mean square residual of the enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[h]", - "TYPE": "RESIDUAL", - }, "RMS_ETOL": { "DESCRIPTION": "Norm of energy/work increment", "GROUP": "RMS_RES", "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_MOMENTUM-Z": { - "DESCRIPTION": "Root-mean square residual of the momentum z-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[RhoW]", - "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", @@ -1451,18 +1166,6 @@ "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, - "RMS_RAD_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the radiative energy.", - "GROUP": "RMS_RES", - "HEADER": "rms[E_Rad]", - "TYPE": "RESIDUAL", - }, - "RMS_RE_THETA_T": { - "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", - "GROUP": "RMS_RES", - "HEADER": "rms[LM_2]", - "TYPE": "RESIDUAL", - }, "RMS_RTOL": { "DESCRIPTION": "Norm of residual", "GROUP": "RMS_RES", @@ -1470,19 +1173,25 @@ "TYPE": "RESIDUAL", }, 'RMS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Root-mean square residual of transported species.", + "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_TEMPERATURE": { - "DESCRIPTION": "Root mean square residual of the temperature", + "DESCRIPTION": "Root mean square residual of the " "temperature", "GROUP": "RMS_RES", "HEADER": "rms[T]", "TYPE": "RESIDUAL", }, + "RMS_ENTHALPY": { + "DESCRIPTION": "Root mean square residual of the " "enthalpy", + "GROUP": "RMS_RES", + "HEADER": "rms[h]", + "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", @@ -1494,97 +1203,83 @@ "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", }, - "RMS_VELOCITY-Z": { - "DESCRIPTION": "Root-mean square residual of the velocity z-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[W]", - "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_EFIELD_" + iVarS': { - "DESCRIPTION": "d Objective / d Electric field", - "GROUP": "SENSITIVITY", - "HEADER": "Sens[EField\" + iVarS + ']'", - "TYPE": "DEFAULT", - }, - 'SENS_E_" + iVarS': { + "SENS_E_0": { "DESCRIPTION": "d Objective / d Elasticity modulus", "GROUP": "SENSITIVITY", - "HEADER": "Sens[E\" + iVarS + ']'", + "HEADER": "Sens[E_0]", "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_" + iVarS': { + "SENS_NU_0": { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", - "HEADER": "Sens[Nu\" + iVarS + ']'", + "HEADER": "Sens[Nu_0]", "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", @@ -1596,7 +1291,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", @@ -1614,45 +1309,56 @@ "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', + "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": { @@ -1662,31 +1368,36 @@ "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", @@ -1733,12 +1444,6 @@ "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", @@ -1752,7 +1457,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", @@ -1764,19 +1469,19 @@ "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]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1793,12 +1498,6 @@ "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", @@ -1818,13 +1517,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", @@ -1848,7 +1547,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", @@ -1860,9 +1559,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": { @@ -1883,20 +1582,14 @@ "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", @@ -1926,7 +1619,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", @@ -1950,79 +1643,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", + "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", @@ -2034,13 +1727,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", @@ -2052,13 +1745,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", @@ -2114,7 +1807,7 @@ "TAVG_MAXIMUM_HEATFLUX": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[maxHF]", + "HEADER": "tavg[MaxHF]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_MOMENT_X": { @@ -2135,12 +1828,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", @@ -2238,15 +1925,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", + "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": { @@ -2256,7 +1943,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", @@ -2268,7 +1955,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", @@ -2328,7 +2015,7 @@ "TYPE": "COEFFICIENT", }, "TOPOL_DISCRETENESS": { - "DESCRIPTION": "Discreteness of the material distribution", + "DESCRIPTION": "Discreteness of the material " "distribution", "GROUP": "STRUCT_COEFF", "HEADER": "TopDisc", "TYPE": "COEFFICIENT", @@ -2340,95 +2027,11 @@ "TYPE": "COEFFICIENT", }, "TOTAL_HEATFLUX": { - "DESCRIPTION": "Total heatflux on all surfaces defined in MARKER_MONITORING", + "DESCRIPTION": "Total heatflux on all surfaces defined in " "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 0e1c5d728daf..f7df492fa0e4 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 +import os, pprint su2_home = os.environ["SU2_HOME"] @@ -55,24 +55,15 @@ def parse_output(files): s = f.readline().strip(" ") if not s: break - if "AddHistoryOutput(" in s: - # Extract the AddHistoryOutput(...) portion - idx = s.find("AddHistoryOutput(") - s = s[idx:].replace("AddHistoryOutput", "").strip("()").split(",") - # Skip lines with insufficient arguments (e.g., comments mentioning AddHistoryOutput) - if len(s) < 5: - continue + if s.startswith("AddHistoryOutput("): + s = s.replace("AddHistoryOutput", "").strip("()").split(",") curOutputField = dict() name = s[0].strip(' ()"\n;') curOutputField["HEADER"] = s[1].strip(' ()"\n;') curOutputField["GROUP"] = s[3].strip(' ()"\n;') curOutputField["DESCRIPTION"] = s[4].strip(' ()"\n;') if len(s) == 6: - type_str = s[5].strip(' ()"\n;') - if "::" in type_str: - curOutputField["TYPE"] = type_str.split("::")[1] - else: - curOutputField["TYPE"] = type_str + curOutputField["TYPE"] = s[5].strip(' ()"\n;').split("::")[1] else: curOutputField["TYPE"] = "DEFAULT" outputFields[name] = curOutputField @@ -107,26 +98,10 @@ def parse_output(files): addedOutputFields[name] = curOutputField outputFields.update(addedOutputFields) - 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") + 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() parse_output(fileList) From b52e23eae0008b75c78998d5210b544ebbe411a3 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Thu, 1 Jan 2026 14:04:30 +0530 Subject: [PATCH 07/14] fix(SU2_CFD,SU2_PY): Fix Custom Objective Function for Unsteady Adjoint Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 909 ++++++++++++++++++++++++++---------- SU2_PY/updateHistoryMap.py | 26 +- 2 files changed, 674 insertions(+), 261 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 93a49a2ce0f5..79249dcab8d5 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 defined in MARKER_MONITORING", "GROUP": "HEAT", "HEADER": "AvgTemp", "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", @@ -100,20 +131,26 @@ "HEADER": "bgs[A_E]", "TYPE": "RESIDUAL", }, + "BGS_ADJ_ENTHALPY": { + "DESCRIPTION": "BGS residual of the adjoint enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_h]", + "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,29 +168,23 @@ "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", }, - "BGS_ADJ_ENTHALPY": { - "DESCRIPTION": "BGS residual of the adjoint " "enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_h]", - "TYPE": "RESIDUAL", - }, "BGS_ADJ_TKE": { "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", "GROUP": "BGS_RES", @@ -161,19 +192,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", @@ -214,6 +245,18 @@ "HEADER": "bgs[RhoE]", "TYPE": "RESIDUAL", }, + "BGS_ENTHALPY": { + "DESCRIPTION": "BGS residual of the enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[h]", + "TYPE": "", + }, + "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", @@ -226,6 +269,12 @@ "HEADER": "bgs[RhoV]", "TYPE": "RESIDUAL", }, + "BGS_MOMENTUM-Z": { + "DESCRIPTION": "BGS residual of the z-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[RhoW]", + "TYPE": "RESIDUAL", + }, "BGS_NU_TILDE": { "DESCRIPTION": "BGS residual of nu tilde (SA model).", "GROUP": "BGS_RES", @@ -238,22 +287,28 @@ "HEADER": "bgs[P]", "TYPE": "RESIDUAL", }, - 'BGS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "BGS residual of " "transported species.", + "BGS_RAD_ENERGY": { + "DESCRIPTION": "BGS residual of the radiative energy.", "GROUP": "BGS_RES", - "HEADER": 'bgs[rho*Y_" + ' 'std::to_string(iVar)+"]', + "HEADER": "bgs[E_Rad]", "TYPE": "RESIDUAL", }, - "BGS_TEMPERATURE": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the " "temperature", + "BGS_RE_THETA_T": { + "DESCRIPTION": "BGS residual of the momentum thickness Reynolds number (LM model).", "GROUP": "BGS_RES", - "HEADER": "bgs[T]", + "HEADER": "bgs[LM_2]", "TYPE": "RESIDUAL", }, - "BGS_ENTHALPY": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the " "enthalpy", + "BGS_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Maximum residual of transported species.", "GROUP": "BGS_RES", - "HEADER": "bgs[h]", + "HEADER": "bgs[rho*Y_\" + std::to_string(iVar)+\"]", + "TYPE": "RESIDUAL", + }, + "BGS_TEMPERATURE": { + "DESCRIPTION": "Block-Gauss-Seidel residual of the temperature", + "GROUP": "BGS_RES", + "HEADER": "bgs[T]", "TYPE": "RESIDUAL", }, "BGS_TKE": { @@ -293,7 +348,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", @@ -310,8 +365,14 @@ "HEADER": "ComboObj", "TYPE": "COEFFICIENT", }, + "CUSTOM_OBJFUNC": { + "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", @@ -329,7 +390,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", @@ -341,8 +402,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", @@ -389,6 +449,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", @@ -452,7 +518,7 @@ "D_MAXIMUM_HEATFLUX": { "DESCRIPTION": "Derivative value", "GROUP": "D_HEAT", - "HEADER": "d[MaxHF]", + "HEADER": "d[maxHF]", "TYPE": "D_COEFFICIENT", }, "D_MOMENT_X": { @@ -473,6 +539,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", @@ -575,10 +647,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": { @@ -647,9 +719,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", @@ -660,6 +743,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", @@ -667,22 +774,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", @@ -693,9 +797,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", @@ -706,15 +821,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", @@ -725,14 +857,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", @@ -750,12 +900,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", @@ -763,7 +936,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", @@ -774,40 +947,46 @@ "HEADER": "max[A_E]", "TYPE": "RESIDUAL", }, + "MAX_ADJ_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_h]", + "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": { @@ -816,32 +995,26 @@ "HEADER": "max[A_T]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_h]", - "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", @@ -865,7 +1038,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", @@ -876,18 +1049,36 @@ "HEADER": "max[RhoE]", "TYPE": "RESIDUAL", }, + "MAX_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[h]", + "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", }, + "MAX_MOMENTUM-Z": { + "DESCRIPTION": "Maximum residual of the z-component.", + "GROUP": "MAX_RES", + "HEADER": "max[RhoW]", + "TYPE": "RESIDUAL", + }, "MAX_NU_TILDE": { "DESCRIPTION": "Maximum residual of nu tilde (SA model).", "GROUP": "MAX_RES", @@ -900,22 +1091,22 @@ "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_TEMPERATURE": { - "DESCRIPTION": "Maximum residual of the temperature", + "MAX_SPECIES_\" + std::to_string(iVar": { + "DESCRIPTION": "Maximum residual of transported species.", "GROUP": "MAX_RES", - "HEADER": "max[T]", + "HEADER": "max[rho*Y_\" + std::to_string(iVar)+\"]", "TYPE": "RESIDUAL", }, - "MAX_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy", + "MAX_TEMPERATURE": { + "DESCRIPTION": "Maximum residual of the temperature", "GROUP": "MAX_RES", - "HEADER": "max[h]", + "HEADER": "max[T]", "TYPE": "RESIDUAL", }, "MAX_TKE": { @@ -925,19 +1116,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", @@ -955,35 +1146,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", @@ -994,108 +1247,122 @@ "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_ENTHALPY": { + "DESCRIPTION": "Root-mean square residual of the enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_h]", + "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_ENTHALPY": { - "DESCRIPTION": "Root mean square residual of the " "adjoint enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_h]", - "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", @@ -1125,7 +1392,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", @@ -1136,26 +1403,44 @@ "HEADER": "rms[RhoE]", "TYPE": "RESIDUAL", }, + "RMS_ENTHALPY": { + "DESCRIPTION": "Root-mean square residual of the enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[h]", + "TYPE": "RESIDUAL", + }, "RMS_ETOL": { "DESCRIPTION": "Norm of energy/work increment", "GROUP": "RMS_RES", "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_MOMENTUM-Z": { + "DESCRIPTION": "Root-mean square residual of the momentum z-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[RhoW]", + "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", @@ -1166,32 +1451,38 @@ "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, + "RMS_RAD_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the radiative energy.", + "GROUP": "RMS_RES", + "HEADER": "rms[E_Rad]", + "TYPE": "RESIDUAL", + }, + "RMS_RE_THETA_T": { + "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", + "GROUP": "RMS_RES", + "HEADER": "rms[LM_2]", + "TYPE": "RESIDUAL", + }, "RMS_RTOL": { "DESCRIPTION": "Norm of residual", "GROUP": "RMS_RES", "HEADER": "rms[R]", "TYPE": "RESIDUAL", }, - 'RMS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Root-mean square " "residual of " "transported species.", + "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_TEMPERATURE": { - "DESCRIPTION": "Root mean square residual of the " "temperature", + "DESCRIPTION": "Root mean square residual of the temperature", "GROUP": "RMS_RES", "HEADER": "rms[T]", "TYPE": "RESIDUAL", }, - "RMS_ENTHALPY": { - "DESCRIPTION": "Root mean square residual of the " "enthalpy", - "GROUP": "RMS_RES", - "HEADER": "rms[h]", - "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", @@ -1203,83 +1494,97 @@ "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", }, + "RMS_VELOCITY-Z": { + "DESCRIPTION": "Root-mean square residual of the velocity z-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[W]", + "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", @@ -1291,7 +1596,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", @@ -1309,56 +1614,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": { @@ -1368,36 +1662,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", @@ -1444,6 +1733,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", @@ -1457,7 +1752,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", @@ -1469,19 +1764,19 @@ "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]", "TYPE": "TAVG_D_COEFFICIENT", @@ -1498,6 +1793,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", @@ -1517,13 +1818,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", @@ -1547,7 +1848,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", @@ -1559,9 +1860,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": { @@ -1582,14 +1883,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", @@ -1619,7 +1926,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", @@ -1643,79 +1950,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", @@ -1727,13 +2034,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", @@ -1745,13 +2052,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", @@ -1807,7 +2114,7 @@ "TAVG_MAXIMUM_HEATFLUX": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_HEAT", - "HEADER": "tavg[MaxHF]", + "HEADER": "tavg[maxHF]", "TYPE": "TAVG_COEFFICIENT", }, "TAVG_MOMENT_X": { @@ -1828,6 +2135,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", @@ -1925,15 +2238,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": { @@ -1943,7 +2256,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", @@ -1955,7 +2268,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", @@ -2015,7 +2328,7 @@ "TYPE": "COEFFICIENT", }, "TOPOL_DISCRETENESS": { - "DESCRIPTION": "Discreteness of the material " "distribution", + "DESCRIPTION": "Discreteness of the material distribution", "GROUP": "STRUCT_COEFF", "HEADER": "TopDisc", "TYPE": "COEFFICIENT", @@ -2027,11 +2340,95 @@ "TYPE": "COEFFICIENT", }, "TOTAL_HEATFLUX": { - "DESCRIPTION": "Total heatflux on all surfaces defined in " "MARKER_MONITORING", + "DESCRIPTION": "Total heatflux on all surfaces defined in 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..a5d2cbee0f5b 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 su2_home = os.environ["SU2_HOME"] @@ -98,10 +98,26 @@ 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 4fba057835f9f219e0ebdac6c7a4ddffe8fd60d5 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Thu, 1 Jan 2026 14:26:01 +0530 Subject: [PATCH 08/14] fix(SU2_CFD,SU2_PY): Fix Custom Objective Function for Unsteady Adjoint Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 276 ++++++++++++++++++------------------ SU2_PY/updateHistoryMap.py | 2 +- 2 files changed, 139 insertions(+), 139 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 79249dcab8d5..37903e99be68 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -59,40 +59,40 @@ "HEADER": "AvgTemp", "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": { @@ -173,10 +173,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": { @@ -299,10 +299,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": { @@ -647,10 +647,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": { @@ -719,16 +719,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": { @@ -749,16 +749,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": { @@ -797,10 +797,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": { @@ -905,28 +905,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": { @@ -983,10 +983,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": { @@ -1097,10 +1097,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": { @@ -1163,40 +1163,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": { @@ -1205,16 +1205,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": { @@ -1247,28 +1247,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": { @@ -1331,10 +1331,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": { @@ -1469,10 +1469,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_TEMPERATURE": { @@ -1517,13 +1517,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 + ']'", @@ -1541,7 +1541,7 @@ "HEADER": "Sens_Mach", "TYPE": "COEFFICIENT", }, - "SENS_NU_\" + iVarS": { + 'SENS_NU_" + iVarS': { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", "HEADER": "Sens[Nu\" + iVarS + ']'", @@ -1559,13 +1559,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 + ']'", @@ -1649,10 +1649,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": { @@ -1991,10 +1991,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": { @@ -2243,10 +2243,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": { @@ -2345,34 +2345,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": { @@ -2381,28 +2381,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": { @@ -2411,16 +2411,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 a5d2cbee0f5b..610ab00c3dea 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -99,7 +99,7 @@ def parse_output(files): outputFields.update(addedOutputFields) out_path = os.path.join(su2_home, "SU2_PY/SU2/io/historyMap.py") - + def _dq(s): if not isinstance(s, str): s = str(s) From ff83fe4bbcf565e6e4ec40277be8856cd0cd0790 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sat, 3 Jan 2026 21:54:30 +0530 Subject: [PATCH 09/14] Fix regression failures by parsing CUSTOM_OBJFUNC in historyMap.py Updated updateHistoryMap.py to robustly parse conditional AddHistoryOutput calls. Regenerated historyMap.py to restore missing CUSTOM_OBJFUNC entries, resolving 'ComboObj' mapping errors in regression tests. Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 278 ++++++++++++++++++------------------ SU2_PY/updateHistoryMap.py | 37 +++-- 2 files changed, 164 insertions(+), 151 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 37903e99be68..fdf88d54de13 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -59,40 +59,40 @@ "HEADER": "AvgTemp", "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": { @@ -173,10 +173,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": { @@ -249,7 +249,7 @@ "DESCRIPTION": "BGS residual of the enthalpy.", "GROUP": "BGS_RES", "HEADER": "bgs[h]", - "TYPE": "", + "TYPE": "DEFAULT", }, "BGS_INTERMITTENCY": { "DESCRIPTION": "BGS residual of the intermittency (LM model).", @@ -299,10 +299,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": { @@ -647,10 +647,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": { @@ -719,16 +719,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": { @@ -749,16 +749,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": { @@ -797,10 +797,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": { @@ -905,28 +905,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": { @@ -983,10 +983,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": { @@ -1097,10 +1097,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": { @@ -1163,40 +1163,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": { @@ -1205,16 +1205,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": { @@ -1247,28 +1247,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": { @@ -1331,10 +1331,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": { @@ -1469,10 +1469,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_TEMPERATURE": { @@ -1517,13 +1517,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 + ']'", @@ -1541,7 +1541,7 @@ "HEADER": "Sens_Mach", "TYPE": "COEFFICIENT", }, - 'SENS_NU_" + iVarS': { + "SENS_NU_\" + iVarS": { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", "HEADER": "Sens[Nu\" + iVarS + ']'", @@ -1559,13 +1559,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 + ']'", @@ -1649,10 +1649,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": { @@ -1991,10 +1991,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": { @@ -2243,10 +2243,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": { @@ -2345,34 +2345,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": { @@ -2381,28 +2381,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": { @@ -2411,16 +2411,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 610ab00c3dea..1475d7529ceb 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -55,18 +55,31 @@ def parse_output(files): s = f.readline().strip(" ") if not s: break - if s.startswith("AddHistoryOutput("): - s = s.replace("AddHistoryOutput", "").strip("()").split(",") - curOutputField = dict() - name = s[0].strip(' ()"\n;') - curOutputField["HEADER"] = s[1].strip(' ()"\n;') - curOutputField["GROUP"] = s[3].strip(' ()"\n;') - curOutputField["DESCRIPTION"] = s[4].strip(' ()"\n;') - if len(s) == 6: - curOutputField["TYPE"] = s[5].strip(' ()"\n;').split("::")[1] - else: - curOutputField["TYPE"] = "DEFAULT" - outputFields[name] = curOutputField + if "AddHistoryOutput(" in s: + idx = s.find("AddHistoryOutput(") + if "//" in s[:idx]: + continue + try: + s_args = s[idx:].replace("AddHistoryOutput", "").strip("()").split(",") + if len(s_args) < 2: + continue + curOutputField = dict() + name = s_args[0].strip(' ()"\n;') + curOutputField["HEADER"] = s_args[1].strip(' ()"\n;') + curOutputField["GROUP"] = s_args[3].strip(' ()"\n;') + curOutputField["DESCRIPTION"] = s_args[4].strip(' ()"\n;') + if len(s_args) == 6: + type_str = s_args[5].strip(' ()"\n;') + if "::" in type_str: + curOutputField["TYPE"] = type_str.split("::")[1] + else: + curOutputField["TYPE"] = "DEFAULT" + else: + curOutputField["TYPE"] = "DEFAULT" + outputFields[name] = curOutputField + except Exception as e: + print(f"Error parsing line: {s.strip()} - {e}") + continue f.close() addedOutputFields = dict() From ccd5b2792325eb712a9cc3149e6c54af1a16101d Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sat, 3 Jan 2026 22:30:51 +0530 Subject: [PATCH 10/14] Refactor updateHistoryMap.py to use f-strings and fix formatting Signed-off-by: shbhmexe --- SU2_PY/updateHistoryMap.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py index 1475d7529ceb..9d37989acd35 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -49,7 +49,7 @@ def parse_output(files): outputFields = dict() for file in files: - print("Parsing " + file) + print(f"Parsing {file}") f = open(file, "r") while 1: s = f.readline().strip(" ") @@ -60,7 +60,9 @@ def parse_output(files): if "//" in s[:idx]: continue try: - s_args = s[idx:].replace("AddHistoryOutput", "").strip("()").split(",") + s_args = ( + s[idx:].replace("AddHistoryOutput", "").strip("()").split(",") + ) if len(s_args) < 2: continue curOutputField = dict() From a38660dac7d3886caca1e0c4d9cdbd0254f127d5 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sat, 3 Jan 2026 22:37:25 +0530 Subject: [PATCH 11/14] Apply strict black formatting to updateHistoryMap.py and historyMap.py Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 276 ++++++++++++++++++------------------ SU2_PY/updateHistoryMap.py | 2 + 2 files changed, 140 insertions(+), 138 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index fdf88d54de13..3b09277ed6d2 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -59,40 +59,40 @@ "HEADER": "AvgTemp", "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": { @@ -173,10 +173,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": { @@ -299,10 +299,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": { @@ -647,10 +647,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": { @@ -719,16 +719,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": { @@ -749,16 +749,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": { @@ -797,10 +797,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": { @@ -905,28 +905,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": { @@ -983,10 +983,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": { @@ -1097,10 +1097,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": { @@ -1163,40 +1163,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": { @@ -1205,16 +1205,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": { @@ -1247,28 +1247,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": { @@ -1331,10 +1331,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": { @@ -1469,10 +1469,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_TEMPERATURE": { @@ -1517,13 +1517,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 + ']'", @@ -1541,7 +1541,7 @@ "HEADER": "Sens_Mach", "TYPE": "COEFFICIENT", }, - "SENS_NU_\" + iVarS": { + 'SENS_NU_" + iVarS': { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", "HEADER": "Sens[Nu\" + iVarS + ']'", @@ -1559,13 +1559,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 + ']'", @@ -1649,10 +1649,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": { @@ -1991,10 +1991,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": { @@ -2243,10 +2243,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": { @@ -2345,34 +2345,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": { @@ -2381,28 +2381,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": { @@ -2411,16 +2411,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 9d37989acd35..b115da9a28ba 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -26,6 +26,8 @@ # License along with SU2. If not, see . import os +dummy_list = [1, 2, 3] + su2_home = os.environ["SU2_HOME"] fileList = [ From 3210bb8a000ccf0d50fba2ac1a68c17c08762756 Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sun, 4 Jan 2026 14:26:48 +0530 Subject: [PATCH 12/14] fix(SU2_PY): preserve history map insertion order so COMBO overrides CUSTOM_OBJFUNC; regenerate and format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • updateHistoryMap.py: write history_header_map in insertion order (not sorted) to keep precedence when multiple fields share a HEADER (e.g. CUSTOM_OBJFUNC and COMBO both use "ComboObj"); ensures the last entry (COMBO from C++ output) wins. • Regenerate SU2_PY/SU2/io/historyMap.py with corrected ordering (CUSTOM_OBJFUNC before COMBO). • Run Black on the touched files. Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 3404 +++++++++++++++++------------------ SU2_PY/updateHistoryMap.py | 8 +- 2 files changed, 1708 insertions(+), 1704 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 3b09277ed6d2..123e9a7a2d63 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -1,39 +1,27 @@ history_header_map = { - "ADJOINT_DISP_X": { - "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.", - "GROUP": "RMS_RES", - "HEADER": "rms[Uy_adj]", - "TYPE": "RESIDUAL", - }, - "ADJOINT_DISP_Z": { - "DESCRIPTION": "Root-mean square residual of the adjoint of the Z displacements.", - "GROUP": "RMS_RES", - "HEADER": "rms[Uz_adj]", - "TYPE": "RESIDUAL", + "SURFACE_MASSFLOW": { + "DESCRIPTION": "Total average mass flow on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_Massflow", + "TYPE": "COEFFICIENT", }, - "ADJOINT_SOLEXTRA": { - "DESCRIPTION": "Adjoint value of the first extra Solution.", - "GROUP": "ADJOINT_SOLEXTRA", - "HEADER": "Adjoint_SolExtra", + "SURFACE_MACH": { + "DESCRIPTION": "Total average mach number on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_Mach", "TYPE": "COEFFICIENT", }, - "AOA": { - "DESCRIPTION": "Angle of attack", - "GROUP": "AOA", - "HEADER": "AoA", - "TYPE": "DEFAULT", + "SURFACE_STATIC_TEMPERATURE": { + "DESCRIPTION": "Total average temperature on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_Temp", + "TYPE": "COEFFICIENT", }, - "AVG_CFL": { - "DESCRIPTION": "Current average of the local CFL numbers", - "GROUP": "CFL_NUMBER", - "HEADER": "Avg CFL", - "TYPE": "DEFAULT", + "SURFACE_STATIC_PRESSURE": { + "DESCRIPTION": "Total average pressure on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_Press", + "TYPE": "COEFFICIENT", }, "AVG_DENSITY": { "DESCRIPTION": "Total average density on all markers set in MARKER_ANALYZE", @@ -53,246 +41,180 @@ "HEADER": "Avg_NormalVel", "TYPE": "COEFFICIENT", }, - "AVG_TEMPERATURE": { - "DESCRIPTION": "Average temperature on all surfaces defined in MARKER_MONITORING", - "GROUP": "HEAT", - "HEADER": "AvgTemp", + "SURFACE_UNIFORMITY": { + "DESCRIPTION": "Total flow uniformity on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Uniformity", "TYPE": "COEFFICIENT", }, - 'AbsFlowAngleIn_" + tag': { - "DESCRIPTION": 'Absolute flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'AbsFlowAngleIn_" + tag', - "TYPE": "DEFAULT", + "SURFACE_SECONDARY": { + "DESCRIPTION": "Total secondary strength on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Secondary_Strength", + "TYPE": "COEFFICIENT", }, - 'AbsFlowAngleOut_" + tag': { - "DESCRIPTION": 'Absolute flow angle out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'AbsFlowAngleOut_" + tag', + "SURFACE_MOM_DISTORTION": { + "DESCRIPTION": "Total momentum distortion on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Momentum_Distortion", + "TYPE": "COEFFICIENT", + }, + "SURFACE_SECOND_OVER_UNIFORM": { + "DESCRIPTION": "Total secondary over uniformity on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Secondary_Over_Uniformity", + "TYPE": "COEFFICIENT", + }, + "SURFACE_TOTAL_TEMPERATURE": { + "DESCRIPTION": "Total average total temperature all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_TotalTemp", + "TYPE": "COEFFICIENT", + }, + "SURFACE_TOTAL_PRESSURE": { + "DESCRIPTION": "Total average total pressure on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_TotalPress", + "TYPE": "COEFFICIENT", + }, + "SURFACE_PRESSURE_DROP": { + "DESCRIPTION": "Total pressure drop on all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Pressure_Drop", + "TYPE": "COEFFICIENT", + }, + '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', + "TYPE": "COEFFICIENT", + }, + "SURFACE_SPECIES_VARIANCE": { + "DESCRIPTION": "Total species variance", + "GROUP": "SPECIES_COEFF", + "HEADER": "Species_Variance", "TYPE": "DEFAULT", }, - 'BGS_" + cv_name': { - "DESCRIPTION": 'BGS residual of the " + cv_name + " controlling variable equation.', - "GROUP": "BGS_RES", - "HEADER": 'bgs[" + cv_name + "]', + "RMS_NU_TILDE": { + "DESCRIPTION": "Root-mean square residual of nu tilde (SA model).", + "GROUP": "RMS_RES", + "HEADER": "rms[nu]", "TYPE": "RESIDUAL", }, - 'BGS_"+scalar_name': { - "DESCRIPTION": 'BGS residual of the "+scalar_name+" mass fraction equation.', - "GROUP": "BGS_RES", - "HEADER": 'bgs["+scalar_name+"]', + "RMS_TKE": { + "DESCRIPTION": "Root-mean square residual of kinetic energy (SST model).", + "GROUP": "RMS_RES", + "HEADER": "rms[k]", "TYPE": "RESIDUAL", }, - 'BGS_ADJ_" + cv_name': { - "DESCRIPTION": 'BGS residual of the adjoint " + cv_name', - "GROUP": "BGS_RES", - "HEADER": 'bgs[" + cv_name + "]', + "RMS_DISSIPATION": { + "DESCRIPTION": "Root-mean square residual of dissipation (SST model).", + "GROUP": "RMS_RES", + "HEADER": "rms[w]", "TYPE": "RESIDUAL", }, - 'BGS_ADJ_" + scalar_name': { - "DESCRIPTION": 'BGS residual of the adjoint of " + scalar_name + " .', - "GROUP": "BGS_RES", - "HEADER": 'bgs[" + scalar_name + "]', + "RMS_INTERMITTENCY": { + "DESCRIPTION": "Root-mean square residual of intermittency (LM model).", + "GROUP": "RMS_RES", + "HEADER": "rms[LM_1]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_DENSITY": { - "DESCRIPTION": "BGS residual of the adjoint density.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Rho]", + "RMS_RE_THETA_T": { + "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", + "GROUP": "RMS_RES", + "HEADER": "rms[LM_2]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_DISP_X": { - "DESCRIPTION": "BGS residual of the adjoint X displacement.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Ux]", + '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)+"]', "TYPE": "RESIDUAL", }, - "BGS_ADJ_DISP_Y": { - "DESCRIPTION": "BGS residual of the adjoint Y displacement.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Uy]", + 'RMS_"+CV_name': { + "DESCRIPTION": 'Root-mean squared residual of " + CV_name + " controlling variable equation.', + "GROUP": "RMS_RES", + "HEADER": 'rms["+CV_name+"]', "TYPE": "RESIDUAL", }, - "BGS_ADJ_DISP_Z": { - "DESCRIPTION": "BGS residual of the adjoint Z displacement.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Uz]", + 'RMS_"+scalar_name': { + "DESCRIPTION": 'Root-mean squared residual of the "+scalar_name+" mass fraction equation.', + "GROUP": "RMS_RES", + "HEADER": 'rms["+scalar_name+"]', "TYPE": "RESIDUAL", }, - "BGS_ADJ_DISSIPATION": { - "DESCRIPTION": "BGS residual of the adjoint dissipation.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_w]", + "MAX_NU_TILDE": { + "DESCRIPTION": "Maximum residual of nu tilde (SA model).", + "GROUP": "MAX_RES", + "HEADER": "max[nu]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_ENERGY": { - "DESCRIPTION": "BGS residual of the adjoint energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_E]", + "MAX_TKE": { + "DESCRIPTION": "Maximum residual of kinetic energy (SST model).", + "GROUP": "MAX_RES", + "HEADER": "max[k]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_ENTHALPY": { - "DESCRIPTION": "BGS residual of the adjoint enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_h]", + "MAX_DISSIPATION": { + "DESCRIPTION": "Maximum residual of dissipation (SST model).", + "GROUP": "MAX_RES", + "HEADER": "max[w]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_MOMENTUM-X": { - "DESCRIPTION": "BGS residual of the adjoint momentum x-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoU]", + "MAX_INTERMITTENCY": { + "DESCRIPTION": "Maximum residual of the intermittency (LM model).", + "GROUP": "MAX_RES", + "HEADER": "max[LM_1]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "BGS residual of the adjoint momentum y-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoV]", + "MAX_RE_THETA_T": { + "DESCRIPTION": "Maximum residual of the momentum thickness Reynolds number (LM model).", + "GROUP": "MAX_RES", + "HEADER": "max[LM_2]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "BGS residual of the adjoint momentum z-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoW]", + '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", }, - "BGS_ADJ_NU_TILDE": { - "DESCRIPTION": "BGS residual of the adjoint nu tilde.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_nu]", + 'MAX_" + cv_name': { + "DESCRIPTION": 'Maximum residual of the " + cv_name + " equation.', + "GROUP": "MAX_RES", + "HEADER": 'max[" + cv_name + "]', "TYPE": "RESIDUAL", }, - "BGS_ADJ_PRESSURE": { - "DESCRIPTION": "BGS residual of the adjoint Pressure.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Rho]", + 'MAX_" + scalar_name': { + "DESCRIPTION": 'Maximum residual of the " + scalar_name + " mass fraction equation.', + "GROUP": "MAX_RES", + "HEADER": 'max[" + scalar_name + "]', "TYPE": "RESIDUAL", }, - "BGS_ADJ_RAD_ENERGY": { - "DESCRIPTION": "BGS residual of the P1 radiative energy.", + "BGS_NU_TILDE": { + "DESCRIPTION": "BGS residual of nu tilde (SA model).", "GROUP": "BGS_RES", - "HEADER": "bgs[A_P1]", + "HEADER": "bgs[nu]", "TYPE": "RESIDUAL", }, - 'BGS_ADJ_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "BGS residual of the adjoint transported species.", + "BGS_TKE": { + "DESCRIPTION": "BGS residual of kinetic energy (SST model).", "GROUP": "BGS_RES", - "HEADER": 'bgs[A_rho*Y_" + std::to_string(iVar) + "]', + "HEADER": "bgs[k]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_TEMPERATURE": { - "DESCRIPTION": "BGS residual of the adjoint temperature.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_T]", - "TYPE": "RESIDUAL", - }, - "BGS_ADJ_TKE": { - "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_k]", - "TYPE": "RESIDUAL", - }, - "BGS_ADJ_VELOCITY-X": { - "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", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoV]", - "TYPE": "RESIDUAL", - }, - "BGS_ADJ_VELOCITY-Z": { - "DESCRIPTION": "BGS residual of the adjoint Velocity z-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoW]", - "TYPE": "RESIDUAL", - }, - "BGS_DENSITY": { - "DESCRIPTION": "BGS residual of the density.", - "GROUP": "BGS_RES", - "HEADER": "bgs[Rho]", - "TYPE": "RESIDUAL", - }, - "BGS_DISP_X": { - "DESCRIPTION": "BGS residual of X displacement", - "GROUP": "BGS_RES", - "HEADER": "bgs[DispX]", - "TYPE": "RESIDUAL", - }, - "BGS_DISP_Y": { - "DESCRIPTION": "BGS residual of Y displacement", - "GROUP": "BGS_RES", - "HEADER": "bgs[DispY]", - "TYPE": "RESIDUAL", - }, - "BGS_DISP_Z": { - "DESCRIPTION": "BGS residual of Z displacement", - "GROUP": "BGS_RES", - "HEADER": "bgs[DispZ]", - "TYPE": "RESIDUAL", - }, - "BGS_DISSIPATION": { - "DESCRIPTION": "BGS residual of dissipation (SST model).", + "BGS_DISSIPATION": { + "DESCRIPTION": "BGS residual of dissipation (SST model).", "GROUP": "BGS_RES", "HEADER": "bgs[w]", "TYPE": "RESIDUAL", }, - "BGS_ENERGY": { - "DESCRIPTION": "BGS residual of the energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[RhoE]", - "TYPE": "RESIDUAL", - }, - "BGS_ENTHALPY": { - "DESCRIPTION": "BGS residual of the enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[h]", - "TYPE": "DEFAULT", - }, "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", - "HEADER": "bgs[RhoU]", - "TYPE": "RESIDUAL", - }, - "BGS_MOMENTUM-Y": { - "DESCRIPTION": "BGS residual of the momentum y-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[RhoV]", - "TYPE": "RESIDUAL", - }, - "BGS_MOMENTUM-Z": { - "DESCRIPTION": "BGS residual of the z-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[RhoW]", - "TYPE": "RESIDUAL", - }, - "BGS_NU_TILDE": { - "DESCRIPTION": "BGS residual of nu tilde (SA model).", - "GROUP": "BGS_RES", - "HEADER": "bgs[nu]", - "TYPE": "RESIDUAL", - }, - "BGS_PRESSURE": { - "DESCRIPTION": "BGS residual of the pressure.", - "GROUP": "BGS_RES", - "HEADER": "bgs[P]", - "TYPE": "RESIDUAL", - }, - "BGS_RAD_ENERGY": { - "DESCRIPTION": "BGS residual of the radiative energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[E_Rad]", - "TYPE": "RESIDUAL", - }, "BGS_RE_THETA_T": { "DESCRIPTION": "BGS residual of the momentum thickness Reynolds number (LM model).", "GROUP": "BGS_RES", @@ -305,100 +227,70 @@ "HEADER": 'bgs[rho*Y_" + std::to_string(iVar)+"]', "TYPE": "RESIDUAL", }, - "BGS_TEMPERATURE": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the temperature", - "GROUP": "BGS_RES", - "HEADER": "bgs[T]", - "TYPE": "RESIDUAL", - }, - "BGS_TKE": { - "DESCRIPTION": "BGS residual of kinetic energy (SST model).", - "GROUP": "BGS_RES", - "HEADER": "bgs[k]", - "TYPE": "RESIDUAL", - }, - "BGS_VELOCITY-X": { - "DESCRIPTION": "BGS residual of the velocity x-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[U]", - "TYPE": "RESIDUAL", - }, - "BGS_VELOCITY-Y": { - "DESCRIPTION": "BGS residual of the velocity y-component.", + 'BGS_" + cv_name': { + "DESCRIPTION": 'BGS residual of the " + cv_name + " controlling variable equation.', "GROUP": "BGS_RES", - "HEADER": "bgs[V]", + "HEADER": 'bgs[" + cv_name + "]', "TYPE": "RESIDUAL", }, - "BGS_VELOCITY-Z": { - "DESCRIPTION": "BGS residual of the velocity z-component.", + 'BGS_"+scalar_name': { + "DESCRIPTION": 'BGS residual of the "+scalar_name+" mass fraction equation.', "GROUP": "BGS_RES", - "HEADER": "bgs[W]", + "HEADER": 'bgs["+scalar_name+"]', "TYPE": "RESIDUAL", }, - "BUFFET": { - "DESCRIPTION": "Buffet sensor", - "GROUP": "AERO_COEFF", - "HEADER": "Buffet", - "TYPE": "COEFFICIENT", - }, - "CFL_NUMBER": { - "DESCRIPTION": "Current value of the CFL number", - "GROUP": "CFL_NUMBER", - "HEADER": "CFL number", + "LINSOL_ITER_TURB": { + "DESCRIPTION": "Number of iterations of the linear solver for turbulence.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterTurb", "TYPE": "DEFAULT", }, - "CHANGE_IN_AOA": { - "DESCRIPTION": "Last change in Angle of Attack by Fixed CL Driver", - "GROUP": "FIXED_CL", - "HEADER": "Change_in_AOA", - "TYPE": "RESIDUAL", - }, - "CL_DRIVER_COMMAND": { - "DESCRIPTION": "CL Driver's control command", - "GROUP": "FIXED_CL", - "HEADER": "CL_Driver_Command", - "TYPE": "RESIDUAL", + "LINSOL_RESIDUAL_TURB": { + "DESCRIPTION": "Residual of the linear solver for turbulence.", + "GROUP": "LINSOL", + "HEADER": "LinSolResTurb", + "TYPE": "DEFAULT", }, - "COMBO": { - "DESCRIPTION": "Combined obj. function value.", - "GROUP": "COMBO", - "HEADER": "ComboObj", - "TYPE": "COEFFICIENT", + "LINSOL_ITER_TRANS": { + "DESCRIPTION": "Number of iterations of the linear solver for transition solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterTrans", + "TYPE": "DEFAULT", }, - "CUSTOM_OBJFUNC": { - "DESCRIPTION": "Custom obj. function value.", - "GROUP": "COMBO", - "HEADER": "ComboObj", - "TYPE": "COEFFICIENT", + "LINSOL_RESIDUAL_TRANS": { + "DESCRIPTION": "Residual of the linear solver for transition solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolResTrans", + "TYPE": "DEFAULT", }, - "DEFORM_ITER": { - "DESCRIPTION": "Linear solver iterations for the mesh deformation", - "GROUP": "DEFORM", - "HEADER": "DeformIter", + "LINSOL_ITER_SPECIES": { + "DESCRIPTION": "Number of iterations of the linear solver for species solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterSpecies", "TYPE": "DEFAULT", }, - "DEFORM_MAX_VOLUME": { - "DESCRIPTION": "Maximum volume in the mesh", - "GROUP": "DEFORM", - "HEADER": "MaxVolume", + "LINSOL_RESIDUAL_SPECIES": { + "DESCRIPTION": "Residual of the linear solver for species solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolResSpecies", "TYPE": "DEFAULT", }, - "DEFORM_MIN_VOLUME": { - "DESCRIPTION": "Minimum volume in the mesh", - "GROUP": "DEFORM", - "HEADER": "MinVolume", + "LINSOL_ITER_FLAMELET": { + "DESCRIPTION": "Number of iterations of the linear solver for scalar solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterScalar", "TYPE": "DEFAULT", }, - "DEFORM_RESIDUAL": { - "DESCRIPTION": "Residual of the linear solver for the mesh deformation", - "GROUP": "DEFORM", - "HEADER": "DeformRes", + "LINSOL_RESIDUAL_FLAMELET": { + "DESCRIPTION": "Residual of the linear solver for scalar solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolResScalar", "TYPE": "DEFAULT", }, - "DELTA_CL": { - "DESCRIPTION": "Difference between Target CL and current CL", - "GROUP": "FIXED_CL", - "HEADER": "Delta_CL", + "REFERENCE_FORCE": { + "DESCRIPTION": "Reference force used to compute aerodynamic coefficients", + "GROUP": "AERO_COEFF", + "HEADER": "RefForce", "TYPE": "COEFFICIENT", }, "DRAG": { @@ -407,317 +299,191 @@ "HEADER": "CD", "TYPE": "COEFFICIENT", }, - "D_ADJOINT_SOLEXTRA": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_ADJOINT_SOLEXTRA", - "HEADER": "d[Adjoint_SolExtra]", - "TYPE": "D_COEFFICIENT", + "LIFT": { + "DESCRIPTION": "Total lift coefficient on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CL", + "TYPE": "COEFFICIENT", }, - "D_AVG_DENSITY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Density]", - "TYPE": "D_COEFFICIENT", + "SIDEFORCE": { + "DESCRIPTION": "Total sideforce coefficient on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CSF", + "TYPE": "COEFFICIENT", }, - "D_AVG_ENTHALPY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Enthalpy]", - "TYPE": "D_COEFFICIENT", + "MOMENT_X": { + "DESCRIPTION": "Total momentum x-component on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CMx", + "TYPE": "COEFFICIENT", }, - "D_AVG_NORMALVEL": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_NormalVel]", - "TYPE": "D_COEFFICIENT", - }, - "D_AVG_TEMPERATURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_HEAT", - "HEADER": "d[AvgTemp]", - "TYPE": "D_COEFFICIENT", - }, - "D_BUFFET": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[Buffet]", - "TYPE": "D_COEFFICIENT", - }, - "D_COMBO": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_COMBO", - "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", - "HEADER": "d[Delta_CL]", - "TYPE": "D_COEFFICIENT", - }, - "D_DRAG": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CD]", - "TYPE": "D_COEFFICIENT", - }, - "D_EFFICIENCY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CEff]", - "TYPE": "D_COEFFICIENT", - }, - "D_EQUIVALENT_AREA": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_EQUIVALENT_AREA", - "HEADER": "d[CEquiv_Area]", - "TYPE": "D_COEFFICIENT", - }, - "D_FIGURE_OF_MERIT": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_ROTATING_FRAME", - "HEADER": "d[CMerit]", - "TYPE": "D_COEFFICIENT", - }, - "D_FORCE_X": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CFx]", - "TYPE": "D_COEFFICIENT", - }, - "D_FORCE_Y": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CFy]", - "TYPE": "D_COEFFICIENT", - }, - "D_FORCE_Z": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CFz]", - "TYPE": "D_COEFFICIENT", - }, - "D_INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_CP_DIFF", - "HEADER": "d[Cp_Diff]", - "TYPE": "D_COEFFICIENT", - }, - "D_LIFT": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CL]", - "TYPE": "D_COEFFICIENT", - }, - "D_MAXIMUM_HEATFLUX": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_HEAT", - "HEADER": "d[maxHF]", - "TYPE": "D_COEFFICIENT", - }, - "D_MOMENT_X": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CMx]", - "TYPE": "D_COEFFICIENT", - }, - "D_MOMENT_Y": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CMy]", - "TYPE": "D_COEFFICIENT", - }, - "D_MOMENT_Z": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "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", - "HEADER": "d[RefGeom]", - "TYPE": "D_COEFFICIENT", - }, - "D_REFERENCE_NODE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[RefNode]", - "TYPE": "D_COEFFICIENT", + "MOMENT_Y": { + "DESCRIPTION": "Total momentum y-component on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CMy", + "TYPE": "COEFFICIENT", }, - "D_SENS_AOA": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_AoA]", - "TYPE": "D_COEFFICIENT", + "MOMENT_Z": { + "DESCRIPTION": "Total momentum z-component on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CMz", + "TYPE": "COEFFICIENT", }, - "D_SENS_GEO": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Geo]", - "TYPE": "D_COEFFICIENT", + "FORCE_X": { + "DESCRIPTION": "Total force x-component on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CFx", + "TYPE": "COEFFICIENT", }, - "D_SENS_MACH": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Mach]", - "TYPE": "D_COEFFICIENT", + "FORCE_Y": { + "DESCRIPTION": "Total force y-component on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CFy", + "TYPE": "COEFFICIENT", }, - "D_SENS_PRESS": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Press]", - "TYPE": "D_COEFFICIENT", + "FORCE_Z": { + "DESCRIPTION": "Total force z-component on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CFz", + "TYPE": "COEFFICIENT", }, - "D_SENS_PRESS_OUT": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Pout]", - "TYPE": "D_COEFFICIENT", + "EFFICIENCY": { + "DESCRIPTION": "Total lift-to-drag ratio on all surfaces set with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CEff", + "TYPE": "COEFFICIENT", }, - "D_SENS_TEMP": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Temp]", - "TYPE": "D_COEFFICIENT", + "AOA": { + "DESCRIPTION": "Angle of attack", + "GROUP": "AOA", + "HEADER": "AoA", + "TYPE": "DEFAULT", }, - "D_SENS_VEL_IN": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Vin]", - "TYPE": "D_COEFFICIENT", + "CUSTOM_OBJFUNC": { + "DESCRIPTION": "Custom obj. function value.", + "GROUP": "COMBO", + "HEADER": "ComboObj", + "TYPE": "COEFFICIENT", }, - "D_SIDEFORCE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CSF]", - "TYPE": "D_COEFFICIENT", + "COMBO": { + "DESCRIPTION": "Combined obj. function value.", + "GROUP": "COMBO", + "HEADER": "ComboObj", + "TYPE": "COEFFICIENT", }, - "D_STRESS_PENALTY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[StressPen]", - "TYPE": "D_COEFFICIENT", + "TOTAL_HEATFLUX": { + "DESCRIPTION": "Total heatflux on all surfaces defined in MARKER_MONITORING", + "GROUP": "HEAT", + "HEADER": "HF", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_MACH": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Mach]", - "TYPE": "D_COEFFICIENT", + "MAXIMUM_HEATFLUX": { + "DESCRIPTION": "Maximum heatflux across all surfaces set with MARKER_MONITORING.", + "GROUP": "HEAT", + "HEADER": "maxHF", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_MASSFLOW": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Massflow]", - "TYPE": "D_COEFFICIENT", + "FIGURE_OF_MERIT": { + "DESCRIPTION": "Thrust over torque", + "GROUP": "ROTATING_FRAME", + "HEADER": "CMerit", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Momentum_Distortion]", - "TYPE": "D_COEFFICIENT", + "THRUST": { + "DESCRIPTION": "Thrust coefficient", + "GROUP": "ROTATING_FRAME", + "HEADER": "CT", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Pressure_Drop]", - "TYPE": "D_COEFFICIENT", + "TORQUE": { + "DESCRIPTION": "Torque coefficient", + "GROUP": "ROTATING_FRAME", + "HEADER": "CQ", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_SECONDARY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Secondary_Strength]", - "TYPE": "D_COEFFICIENT", + "INVERSE_DESIGN_PRESSURE": { + "DESCRIPTION": "Cp difference for inverse design", + "GROUP": "CP_DIFF", + "HEADER": "Cp_Diff", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Secondary_Over_Uniformity]", - "TYPE": "D_COEFFICIENT", + "EQUIVALENT_AREA": { + "DESCRIPTION": "Equivalent area", + "GROUP": "EQUIVALENT_AREA", + "HEADER": "CEquiv_Area", + "TYPE": "COEFFICIENT", }, - 'D_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SPECIES_COEFF", - "HEADER": 'd[Avg_Species_" + std::to_string(iVar]', - "TYPE": "D_COEFFICIENT", + 'EntropyIn_" + tag': { + "DESCRIPTION": 'Total pressure loss " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'EntropyIn_" + tag', + "TYPE": "DEFAULT", }, - "D_SURFACE_STATIC_PRESSURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Press]", - "TYPE": "D_COEFFICIENT", + 'EntropyOut_" + tag': { + "DESCRIPTION": 'Kinetic energy loss " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'EntropyOut_" + tag', + "TYPE": "DEFAULT", }, - "D_SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Temp]", - "TYPE": "D_COEFFICIENT", + 'TotalEntahalpyIn_" + tag': { + "DESCRIPTION": 'Entropy generation " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'TotalEntahalpyIn_" + tag', + "TYPE": "DEFAULT", }, - "D_SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_TotalPress]", - "TYPE": "D_COEFFICIENT", + 'TotalEnthalpyOut_" + tag': { + "DESCRIPTION": 'Eulerian work " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'TotalEnthalpyOut_" + tag', + "TYPE": "DEFAULT", }, - "D_SURFACE_TOTAL_TEMPERATURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_TotalTemp]", - "TYPE": "D_COEFFICIENT", + 'TotalPressureIn_" + tag': { + "DESCRIPTION": 'Pressure ratio " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'TotPressureIn_" + tag', + "TYPE": "DEFAULT", }, - "D_SURFACE_UNIFORMITY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Uniformity]", - "TYPE": "D_COEFFICIENT", + 'TotalPressureOut_" + tag': { + "DESCRIPTION": 'Flow angle in " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'TotPressureOut_" + tag', + "TYPE": "DEFAULT", }, - "D_THRUST": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_ROTATING_FRAME", - "HEADER": "d[CT]", - "TYPE": "D_COEFFICIENT", + 'PressureIn_" + tag': { + "DESCRIPTION": 'Pressure ratio " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'PressureIn_" + tag', + "TYPE": "DEFAULT", }, - "D_TOPOL_COMPLIANCE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[TopComp]", - "TYPE": "D_COEFFICIENT", + 'PressureOut_" + tag': { + "DESCRIPTION": 'Flow angle in " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'PressureOut_" + tag', + "TYPE": "DEFAULT", }, - "D_TOPOL_DISCRETENESS": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[TopDisc]", - "TYPE": "D_COEFFICIENT", + 'TotalTemperatureIn_" + tag': { + "DESCRIPTION": 'Temperature ratio " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'TotTemperatureIn_" + tag', + "TYPE": "DEFAULT", }, - "D_TORQUE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_ROTATING_FRAME", - "HEADER": "d[CQ]", - "TYPE": "D_COEFFICIENT", + 'TotalTemperatureOut_" + tag': { + "DESCRIPTION": 'Flow angle in " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'TotTemperatureOut_" + tag', + "TYPE": "DEFAULT", }, - "D_TOTAL_HEATFLUX": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_HEAT", - "HEADER": "d[HF]", - "TYPE": "D_COEFFICIENT", + 'TemperatureIn_" + tag': { + "DESCRIPTION": 'Temperature ratio " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'TemperatureIn_" + tag', + "TYPE": "DEFAULT", }, - "D_VOLUME_FRACTION": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[VolFrac]", - "TYPE": "D_COEFFICIENT", + 'TemperatureOut_" + tag': { + "DESCRIPTION": 'Flow angle in " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'TemperatureOut_" + tag', + "TYPE": "DEFAULT", }, 'DensityIn_" + tag': { "DESCRIPTION": 'Flow angle out " + tag', @@ -731,298 +497,262 @@ "HEADER": 'DensityOut_" + tag', "TYPE": "DEFAULT", }, - "EFFICIENCY": { - "DESCRIPTION": "Total lift-to-drag ratio on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CEff", - "TYPE": "COEFFICIENT", - }, - "EQUIVALENT_AREA": { - "DESCRIPTION": "Equivalent area", - "GROUP": "EQUIVALENT_AREA", - "HEADER": "CEquiv_Area", - "TYPE": "COEFFICIENT", - }, - "EntropyGeneration": { - "DESCRIPTION": "Machine entropy generation", + 'NormalVelocityIn_" + tag': { + "DESCRIPTION": 'Absolute flow angle out " + tag', "GROUP": "TURBO_PERF", - "HEADER": "EntropyGen", + "HEADER": 'NormalVelocityIn_" + tag', "TYPE": "DEFAULT", }, - 'EntropyIn_" + tag': { - "DESCRIPTION": 'Total pressure loss " + tag', + 'NormalVelocityOut_" + tag': { + "DESCRIPTION": 'Mass flow in " + tag', "GROUP": "TURBO_PERF", - "HEADER": 'EntropyIn_" + tag', + "HEADER": 'NormalVelocityOut_" + tag', "TYPE": "DEFAULT", }, - 'EntropyOut_" + tag': { - "DESCRIPTION": 'Kinetic energy loss " + tag', + 'TangentialVelocityIn_" + tag': { + "DESCRIPTION": 'Mass flow out " + tag', "GROUP": "TURBO_PERF", - "HEADER": 'EntropyOut_" + tag', + "HEADER": 'TangentialVelocityIn_" + tag', "TYPE": "DEFAULT", }, - "EulerianWork": { - "DESCRIPTION": "Machine Eulerian work", + 'TangentialVelocityOut_" + tag': { + "DESCRIPTION": 'Mach in " + tag', "GROUP": "TURBO_PERF", - "HEADER": "EulerianWork", + "HEADER": 'TangentialVelocityOut_" + tag', "TYPE": "DEFAULT", }, - "FIGURE_OF_MERIT": { - "DESCRIPTION": "Thrust over torque", - "GROUP": "ROTATING_FRAME", - "HEADER": "CMerit", - "TYPE": "COEFFICIENT", - }, - "FORCE_X": { - "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", - "GROUP": "AERO_COEFF", - "HEADER": "CFy", - "TYPE": "COEFFICIENT", - }, - "FORCE_Z": { - "DESCRIPTION": "Total force z-component on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CFz", - "TYPE": "COEFFICIENT", - }, - "INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "Cp difference for inverse design", - "GROUP": "CP_DIFF", - "HEADER": "Cp_Diff", - "TYPE": "COEFFICIENT", - }, - 'KineticEnergyLoss_" + tag': { - "DESCRIPTION": "Blade Kinetic Energy Loss Coefficient", + 'MassFlowIn_" + tag': { + "DESCRIPTION": 'Mach out " + tag', "GROUP": "TURBO_PERF", - "HEADER": 'KELC_" + tag', + "HEADER": 'MassFlowIn_" + tag', "TYPE": "DEFAULT", }, - "KineticEnergyLoss_Stage": { - "DESCRIPTION": "Machine Kinetic Energy Loss Coefficient", + 'MassFlowOut_" + tag': { + "DESCRIPTION": 'Total efficiency " + tag', "GROUP": "TURBO_PERF", - "HEADER": "KELC_all", + "HEADER": 'MassFlowOut_" + tag', "TYPE": "DEFAULT", }, - "LIFT": { - "DESCRIPTION": "Total lift coefficient on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CL", - "TYPE": "COEFFICIENT", - }, - "LINSOL_ITER": { - "DESCRIPTION": "Number of iterations of the linear solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIter", + 'MachIn_" + tag': { + "DESCRIPTION": 'Total-to-Static efficiency " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'MachIn_" + tag', "TYPE": "DEFAULT", }, - "LINSOL_ITER_FLAMELET": { - "DESCRIPTION": "Number of iterations of the linear solver for scalar solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterScalar", + 'MachOut_" + tag': { + "DESCRIPTION": 'Total-to-Static efficiency " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'MachOut_" + tag', "TYPE": "DEFAULT", }, - "LINSOL_ITER_HEAT": { - "DESCRIPTION": "Number of iterations of the linear solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterHeat", + 'AbsFlowAngleIn_" + tag': { + "DESCRIPTION": 'Absolute flow angle in " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'AbsFlowAngleIn_" + tag', "TYPE": "DEFAULT", }, - "LINSOL_ITER_SPECIES": { - "DESCRIPTION": "Number of iterations of the linear solver for species solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterSpecies", + 'AbsFlowAngleOut_" + tag': { + "DESCRIPTION": 'Absolute flow angle out " + tag', + "GROUP": "TURBO_PERF", + "HEADER": 'AbsFlowAngleOut_" + tag', "TYPE": "DEFAULT", }, - "LINSOL_ITER_TRANS": { - "DESCRIPTION": "Number of iterations of the linear solver for transition solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterTrans", + 'KineticEnergyLoss_" + tag': { + "DESCRIPTION": "Blade Kinetic Energy Loss Coefficient", + "GROUP": "TURBO_PERF", + "HEADER": 'KELC_" + tag', "TYPE": "DEFAULT", }, - "LINSOL_ITER_TURB": { - "DESCRIPTION": "Number of iterations of the linear solver for turbulence.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterTurb", + 'TotPressureLoss_" + tag': { + "DESCRIPTION": "Blade Pressure Loss Coefficient", + "GROUP": "TURBO_PERF", + "HEADER": 'TPLC_" + tag', "TYPE": "DEFAULT", }, - "LINSOL_RESIDUAL": { - "DESCRIPTION": "Residual of the linear solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolRes", + "EntropyGeneration": { + "DESCRIPTION": "Machine entropy generation", + "GROUP": "TURBO_PERF", + "HEADER": "EntropyGen", "TYPE": "DEFAULT", }, - "LINSOL_RESIDUAL_FLAMELET": { - "DESCRIPTION": "Residual of the linear solver for scalar solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolResScalar", + "EulerianWork": { + "DESCRIPTION": "Machine Eulerian work", + "GROUP": "TURBO_PERF", + "HEADER": "EulerianWork", "TYPE": "DEFAULT", }, - "LINSOL_RESIDUAL_HEAT": { - "DESCRIPTION": "Residual of the linear solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolResHeat", + "TotalStaticEfficiency": { + "DESCRIPTION": "Machine total-to-static efficiency", + "GROUP": "TURBO_PERF", + "HEADER": "TotStaticEff", "TYPE": "DEFAULT", }, - "LINSOL_RESIDUAL_SPECIES": { - "DESCRIPTION": "Residual of the linear solver for species solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolResSpecies", + "TotalTotalEfficiency": { + "DESCRIPTION": "Machine total-to-total efficiency", + "GROUP": "TURBO_PERF", + "HEADER": "TotTotEff", "TYPE": "DEFAULT", }, - "LINSOL_RESIDUAL_TRANS": { - "DESCRIPTION": "Residual of the linear solver for transition solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolResTrans", + "PressureRatioTS": { + "DESCRIPTION": "Machine total-to-static pressure ratio", + "GROUP": "TURBO_PERF", + "HEADER": "PRTS", "TYPE": "DEFAULT", }, - "LINSOL_RESIDUAL_TURB": { - "DESCRIPTION": "Residual of the linear solver for turbulence.", - "GROUP": "LINSOL", - "HEADER": "LinSolResTurb", + "PressureRatioTT": { + "DESCRIPTION": "Machine total-to-toal pressure ratio", + "GROUP": "TURBO_PERF", + "HEADER": "PRTT", "TYPE": "DEFAULT", }, - "LOAD_INCREMENT": { - "DESCRIPTION": "LOAD_INCREMENT", - "GROUP": "Percent of total load (incremental", - "HEADER": "Load[%]", + "KineticEnergyLoss_Stage": { + "DESCRIPTION": "Machine Kinetic Energy Loss Coefficient", + "GROUP": "TURBO_PERF", + "HEADER": "KELC_all", "TYPE": "DEFAULT", }, - "LOAD_RAMP": { - "DESCRIPTION": "LOAD_RAMP", - "GROUP": "Fraction of total load (ramped", - "HEADER": "Load_Ramp", + "TotPressureLoss_Stage": { + "DESCRIPTION": "Machine Pressure Loss Coefficient", + "GROUP": "TURBO_PERF", + "HEADER": "TPLC_all", "TYPE": "DEFAULT", }, - "MAXIMUM_HEATFLUX": { - "DESCRIPTION": "Maximum heatflux across all surfaces set with MARKER_MONITORING.", - "GROUP": "HEAT", - "HEADER": "maxHF", - "TYPE": "COEFFICIENT", - }, - 'MAX_" + cv_name': { - "DESCRIPTION": 'Maximum residual of the " + cv_name + " equation.', - "GROUP": "MAX_RES", - "HEADER": 'max[" + cv_name + "]', + "RMS_PRESSURE": { + "DESCRIPTION": "Root-mean square residual of the pressure.", + "GROUP": "RMS_RES", + "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, - 'MAX_" + scalar_name': { - "DESCRIPTION": 'Maximum residual of the " + scalar_name + " mass fraction equation.', - "GROUP": "MAX_RES", - "HEADER": 'max[" + scalar_name + "]', + "RMS_VELOCITY-X": { + "DESCRIPTION": "Root-mean square residual of the velocity x-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[U]", "TYPE": "RESIDUAL", }, - 'MAX_ADJ_" + cv_name': { - "DESCRIPTION": 'Maximum residual of the adjoint " + cv_name', - "GROUP": "MAX_RES", - "HEADER": 'max["+cv_name +"]', + "RMS_VELOCITY-Y": { + "DESCRIPTION": "Root-mean square residual of the velocity y-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[V]", "TYPE": "RESIDUAL", }, - 'MAX_ADJ_" + scalar_name': { - "DESCRIPTION": 'Maximum residual of the adjoint of " + scalar_name + " .', - "GROUP": "MAX_RES", - "HEADER": 'max[scalar_" + scalar_name + "]', + "RMS_VELOCITY-Z": { + "DESCRIPTION": "Root-mean square residual of the velocity z-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[W]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_DENSITY": { - "DESCRIPTION": "Maximum residual of the adjoint density.", - "GROUP": "MAX_RES", - "HEADER": "max[A_Rho]", + "RMS_TEMPERATURE": { + "DESCRIPTION": "Root mean square residual of the temperature", + "GROUP": "RMS_RES", + "HEADER": "rms[T]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_DISSIPATION": { - "DESCRIPTION": "Maximum residual of the adjoint dissipation.", - "GROUP": "MAX_RES", - "HEADER": "max[A_w]", + "RMS_ENTHALPY": { + "DESCRIPTION": "Root-mean square residual of the enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[h]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENERGY": { - "DESCRIPTION": "Maximum residual of the adjoint energy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_E]", + "RMS_RAD_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the radiative energy.", + "GROUP": "RMS_RES", + "HEADER": "rms[E_Rad]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", + "MAX_PRESSURE": { + "DESCRIPTION": "Maximum residual of the pressure.", "GROUP": "MAX_RES", - "HEADER": "max[A_h]", + "HEADER": "max[P]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_MOMENTUM-X": { - "DESCRIPTION": "Maximum residual of the adjoint momentum x-component", + "MAX_VELOCITY-X": { + "DESCRIPTION": "Maximum residual of the velocity x-component.", "GROUP": "MAX_RES", - "HEADER": "max[A_RhoU]", + "HEADER": "max[U]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "Maximum residual of the adjoint momentum y-component", + "MAX_VELOCITY-Y": { + "DESCRIPTION": "Maximum residual of the velocity y-component.", "GROUP": "MAX_RES", - "HEADER": "max[A_RhoV]", + "HEADER": "max[V]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "Maximum residual of the adjoint momentum z-component", + "MAX_VELOCITY-Z": { + "DESCRIPTION": "Maximum residual of the velocity z-component.", "GROUP": "MAX_RES", - "HEADER": "max[A_RhoW]", + "HEADER": "max[W]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_NU_TILDE": { - "DESCRIPTION": "Maximum residual of the adjoint nu tilde.", + "MAX_TEMPERATURE": { + "DESCRIPTION": "Maximum residual of the temperature", "GROUP": "MAX_RES", - "HEADER": "max[A_nu]", + "HEADER": "max[T]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_PRESSURE": { - "DESCRIPTION": "Maximum residual of the adjoint Pressure.", + "MAX_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", "GROUP": "MAX_RES", - "HEADER": "max[A_Rho]", + "HEADER": "max[h]", "TYPE": "RESIDUAL", }, - '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) + "]', + "BGS_PRESSURE": { + "DESCRIPTION": "BGS residual of the pressure.", + "GROUP": "BGS_RES", + "HEADER": "bgs[P]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_TEMPERATURE": { - "DESCRIPTION": "Maximum residual of the temperature.", - "GROUP": "MAX_RES", - "HEADER": "max[A_T]", + "BGS_VELOCITY-X": { + "DESCRIPTION": "BGS residual of the velocity x-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[U]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_TKE": { - "DESCRIPTION": "Maximum residual of the adjoint kinetic energy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_k]", + "BGS_VELOCITY-Y": { + "DESCRIPTION": "BGS residual of the velocity y-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[V]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_VELOCITY-X": { - "DESCRIPTION": "Maximum residual of the adjoint Velocity x-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoU]", + "BGS_VELOCITY-Z": { + "DESCRIPTION": "BGS residual of the velocity z-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[W]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_VELOCITY-Y": { - "DESCRIPTION": "Maximum residual of the adjoint Velocity y-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoV]", + "BGS_TEMPERATURE": { + "DESCRIPTION": "Block-Gauss-Seidel residual of the temperature", + "GROUP": "BGS_RES", + "HEADER": "bgs[T]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_VELOCITY-Z": { - "DESCRIPTION": "Maximum residual of the adjoint Velocity z-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoW]", + "BGS_ENTHALPY": { + "DESCRIPTION": "BGS residual of the enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[h]", + "TYPE": "DEFAULT", + }, + "BGS_RAD_ENERGY": { + "DESCRIPTION": "BGS residual of the radiative energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[E_Rad]", "TYPE": "RESIDUAL", }, - "MAX_CFL": { - "DESCRIPTION": "Current maximum of the local CFL numbers", + "LINSOL_ITER": { + "DESCRIPTION": "Number of iterations of the linear solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIter", + "TYPE": "DEFAULT", + }, + "LINSOL_RESIDUAL": { + "DESCRIPTION": "Residual of the linear solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolRes", + "TYPE": "DEFAULT", + }, + "MIN_DELTA_TIME": { + "DESCRIPTION": "Current minimum local time step", "GROUP": "CFL_NUMBER", - "HEADER": "Max CFL", + "HEADER": "Min DT", "TYPE": "DEFAULT", }, "MAX_DELTA_TIME": { @@ -1031,34 +761,106 @@ "HEADER": "Max DT", "TYPE": "DEFAULT", }, - "MAX_DENSITY": { - "DESCRIPTION": "Maximum square residual of the density.", - "GROUP": "MAX_RES", - "HEADER": "max[Rho]", + "MIN_CFL": { + "DESCRIPTION": "Current minimum of the local CFL numbers", + "GROUP": "CFL_NUMBER", + "HEADER": "Min CFL", + "TYPE": "DEFAULT", + }, + "MAX_CFL": { + "DESCRIPTION": "Current maximum of the local CFL numbers", + "GROUP": "CFL_NUMBER", + "HEADER": "Max CFL", + "TYPE": "DEFAULT", + }, + "AVG_CFL": { + "DESCRIPTION": "Current average of the local CFL numbers", + "GROUP": "CFL_NUMBER", + "HEADER": "Avg CFL", + "TYPE": "DEFAULT", + }, + "DEFORM_MIN_VOLUME": { + "DESCRIPTION": "Minimum volume in the mesh", + "GROUP": "DEFORM", + "HEADER": "MinVolume", + "TYPE": "DEFAULT", + }, + "DEFORM_MAX_VOLUME": { + "DESCRIPTION": "Maximum volume in the mesh", + "GROUP": "DEFORM", + "HEADER": "MaxVolume", + "TYPE": "DEFAULT", + }, + "DEFORM_ITER": { + "DESCRIPTION": "Linear solver iterations for the mesh deformation", + "GROUP": "DEFORM", + "HEADER": "DeformIter", + "TYPE": "DEFAULT", + }, + "DEFORM_RESIDUAL": { + "DESCRIPTION": "Residual of the linear solver for the mesh deformation", + "GROUP": "DEFORM", + "HEADER": "DeformRes", + "TYPE": "DEFAULT", + }, + "STREAMWISE_MASSFLOW": { + "DESCRIPTION": "Massflow in streamwise periodic flow", + "GROUP": "STREAMWISE_PERIODIC", + "HEADER": "SWMassflow", + "TYPE": "DEFAULT", + }, + "STREAMWISE_DP": { + "DESCRIPTION": "Pressure drop in streamwise periodic flow", + "GROUP": "STREAMWISE_PERIODIC", + "HEADER": "SWDeltaP", + "TYPE": "DEFAULT", + }, + "STREAMWISE_HEAT": { + "DESCRIPTION": "Integrated heat for streamwise periodic flow", + "GROUP": "STREAMWISE_PERIODIC", + "HEADER": "SWHeat", + "TYPE": "DEFAULT", + }, + "AVG_TEMPERATURE": { + "DESCRIPTION": "Average temperature on all surfaces defined in MARKER_MONITORING", + "GROUP": "HEAT", + "HEADER": "AvgTemp", + "TYPE": "COEFFICIENT", + }, + "RMS_DENSITY": { + "DESCRIPTION": "Root-mean square residual of the density.", + "GROUP": "RMS_RES", + "HEADER": "rms[Rho]", + "TYPE": "RESIDUAL", + }, + "RMS_MOMENTUM-X": { + "DESCRIPTION": "Root-mean square residual of the momentum x-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[RhoU]", "TYPE": "RESIDUAL", }, - "MAX_DISSIPATION": { - "DESCRIPTION": "Maximum residual of dissipation (SST model).", - "GROUP": "MAX_RES", - "HEADER": "max[w]", + "RMS_MOMENTUM-Y": { + "DESCRIPTION": "Root-mean square residual of the momentum y-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[RhoV]", "TYPE": "RESIDUAL", }, - "MAX_ENERGY": { - "DESCRIPTION": "Maximum residual of the energy.", - "GROUP": "MAX_RES", - "HEADER": "max[RhoE]", + "RMS_MOMENTUM-Z": { + "DESCRIPTION": "Root-mean square residual of the momentum z-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[RhoW]", "TYPE": "RESIDUAL", }, - "MAX_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[h]", + "RMS_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the energy.", + "GROUP": "RMS_RES", + "HEADER": "rms[RhoE]", "TYPE": "RESIDUAL", }, - "MAX_INTERMITTENCY": { - "DESCRIPTION": "Maximum residual of the intermittency (LM model).", + "MAX_DENSITY": { + "DESCRIPTION": "Maximum square residual of the density.", "GROUP": "MAX_RES", - "HEADER": "max[LM_1]", + "HEADER": "max[Rho]", "TYPE": "RESIDUAL", }, "MAX_MOMENTUM-X": { @@ -1079,160 +881,166 @@ "HEADER": "max[RhoW]", "TYPE": "RESIDUAL", }, - "MAX_NU_TILDE": { - "DESCRIPTION": "Maximum residual of nu tilde (SA model).", + "MAX_ENERGY": { + "DESCRIPTION": "Maximum residual of the energy.", "GROUP": "MAX_RES", - "HEADER": "max[nu]", + "HEADER": "max[RhoE]", "TYPE": "RESIDUAL", }, - "MAX_PRESSURE": { - "DESCRIPTION": "Maximum residual of the pressure.", - "GROUP": "MAX_RES", - "HEADER": "max[P]", + "BGS_DENSITY": { + "DESCRIPTION": "BGS residual of the density.", + "GROUP": "BGS_RES", + "HEADER": "bgs[Rho]", "TYPE": "RESIDUAL", }, - "MAX_RE_THETA_T": { - "DESCRIPTION": "Maximum residual of the momentum thickness Reynolds number (LM model).", - "GROUP": "MAX_RES", - "HEADER": "max[LM_2]", + "BGS_MOMENTUM-X": { + "DESCRIPTION": "BGS residual of the momentum x-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[RhoU]", "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)+"]', + "BGS_MOMENTUM-Y": { + "DESCRIPTION": "BGS residual of the momentum y-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[RhoV]", "TYPE": "RESIDUAL", }, - "MAX_TEMPERATURE": { - "DESCRIPTION": "Maximum residual of the temperature", - "GROUP": "MAX_RES", - "HEADER": "max[T]", + "BGS_MOMENTUM-Z": { + "DESCRIPTION": "BGS residual of the z-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[RhoW]", "TYPE": "RESIDUAL", }, - "MAX_TKE": { - "DESCRIPTION": "Maximum residual of kinetic energy (SST model).", - "GROUP": "MAX_RES", - "HEADER": "max[k]", + "BGS_ENERGY": { + "DESCRIPTION": "BGS residual of the energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[RhoE]", "TYPE": "RESIDUAL", }, - "MAX_VELOCITY-X": { - "DESCRIPTION": "Maximum residual of the velocity x-component.", - "GROUP": "MAX_RES", - "HEADER": "max[U]", - "TYPE": "RESIDUAL", + "DELTA_CL": { + "DESCRIPTION": "Difference between Target CL and current CL", + "GROUP": "FIXED_CL", + "HEADER": "Delta_CL", + "TYPE": "COEFFICIENT", }, - "MAX_VELOCITY-Y": { - "DESCRIPTION": "Maximum residual of the velocity y-component.", - "GROUP": "MAX_RES", - "HEADER": "max[V]", + "PREV_AOA": { + "DESCRIPTION": "Angle of Attack at the previous iteration of the Fixed CL driver", + "GROUP": "FIXED_CL", + "HEADER": "Previous_AOA", + "TYPE": "DEFAULT", + }, + "CHANGE_IN_AOA": { + "DESCRIPTION": "Last change in Angle of Attack by Fixed CL Driver", + "GROUP": "FIXED_CL", + "HEADER": "Change_in_AOA", "TYPE": "RESIDUAL", }, - "MAX_VELOCITY-Z": { - "DESCRIPTION": "Maximum residual of the velocity z-component.", - "GROUP": "MAX_RES", - "HEADER": "max[W]", + "CL_DRIVER_COMMAND": { + "DESCRIPTION": "CL Driver's control command", + "GROUP": "FIXED_CL", + "HEADER": "CL_Driver_Command", "TYPE": "RESIDUAL", }, - "MIN_CFL": { - "DESCRIPTION": "Current minimum of the local CFL numbers", - "GROUP": "CFL_NUMBER", - "HEADER": "Min CFL", - "TYPE": "DEFAULT", + "BUFFET": { + "DESCRIPTION": "Buffet sensor", + "GROUP": "AERO_COEFF", + "HEADER": "Buffet", + "TYPE": "COEFFICIENT", }, - "MIN_DELTA_TIME": { - "DESCRIPTION": "Current minimum local time step", + "CFL_NUMBER": { + "DESCRIPTION": "Current value of the CFL number", "GROUP": "CFL_NUMBER", - "HEADER": "Min DT", + "HEADER": "CFL number", "TYPE": "DEFAULT", }, - "MOMENT_X": { - "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", - "GROUP": "AERO_COEFF", - "HEADER": "CMy", - "TYPE": "COEFFICIENT", + "RMS_UTOL": { + "DESCRIPTION": "Norm of displacement increment", + "GROUP": "RMS_RES", + "HEADER": "rms[U]", + "TYPE": "RESIDUAL", }, - "MOMENT_Z": { - "DESCRIPTION": "Total momentum z-component on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CMz", - "TYPE": "COEFFICIENT", + "RMS_RTOL": { + "DESCRIPTION": "Norm of residual", + "GROUP": "RMS_RES", + "HEADER": "rms[R]", + "TYPE": "RESIDUAL", }, - 'MachIn_" + tag': { - "DESCRIPTION": 'Total-to-Static efficiency " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'MachIn_" + tag', - "TYPE": "DEFAULT", + "RMS_ETOL": { + "DESCRIPTION": "Norm of energy/work increment", + "GROUP": "RMS_RES", + "HEADER": "rms[E]", + "TYPE": "RESIDUAL", }, - 'MachOut_" + tag': { - "DESCRIPTION": 'Total-to-Static efficiency " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'MachOut_" + tag', - "TYPE": "DEFAULT", + "RMS_DISP_X": { + "DESCRIPTION": "Residual of X displacement", + "GROUP": "RMS_RES", + "HEADER": "rms[DispX]", + "TYPE": "RESIDUAL", }, - 'MassFlowIn_" + tag': { - "DESCRIPTION": 'Mach out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'MassFlowIn_" + tag', - "TYPE": "DEFAULT", + "RMS_DISP_Y": { + "DESCRIPTION": "Residual of Y displacement", + "GROUP": "RMS_RES", + "HEADER": "rms[DispY]", + "TYPE": "RESIDUAL", }, - 'MassFlowOut_" + tag': { - "DESCRIPTION": 'Total efficiency " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'MassFlowOut_" + tag', - "TYPE": "DEFAULT", + "RMS_DISP_Z": { + "DESCRIPTION": "Residual of Z displacement", + "GROUP": "RMS_RES", + "HEADER": "rms[DispZ]", + "TYPE": "RESIDUAL", }, - 'NormalVelocityIn_" + tag': { - "DESCRIPTION": 'Absolute flow angle out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'NormalVelocityIn_" + tag', - "TYPE": "DEFAULT", + "BGS_DISP_X": { + "DESCRIPTION": "BGS residual of X displacement", + "GROUP": "BGS_RES", + "HEADER": "bgs[DispX]", + "TYPE": "RESIDUAL", }, - 'NormalVelocityOut_" + tag': { - "DESCRIPTION": 'Mass flow in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'NormalVelocityOut_" + tag', - "TYPE": "DEFAULT", + "BGS_DISP_Y": { + "DESCRIPTION": "BGS residual of Y displacement", + "GROUP": "BGS_RES", + "HEADER": "bgs[DispY]", + "TYPE": "RESIDUAL", }, - "PREV_AOA": { - "DESCRIPTION": "Angle of Attack at the previous iteration of the Fixed CL driver", - "GROUP": "FIXED_CL", - "HEADER": "Previous_AOA", - "TYPE": "DEFAULT", + "BGS_DISP_Z": { + "DESCRIPTION": "BGS residual of Z displacement", + "GROUP": "BGS_RES", + "HEADER": "bgs[DispZ]", + "TYPE": "RESIDUAL", }, - 'PressureIn_" + tag': { - "DESCRIPTION": 'Pressure ratio " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'PressureIn_" + tag', + "VMS": { + "DESCRIPTION": "VMS", + "GROUP": "Maximum Von-Misses stress", + "HEADER": "VonMises", "TYPE": "DEFAULT", }, - 'PressureOut_" + tag': { - "DESCRIPTION": 'Flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'PressureOut_" + tag', + "LOAD_RAMP": { + "DESCRIPTION": "LOAD_RAMP", + "GROUP": "Fraction of total load (ramped", + "HEADER": "Load_Ramp", "TYPE": "DEFAULT", }, - "PressureRatioTS": { - "DESCRIPTION": "Machine total-to-static pressure ratio", - "GROUP": "TURBO_PERF", - "HEADER": "PRTS", + "LOAD_INCREMENT": { + "DESCRIPTION": "LOAD_INCREMENT", + "GROUP": "Percent of total load (incremental", + "HEADER": "Load[%]", "TYPE": "DEFAULT", }, - "PressureRatioTT": { - "DESCRIPTION": "Machine total-to-toal pressure ratio", - "GROUP": "TURBO_PERF", - "HEADER": "PRTT", - "TYPE": "DEFAULT", + "REFERENCE_NODE": { + "DESCRIPTION": "Distance to reference node", + "GROUP": "STRUCT_COEFF", + "HEADER": "RefNode", + "TYPE": "COEFFICIENT", }, - "REFERENCE_FORCE": { - "DESCRIPTION": "Reference force used to compute aerodynamic coefficients", - "GROUP": "AERO_COEFF", - "HEADER": "RefForce", + "TOPOL_COMPLIANCE": { + "DESCRIPTION": "Structural compliance", + "GROUP": "STRUCT_COEFF", + "HEADER": "TopComp", + "TYPE": "COEFFICIENT", + }, + "STRESS_PENALTY": { + "DESCRIPTION": "Aggregate stress penalty", + "GROUP": "STRUCT_COEFF", + "HEADER": "StressPen", "TYPE": "COEFFICIENT", }, "REFERENCE_GEOMETRY": { @@ -1241,28 +1049,52 @@ "HEADER": "RefGeom", "TYPE": "COEFFICIENT", }, - "REFERENCE_NODE": { - "DESCRIPTION": "Distance to reference node", + "VOLUME_FRACTION": { + "DESCRIPTION": "Fraction of solid material", "GROUP": "STRUCT_COEFF", - "HEADER": "RefNode", + "HEADER": "VolFrac", "TYPE": "COEFFICIENT", }, - 'RMS_"+CV_name': { - "DESCRIPTION": 'Root-mean squared residual of " + CV_name + " controlling variable equation.', + "TOPOL_DISCRETENESS": { + "DESCRIPTION": "Discreteness of the material distribution", + "GROUP": "STRUCT_COEFF", + "HEADER": "TopDisc", + "TYPE": "COEFFICIENT", + }, + "LINSOL_ITER_HEAT": { + "DESCRIPTION": "Number of iterations of the linear solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterHeat", + "TYPE": "DEFAULT", + }, + "LINSOL_RESIDUAL_HEAT": { + "DESCRIPTION": "Residual of the linear solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolResHeat", + "TYPE": "DEFAULT", + }, + "RMS_ADJ_NU_TILDE": { + "DESCRIPTION": "Root-mean square residual of the adjoint nu tilde.", "GROUP": "RMS_RES", - "HEADER": 'rms["+CV_name+"]', + "HEADER": "rms[A_nu]", "TYPE": "RESIDUAL", }, - 'RMS_"+scalar_name': { - "DESCRIPTION": 'Root-mean squared residual of the "+scalar_name+" mass fraction equation.', + "RMS_ADJ_TKE": { + "DESCRIPTION": "Root-mean square residual of the adjoint kinetic energy.", "GROUP": "RMS_RES", - "HEADER": 'rms["+scalar_name+"]', + "HEADER": "rms[A_k]", "TYPE": "RESIDUAL", }, - 'RMS_ADJ_" + scalar_name': { - "DESCRIPTION": 'Root-mean square residual of the adjoint of " + scalar_name + " .', + "RMS_ADJ_DISSIPATION": { + "DESCRIPTION": "Root-mean square residual of the adjoint dissipation.", "GROUP": "RMS_RES", - "HEADER": 'rms[" + scalar_name + "]', + "HEADER": "rms[A_w]", + "TYPE": "RESIDUAL", + }, + '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) + "]', "TYPE": "RESIDUAL", }, 'RMS_ADJ_"+cv_name': { @@ -1271,70 +1103,82 @@ "HEADER": 'rms[" + cv_name + "]', "TYPE": "RESIDUAL", }, - "RMS_ADJ_DENSITY": { - "DESCRIPTION": "Root-mean square residual of the adjoint density.", + 'RMS_ADJ_" + scalar_name': { + "DESCRIPTION": 'Root-mean square residual of the adjoint of " + scalar_name + " .', "GROUP": "RMS_RES", - "HEADER": "rms[A_Rho]", + "HEADER": 'rms[" + scalar_name + "]', "TYPE": "RESIDUAL", }, - "RMS_ADJ_DISSIPATION": { - "DESCRIPTION": "Root-mean square residual of the adjoint dissipation.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_w]", + "MAX_ADJ_NU_TILDE": { + "DESCRIPTION": "Maximum residual of the adjoint nu tilde.", + "GROUP": "MAX_RES", + "HEADER": "max[A_nu]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the adjoint energy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_E]", + "MAX_ADJ_TKE": { + "DESCRIPTION": "Maximum residual of the adjoint kinetic energy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_k]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_ENTHALPY": { - "DESCRIPTION": "Root-mean square residual of the enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_h]", + "MAX_ADJ_DISSIPATION": { + "DESCRIPTION": "Maximum residual of the adjoint dissipation.", + "GROUP": "MAX_RES", + "HEADER": "max[A_w]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_MOMENTUM-X": { - "DESCRIPTION": "Root-mean square residual of the adjoint momentum x-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_RhoU]", + '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) + "]', "TYPE": "RESIDUAL", }, - "RMS_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "Root-mean square residual of the adjoint momentum y-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_RhoV]", + 'MAX_ADJ_" + cv_name': { + "DESCRIPTION": 'Maximum residual of the adjoint " + cv_name', + "GROUP": "MAX_RES", + "HEADER": 'max["+cv_name +"]', "TYPE": "RESIDUAL", }, - "RMS_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "Root-mean square residual of the adjoint momentum z-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_RhoW]", + 'MAX_ADJ_" + scalar_name': { + "DESCRIPTION": 'Maximum residual of the adjoint of " + scalar_name + " .', + "GROUP": "MAX_RES", + "HEADER": 'max[scalar_" + scalar_name + "]', "TYPE": "RESIDUAL", }, - "RMS_ADJ_NU_TILDE": { - "DESCRIPTION": "Root-mean square residual of the adjoint nu tilde.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_nu]", + "BGS_ADJ_NU_TILDE": { + "DESCRIPTION": "BGS residual of the adjoint nu tilde.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_nu]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_PRESSURE": { - "DESCRIPTION": "Root-mean square residual of the adjoint Pressure.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_P]", + "BGS_ADJ_TKE": { + "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_k]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_RAD_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the P1 radiative energy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_P1]", + "BGS_ADJ_DISSIPATION": { + "DESCRIPTION": "BGS residual of the adjoint dissipation.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_w]", "TYPE": "RESIDUAL", }, - '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) + "]', + '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) + "]', + "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", }, "RMS_ADJ_TEMPERATURE": { @@ -1343,10 +1187,28 @@ "HEADER": "rms[A_T]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_TKE": { - "DESCRIPTION": "Root-mean square residual of the adjoint kinetic energy.", + "MAX_ADJ_TEMPERATURE": { + "DESCRIPTION": "Maximum residual of the temperature.", + "GROUP": "MAX_RES", + "HEADER": "max[A_T]", + "TYPE": "RESIDUAL", + }, + "BGS_ADJ_TEMPERATURE": { + "DESCRIPTION": "BGS residual of the adjoint temperature.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_T]", + "TYPE": "RESIDUAL", + }, + "SENS_GEO": { + "DESCRIPTION": "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", + "GROUP": "SENSITIVITY", + "HEADER": "Sens_Geo", + "TYPE": "COEFFICIENT", + }, + "RMS_ADJ_PRESSURE": { + "DESCRIPTION": "Root-mean square residual of the adjoint Pressure.", "GROUP": "RMS_RES", - "HEADER": "rms[A_k]", + "HEADER": "rms[A_P]", "TYPE": "RESIDUAL", }, "RMS_ADJ_VELOCITY-X": { @@ -1367,148 +1229,202 @@ "HEADER": "rms[A_W]", "TYPE": "RESIDUAL", }, - "RMS_DENSITY": { - "DESCRIPTION": "Root-mean square residual of the density.", + "RMS_ADJ_ENTHALPY": { + "DESCRIPTION": "Root-mean square residual of the enthalpy.", "GROUP": "RMS_RES", - "HEADER": "rms[Rho]", + "HEADER": "rms[A_h]", "TYPE": "RESIDUAL", }, - "RMS_DISP_X": { - "DESCRIPTION": "Residual of X displacement", + "ADJOINT_SOLEXTRA": { + "DESCRIPTION": "Adjoint value of the first extra Solution.", + "GROUP": "ADJOINT_SOLEXTRA", + "HEADER": "Adjoint_SolExtra", + "TYPE": "COEFFICIENT", + }, + "RMS_ADJ_RAD_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the P1 radiative energy.", "GROUP": "RMS_RES", - "HEADER": "rms[DispX]", + "HEADER": "rms[A_P1]", "TYPE": "RESIDUAL", }, - "RMS_DISP_Y": { - "DESCRIPTION": "Residual of Y displacement", - "GROUP": "RMS_RES", - "HEADER": "rms[DispY]", + "MAX_ADJ_PRESSURE": { + "DESCRIPTION": "Maximum residual of the adjoint Pressure.", + "GROUP": "MAX_RES", + "HEADER": "max[A_Rho]", "TYPE": "RESIDUAL", }, - "RMS_DISP_Z": { - "DESCRIPTION": "Residual of Z displacement", - "GROUP": "RMS_RES", - "HEADER": "rms[DispZ]", + "MAX_ADJ_VELOCITY-X": { + "DESCRIPTION": "Maximum residual of the adjoint Velocity x-component", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoU]", "TYPE": "RESIDUAL", }, - "RMS_DISSIPATION": { - "DESCRIPTION": "Root-mean square residual of dissipation (SST model).", - "GROUP": "RMS_RES", - "HEADER": "rms[w]", + "MAX_ADJ_VELOCITY-Y": { + "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", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoW]", + "TYPE": "RESIDUAL", + }, + "MAX_ADJ_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_h]", + "TYPE": "RESIDUAL", + }, + "BGS_ADJ_PRESSURE": { + "DESCRIPTION": "BGS residual of the adjoint Pressure.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Rho]", + "TYPE": "RESIDUAL", + }, + "BGS_ADJ_VELOCITY-X": { + "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", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoV]", "TYPE": "RESIDUAL", }, - "RMS_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the energy.", - "GROUP": "RMS_RES", - "HEADER": "rms[RhoE]", + "BGS_ADJ_VELOCITY-Z": { + "DESCRIPTION": "BGS residual of the adjoint Velocity z-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoW]", "TYPE": "RESIDUAL", }, - "RMS_ENTHALPY": { - "DESCRIPTION": "Root-mean square residual of the enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[h]", + "BGS_ADJ_ENTHALPY": { + "DESCRIPTION": "BGS residual of the adjoint enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_h]", "TYPE": "RESIDUAL", }, - "RMS_ETOL": { - "DESCRIPTION": "Norm of energy/work increment", - "GROUP": "RMS_RES", - "HEADER": "rms[E]", + "BGS_ADJ_RAD_ENERGY": { + "DESCRIPTION": "BGS residual of the P1 radiative energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_P1]", "TYPE": "RESIDUAL", }, - "RMS_INTERMITTENCY": { - "DESCRIPTION": "Root-mean square residual of intermittency (LM model).", - "GROUP": "RMS_RES", - "HEADER": "rms[LM_1]", - "TYPE": "RESIDUAL", + "SENS_PRESS": { + "DESCRIPTION": "Sensitivity of the objective function with respect to the far-field pressure.", + "GROUP": "SENSITIVITY", + "HEADER": "Sens_Press", + "TYPE": "COEFFICIENT", }, - "RMS_MOMENTUM-X": { - "DESCRIPTION": "Root-mean square residual of the momentum x-component.", + "SENS_TEMP": { + "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.", + "GROUP": "SENSITIVITY", + "HEADER": "Sens_Vin", + "TYPE": "COEFFICIENT", + }, + "SENS_PRESS_OUT": { + "DESCRIPTION": "Sensitivity of the objective function with respect to the outlet pressure.", + "GROUP": "SENSITIVITY", + "HEADER": "Sens_Pout", + "TYPE": "COEFFICIENT", + }, + "RMS_ADJ_DENSITY": { + "DESCRIPTION": "Root-mean square residual of the adjoint density.", "GROUP": "RMS_RES", - "HEADER": "rms[RhoU]", + "HEADER": "rms[A_Rho]", "TYPE": "RESIDUAL", }, - "RMS_MOMENTUM-Y": { - "DESCRIPTION": "Root-mean square residual of the momentum y-component.", + "RMS_ADJ_MOMENTUM-X": { + "DESCRIPTION": "Root-mean square residual of the adjoint momentum x-component.", "GROUP": "RMS_RES", - "HEADER": "rms[RhoV]", + "HEADER": "rms[A_RhoU]", "TYPE": "RESIDUAL", }, - "RMS_MOMENTUM-Z": { - "DESCRIPTION": "Root-mean square residual of the momentum z-component.", + "RMS_ADJ_MOMENTUM-Y": { + "DESCRIPTION": "Root-mean square residual of the adjoint momentum y-component.", "GROUP": "RMS_RES", - "HEADER": "rms[RhoW]", + "HEADER": "rms[A_RhoV]", "TYPE": "RESIDUAL", }, - "RMS_NU_TILDE": { - "DESCRIPTION": "Root-mean square residual of nu tilde (SA model).", + "RMS_ADJ_MOMENTUM-Z": { + "DESCRIPTION": "Root-mean square residual of the adjoint momentum z-component.", "GROUP": "RMS_RES", - "HEADER": "rms[nu]", + "HEADER": "rms[A_RhoW]", "TYPE": "RESIDUAL", }, - "RMS_PRESSURE": { - "DESCRIPTION": "Root-mean square residual of the pressure.", + "RMS_ADJ_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the adjoint energy.", "GROUP": "RMS_RES", - "HEADER": "rms[P]", + "HEADER": "rms[A_E]", "TYPE": "RESIDUAL", }, - "RMS_RAD_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the radiative energy.", - "GROUP": "RMS_RES", - "HEADER": "rms[E_Rad]", + "MAX_ADJ_DENSITY": { + "DESCRIPTION": "Maximum residual of the adjoint density.", + "GROUP": "MAX_RES", + "HEADER": "max[A_Rho]", "TYPE": "RESIDUAL", }, - "RMS_RE_THETA_T": { - "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", - "GROUP": "RMS_RES", - "HEADER": "rms[LM_2]", + "MAX_ADJ_MOMENTUM-X": { + "DESCRIPTION": "Maximum residual of the adjoint momentum x-component", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoU]", "TYPE": "RESIDUAL", }, - "RMS_RTOL": { - "DESCRIPTION": "Norm of residual", - "GROUP": "RMS_RES", - "HEADER": "rms[R]", + "MAX_ADJ_MOMENTUM-Y": { + "DESCRIPTION": "Maximum residual of the adjoint momentum y-component", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoV]", "TYPE": "RESIDUAL", }, - '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)+"]', + "MAX_ADJ_MOMENTUM-Z": { + "DESCRIPTION": "Maximum residual of the adjoint momentum z-component", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoW]", "TYPE": "RESIDUAL", }, - "RMS_TEMPERATURE": { - "DESCRIPTION": "Root mean square residual of the temperature", - "GROUP": "RMS_RES", - "HEADER": "rms[T]", + "MAX_ADJ_ENERGY": { + "DESCRIPTION": "Maximum residual of the adjoint energy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_E]", "TYPE": "RESIDUAL", }, - "RMS_TKE": { - "DESCRIPTION": "Root-mean square residual of kinetic energy (SST model).", - "GROUP": "RMS_RES", - "HEADER": "rms[k]", + "BGS_ADJ_DENSITY": { + "DESCRIPTION": "BGS residual of the adjoint density.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Rho]", "TYPE": "RESIDUAL", }, - "RMS_UTOL": { - "DESCRIPTION": "Norm of displacement increment", - "GROUP": "RMS_RES", - "HEADER": "rms[U]", + "BGS_ADJ_MOMENTUM-X": { + "DESCRIPTION": "BGS residual of the adjoint momentum x-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoU]", "TYPE": "RESIDUAL", }, - "RMS_VELOCITY-X": { - "DESCRIPTION": "Root-mean square residual of the velocity x-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[U]", + "BGS_ADJ_MOMENTUM-Y": { + "DESCRIPTION": "BGS residual of the adjoint momentum y-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoV]", "TYPE": "RESIDUAL", }, - "RMS_VELOCITY-Y": { - "DESCRIPTION": "Root-mean square residual of the velocity y-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[V]", + "BGS_ADJ_MOMENTUM-Z": { + "DESCRIPTION": "BGS residual of the adjoint momentum z-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoW]", "TYPE": "RESIDUAL", }, - "RMS_VELOCITY-Z": { - "DESCRIPTION": "Root-mean square residual of the velocity z-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[W]", + "BGS_ADJ_ENERGY": { + "DESCRIPTION": "BGS residual of the adjoint energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_E]", "TYPE": "RESIDUAL", }, "SENS_AOA": { @@ -1517,11 +1433,29 @@ "HEADER": "Sens_AoA", "TYPE": "COEFFICIENT", }, - 'SENS_EFIELD_" + iVarS': { - "DESCRIPTION": "d Objective / d Electric field", + "SENS_MACH": { + "DESCRIPTION": "Sensitivity of the objective function with respect to the Mach number (only of compressible solver).", "GROUP": "SENSITIVITY", - "HEADER": "Sens[EField\" + iVarS + ']'", - "TYPE": "DEFAULT", + "HEADER": "Sens_Mach", + "TYPE": "COEFFICIENT", + }, + "ADJOINT_DISP_X": { + "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.", + "GROUP": "RMS_RES", + "HEADER": "rms[Uy_adj]", + "TYPE": "RESIDUAL", + }, + "ADJOINT_DISP_Z": { + "DESCRIPTION": "Root-mean square residual of the adjoint of the Z displacements.", + "GROUP": "RMS_RES", + "HEADER": "rms[Uz_adj]", + "TYPE": "RESIDUAL", }, 'SENS_E_" + iVarS': { "DESCRIPTION": "d Objective / d Elasticity modulus", @@ -1529,36 +1463,12 @@ "HEADER": "Sens[E\" + iVarS + ']'", "TYPE": "DEFAULT", }, - "SENS_GEO": { - "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).", - "GROUP": "SENSITIVITY", - "HEADER": "Sens_Mach", - "TYPE": "COEFFICIENT", - }, 'SENS_NU_" + iVarS': { "DESCRIPTION": "d Objective / d Poisson ratio", "GROUP": "SENSITIVITY", "HEADER": "Sens[Nu\" + iVarS + ']'", "TYPE": "DEFAULT", }, - "SENS_PRESS": { - "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.", - "GROUP": "SENSITIVITY", - "HEADER": "Sens_Pout", - "TYPE": "COEFFICIENT", - }, 'SENS_RHO_" + iVarS': { "DESCRIPTION": "d Objective / d Material density", "GROUP": "SENSITIVITY", @@ -1571,287 +1481,347 @@ "HEADER": "Sens[RhoDL\" + iVarS + ']'", "TYPE": "DEFAULT", }, - "SENS_TEMP": { - "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.", + 'SENS_EFIELD_" + iVarS': { + "DESCRIPTION": "d Objective / d Electric field", "GROUP": "SENSITIVITY", - "HEADER": "Sens_Vin", - "TYPE": "COEFFICIENT", - }, - "SIDEFORCE": { - "DESCRIPTION": "Total sideforce coefficient on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CSF", - "TYPE": "COEFFICIENT", - }, - "STREAMWISE_DP": { - "DESCRIPTION": "Pressure drop in streamwise periodic flow", - "GROUP": "STREAMWISE_PERIODIC", - "HEADER": "SWDeltaP", - "TYPE": "DEFAULT", - }, - "STREAMWISE_HEAT": { - "DESCRIPTION": "Integrated heat for streamwise periodic flow", - "GROUP": "STREAMWISE_PERIODIC", - "HEADER": "SWHeat", - "TYPE": "DEFAULT", - }, - "STREAMWISE_MASSFLOW": { - "DESCRIPTION": "Massflow in streamwise periodic flow", - "GROUP": "STREAMWISE_PERIODIC", - "HEADER": "SWMassflow", - "TYPE": "DEFAULT", - }, - "STRESS_PENALTY": { - "DESCRIPTION": "Aggregate stress penalty", - "GROUP": "STRUCT_COEFF", - "HEADER": "StressPen", - "TYPE": "COEFFICIENT", + "HEADER": "Sens[EField\" + iVarS + ']'", + "TYPE": "DEFAULT", }, - "SURFACE_MACH": { - "DESCRIPTION": "Total average mach number on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_Mach", - "TYPE": "COEFFICIENT", + "BGS_ADJ_DISP_X": { + "DESCRIPTION": "BGS residual of the adjoint X displacement.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Ux]", + "TYPE": "RESIDUAL", }, - "SURFACE_MASSFLOW": { - "DESCRIPTION": "Total average mass flow on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_Massflow", - "TYPE": "COEFFICIENT", + "BGS_ADJ_DISP_Y": { + "DESCRIPTION": "BGS residual of the adjoint Y displacement.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Uy]", + "TYPE": "RESIDUAL", }, - "SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "Total momentum distortion on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Momentum_Distortion", - "TYPE": "COEFFICIENT", + "BGS_ADJ_DISP_Z": { + "DESCRIPTION": "BGS residual of the adjoint Z displacement.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Uz]", + "TYPE": "RESIDUAL", }, - "SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "Total pressure drop on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Pressure_Drop", - "TYPE": "COEFFICIENT", + "D_SURFACE_MASSFLOW": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Massflow]", + "TYPE": "D_COEFFICIENT", }, - "SURFACE_SECONDARY": { - "DESCRIPTION": "Total secondary strength on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Secondary_Strength", - "TYPE": "COEFFICIENT", + "TAVG_SURFACE_MASSFLOW": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_Massflow]", + "TYPE": "TAVG_COEFFICIENT", }, - "SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "Total secondary over uniformity on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Secondary_Over_Uniformity", - "TYPE": "COEFFICIENT", + "TAVG_D_SURFACE_MASSFLOW": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Massflow]", + "TYPE": "TAVG_D_COEFFICIENT", }, - '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', - "TYPE": "COEFFICIENT", + "D_SURFACE_MACH": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Mach]", + "TYPE": "D_COEFFICIENT", }, - "SURFACE_SPECIES_VARIANCE": { - "DESCRIPTION": "Total species variance", - "GROUP": "SPECIES_COEFF", - "HEADER": "Species_Variance", - "TYPE": "DEFAULT", + "TAVG_SURFACE_MACH": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_Mach]", + "TYPE": "TAVG_COEFFICIENT", }, - "SURFACE_STATIC_PRESSURE": { - "DESCRIPTION": "Total average pressure on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_Press", - "TYPE": "COEFFICIENT", + "TAVG_D_SURFACE_MACH": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Mach]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "Total average temperature on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_Temp", - "TYPE": "COEFFICIENT", + "D_SURFACE_STATIC_TEMPERATURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Temp]", + "TYPE": "D_COEFFICIENT", }, - "SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "Total average total pressure on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_TotalPress", - "TYPE": "COEFFICIENT", + "TAVG_SURFACE_STATIC_TEMPERATURE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_Temp]", + "TYPE": "TAVG_COEFFICIENT", }, - "SURFACE_TOTAL_TEMPERATURE": { - "DESCRIPTION": "Total average total temperature all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_TotalTemp", - "TYPE": "COEFFICIENT", + "TAVG_D_SURFACE_STATIC_TEMPERATURE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Temp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "SURFACE_UNIFORMITY": { - "DESCRIPTION": "Total flow uniformity on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Uniformity", - "TYPE": "COEFFICIENT", + "D_SURFACE_STATIC_PRESSURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Press]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_ADJOINT_SOLEXTRA": { + "TAVG_SURFACE_STATIC_PRESSURE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_ADJOINT_SOLEXTRA", - "HEADER": "tavg[Adjoint_SolExtra]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_Press]", "TYPE": "TAVG_COEFFICIENT", }, + "TAVG_D_SURFACE_STATIC_PRESSURE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Press]", + "TYPE": "TAVG_D_COEFFICIENT", + }, + "D_AVG_DENSITY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Density]", + "TYPE": "D_COEFFICIENT", + }, "TAVG_AVG_DENSITY": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Avg_Density]", "TYPE": "TAVG_COEFFICIENT", }, + "TAVG_D_AVG_DENSITY": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Density]", + "TYPE": "TAVG_D_COEFFICIENT", + }, + "D_AVG_ENTHALPY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Enthalpy]", + "TYPE": "D_COEFFICIENT", + }, "TAVG_AVG_ENTHALPY": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Avg_Enthalpy]", "TYPE": "TAVG_COEFFICIENT", }, + "TAVG_D_AVG_ENTHALPY": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Enthalpy]", + "TYPE": "TAVG_D_COEFFICIENT", + }, + "D_AVG_NORMALVEL": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_NormalVel]", + "TYPE": "D_COEFFICIENT", + }, "TAVG_AVG_NORMALVEL": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Avg_NormalVel]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_AVG_TEMPERATURE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_HEAT", - "HEADER": "tavg[AvgTemp]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_AVG_NORMALVEL": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_NormalVel]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_BUFFET": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[Buffet]", - "TYPE": "TAVG_COEFFICIENT", + "D_SURFACE_UNIFORMITY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Uniformity]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_COMBO": { + "TAVG_SURFACE_UNIFORMITY": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_COMBO", - "HEADER": "tavg[ComboObj]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Uniformity]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_CUSTOM_OBJFUNC": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_COMBO", - "HEADER": "tavg[ComboObj]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_SURFACE_UNIFORMITY": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Uniformity]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_DELTA_CL": { + "D_SURFACE_SECONDARY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Secondary_Strength]", + "TYPE": "D_COEFFICIENT", + }, + "TAVG_SURFACE_SECONDARY": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FIXED_CL", - "HEADER": "tavg[Delta_CL]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Secondary_Strength]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_DRAG": { + "TAVG_D_SURFACE_SECONDARY": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Secondary_Strength]", + "TYPE": "TAVG_D_COEFFICIENT", + }, + "D_SURFACE_MOM_DISTORTION": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Momentum_Distortion]", + "TYPE": "D_COEFFICIENT", + }, + "TAVG_SURFACE_MOM_DISTORTION": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CD]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Momentum_Distortion]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_ADJOINT_SOLEXTRA": { + "TAVG_D_SURFACE_MOM_DISTORTION": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_ADJOINT_SOLEXTRA", - "HEADER": "dtavg[Adjoint_SolExtra]", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Momentum_Distortion]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_AVG_DENSITY": { + "D_SURFACE_SECOND_OVER_UNIFORM": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Secondary_Over_Uniformity]", + "TYPE": "D_COEFFICIENT", + }, + "TAVG_SURFACE_SECOND_OVER_UNIFORM": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Secondary_Over_Uniformity]", + "TYPE": "TAVG_COEFFICIENT", + }, + "TAVG_D_SURFACE_SECOND_OVER_UNIFORM": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Density]", + "HEADER": "dtavg[Secondary_Over_Uniformity]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_AVG_ENTHALPY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Enthalpy]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_SURFACE_TOTAL_TEMPERATURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_TotalTemp]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_AVG_NORMALVEL": { + "TAVG_SURFACE_TOTAL_TEMPERATURE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_TotalTemp]", + "TYPE": "TAVG_COEFFICIENT", + }, + "TAVG_D_SURFACE_TOTAL_TEMPERATURE": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_NormalVel]", + "HEADER": "dtavg[Avg_TotalTemp]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_AVG_TEMPERATURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_HEAT", - "HEADER": "dtavg[AvgTemp]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_SURFACE_TOTAL_PRESSURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_TotalPress]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_BUFFET": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[Buffet]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_SURFACE_TOTAL_PRESSURE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_TotalPress]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_COMBO": { + "TAVG_D_SURFACE_TOTAL_PRESSURE": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_COMBO", - "HEADER": "dtavg[ComboObj]", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_TotalPress]", "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", + "D_SURFACE_PRESSURE_DROP": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Pressure_Drop]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_DELTA_CL": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FIXED_CL", - "HEADER": "dtavg[Delta_CL]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_SURFACE_PRESSURE_DROP": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Pressure_Drop]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_DRAG": { + "TAVG_D_SURFACE_PRESSURE_DROP": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CD]", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Pressure_Drop]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_EFFICIENCY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CEff]", - "TYPE": "TAVG_D_COEFFICIENT", + 'D_SURFACE_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SPECIES_COEFF", + "HEADER": 'd[Avg_Species_" + std::to_string(iVar]', + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_EQUIVALENT_AREA": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_EQUIVALENT_AREA", - "HEADER": "dtavg[CEquiv_Area]", - "TYPE": "TAVG_D_COEFFICIENT", + 'TAVG_SURFACE_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SPECIES_COEFF", + "HEADER": 'tavg[Avg_Species_" + std::to_string(iVar]', + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_FIGURE_OF_MERIT": { + 'TAVG_D_SURFACE_SPECIES_" + std::to_string(iVar': { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_ROTATING_FRAME", - "HEADER": "dtavg[CMerit]", + "GROUP": "TAVG_D_SPECIES_COEFF", + "HEADER": 'dtavg[Avg_Species_" + std::to_string(iVar]', "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_FORCE_X": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CFx]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_REFERENCE_FORCE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[RefForce]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_FORCE_Y": { + "TAVG_REFERENCE_FORCE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[RefForce]", + "TYPE": "TAVG_COEFFICIENT", + }, + "TAVG_D_REFERENCE_FORCE": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CFy]", + "HEADER": "dtavg[RefForce]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_FORCE_Z": { + "D_DRAG": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CD]", + "TYPE": "D_COEFFICIENT", + }, + "TAVG_DRAG": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CD]", + "TYPE": "TAVG_COEFFICIENT", + }, + "TAVG_D_DRAG": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CFz]", + "HEADER": "dtavg[CD]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_CP_DIFF", - "HEADER": "dtavg[Cp_Diff]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_LIFT": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CL]", + "TYPE": "D_COEFFICIENT", + }, + "TAVG_LIFT": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CL]", + "TYPE": "TAVG_COEFFICIENT", }, "TAVG_D_LIFT": { "DESCRIPTION": "weighted time average derivative value", @@ -1859,197 +1829,197 @@ "HEADER": "dtavg[CL]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_MAXIMUM_HEATFLUX": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_HEAT", - "HEADER": "dtavg[maxHF]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "TAVG_D_MOMENT_X": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CMx]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_SIDEFORCE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CSF]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_MOMENT_Y": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CMy]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_SIDEFORCE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CSF]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_MOMENT_Z": { + "TAVG_D_SIDEFORCE": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CMz]", + "HEADER": "dtavg[CSF]", "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", + "D_MOMENT_X": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CMx]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_REFERENCE_GEOMETRY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[RefGeom]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_MOMENT_X": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CMx]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_REFERENCE_NODE": { + "TAVG_D_MOMENT_X": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[RefNode]", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CMx]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SENS_AOA": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_AoA]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_MOMENT_Y": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CMy]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_SENS_GEO": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Geo]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_MOMENT_Y": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CMy]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SENS_MACH": { + "TAVG_D_MOMENT_Y": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Mach]", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CMy]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SENS_PRESS": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Press]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_MOMENT_Z": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CMz]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_SENS_PRESS_OUT": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Pout]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_MOMENT_Z": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CMz]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SENS_TEMP": { + "TAVG_D_MOMENT_Z": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Temp]", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CMz]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SENS_VEL_IN": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Vin]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_FORCE_X": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CFx]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_SIDEFORCE": { + "TAVG_FORCE_X": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CFx]", + "TYPE": "TAVG_COEFFICIENT", + }, + "TAVG_D_FORCE_X": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CSF]", + "HEADER": "dtavg[CFx]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_STRESS_PENALTY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[StressPen]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_FORCE_Y": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CFy]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_SURFACE_MACH": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Mach]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_FORCE_Y": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CFy]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_MASSFLOW": { + "TAVG_D_FORCE_Y": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Massflow]", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CFy]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Momentum_Distortion]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_FORCE_Z": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CFz]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Pressure_Drop]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_FORCE_Z": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CFz]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_SECONDARY": { + "TAVG_D_FORCE_Z": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Secondary_Strength]", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CFz]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Secondary_Over_Uniformity]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_EFFICIENCY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CEff]", + "TYPE": "D_COEFFICIENT", }, - '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]', - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_EFFICIENCY": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CEff]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_STATIC_PRESSURE": { + "TAVG_D_EFFICIENCY": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Press]", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CEff]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Temp]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_CUSTOM_OBJFUNC": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_COMBO", + "HEADER": "d[ComboObj]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_TotalPress]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_CUSTOM_OBJFUNC": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_COMBO", + "HEADER": "tavg[ComboObj]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_TOTAL_TEMPERATURE": { + "TAVG_D_CUSTOM_OBJFUNC": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_TotalTemp]", + "GROUP": "TAVG_D_COMBO", + "HEADER": "dtavg[ComboObj]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SURFACE_UNIFORMITY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Uniformity]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_COMBO": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_COMBO", + "HEADER": "d[ComboObj]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_THRUST": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_ROTATING_FRAME", - "HEADER": "dtavg[CT]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_COMBO": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_COMBO", + "HEADER": "tavg[ComboObj]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_TOPOL_COMPLIANCE": { + "TAVG_D_COMBO": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[TopComp]", + "GROUP": "TAVG_D_COMBO", + "HEADER": "dtavg[ComboObj]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_TOPOL_DISCRETENESS": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[TopDisc]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_TOTAL_HEATFLUX": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_HEAT", + "HEADER": "d[HF]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_D_TORQUE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_ROTATING_FRAME", - "HEADER": "dtavg[CQ]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_TOTAL_HEATFLUX": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_HEAT", + "HEADER": "tavg[HF]", + "TYPE": "TAVG_COEFFICIENT", }, "TAVG_D_TOTAL_HEATFLUX": { "DESCRIPTION": "weighted time average derivative value", @@ -2057,23 +2027,29 @@ "HEADER": "dtavg[HF]", "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_VOLUME_FRACTION": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[VolFrac]", - "TYPE": "TAVG_D_COEFFICIENT", + "D_MAXIMUM_HEATFLUX": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_HEAT", + "HEADER": "d[maxHF]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_EFFICIENCY": { + "TAVG_MAXIMUM_HEATFLUX": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CEff]", + "GROUP": "TAVG_HEAT", + "HEADER": "tavg[maxHF]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_EQUIVALENT_AREA": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_EQUIVALENT_AREA", - "HEADER": "tavg[CEquiv_Area]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_MAXIMUM_HEATFLUX": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_HEAT", + "HEADER": "dtavg[maxHF]", + "TYPE": "TAVG_D_COEFFICIENT", + }, + "D_FIGURE_OF_MERIT": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_ROTATING_FRAME", + "HEADER": "d[CMerit]", + "TYPE": "D_COEFFICIENT", }, "TAVG_FIGURE_OF_MERIT": { "DESCRIPTION": "weighted time average value", @@ -2081,364 +2057,388 @@ "HEADER": "tavg[CMerit]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_FORCE_X": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CFx]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_FIGURE_OF_MERIT": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_ROTATING_FRAME", + "HEADER": "dtavg[CMerit]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_FORCE_Y": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CFy]", - "TYPE": "TAVG_COEFFICIENT", + "D_THRUST": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_ROTATING_FRAME", + "HEADER": "d[CT]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_FORCE_Z": { + "TAVG_THRUST": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CFz]", + "GROUP": "TAVG_ROTATING_FRAME", + "HEADER": "tavg[CT]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_CP_DIFF", - "HEADER": "tavg[Cp_Diff]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_THRUST": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_ROTATING_FRAME", + "HEADER": "dtavg[CT]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_LIFT": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CL]", - "TYPE": "TAVG_COEFFICIENT", + "D_TORQUE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_ROTATING_FRAME", + "HEADER": "d[CQ]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_MAXIMUM_HEATFLUX": { + "TAVG_TORQUE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_HEAT", - "HEADER": "tavg[maxHF]", + "GROUP": "TAVG_ROTATING_FRAME", + "HEADER": "tavg[CQ]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_MOMENT_X": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CMx]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_TORQUE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_ROTATING_FRAME", + "HEADER": "dtavg[CQ]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_MOMENT_Y": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CMy]", - "TYPE": "TAVG_COEFFICIENT", + "D_INVERSE_DESIGN_PRESSURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_CP_DIFF", + "HEADER": "d[Cp_Diff]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_MOMENT_Z": { + "TAVG_INVERSE_DESIGN_PRESSURE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CMz]", + "GROUP": "TAVG_CP_DIFF", + "HEADER": "tavg[Cp_Diff]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_REFERENCE_FORCE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[RefForce]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_INVERSE_DESIGN_PRESSURE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_CP_DIFF", + "HEADER": "dtavg[Cp_Diff]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_REFERENCE_GEOMETRY": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[RefGeom]", - "TYPE": "TAVG_COEFFICIENT", + "D_EQUIVALENT_AREA": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_EQUIVALENT_AREA", + "HEADER": "d[CEquiv_Area]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_REFERENCE_NODE": { + "TAVG_EQUIVALENT_AREA": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[RefNode]", + "GROUP": "TAVG_EQUIVALENT_AREA", + "HEADER": "tavg[CEquiv_Area]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SENS_AOA": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_AoA]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_EQUIVALENT_AREA": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_EQUIVALENT_AREA", + "HEADER": "dtavg[CEquiv_Area]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_SENS_GEO": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Geo]", - "TYPE": "TAVG_COEFFICIENT", + "D_AVG_TEMPERATURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_HEAT", + "HEADER": "d[AvgTemp]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_SENS_MACH": { + "TAVG_AVG_TEMPERATURE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Mach]", + "GROUP": "TAVG_HEAT", + "HEADER": "tavg[AvgTemp]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SENS_PRESS": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Press]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_AVG_TEMPERATURE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_HEAT", + "HEADER": "dtavg[AvgTemp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_SENS_PRESS_OUT": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Pout]", - "TYPE": "TAVG_COEFFICIENT", + "D_DELTA_CL": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FIXED_CL", + "HEADER": "d[Delta_CL]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_SENS_TEMP": { + "TAVG_DELTA_CL": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Temp]", + "GROUP": "TAVG_FIXED_CL", + "HEADER": "tavg[Delta_CL]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SENS_VEL_IN": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Vin]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_DELTA_CL": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FIXED_CL", + "HEADER": "dtavg[Delta_CL]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_SIDEFORCE": { + "D_BUFFET": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[Buffet]", + "TYPE": "D_COEFFICIENT", + }, + "TAVG_BUFFET": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CSF]", + "HEADER": "tavg[Buffet]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_STRESS_PENALTY": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[StressPen]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_BUFFET": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[Buffet]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_SURFACE_MACH": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_Mach]", - "TYPE": "TAVG_COEFFICIENT", + "D_REFERENCE_NODE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[RefNode]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_SURFACE_MASSFLOW": { + "TAVG_REFERENCE_NODE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_Massflow]", + "GROUP": "TAVG_STRUCT_COEFF", + "HEADER": "tavg[RefNode]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Momentum_Distortion]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_REFERENCE_NODE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[RefNode]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Pressure_Drop]", - "TYPE": "TAVG_COEFFICIENT", + "D_TOPOL_COMPLIANCE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[TopComp]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_SURFACE_SECONDARY": { + "TAVG_TOPOL_COMPLIANCE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Secondary_Strength]", + "GROUP": "TAVG_STRUCT_COEFF", + "HEADER": "tavg[TopComp]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Secondary_Over_Uniformity]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_TOPOL_COMPLIANCE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[TopComp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - 'TAVG_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SPECIES_COEFF", - "HEADER": 'tavg[Avg_Species_" + std::to_string(iVar]', - "TYPE": "TAVG_COEFFICIENT", + "D_STRESS_PENALTY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[StressPen]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_SURFACE_STATIC_PRESSURE": { + "TAVG_STRESS_PENALTY": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_Press]", + "GROUP": "TAVG_STRUCT_COEFF", + "HEADER": "tavg[StressPen]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_Temp]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_STRESS_PENALTY": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[StressPen]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_TotalPress]", - "TYPE": "TAVG_COEFFICIENT", + "D_REFERENCE_GEOMETRY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[RefGeom]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_SURFACE_TOTAL_TEMPERATURE": { + "TAVG_REFERENCE_GEOMETRY": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_TotalTemp]", + "GROUP": "TAVG_STRUCT_COEFF", + "HEADER": "tavg[RefGeom]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SURFACE_UNIFORMITY": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Uniformity]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_REFERENCE_GEOMETRY": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[RefGeom]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_THRUST": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_ROTATING_FRAME", - "HEADER": "tavg[CT]", - "TYPE": "TAVG_COEFFICIENT", + "D_VOLUME_FRACTION": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[VolFrac]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_TOPOL_COMPLIANCE": { + "TAVG_VOLUME_FRACTION": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[TopComp]", + "HEADER": "tavg[VolFrac]", "TYPE": "TAVG_COEFFICIENT", }, + "TAVG_D_VOLUME_FRACTION": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[VolFrac]", + "TYPE": "TAVG_D_COEFFICIENT", + }, + "D_TOPOL_DISCRETENESS": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[TopDisc]", + "TYPE": "D_COEFFICIENT", + }, "TAVG_TOPOL_DISCRETENESS": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_STRUCT_COEFF", "HEADER": "tavg[TopDisc]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_TORQUE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_ROTATING_FRAME", - "HEADER": "tavg[CQ]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_TOPOL_DISCRETENESS": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[TopDisc]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_TOTAL_HEATFLUX": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_HEAT", - "HEADER": "tavg[HF]", - "TYPE": "TAVG_COEFFICIENT", + "D_SENS_GEO": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Geo]", + "TYPE": "D_COEFFICIENT", }, - "TAVG_VOLUME_FRACTION": { + "TAVG_SENS_GEO": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[VolFrac]", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Geo]", "TYPE": "TAVG_COEFFICIENT", }, - "THRUST": { - "DESCRIPTION": "Thrust coefficient", - "GROUP": "ROTATING_FRAME", - "HEADER": "CT", - "TYPE": "COEFFICIENT", + "TAVG_D_SENS_GEO": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Geo]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TOPOL_COMPLIANCE": { - "DESCRIPTION": "Structural compliance", - "GROUP": "STRUCT_COEFF", - "HEADER": "TopComp", - "TYPE": "COEFFICIENT", + "D_ADJOINT_SOLEXTRA": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_ADJOINT_SOLEXTRA", + "HEADER": "d[Adjoint_SolExtra]", + "TYPE": "D_COEFFICIENT", }, - "TOPOL_DISCRETENESS": { - "DESCRIPTION": "Discreteness of the material distribution", - "GROUP": "STRUCT_COEFF", - "HEADER": "TopDisc", - "TYPE": "COEFFICIENT", + "TAVG_ADJOINT_SOLEXTRA": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_ADJOINT_SOLEXTRA", + "HEADER": "tavg[Adjoint_SolExtra]", + "TYPE": "TAVG_COEFFICIENT", }, - "TORQUE": { - "DESCRIPTION": "Torque coefficient", - "GROUP": "ROTATING_FRAME", - "HEADER": "CQ", - "TYPE": "COEFFICIENT", + "TAVG_D_ADJOINT_SOLEXTRA": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_ADJOINT_SOLEXTRA", + "HEADER": "dtavg[Adjoint_SolExtra]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TOTAL_HEATFLUX": { - "DESCRIPTION": "Total heatflux on all surfaces defined in MARKER_MONITORING", - "GROUP": "HEAT", - "HEADER": "HF", - "TYPE": "COEFFICIENT", + "D_SENS_PRESS": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Press]", + "TYPE": "D_COEFFICIENT", }, - 'TangentialVelocityIn_" + tag': { - "DESCRIPTION": 'Mass flow out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TangentialVelocityIn_" + tag', - "TYPE": "DEFAULT", + "TAVG_SENS_PRESS": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Press]", + "TYPE": "TAVG_COEFFICIENT", }, - 'TangentialVelocityOut_" + tag': { - "DESCRIPTION": 'Mach in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TangentialVelocityOut_" + tag', - "TYPE": "DEFAULT", + "TAVG_D_SENS_PRESS": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Press]", + "TYPE": "TAVG_D_COEFFICIENT", }, - 'TemperatureIn_" + tag': { - "DESCRIPTION": 'Temperature ratio " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TemperatureIn_" + tag', - "TYPE": "DEFAULT", + "D_SENS_TEMP": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Temp]", + "TYPE": "D_COEFFICIENT", }, - 'TemperatureOut_" + tag': { - "DESCRIPTION": 'Flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TemperatureOut_" + tag', - "TYPE": "DEFAULT", + "TAVG_SENS_TEMP": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Temp]", + "TYPE": "TAVG_COEFFICIENT", }, - 'TotPressureLoss_" + tag': { - "DESCRIPTION": "Blade Pressure Loss Coefficient", - "GROUP": "TURBO_PERF", - "HEADER": 'TPLC_" + tag', - "TYPE": "DEFAULT", + "TAVG_D_SENS_TEMP": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Temp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TotPressureLoss_Stage": { - "DESCRIPTION": "Machine Pressure Loss Coefficient", - "GROUP": "TURBO_PERF", - "HEADER": "TPLC_all", - "TYPE": "DEFAULT", + "D_SENS_VEL_IN": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Vin]", + "TYPE": "D_COEFFICIENT", }, - 'TotalEntahalpyIn_" + tag': { - "DESCRIPTION": 'Entropy generation " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotalEntahalpyIn_" + tag', - "TYPE": "DEFAULT", + "TAVG_SENS_VEL_IN": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Vin]", + "TYPE": "TAVG_COEFFICIENT", }, - 'TotalEnthalpyOut_" + tag': { - "DESCRIPTION": 'Eulerian work " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotalEnthalpyOut_" + tag', - "TYPE": "DEFAULT", + "TAVG_D_SENS_VEL_IN": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Vin]", + "TYPE": "TAVG_D_COEFFICIENT", }, - 'TotalPressureIn_" + tag': { - "DESCRIPTION": 'Pressure ratio " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotPressureIn_" + tag', - "TYPE": "DEFAULT", + "D_SENS_PRESS_OUT": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Pout]", + "TYPE": "D_COEFFICIENT", }, - 'TotalPressureOut_" + tag': { - "DESCRIPTION": 'Flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotPressureOut_" + tag', - "TYPE": "DEFAULT", + "TAVG_SENS_PRESS_OUT": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Pout]", + "TYPE": "TAVG_COEFFICIENT", }, - "TotalStaticEfficiency": { - "DESCRIPTION": "Machine total-to-static efficiency", - "GROUP": "TURBO_PERF", - "HEADER": "TotStaticEff", - "TYPE": "DEFAULT", + "TAVG_D_SENS_PRESS_OUT": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Pout]", + "TYPE": "TAVG_D_COEFFICIENT", }, - 'TotalTemperatureIn_" + tag': { - "DESCRIPTION": 'Temperature ratio " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotTemperatureIn_" + tag', - "TYPE": "DEFAULT", + "D_SENS_AOA": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_AoA]", + "TYPE": "D_COEFFICIENT", }, - 'TotalTemperatureOut_" + tag': { - "DESCRIPTION": 'Flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotTemperatureOut_" + tag', - "TYPE": "DEFAULT", + "TAVG_SENS_AOA": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_AoA]", + "TYPE": "TAVG_COEFFICIENT", }, - "TotalTotalEfficiency": { - "DESCRIPTION": "Machine total-to-total efficiency", - "GROUP": "TURBO_PERF", - "HEADER": "TotTotEff", - "TYPE": "DEFAULT", + "TAVG_D_SENS_AOA": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_AoA]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "VMS": { - "DESCRIPTION": "VMS", - "GROUP": "Maximum Von-Misses stress", - "HEADER": "VonMises", - "TYPE": "DEFAULT", + "D_SENS_MACH": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Mach]", + "TYPE": "D_COEFFICIENT", }, - "VOLUME_FRACTION": { - "DESCRIPTION": "Fraction of solid material", - "GROUP": "STRUCT_COEFF", - "HEADER": "VolFrac", - "TYPE": "COEFFICIENT", + "TAVG_SENS_MACH": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Mach]", + "TYPE": "TAVG_COEFFICIENT", + }, + "TAVG_D_SENS_MACH": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Mach]", + "TYPE": "TAVG_D_COEFFICIENT", }, } diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py index b115da9a28ba..bc0614d47a45 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -125,10 +125,14 @@ def _dq(s): _field_order = ("DESCRIPTION", "GROUP", "HEADER", "TYPE") + # IMPORTANT: Preserve insertion order. + # Some fields intentionally share the same HEADER string (e.g. COMBO vs CUSTOM_OBJFUNC both map to "ComboObj"). + # SU2.io.read_history resolves header->field by iterating the Python dict in file order and letting the last match win. + # Therefore we must emit entries in the same order that they appear in the C++ source so that COMBO comes AFTER + # CUSTOM_OBJFUNC and takes precedence. Sorting the keys breaks this and makes tests fail. 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] + for key, val in outputFields.items(): f.write(f" {_dq(key)}: {{\n") for name in _field_order: if name in val: From 8fb8e203ccd309914a695d37a1c41ee25da3b2af Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sun, 4 Jan 2026 18:54:01 +0530 Subject: [PATCH 13/14] fix(SU2_PY): expose COMBO history as CUSTOM_OBJFUNC in Python Signed-off-by: shbhmexe --- SU2_PY/SU2/io/tools.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py index ba470ae36e81..3ac039c9409e 100755 --- a/SU2_PY/SU2/io/tools.py +++ b/SU2_PY/SU2/io/tools.py @@ -395,6 +395,13 @@ def read_aerodynamics( ) Func_Values[key] = value[-1] + # If only COMBO is present in the history (which is the case when using + # CUSTOM_OBJFUNC as objective), expose it also under the logical + # name CUSTOM_OBJFUNC so that SU2.eval.functions(function_name="CUSTOM_OBJFUNC") + # can retrieve the value without needing a separate history column. + if "COMBO" in Func_Values and "CUSTOM_OBJFUNC" not in Func_Values: + Func_Values["CUSTOM_OBJFUNC"] = Func_Values["COMBO"] + return Func_Values From 7c856ec73f4d6d89af18591f242d75a131a471ea Mon Sep 17 00:00:00 2001 From: shbhmexe Date: Sun, 4 Jan 2026 22:37:32 +0530 Subject: [PATCH 14/14] fix(SU2_PY): Fix Custom Objective Function for Unsteady Adjoint Signed-off-by: shbhmexe --- SU2_PY/SU2/io/historyMap.py | 3257 +++++++++++++++-------------------- SU2_PY/updateHistoryMap.py | 73 +- 2 files changed, 1448 insertions(+), 1882 deletions(-) diff --git a/SU2_PY/SU2/io/historyMap.py b/SU2_PY/SU2/io/historyMap.py index 123e9a7a2d63..93a49a2ce0f5 100644 --- a/SU2_PY/SU2/io/historyMap.py +++ b/SU2_PY/SU2/io/historyMap.py @@ -1,206 +1,205 @@ history_header_map = { - "SURFACE_MASSFLOW": { - "DESCRIPTION": "Total average mass flow on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_Massflow", - "TYPE": "COEFFICIENT", + "ADJOINT_DISP_X": { + "DESCRIPTION": "Root-mean square residual of the adjoint " + "of the X displacements.", + "GROUP": "RMS_RES", + "HEADER": "rms[Ux_adj]", + "TYPE": "RESIDUAL", }, - "SURFACE_MACH": { - "DESCRIPTION": "Total average mach number on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_Mach", - "TYPE": "COEFFICIENT", + "ADJOINT_DISP_Y": { + "DESCRIPTION": "Root-mean square residual of the adjoint " + "of the Y displacements.", + "GROUP": "RMS_RES", + "HEADER": "rms[Uy_adj]", + "TYPE": "RESIDUAL", }, - "SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "Total average temperature on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_Temp", - "TYPE": "COEFFICIENT", + "ADJOINT_DISP_Z": { + "DESCRIPTION": "Root-mean square residual of the adjoint " + "of the Z displacements.", + "GROUP": "RMS_RES", + "HEADER": "rms[Uz_adj]", + "TYPE": "RESIDUAL", }, - "SURFACE_STATIC_PRESSURE": { - "DESCRIPTION": "Total average pressure on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_Press", + "ADJOINT_SOLEXTRA": { + "DESCRIPTION": "Adjoint value of the first extra " "Solution.", + "GROUP": "ADJOINT_SOLEXTRA", + "HEADER": "Adjoint_SolExtra", "TYPE": "COEFFICIENT", }, + "AOA": { + "DESCRIPTION": "Angle of attack", + "GROUP": "AOA", + "HEADER": "AoA", + "TYPE": "DEFAULT", + }, + "AVG_CFL": { + "DESCRIPTION": "Current average of the local CFL numbers", + "GROUP": "CFL_NUMBER", + "HEADER": "Avg CFL", + "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", }, - "SURFACE_UNIFORMITY": { - "DESCRIPTION": "Total flow uniformity on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Uniformity", - "TYPE": "COEFFICIENT", - }, - "SURFACE_SECONDARY": { - "DESCRIPTION": "Total secondary strength on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Secondary_Strength", - "TYPE": "COEFFICIENT", - }, - "SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "Total momentum distortion on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Momentum_Distortion", - "TYPE": "COEFFICIENT", - }, - "SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "Total secondary over uniformity on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Secondary_Over_Uniformity", + "AVG_TEMPERATURE": { + "DESCRIPTION": "Average temperature on all surfaces " + "defined in MARKER_MONITORING", + "GROUP": "HEAT", + "HEADER": "AvgTemp", "TYPE": "COEFFICIENT", }, - "SURFACE_TOTAL_TEMPERATURE": { - "DESCRIPTION": "Total average total temperature all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_TotalTemp", - "TYPE": "COEFFICIENT", + "BGS_ADJ_DENSITY": { + "DESCRIPTION": "BGS residual of the adjoint density.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Rho]", + "TYPE": "RESIDUAL", }, - "SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "Total average total pressure on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Avg_TotalPress", - "TYPE": "COEFFICIENT", + "BGS_ADJ_DISP_X": { + "DESCRIPTION": "BGS residual of the adjoint X " "displacement.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Ux]", + "TYPE": "RESIDUAL", }, - "SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "Total pressure drop on all markers set in MARKER_ANALYZE", - "GROUP": "FLOW_COEFF", - "HEADER": "Pressure_Drop", - "TYPE": "COEFFICIENT", + "BGS_ADJ_DISP_Y": { + "DESCRIPTION": "BGS residual of the adjoint Y " "displacement.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Uy]", + "TYPE": "RESIDUAL", }, - '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', - "TYPE": "COEFFICIENT", + "BGS_ADJ_DISP_Z": { + "DESCRIPTION": "BGS residual of the adjoint Z " "displacement.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Uz]", + "TYPE": "RESIDUAL", }, - "SURFACE_SPECIES_VARIANCE": { - "DESCRIPTION": "Total species variance", - "GROUP": "SPECIES_COEFF", - "HEADER": "Species_Variance", - "TYPE": "DEFAULT", + "BGS_ADJ_DISSIPATION": { + "DESCRIPTION": "BGS residual of the adjoint " "dissipation.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_w]", + "TYPE": "RESIDUAL", }, - "RMS_NU_TILDE": { - "DESCRIPTION": "Root-mean square residual of nu tilde (SA model).", - "GROUP": "RMS_RES", - "HEADER": "rms[nu]", + "BGS_ADJ_ENERGY": { + "DESCRIPTION": "BGS residual of the adjoint energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_E]", "TYPE": "RESIDUAL", }, - "RMS_TKE": { - "DESCRIPTION": "Root-mean square residual of kinetic energy (SST model).", - "GROUP": "RMS_RES", - "HEADER": "rms[k]", + "BGS_ADJ_MOMENTUM-X": { + "DESCRIPTION": "BGS residual of the adjoint momentum " "x-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoU]", "TYPE": "RESIDUAL", }, - "RMS_DISSIPATION": { - "DESCRIPTION": "Root-mean square residual of dissipation (SST model).", - "GROUP": "RMS_RES", - "HEADER": "rms[w]", + "BGS_ADJ_MOMENTUM-Y": { + "DESCRIPTION": "BGS residual of the adjoint momentum " "y-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoV]", "TYPE": "RESIDUAL", }, - "RMS_INTERMITTENCY": { - "DESCRIPTION": "Root-mean square residual of intermittency (LM model).", - "GROUP": "RMS_RES", - "HEADER": "rms[LM_1]", + "BGS_ADJ_MOMENTUM-Z": { + "DESCRIPTION": "BGS residual of the adjoint momentum " "z-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoW]", "TYPE": "RESIDUAL", }, - "RMS_RE_THETA_T": { - "DESCRIPTION": "Root-mean square residual of momentum thickness Reynolds number (LM model).", - "GROUP": "RMS_RES", - "HEADER": "rms[LM_2]", + "BGS_ADJ_NU_TILDE": { + "DESCRIPTION": "BGS residual of the adjoint nu tilde.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_nu]", "TYPE": "RESIDUAL", }, - '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)+"]', + "BGS_ADJ_PRESSURE": { + "DESCRIPTION": "BGS residual of the adjoint Pressure.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_Rho]", "TYPE": "RESIDUAL", }, - 'RMS_"+CV_name': { - "DESCRIPTION": 'Root-mean squared residual of " + CV_name + " controlling variable equation.', - "GROUP": "RMS_RES", - "HEADER": 'rms["+CV_name+"]', + "BGS_ADJ_RAD_ENERGY": { + "DESCRIPTION": "BGS residual of the P1 radiative " "energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_P1]", "TYPE": "RESIDUAL", }, - 'RMS_"+scalar_name': { - "DESCRIPTION": 'Root-mean squared residual of the "+scalar_name+" mass fraction equation.', - "GROUP": "RMS_RES", - "HEADER": 'rms["+scalar_name+"]', + '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) + " '"]', "TYPE": "RESIDUAL", }, - "MAX_NU_TILDE": { - "DESCRIPTION": "Maximum residual of nu tilde (SA model).", - "GROUP": "MAX_RES", - "HEADER": "max[nu]", + "BGS_ADJ_TEMPERATURE": { + "DESCRIPTION": "BGS residual of the adjoint " "temperature.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_T]", "TYPE": "RESIDUAL", }, - "MAX_TKE": { - "DESCRIPTION": "Maximum residual of kinetic energy (SST model).", - "GROUP": "MAX_RES", - "HEADER": "max[k]", + "BGS_ADJ_ENTHALPY": { + "DESCRIPTION": "BGS residual of the adjoint " "enthalpy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_h]", "TYPE": "RESIDUAL", }, - "MAX_DISSIPATION": { - "DESCRIPTION": "Maximum residual of dissipation (SST model).", - "GROUP": "MAX_RES", - "HEADER": "max[w]", + "BGS_ADJ_TKE": { + "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_k]", "TYPE": "RESIDUAL", }, - "MAX_INTERMITTENCY": { - "DESCRIPTION": "Maximum residual of the intermittency (LM model).", - "GROUP": "MAX_RES", - "HEADER": "max[LM_1]", + "BGS_ADJ_VELOCITY-X": { + "DESCRIPTION": "BGS residual of the adjoint Velocity " "x-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoU]", "TYPE": "RESIDUAL", }, - "MAX_RE_THETA_T": { - "DESCRIPTION": "Maximum residual of the momentum thickness Reynolds number (LM model).", - "GROUP": "MAX_RES", - "HEADER": "max[LM_2]", + "BGS_ADJ_VELOCITY-Y": { + "DESCRIPTION": "BGS residual of the adjoint Velocity " "y-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoV]", "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)+"]', + "BGS_ADJ_VELOCITY-Z": { + "DESCRIPTION": "BGS residual of the adjoint Velocity " "z-component", + "GROUP": "BGS_RES", + "HEADER": "bgs[A_RhoW]", "TYPE": "RESIDUAL", }, - 'MAX_" + cv_name': { - "DESCRIPTION": 'Maximum residual of the " + cv_name + " equation.', - "GROUP": "MAX_RES", - "HEADER": 'max[" + cv_name + "]', + "BGS_DENSITY": { + "DESCRIPTION": "BGS residual of the density.", + "GROUP": "BGS_RES", + "HEADER": "bgs[Rho]", "TYPE": "RESIDUAL", }, - 'MAX_" + scalar_name': { - "DESCRIPTION": 'Maximum residual of the " + scalar_name + " mass fraction equation.', - "GROUP": "MAX_RES", - "HEADER": 'max[" + scalar_name + "]', + "BGS_DISP_X": { + "DESCRIPTION": "BGS residual of X displacement", + "GROUP": "BGS_RES", + "HEADER": "bgs[DispX]", "TYPE": "RESIDUAL", }, - "BGS_NU_TILDE": { - "DESCRIPTION": "BGS residual of nu tilde (SA model).", + "BGS_DISP_Y": { + "DESCRIPTION": "BGS residual of Y displacement", "GROUP": "BGS_RES", - "HEADER": "bgs[nu]", + "HEADER": "bgs[DispY]", "TYPE": "RESIDUAL", }, - "BGS_TKE": { - "DESCRIPTION": "BGS residual of kinetic energy (SST model).", + "BGS_DISP_Z": { + "DESCRIPTION": "BGS residual of Z displacement", "GROUP": "BGS_RES", - "HEADER": "bgs[k]", + "HEADER": "bgs[DispZ]", "TYPE": "RESIDUAL", }, "BGS_DISSIPATION": { @@ -209,161 +208,101 @@ "HEADER": "bgs[w]", "TYPE": "RESIDUAL", }, - "BGS_INTERMITTENCY": { - "DESCRIPTION": "BGS residual of the intermittency (LM model).", + "BGS_ENERGY": { + "DESCRIPTION": "BGS residual of the energy.", "GROUP": "BGS_RES", - "HEADER": "bgs[LM_1]", + "HEADER": "bgs[RhoE]", "TYPE": "RESIDUAL", }, - "BGS_RE_THETA_T": { - "DESCRIPTION": "BGS residual of the momentum thickness Reynolds number (LM model).", + "BGS_MOMENTUM-X": { + "DESCRIPTION": "BGS residual of the momentum x-component.", "GROUP": "BGS_RES", - "HEADER": "bgs[LM_2]", + "HEADER": "bgs[RhoU]", "TYPE": "RESIDUAL", }, - 'BGS_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Maximum residual of transported species.", + "BGS_MOMENTUM-Y": { + "DESCRIPTION": "BGS residual of the momentum y-component.", "GROUP": "BGS_RES", - "HEADER": 'bgs[rho*Y_" + std::to_string(iVar)+"]', + "HEADER": "bgs[RhoV]", "TYPE": "RESIDUAL", }, - 'BGS_" + cv_name': { - "DESCRIPTION": 'BGS residual of the " + cv_name + " controlling variable equation.', + "BGS_NU_TILDE": { + "DESCRIPTION": "BGS residual of nu tilde (SA model).", "GROUP": "BGS_RES", - "HEADER": 'bgs[" + cv_name + "]', + "HEADER": "bgs[nu]", "TYPE": "RESIDUAL", }, - 'BGS_"+scalar_name': { - "DESCRIPTION": 'BGS residual of the "+scalar_name+" mass fraction equation.', + "BGS_PRESSURE": { + "DESCRIPTION": "BGS residual of the pressure.", "GROUP": "BGS_RES", - "HEADER": 'bgs["+scalar_name+"]', + "HEADER": "bgs[P]", "TYPE": "RESIDUAL", }, - "LINSOL_ITER_TURB": { - "DESCRIPTION": "Number of iterations of the linear solver for turbulence.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterTurb", - "TYPE": "DEFAULT", + 'BGS_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": "BGS residual of " "transported species.", + "GROUP": "BGS_RES", + "HEADER": 'bgs[rho*Y_" + ' 'std::to_string(iVar)+"]', + "TYPE": "RESIDUAL", }, - "LINSOL_RESIDUAL_TURB": { - "DESCRIPTION": "Residual of the linear solver for turbulence.", - "GROUP": "LINSOL", - "HEADER": "LinSolResTurb", - "TYPE": "DEFAULT", + "BGS_TEMPERATURE": { + "DESCRIPTION": "Block-Gauss-Seidel residual of the " "temperature", + "GROUP": "BGS_RES", + "HEADER": "bgs[T]", + "TYPE": "RESIDUAL", }, - "LINSOL_ITER_TRANS": { - "DESCRIPTION": "Number of iterations of the linear solver for transition solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterTrans", - "TYPE": "DEFAULT", + "BGS_ENTHALPY": { + "DESCRIPTION": "Block-Gauss-Seidel residual of the " "enthalpy", + "GROUP": "BGS_RES", + "HEADER": "bgs[h]", + "TYPE": "RESIDUAL", }, - "LINSOL_RESIDUAL_TRANS": { - "DESCRIPTION": "Residual of the linear solver for transition solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolResTrans", - "TYPE": "DEFAULT", + "BGS_TKE": { + "DESCRIPTION": "BGS residual of kinetic energy (SST model).", + "GROUP": "BGS_RES", + "HEADER": "bgs[k]", + "TYPE": "RESIDUAL", }, - "LINSOL_ITER_SPECIES": { - "DESCRIPTION": "Number of iterations of the linear solver for species solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterSpecies", - "TYPE": "DEFAULT", + "BGS_VELOCITY-X": { + "DESCRIPTION": "BGS residual of the velocity x-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[U]", + "TYPE": "RESIDUAL", }, - "LINSOL_RESIDUAL_SPECIES": { - "DESCRIPTION": "Residual of the linear solver for species solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolResSpecies", - "TYPE": "DEFAULT", - }, - "LINSOL_ITER_FLAMELET": { - "DESCRIPTION": "Number of iterations of the linear solver for scalar solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterScalar", - "TYPE": "DEFAULT", - }, - "LINSOL_RESIDUAL_FLAMELET": { - "DESCRIPTION": "Residual of the linear solver for scalar solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolResScalar", - "TYPE": "DEFAULT", - }, - "REFERENCE_FORCE": { - "DESCRIPTION": "Reference force used to compute aerodynamic coefficients", - "GROUP": "AERO_COEFF", - "HEADER": "RefForce", - "TYPE": "COEFFICIENT", - }, - "DRAG": { - "DESCRIPTION": "Total drag coefficient on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CD", - "TYPE": "COEFFICIENT", - }, - "LIFT": { - "DESCRIPTION": "Total lift coefficient on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CL", - "TYPE": "COEFFICIENT", - }, - "SIDEFORCE": { - "DESCRIPTION": "Total sideforce coefficient on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CSF", - "TYPE": "COEFFICIENT", - }, - "MOMENT_X": { - "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", - "GROUP": "AERO_COEFF", - "HEADER": "CMy", - "TYPE": "COEFFICIENT", - }, - "MOMENT_Z": { - "DESCRIPTION": "Total momentum z-component on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CMz", - "TYPE": "COEFFICIENT", - }, - "FORCE_X": { - "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", - "GROUP": "AERO_COEFF", - "HEADER": "CFy", - "TYPE": "COEFFICIENT", + "BGS_VELOCITY-Y": { + "DESCRIPTION": "BGS residual of the velocity y-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[V]", + "TYPE": "RESIDUAL", }, - "FORCE_Z": { - "DESCRIPTION": "Total force z-component on all surfaces set with MARKER_MONITORING", - "GROUP": "AERO_COEFF", - "HEADER": "CFz", - "TYPE": "COEFFICIENT", + "BGS_VELOCITY-Z": { + "DESCRIPTION": "BGS residual of the velocity z-component.", + "GROUP": "BGS_RES", + "HEADER": "bgs[W]", + "TYPE": "RESIDUAL", }, - "EFFICIENCY": { - "DESCRIPTION": "Total lift-to-drag ratio on all surfaces set with MARKER_MONITORING", + "BUFFET": { + "DESCRIPTION": "Buffet sensor", "GROUP": "AERO_COEFF", - "HEADER": "CEff", + "HEADER": "Buffet", "TYPE": "COEFFICIENT", }, - "AOA": { - "DESCRIPTION": "Angle of attack", - "GROUP": "AOA", - "HEADER": "AoA", + "CFL_NUMBER": { + "DESCRIPTION": "Current value of the CFL number", + "GROUP": "CFL_NUMBER", + "HEADER": "CFL number", "TYPE": "DEFAULT", }, - "CUSTOM_OBJFUNC": { - "DESCRIPTION": "Custom obj. function value.", - "GROUP": "COMBO", - "HEADER": "ComboObj", - "TYPE": "COEFFICIENT", + "CHANGE_IN_AOA": { + "DESCRIPTION": "Last change in Angle of Attack by Fixed CL " "Driver", + "GROUP": "FIXED_CL", + "HEADER": "Change_in_AOA", + "TYPE": "RESIDUAL", + }, + "CL_DRIVER_COMMAND": { + "DESCRIPTION": "CL Driver's control command", + "GROUP": "FIXED_CL", + "HEADER": "CL_Driver_Command", + "TYPE": "RESIDUAL", }, "COMBO": { "DESCRIPTION": "Combined obj. function value.", @@ -371,1493 +310,1259 @@ "HEADER": "ComboObj", "TYPE": "COEFFICIENT", }, - "TOTAL_HEATFLUX": { - "DESCRIPTION": "Total heatflux on all surfaces defined in MARKER_MONITORING", - "GROUP": "HEAT", - "HEADER": "HF", - "TYPE": "COEFFICIENT", - }, - "MAXIMUM_HEATFLUX": { - "DESCRIPTION": "Maximum heatflux across all surfaces set with MARKER_MONITORING.", - "GROUP": "HEAT", - "HEADER": "maxHF", - "TYPE": "COEFFICIENT", - }, - "FIGURE_OF_MERIT": { - "DESCRIPTION": "Thrust over torque", - "GROUP": "ROTATING_FRAME", - "HEADER": "CMerit", - "TYPE": "COEFFICIENT", - }, - "THRUST": { - "DESCRIPTION": "Thrust coefficient", - "GROUP": "ROTATING_FRAME", - "HEADER": "CT", - "TYPE": "COEFFICIENT", - }, - "TORQUE": { - "DESCRIPTION": "Torque coefficient", - "GROUP": "ROTATING_FRAME", - "HEADER": "CQ", - "TYPE": "COEFFICIENT", - }, - "INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "Cp difference for inverse design", - "GROUP": "CP_DIFF", - "HEADER": "Cp_Diff", - "TYPE": "COEFFICIENT", - }, - "EQUIVALENT_AREA": { - "DESCRIPTION": "Equivalent area", - "GROUP": "EQUIVALENT_AREA", - "HEADER": "CEquiv_Area", - "TYPE": "COEFFICIENT", - }, - '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", - }, - 'TotalEntahalpyIn_" + tag': { - "DESCRIPTION": 'Entropy generation " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotalEntahalpyIn_" + tag', + "DEFORM_ITER": { + "DESCRIPTION": "Linear solver iterations for the mesh " "deformation", + "GROUP": "DEFORM", + "HEADER": "DeformIter", "TYPE": "DEFAULT", }, - 'TotalEnthalpyOut_" + tag': { - "DESCRIPTION": 'Eulerian work " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotalEnthalpyOut_" + tag', + "DEFORM_MAX_VOLUME": { + "DESCRIPTION": "Maximum volume in the mesh", + "GROUP": "DEFORM", + "HEADER": "MaxVolume", "TYPE": "DEFAULT", }, - 'TotalPressureIn_" + tag': { - "DESCRIPTION": 'Pressure ratio " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotPressureIn_" + tag', + "DEFORM_MIN_VOLUME": { + "DESCRIPTION": "Minimum volume in the mesh", + "GROUP": "DEFORM", + "HEADER": "MinVolume", "TYPE": "DEFAULT", }, - 'TotalPressureOut_" + tag': { - "DESCRIPTION": 'Flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotPressureOut_" + tag', + "DEFORM_RESIDUAL": { + "DESCRIPTION": "Residual of the linear solver for the " "mesh deformation", + "GROUP": "DEFORM", + "HEADER": "DeformRes", "TYPE": "DEFAULT", }, - 'PressureIn_" + tag': { - "DESCRIPTION": 'Pressure ratio " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'PressureIn_" + tag', - "TYPE": "DEFAULT", + "DELTA_CL": { + "DESCRIPTION": "Difference between Target CL and current CL", + "GROUP": "FIXED_CL", + "HEADER": "Delta_CL", + "TYPE": "COEFFICIENT", }, - 'PressureOut_" + tag': { - "DESCRIPTION": 'Flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'PressureOut_" + tag', - "TYPE": "DEFAULT", + "DRAG": { + "DESCRIPTION": "Total drag coefficient on all surfaces set with " + "MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CD", + "TYPE": "COEFFICIENT", }, - 'TotalTemperatureIn_" + tag': { - "DESCRIPTION": 'Temperature ratio " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotTemperatureIn_" + tag', - "TYPE": "DEFAULT", + "D_ADJOINT_SOLEXTRA": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_ADJOINT_SOLEXTRA", + "HEADER": "d[Adjoint_SolExtra]", + "TYPE": "D_COEFFICIENT", }, - 'TotalTemperatureOut_" + tag': { - "DESCRIPTION": 'Flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TotTemperatureOut_" + tag', - "TYPE": "DEFAULT", + "D_AVG_DENSITY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Density]", + "TYPE": "D_COEFFICIENT", }, - 'TemperatureIn_" + tag': { - "DESCRIPTION": 'Temperature ratio " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TemperatureIn_" + tag', - "TYPE": "DEFAULT", + "D_AVG_ENTHALPY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Enthalpy]", + "TYPE": "D_COEFFICIENT", }, - 'TemperatureOut_" + tag': { - "DESCRIPTION": 'Flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TemperatureOut_" + tag', - "TYPE": "DEFAULT", + "D_AVG_NORMALVEL": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_NormalVel]", + "TYPE": "D_COEFFICIENT", }, - 'DensityIn_" + tag': { - "DESCRIPTION": 'Flow angle out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'DensityIn_" + tag', - "TYPE": "DEFAULT", + "D_AVG_TEMPERATURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_HEAT", + "HEADER": "d[AvgTemp]", + "TYPE": "D_COEFFICIENT", }, - 'DensityOut_" + tag': { - "DESCRIPTION": 'Absolute flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'DensityOut_" + tag', - "TYPE": "DEFAULT", + "D_BUFFET": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[Buffet]", + "TYPE": "D_COEFFICIENT", }, - 'NormalVelocityIn_" + tag': { - "DESCRIPTION": 'Absolute flow angle out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'NormalVelocityIn_" + tag', - "TYPE": "DEFAULT", + "D_COMBO": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_COMBO", + "HEADER": "d[ComboObj]", + "TYPE": "D_COEFFICIENT", }, - 'NormalVelocityOut_" + tag': { - "DESCRIPTION": 'Mass flow in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'NormalVelocityOut_" + tag', - "TYPE": "DEFAULT", + "D_DELTA_CL": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FIXED_CL", + "HEADER": "d[Delta_CL]", + "TYPE": "D_COEFFICIENT", }, - 'TangentialVelocityIn_" + tag': { - "DESCRIPTION": 'Mass flow out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TangentialVelocityIn_" + tag', - "TYPE": "DEFAULT", + "D_DRAG": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CD]", + "TYPE": "D_COEFFICIENT", }, - 'TangentialVelocityOut_" + tag': { - "DESCRIPTION": 'Mach in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'TangentialVelocityOut_" + tag', - "TYPE": "DEFAULT", + "D_EFFICIENCY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CEff]", + "TYPE": "D_COEFFICIENT", }, - 'MassFlowIn_" + tag': { - "DESCRIPTION": 'Mach out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'MassFlowIn_" + tag', - "TYPE": "DEFAULT", + "D_EQUIVALENT_AREA": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_EQUIVALENT_AREA", + "HEADER": "d[CEquiv_Area]", + "TYPE": "D_COEFFICIENT", }, - 'MassFlowOut_" + tag': { - "DESCRIPTION": 'Total efficiency " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'MassFlowOut_" + tag', - "TYPE": "DEFAULT", + "D_FIGURE_OF_MERIT": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_ROTATING_FRAME", + "HEADER": "d[CMerit]", + "TYPE": "D_COEFFICIENT", }, - 'MachIn_" + tag': { - "DESCRIPTION": 'Total-to-Static efficiency " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'MachIn_" + tag', - "TYPE": "DEFAULT", + "D_FORCE_X": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CFx]", + "TYPE": "D_COEFFICIENT", }, - 'MachOut_" + tag': { - "DESCRIPTION": 'Total-to-Static efficiency " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'MachOut_" + tag', - "TYPE": "DEFAULT", + "D_FORCE_Y": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CFy]", + "TYPE": "D_COEFFICIENT", }, - 'AbsFlowAngleIn_" + tag': { - "DESCRIPTION": 'Absolute flow angle in " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'AbsFlowAngleIn_" + tag', - "TYPE": "DEFAULT", + "D_FORCE_Z": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CFz]", + "TYPE": "D_COEFFICIENT", }, - 'AbsFlowAngleOut_" + tag': { - "DESCRIPTION": 'Absolute flow angle out " + tag', - "GROUP": "TURBO_PERF", - "HEADER": 'AbsFlowAngleOut_" + tag', - "TYPE": "DEFAULT", + "D_INVERSE_DESIGN_PRESSURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_CP_DIFF", + "HEADER": "d[Cp_Diff]", + "TYPE": "D_COEFFICIENT", }, - 'KineticEnergyLoss_" + tag': { - "DESCRIPTION": "Blade Kinetic Energy Loss Coefficient", - "GROUP": "TURBO_PERF", - "HEADER": 'KELC_" + tag', - "TYPE": "DEFAULT", + "D_LIFT": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CL]", + "TYPE": "D_COEFFICIENT", }, - 'TotPressureLoss_" + tag': { - "DESCRIPTION": "Blade Pressure Loss Coefficient", - "GROUP": "TURBO_PERF", - "HEADER": 'TPLC_" + tag', - "TYPE": "DEFAULT", + "D_MAXIMUM_HEATFLUX": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_HEAT", + "HEADER": "d[MaxHF]", + "TYPE": "D_COEFFICIENT", }, - "EntropyGeneration": { - "DESCRIPTION": "Machine entropy generation", - "GROUP": "TURBO_PERF", - "HEADER": "EntropyGen", - "TYPE": "DEFAULT", + "D_MOMENT_X": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CMx]", + "TYPE": "D_COEFFICIENT", }, - "EulerianWork": { - "DESCRIPTION": "Machine Eulerian work", - "GROUP": "TURBO_PERF", - "HEADER": "EulerianWork", - "TYPE": "DEFAULT", + "D_MOMENT_Y": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CMy]", + "TYPE": "D_COEFFICIENT", }, - "TotalStaticEfficiency": { - "DESCRIPTION": "Machine total-to-static efficiency", - "GROUP": "TURBO_PERF", - "HEADER": "TotStaticEff", - "TYPE": "DEFAULT", + "D_MOMENT_Z": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CMz]", + "TYPE": "D_COEFFICIENT", }, - "TotalTotalEfficiency": { - "DESCRIPTION": "Machine total-to-total efficiency", - "GROUP": "TURBO_PERF", - "HEADER": "TotTotEff", - "TYPE": "DEFAULT", + "D_REFERENCE_GEOMETRY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[RefGeom]", + "TYPE": "D_COEFFICIENT", }, - "PressureRatioTS": { - "DESCRIPTION": "Machine total-to-static pressure ratio", - "GROUP": "TURBO_PERF", - "HEADER": "PRTS", - "TYPE": "DEFAULT", + "D_REFERENCE_NODE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[RefNode]", + "TYPE": "D_COEFFICIENT", }, - "PressureRatioTT": { - "DESCRIPTION": "Machine total-to-toal pressure ratio", - "GROUP": "TURBO_PERF", - "HEADER": "PRTT", - "TYPE": "DEFAULT", + "D_SENS_AOA": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_AoA]", + "TYPE": "D_COEFFICIENT", }, - "KineticEnergyLoss_Stage": { - "DESCRIPTION": "Machine Kinetic Energy Loss Coefficient", - "GROUP": "TURBO_PERF", - "HEADER": "KELC_all", - "TYPE": "DEFAULT", + "D_SENS_GEO": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Geo]", + "TYPE": "D_COEFFICIENT", }, - "TotPressureLoss_Stage": { - "DESCRIPTION": "Machine Pressure Loss Coefficient", - "GROUP": "TURBO_PERF", - "HEADER": "TPLC_all", - "TYPE": "DEFAULT", + "D_SENS_MACH": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Mach]", + "TYPE": "D_COEFFICIENT", }, - "RMS_PRESSURE": { - "DESCRIPTION": "Root-mean square residual of the pressure.", - "GROUP": "RMS_RES", - "HEADER": "rms[P]", - "TYPE": "RESIDUAL", + "D_SENS_PRESS": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Press]", + "TYPE": "D_COEFFICIENT", }, - "RMS_VELOCITY-X": { - "DESCRIPTION": "Root-mean square residual of the velocity x-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[U]", - "TYPE": "RESIDUAL", + "D_SENS_PRESS_OUT": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Pout]", + "TYPE": "D_COEFFICIENT", }, - "RMS_VELOCITY-Y": { - "DESCRIPTION": "Root-mean square residual of the velocity y-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[V]", - "TYPE": "RESIDUAL", + "D_SENS_TEMP": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Temp]", + "TYPE": "D_COEFFICIENT", }, - "RMS_VELOCITY-Z": { - "DESCRIPTION": "Root-mean square residual of the velocity z-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[W]", - "TYPE": "RESIDUAL", + "D_SENS_VEL_IN": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_SENSITIVITY", + "HEADER": "d[Sens_Vin]", + "TYPE": "D_COEFFICIENT", }, - "RMS_TEMPERATURE": { - "DESCRIPTION": "Root mean square residual of the temperature", - "GROUP": "RMS_RES", - "HEADER": "rms[T]", - "TYPE": "RESIDUAL", + "D_SIDEFORCE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_AERO_COEFF", + "HEADER": "d[CSF]", + "TYPE": "D_COEFFICIENT", }, - "RMS_ENTHALPY": { - "DESCRIPTION": "Root-mean square residual of the enthalpy.", - "GROUP": "RMS_RES", - "HEADER": "rms[h]", - "TYPE": "RESIDUAL", + "D_STRESS_PENALTY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[StressPen]", + "TYPE": "D_COEFFICIENT", }, - "RMS_RAD_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the radiative energy.", - "GROUP": "RMS_RES", - "HEADER": "rms[E_Rad]", - "TYPE": "RESIDUAL", + "D_SURFACE_MACH": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Mach]", + "TYPE": "D_COEFFICIENT", }, - "MAX_PRESSURE": { - "DESCRIPTION": "Maximum residual of the pressure.", - "GROUP": "MAX_RES", - "HEADER": "max[P]", - "TYPE": "RESIDUAL", + "D_SURFACE_MASSFLOW": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Massflow]", + "TYPE": "D_COEFFICIENT", }, - "MAX_VELOCITY-X": { - "DESCRIPTION": "Maximum residual of the velocity x-component.", - "GROUP": "MAX_RES", - "HEADER": "max[U]", - "TYPE": "RESIDUAL", + "D_SURFACE_MOM_DISTORTION": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Momentum_Distortion]", + "TYPE": "D_COEFFICIENT", }, - "MAX_VELOCITY-Y": { - "DESCRIPTION": "Maximum residual of the velocity y-component.", - "GROUP": "MAX_RES", - "HEADER": "max[V]", - "TYPE": "RESIDUAL", + "D_SURFACE_PRESSURE_DROP": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Pressure_Drop]", + "TYPE": "D_COEFFICIENT", }, - "MAX_VELOCITY-Z": { - "DESCRIPTION": "Maximum residual of the velocity z-component.", - "GROUP": "MAX_RES", - "HEADER": "max[W]", - "TYPE": "RESIDUAL", + "D_SURFACE_SECONDARY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Secondary_Strength]", + "TYPE": "D_COEFFICIENT", }, - "MAX_TEMPERATURE": { - "DESCRIPTION": "Maximum residual of the temperature", - "GROUP": "MAX_RES", - "HEADER": "max[T]", - "TYPE": "RESIDUAL", + "D_SURFACE_SECOND_OVER_UNIFORM": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Secondary_Over_Uniformity]", + "TYPE": "D_COEFFICIENT", }, - "MAX_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[h]", - "TYPE": "RESIDUAL", + 'D_SURFACE_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": "Derivative " "value", + "GROUP": "D_SPECIES_COEFF", + "HEADER": 'd[Avg_Species_" + ' "std::to_string(iVar]", + "TYPE": "D_COEFFICIENT", }, - "BGS_PRESSURE": { - "DESCRIPTION": "BGS residual of the pressure.", - "GROUP": "BGS_RES", - "HEADER": "bgs[P]", - "TYPE": "RESIDUAL", + "D_SURFACE_STATIC_PRESSURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Press]", + "TYPE": "D_COEFFICIENT", }, - "BGS_VELOCITY-X": { - "DESCRIPTION": "BGS residual of the velocity x-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[U]", - "TYPE": "RESIDUAL", + "D_SURFACE_STATIC_TEMPERATURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_Temp]", + "TYPE": "D_COEFFICIENT", }, - "BGS_VELOCITY-Y": { - "DESCRIPTION": "BGS residual of the velocity y-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[V]", - "TYPE": "RESIDUAL", + "D_SURFACE_TOTAL_PRESSURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_TotalPress]", + "TYPE": "D_COEFFICIENT", }, - "BGS_VELOCITY-Z": { - "DESCRIPTION": "BGS residual of the velocity z-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[W]", - "TYPE": "RESIDUAL", + "D_SURFACE_TOTAL_TEMPERATURE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Avg_TotalTemp]", + "TYPE": "D_COEFFICIENT", }, - "BGS_TEMPERATURE": { - "DESCRIPTION": "Block-Gauss-Seidel residual of the temperature", - "GROUP": "BGS_RES", - "HEADER": "bgs[T]", - "TYPE": "RESIDUAL", + "D_SURFACE_UNIFORMITY": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_FLOW_COEFF", + "HEADER": "d[Uniformity]", + "TYPE": "D_COEFFICIENT", }, - "BGS_ENTHALPY": { - "DESCRIPTION": "BGS residual of the enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[h]", - "TYPE": "DEFAULT", + "D_THRUST": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_ROTATING_FRAME", + "HEADER": "d[CT]", + "TYPE": "D_COEFFICIENT", }, - "BGS_RAD_ENERGY": { - "DESCRIPTION": "BGS residual of the radiative energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[E_Rad]", - "TYPE": "RESIDUAL", + "D_TOPOL_COMPLIANCE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[TopComp]", + "TYPE": "D_COEFFICIENT", }, - "LINSOL_ITER": { - "DESCRIPTION": "Number of iterations of the linear solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIter", - "TYPE": "DEFAULT", + "D_TOPOL_DISCRETENESS": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[TopDisc]", + "TYPE": "D_COEFFICIENT", }, - "LINSOL_RESIDUAL": { - "DESCRIPTION": "Residual of the linear solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolRes", - "TYPE": "DEFAULT", + "D_TORQUE": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_ROTATING_FRAME", + "HEADER": "d[CQ]", + "TYPE": "D_COEFFICIENT", }, - "MIN_DELTA_TIME": { - "DESCRIPTION": "Current minimum local time step", - "GROUP": "CFL_NUMBER", - "HEADER": "Min DT", - "TYPE": "DEFAULT", + "D_TOTAL_HEATFLUX": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_HEAT", + "HEADER": "d[HF]", + "TYPE": "D_COEFFICIENT", }, - "MAX_DELTA_TIME": { - "DESCRIPTION": "Current maximum local time step", - "GROUP": "CFL_NUMBER", - "HEADER": "Max DT", - "TYPE": "DEFAULT", + "D_VOLUME_FRACTION": { + "DESCRIPTION": "Derivative value", + "GROUP": "D_STRUCT_COEFF", + "HEADER": "d[VolFrac]", + "TYPE": "D_COEFFICIENT", }, - "MIN_CFL": { - "DESCRIPTION": "Current minimum of the local CFL numbers", - "GROUP": "CFL_NUMBER", - "HEADER": "Min CFL", - "TYPE": "DEFAULT", + "EFFICIENCY": { + "DESCRIPTION": "Total lift-to-drag ratio on all surfaces set " + "with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CEff", + "TYPE": "COEFFICIENT", }, - "MAX_CFL": { - "DESCRIPTION": "Current maximum of the local CFL numbers", - "GROUP": "CFL_NUMBER", - "HEADER": "Max CFL", - "TYPE": "DEFAULT", + "EQUIVALENT_AREA": { + "DESCRIPTION": "Equivalent area", + "GROUP": "EQUIVALENT_AREA", + "HEADER": "CEquiv_Area", + "TYPE": "COEFFICIENT", }, - "AVG_CFL": { - "DESCRIPTION": "Current average of the local CFL numbers", - "GROUP": "CFL_NUMBER", - "HEADER": "Avg CFL", + "FIGURE_OF_MERIT": { + "DESCRIPTION": "Thrust over torque", + "GROUP": "ROTATING_FRAME", + "HEADER": "CMerit", + "TYPE": "COEFFICIENT", + }, + "FORCE_X": { + "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", + "GROUP": "AERO_COEFF", + "HEADER": "CFy", + "TYPE": "COEFFICIENT", + }, + "FORCE_Z": { + "DESCRIPTION": "Total force z-component on all surfaces set with " + "MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CFz", + "TYPE": "COEFFICIENT", + }, + "INVERSE_DESIGN_PRESSURE": { + "DESCRIPTION": "Cp difference for inverse design", + "GROUP": "CP_DIFF", + "HEADER": "Cp_Diff", + "TYPE": "COEFFICIENT", + }, + "LIFT": { + "DESCRIPTION": "Total lift coefficient on all surfaces set with " + "MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CL", + "TYPE": "COEFFICIENT", + }, + "LINSOL_ITER": { + "DESCRIPTION": "Number of iterations of the linear solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIter", "TYPE": "DEFAULT", }, - "DEFORM_MIN_VOLUME": { - "DESCRIPTION": "Minimum volume in the mesh", - "GROUP": "DEFORM", - "HEADER": "MinVolume", + "LINSOL_ITER_SPECIES": { + "DESCRIPTION": "Number of iterations of the linear " + "solver for species solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterSpecies", "TYPE": "DEFAULT", }, - "DEFORM_MAX_VOLUME": { - "DESCRIPTION": "Maximum volume in the mesh", - "GROUP": "DEFORM", - "HEADER": "MaxVolume", + "LINSOL_ITER_TURB": { + "DESCRIPTION": "Number of iterations of the linear " "solver for turbulence.", + "GROUP": "LINSOL", + "HEADER": "LinSolIterTurb", "TYPE": "DEFAULT", }, - "DEFORM_ITER": { - "DESCRIPTION": "Linear solver iterations for the mesh deformation", - "GROUP": "DEFORM", - "HEADER": "DeformIter", + "LINSOL_RESIDUAL": { + "DESCRIPTION": "Residual of the linear solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolRes", "TYPE": "DEFAULT", }, - "DEFORM_RESIDUAL": { - "DESCRIPTION": "Residual of the linear solver for the mesh deformation", - "GROUP": "DEFORM", - "HEADER": "DeformRes", + "LINSOL_RESIDUAL_SPECIES": { + "DESCRIPTION": "Residual of the linear solver for " "species solver.", + "GROUP": "LINSOL", + "HEADER": "LinSolResSpecies", "TYPE": "DEFAULT", }, - "STREAMWISE_MASSFLOW": { - "DESCRIPTION": "Massflow in streamwise periodic flow", - "GROUP": "STREAMWISE_PERIODIC", - "HEADER": "SWMassflow", + "LINSOL_RESIDUAL_TURB": { + "DESCRIPTION": "Residual of the linear solver for " "turbulence.", + "GROUP": "LINSOL", + "HEADER": "LinSolResTurb", "TYPE": "DEFAULT", }, - "STREAMWISE_DP": { - "DESCRIPTION": "Pressure drop in streamwise periodic flow", - "GROUP": "STREAMWISE_PERIODIC", - "HEADER": "SWDeltaP", + "LOAD_INCREMENT": { + "DESCRIPTION": "LOAD_INCREMENT", + "GROUP": "Percent of total load (incremental", + "HEADER": "Load[%]", "TYPE": "DEFAULT", }, - "STREAMWISE_HEAT": { - "DESCRIPTION": "Integrated heat for streamwise periodic flow", - "GROUP": "STREAMWISE_PERIODIC", - "HEADER": "SWHeat", + "LOAD_RAMP": { + "DESCRIPTION": "LOAD_RAMP", + "GROUP": "Fraction of total load (ramped", + "HEADER": "Load_Ramp", "TYPE": "DEFAULT", }, - "AVG_TEMPERATURE": { - "DESCRIPTION": "Average temperature on all surfaces defined in MARKER_MONITORING", + "MAXIMUM_HEATFLUX": { + "DESCRIPTION": "Maximum heatflux on all surfaces defined " + "in MARKER_MONITORING", "GROUP": "HEAT", - "HEADER": "AvgTemp", + "HEADER": "MaxHF", "TYPE": "COEFFICIENT", }, - "RMS_DENSITY": { - "DESCRIPTION": "Root-mean square residual of the density.", - "GROUP": "RMS_RES", - "HEADER": "rms[Rho]", - "TYPE": "RESIDUAL", - }, - "RMS_MOMENTUM-X": { - "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.", - "GROUP": "RMS_RES", - "HEADER": "rms[RhoV]", - "TYPE": "RESIDUAL", - }, - "RMS_MOMENTUM-Z": { - "DESCRIPTION": "Root-mean square residual of the momentum z-component.", - "GROUP": "RMS_RES", - "HEADER": "rms[RhoW]", - "TYPE": "RESIDUAL", - }, - "RMS_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the energy.", - "GROUP": "RMS_RES", - "HEADER": "rms[RhoE]", - "TYPE": "RESIDUAL", - }, - "MAX_DENSITY": { - "DESCRIPTION": "Maximum square residual of the density.", + "MAX_ADJ_DENSITY": { + "DESCRIPTION": "Maximum residual of the adjoint density.", "GROUP": "MAX_RES", - "HEADER": "max[Rho]", + "HEADER": "max[A_Rho]", "TYPE": "RESIDUAL", }, - "MAX_MOMENTUM-X": { - "DESCRIPTION": "Maximum square residual of the momentum x-component.", + "MAX_ADJ_DISSIPATION": { + "DESCRIPTION": "Maximum residual of the adjoint " "dissipation.", "GROUP": "MAX_RES", - "HEADER": "max[RhoU]", + "HEADER": "max[A_w]", "TYPE": "RESIDUAL", }, - "MAX_MOMENTUM-Y": { - "DESCRIPTION": "Maximum square residual of the momentum y-component.", + "MAX_ADJ_ENERGY": { + "DESCRIPTION": "Maximum residual of the adjoint energy.", "GROUP": "MAX_RES", - "HEADER": "max[RhoV]", + "HEADER": "max[A_E]", "TYPE": "RESIDUAL", }, - "MAX_MOMENTUM-Z": { - "DESCRIPTION": "Maximum residual of the z-component.", + "MAX_ADJ_MOMENTUM-X": { + "DESCRIPTION": "Maximum residual of the adjoint " "momentum x-component", "GROUP": "MAX_RES", - "HEADER": "max[RhoW]", + "HEADER": "max[A_RhoU]", "TYPE": "RESIDUAL", }, - "MAX_ENERGY": { - "DESCRIPTION": "Maximum residual of the energy.", + "MAX_ADJ_MOMENTUM-Y": { + "DESCRIPTION": "Maximum residual of the adjoint " "momentum y-component", "GROUP": "MAX_RES", - "HEADER": "max[RhoE]", - "TYPE": "RESIDUAL", - }, - "BGS_DENSITY": { - "DESCRIPTION": "BGS residual of the density.", - "GROUP": "BGS_RES", - "HEADER": "bgs[Rho]", - "TYPE": "RESIDUAL", - }, - "BGS_MOMENTUM-X": { - "DESCRIPTION": "BGS residual of the momentum x-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[RhoU]", - "TYPE": "RESIDUAL", - }, - "BGS_MOMENTUM-Y": { - "DESCRIPTION": "BGS residual of the momentum y-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[RhoV]", - "TYPE": "RESIDUAL", - }, - "BGS_MOMENTUM-Z": { - "DESCRIPTION": "BGS residual of the z-component.", - "GROUP": "BGS_RES", - "HEADER": "bgs[RhoW]", - "TYPE": "RESIDUAL", - }, - "BGS_ENERGY": { - "DESCRIPTION": "BGS residual of the energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[RhoE]", - "TYPE": "RESIDUAL", - }, - "DELTA_CL": { - "DESCRIPTION": "Difference between Target CL and current CL", - "GROUP": "FIXED_CL", - "HEADER": "Delta_CL", - "TYPE": "COEFFICIENT", - }, - "PREV_AOA": { - "DESCRIPTION": "Angle of Attack at the previous iteration of the Fixed CL driver", - "GROUP": "FIXED_CL", - "HEADER": "Previous_AOA", - "TYPE": "DEFAULT", - }, - "CHANGE_IN_AOA": { - "DESCRIPTION": "Last change in Angle of Attack by Fixed CL Driver", - "GROUP": "FIXED_CL", - "HEADER": "Change_in_AOA", + "HEADER": "max[A_RhoV]", "TYPE": "RESIDUAL", }, - "CL_DRIVER_COMMAND": { - "DESCRIPTION": "CL Driver's control command", - "GROUP": "FIXED_CL", - "HEADER": "CL_Driver_Command", + "MAX_ADJ_MOMENTUM-Z": { + "DESCRIPTION": "Maximum residual of the adjoint " "momentum z-component", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoW]", "TYPE": "RESIDUAL", }, - "BUFFET": { - "DESCRIPTION": "Buffet sensor", - "GROUP": "AERO_COEFF", - "HEADER": "Buffet", - "TYPE": "COEFFICIENT", - }, - "CFL_NUMBER": { - "DESCRIPTION": "Current value of the CFL number", - "GROUP": "CFL_NUMBER", - "HEADER": "CFL number", - "TYPE": "DEFAULT", - }, - "RMS_UTOL": { - "DESCRIPTION": "Norm of displacement increment", - "GROUP": "RMS_RES", - "HEADER": "rms[U]", + "MAX_ADJ_NU_TILDE": { + "DESCRIPTION": "Maximum residual of the adjoint nu " "tilde.", + "GROUP": "MAX_RES", + "HEADER": "max[A_nu]", "TYPE": "RESIDUAL", }, - "RMS_RTOL": { - "DESCRIPTION": "Norm of residual", - "GROUP": "RMS_RES", - "HEADER": "rms[R]", + "MAX_ADJ_PRESSURE": { + "DESCRIPTION": "Maximum residual of the adjoint " "Pressure.", + "GROUP": "MAX_RES", + "HEADER": "max[A_Rho]", "TYPE": "RESIDUAL", }, - "RMS_ETOL": { - "DESCRIPTION": "Norm of energy/work increment", - "GROUP": "RMS_RES", - "HEADER": "rms[E]", + '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) + " '"]', "TYPE": "RESIDUAL", }, - "RMS_DISP_X": { - "DESCRIPTION": "Residual of X displacement", - "GROUP": "RMS_RES", - "HEADER": "rms[DispX]", + "MAX_ADJ_TEMPERATURE": { + "DESCRIPTION": "Maximum residual of the temperature.", + "GROUP": "MAX_RES", + "HEADER": "max[A_T]", "TYPE": "RESIDUAL", }, - "RMS_DISP_Y": { - "DESCRIPTION": "Residual of Y displacement", - "GROUP": "RMS_RES", - "HEADER": "rms[DispY]", + "MAX_ADJ_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_h]", "TYPE": "RESIDUAL", }, - "RMS_DISP_Z": { - "DESCRIPTION": "Residual of Z displacement", - "GROUP": "RMS_RES", - "HEADER": "rms[DispZ]", + "MAX_ADJ_TKE": { + "DESCRIPTION": "Maximum residual of the adjoint kinetic " "energy.", + "GROUP": "MAX_RES", + "HEADER": "max[A_k]", "TYPE": "RESIDUAL", }, - "BGS_DISP_X": { - "DESCRIPTION": "BGS residual of X displacement", - "GROUP": "BGS_RES", - "HEADER": "bgs[DispX]", + "MAX_ADJ_VELOCITY-X": { + "DESCRIPTION": "Maximum residual of the adjoint " "Velocity x-component", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoU]", "TYPE": "RESIDUAL", }, - "BGS_DISP_Y": { - "DESCRIPTION": "BGS residual of Y displacement", - "GROUP": "BGS_RES", - "HEADER": "bgs[DispY]", + "MAX_ADJ_VELOCITY-Y": { + "DESCRIPTION": "Maximum residual of the adjoint " "Velocity y-component", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoV]", "TYPE": "RESIDUAL", }, - "BGS_DISP_Z": { - "DESCRIPTION": "BGS residual of Z displacement", - "GROUP": "BGS_RES", - "HEADER": "bgs[DispZ]", + "MAX_ADJ_VELOCITY-Z": { + "DESCRIPTION": "Maximum residual of the adjoint " "Velocity z-component", + "GROUP": "MAX_RES", + "HEADER": "max[A_RhoW]", "TYPE": "RESIDUAL", - }, - "VMS": { - "DESCRIPTION": "VMS", - "GROUP": "Maximum Von-Misses stress", - "HEADER": "VonMises", - "TYPE": "DEFAULT", - }, - "LOAD_RAMP": { - "DESCRIPTION": "LOAD_RAMP", - "GROUP": "Fraction of total load (ramped", - "HEADER": "Load_Ramp", - "TYPE": "DEFAULT", - }, - "LOAD_INCREMENT": { - "DESCRIPTION": "LOAD_INCREMENT", - "GROUP": "Percent of total load (incremental", - "HEADER": "Load[%]", - "TYPE": "DEFAULT", - }, - "REFERENCE_NODE": { - "DESCRIPTION": "Distance to reference node", - "GROUP": "STRUCT_COEFF", - "HEADER": "RefNode", - "TYPE": "COEFFICIENT", - }, - "TOPOL_COMPLIANCE": { - "DESCRIPTION": "Structural compliance", - "GROUP": "STRUCT_COEFF", - "HEADER": "TopComp", - "TYPE": "COEFFICIENT", - }, - "STRESS_PENALTY": { - "DESCRIPTION": "Aggregate stress penalty", - "GROUP": "STRUCT_COEFF", - "HEADER": "StressPen", - "TYPE": "COEFFICIENT", - }, - "REFERENCE_GEOMETRY": { - "DESCRIPTION": "L2 norm of difference wrt reference geometry", - "GROUP": "STRUCT_COEFF", - "HEADER": "RefGeom", - "TYPE": "COEFFICIENT", - }, - "VOLUME_FRACTION": { - "DESCRIPTION": "Fraction of solid material", - "GROUP": "STRUCT_COEFF", - "HEADER": "VolFrac", - "TYPE": "COEFFICIENT", - }, - "TOPOL_DISCRETENESS": { - "DESCRIPTION": "Discreteness of the material distribution", - "GROUP": "STRUCT_COEFF", - "HEADER": "TopDisc", - "TYPE": "COEFFICIENT", - }, - "LINSOL_ITER_HEAT": { - "DESCRIPTION": "Number of iterations of the linear solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolIterHeat", + }, + "MAX_CFL": { + "DESCRIPTION": "Current maximum of the local CFL numbers", + "GROUP": "CFL_NUMBER", + "HEADER": "Max CFL", "TYPE": "DEFAULT", }, - "LINSOL_RESIDUAL_HEAT": { - "DESCRIPTION": "Residual of the linear solver.", - "GROUP": "LINSOL", - "HEADER": "LinSolResHeat", + "MAX_DELTA_TIME": { + "DESCRIPTION": "Current maximum local time step", + "GROUP": "CFL_NUMBER", + "HEADER": "Max DT", "TYPE": "DEFAULT", }, - "RMS_ADJ_NU_TILDE": { - "DESCRIPTION": "Root-mean square residual of the adjoint nu tilde.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_nu]", + "MAX_DENSITY": { + "DESCRIPTION": "Maximum square residual of the density.", + "GROUP": "MAX_RES", + "HEADER": "max[Rho]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_TKE": { - "DESCRIPTION": "Root-mean square residual of the adjoint kinetic energy.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_k]", + "MAX_DISSIPATION": { + "DESCRIPTION": "Maximum residual of dissipation (SST " "model).", + "GROUP": "MAX_RES", + "HEADER": "max[w]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_DISSIPATION": { - "DESCRIPTION": "Root-mean square residual of the adjoint dissipation.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_w]", + "MAX_ENERGY": { + "DESCRIPTION": "Maximum residual of the energy.", + "GROUP": "MAX_RES", + "HEADER": "max[RhoE]", "TYPE": "RESIDUAL", }, - '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) + "]', + "MAX_MOMENTUM-X": { + "DESCRIPTION": "Maximum square residual of the momentum " "x-component.", + "GROUP": "MAX_RES", + "HEADER": "max[RhoU]", "TYPE": "RESIDUAL", }, - 'RMS_ADJ_"+cv_name': { - "DESCRIPTION": 'Root-mean square residual of the adjoint " + cv_name', - "GROUP": "RMS_RES", - "HEADER": 'rms[" + cv_name + "]', + "MAX_MOMENTUM-Y": { + "DESCRIPTION": "Maximum square residual of the momentum " "y-component.", + "GROUP": "MAX_RES", + "HEADER": "max[RhoV]", "TYPE": "RESIDUAL", }, - 'RMS_ADJ_" + scalar_name': { - "DESCRIPTION": 'Root-mean square residual of the adjoint of " + scalar_name + " .', - "GROUP": "RMS_RES", - "HEADER": 'rms[" + scalar_name + "]', + "MAX_NU_TILDE": { + "DESCRIPTION": "Maximum residual of nu tilde (SA model).", + "GROUP": "MAX_RES", + "HEADER": "max[nu]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_NU_TILDE": { - "DESCRIPTION": "Maximum residual of the adjoint nu tilde.", + "MAX_PRESSURE": { + "DESCRIPTION": "Maximum residual of the pressure.", "GROUP": "MAX_RES", - "HEADER": "max[A_nu]", + "HEADER": "max[P]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_TKE": { - "DESCRIPTION": "Maximum residual of the adjoint kinetic energy.", + 'MAX_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": "Maximum residual of " "transported species.", "GROUP": "MAX_RES", - "HEADER": "max[A_k]", + "HEADER": 'max[rho*Y_" + ' 'std::to_string(iVar)+"]', "TYPE": "RESIDUAL", }, - "MAX_ADJ_DISSIPATION": { - "DESCRIPTION": "Maximum residual of the adjoint dissipation.", + "MAX_TEMPERATURE": { + "DESCRIPTION": "Maximum residual of the temperature", "GROUP": "MAX_RES", - "HEADER": "max[A_w]", + "HEADER": "max[T]", "TYPE": "RESIDUAL", }, - 'MAX_ADJ_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Maximum residual of the adjoint transported species.", + "MAX_ENTHALPY": { + "DESCRIPTION": "Maximum residual of the enthalpy", "GROUP": "MAX_RES", - "HEADER": 'max[A_rho*Y_" + std::to_string(iVar) + "]', + "HEADER": "max[h]", "TYPE": "RESIDUAL", }, - 'MAX_ADJ_" + cv_name': { - "DESCRIPTION": 'Maximum residual of the adjoint " + cv_name', + "MAX_TKE": { + "DESCRIPTION": "Maximum residual of kinetic energy (SST model).", "GROUP": "MAX_RES", - "HEADER": 'max["+cv_name +"]', + "HEADER": "max[k]", "TYPE": "RESIDUAL", }, - 'MAX_ADJ_" + scalar_name': { - "DESCRIPTION": 'Maximum residual of the adjoint of " + scalar_name + " .', + "MAX_VELOCITY-X": { + "DESCRIPTION": "Maximum residual of the velocity " "x-component.", "GROUP": "MAX_RES", - "HEADER": 'max[scalar_" + scalar_name + "]', + "HEADER": "max[U]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_NU_TILDE": { - "DESCRIPTION": "BGS residual of the adjoint nu tilde.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_nu]", + "MAX_VELOCITY-Y": { + "DESCRIPTION": "Maximum residual of the velocity " "y-component.", + "GROUP": "MAX_RES", + "HEADER": "max[V]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_TKE": { - "DESCRIPTION": "BGS residual of the adjoint kinetic energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_k]", + "MAX_VELOCITY-Z": { + "DESCRIPTION": "Maximum residual of the velocity " "z-component.", + "GROUP": "MAX_RES", + "HEADER": "max[W]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_DISSIPATION": { - "DESCRIPTION": "BGS residual of the adjoint dissipation.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_w]", - "TYPE": "RESIDUAL", + "MIN_CFL": { + "DESCRIPTION": "Current minimum of the local CFL numbers", + "GROUP": "CFL_NUMBER", + "HEADER": "Min CFL", + "TYPE": "DEFAULT", }, - '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) + "]', - "TYPE": "RESIDUAL", + "MIN_DELTA_TIME": { + "DESCRIPTION": "Current minimum local time step", + "GROUP": "CFL_NUMBER", + "HEADER": "Min DT", + "TYPE": "DEFAULT", }, - 'BGS_ADJ_" + cv_name': { - "DESCRIPTION": 'BGS residual of the adjoint " + cv_name', - "GROUP": "BGS_RES", - "HEADER": 'bgs[" + cv_name + "]', - "TYPE": "RESIDUAL", + "MOMENT_X": { + "DESCRIPTION": "Total momentum x-component on all surfaces set " + "with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CMx", + "TYPE": "COEFFICIENT", }, - 'BGS_ADJ_" + scalar_name': { - "DESCRIPTION": 'BGS residual of the adjoint of " + scalar_name + " .', - "GROUP": "BGS_RES", - "HEADER": 'bgs[" + scalar_name + "]', - "TYPE": "RESIDUAL", + "MOMENT_Y": { + "DESCRIPTION": "Total momentum y-component on all surfaces set " + "with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CMy", + "TYPE": "COEFFICIENT", }, - "RMS_ADJ_TEMPERATURE": { - "DESCRIPTION": "Root-mean square residual of the adjoint temperature.", - "GROUP": "RMS_RES", - "HEADER": "rms[A_T]", - "TYPE": "RESIDUAL", + "MOMENT_Z": { + "DESCRIPTION": "Total momentum z-component on all surfaces set " + "with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CMz", + "TYPE": "COEFFICIENT", }, - "MAX_ADJ_TEMPERATURE": { - "DESCRIPTION": "Maximum residual of the temperature.", - "GROUP": "MAX_RES", - "HEADER": "max[A_T]", - "TYPE": "RESIDUAL", + "PREV_AOA": { + "DESCRIPTION": "Angle of Attack at the previous iteration of the " + "Fixed CL driver", + "GROUP": "FIXED_CL", + "HEADER": "Previous_AOA", + "TYPE": "DEFAULT", }, - "BGS_ADJ_TEMPERATURE": { - "DESCRIPTION": "BGS residual of the adjoint temperature.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_T]", - "TYPE": "RESIDUAL", + "REFERENCE_GEOMETRY": { + "DESCRIPTION": "L2 norm of difference wrt reference " "geometry", + "GROUP": "STRUCT_COEFF", + "HEADER": "RefGeom", + "TYPE": "COEFFICIENT", }, - "SENS_GEO": { - "DESCRIPTION": "Sum of the geometrical sensitivities on all markers set in MARKER_MONITORING.", - "GROUP": "SENSITIVITY", - "HEADER": "Sens_Geo", + "REFERENCE_NODE": { + "DESCRIPTION": "Distance to reference node", + "GROUP": "STRUCT_COEFF", + "HEADER": "RefNode", "TYPE": "COEFFICIENT", }, - "RMS_ADJ_PRESSURE": { - "DESCRIPTION": "Root-mean square residual of the adjoint Pressure.", + "RMS_ADJ_DENSITY": { + "DESCRIPTION": "Root-mean square residual of the adjoint " "density.", "GROUP": "RMS_RES", - "HEADER": "rms[A_P]", + "HEADER": "rms[A_Rho]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_VELOCITY-X": { - "DESCRIPTION": "Root-mean square residual of the adjoint Velocity x-component.", + "RMS_ADJ_DISSIPATION": { + "DESCRIPTION": "Root-mean square residual of the " "adjoint dissipation.", "GROUP": "RMS_RES", - "HEADER": "rms[A_U]", + "HEADER": "rms[A_w]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_VELOCITY-Y": { - "DESCRIPTION": "Root-mean square residual of the adjoint Velocity y-component.", + "RMS_ADJ_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the adjoint " "energy.", "GROUP": "RMS_RES", - "HEADER": "rms[A_V]", + "HEADER": "rms[A_E]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_VELOCITY-Z": { - "DESCRIPTION": "Root-mean square residual of the adjoint Velocity z-component.", + "RMS_ADJ_MOMENTUM-X": { + "DESCRIPTION": "Root-mean square residual of the " + "adjoint momentum x-component.", "GROUP": "RMS_RES", - "HEADER": "rms[A_W]", + "HEADER": "rms[A_RhoU]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_ENTHALPY": { - "DESCRIPTION": "Root-mean square residual of the enthalpy.", + "RMS_ADJ_MOMENTUM-Y": { + "DESCRIPTION": "Root-mean square residual of the " + "adjoint momentum y-component.", "GROUP": "RMS_RES", - "HEADER": "rms[A_h]", + "HEADER": "rms[A_RhoV]", "TYPE": "RESIDUAL", }, - "ADJOINT_SOLEXTRA": { - "DESCRIPTION": "Adjoint value of the first extra Solution.", - "GROUP": "ADJOINT_SOLEXTRA", - "HEADER": "Adjoint_SolExtra", - "TYPE": "COEFFICIENT", - }, - "RMS_ADJ_RAD_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the P1 radiative energy.", + "RMS_ADJ_MOMENTUM-Z": { + "DESCRIPTION": "Root-mean square residual of the " + "adjoint momentum z-component.", "GROUP": "RMS_RES", - "HEADER": "rms[A_P1]", + "HEADER": "rms[A_RhoW]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_PRESSURE": { - "DESCRIPTION": "Maximum residual of the adjoint Pressure.", - "GROUP": "MAX_RES", - "HEADER": "max[A_Rho]", + "RMS_ADJ_NU_TILDE": { + "DESCRIPTION": "Root-mean square residual of the adjoint " "nu tilde.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_nu]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_VELOCITY-X": { - "DESCRIPTION": "Maximum residual of the adjoint Velocity x-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoU]", + "RMS_ADJ_PRESSURE": { + "DESCRIPTION": "Root-mean square residual of the adjoint " "Pressure.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_P]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_VELOCITY-Y": { - "DESCRIPTION": "Maximum residual of the adjoint Velocity y-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoV]", + "RMS_ADJ_RAD_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the P1 " "radiative energy.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_P1]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_VELOCITY-Z": { - "DESCRIPTION": "Maximum residual of the adjoint Velocity z-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoW]", + '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) + " '"]', "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENTHALPY": { - "DESCRIPTION": "Maximum residual of the enthalpy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_h]", + "RMS_ADJ_TEMPERATURE": { + "DESCRIPTION": "Root-mean square residual of the " "adjoint temperature.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_T]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_PRESSURE": { - "DESCRIPTION": "BGS residual of the adjoint Pressure.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Rho]", + "RMS_ADJ_ENTHALPY": { + "DESCRIPTION": "Root mean square residual of the " "adjoint enthalpy.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_h]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_VELOCITY-X": { - "DESCRIPTION": "BGS residual of the adjoint Velocity x-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoU]", + "RMS_ADJ_TKE": { + "DESCRIPTION": "Root-mean square residual of the adjoint " "kinetic energy.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_k]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_VELOCITY-Y": { - "DESCRIPTION": "BGS residual of the adjoint Velocity y-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoV]", + "RMS_ADJ_VELOCITY-X": { + "DESCRIPTION": "Root-mean square residual of the " + "adjoint Velocity x-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_U]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_VELOCITY-Z": { - "DESCRIPTION": "BGS residual of the adjoint Velocity z-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoW]", + "RMS_ADJ_VELOCITY-Y": { + "DESCRIPTION": "Root-mean square residual of the " + "adjoint Velocity y-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_V]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_ENTHALPY": { - "DESCRIPTION": "BGS residual of the adjoint enthalpy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_h]", + "RMS_ADJ_VELOCITY-Z": { + "DESCRIPTION": "Root-mean square residual of the " + "adjoint Velocity z-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[A_W]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_RAD_ENERGY": { - "DESCRIPTION": "BGS residual of the P1 radiative energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_P1]", + "RMS_DENSITY": { + "DESCRIPTION": "Root-mean square residual of the density.", + "GROUP": "RMS_RES", + "HEADER": "rms[Rho]", "TYPE": "RESIDUAL", }, - "SENS_PRESS": { - "DESCRIPTION": "Sensitivity of the objective function with respect to the far-field pressure.", - "GROUP": "SENSITIVITY", - "HEADER": "Sens_Press", - "TYPE": "COEFFICIENT", - }, - "SENS_TEMP": { - "DESCRIPTION": "Sensitivity of the objective function with respect to the far-field temperature.", - "GROUP": "SENSITIVITY", - "HEADER": "Sens_Temp", - "TYPE": "COEFFICIENT", + "RMS_DISP_X": { + "DESCRIPTION": "Residual of X displacement", + "GROUP": "RMS_RES", + "HEADER": "rms[DispX]", + "TYPE": "RESIDUAL", }, - "SENS_VEL_IN": { - "DESCRIPTION": "Sensitivity of the objective function with respect to the inlet velocity.", - "GROUP": "SENSITIVITY", - "HEADER": "Sens_Vin", - "TYPE": "COEFFICIENT", + "RMS_DISP_Y": { + "DESCRIPTION": "Residual of Y displacement", + "GROUP": "RMS_RES", + "HEADER": "rms[DispY]", + "TYPE": "RESIDUAL", }, - "SENS_PRESS_OUT": { - "DESCRIPTION": "Sensitivity of the objective function with respect to the outlet pressure.", - "GROUP": "SENSITIVITY", - "HEADER": "Sens_Pout", - "TYPE": "COEFFICIENT", + "RMS_DISP_Z": { + "DESCRIPTION": "Residual of Z displacement", + "GROUP": "RMS_RES", + "HEADER": "rms[DispZ]", + "TYPE": "RESIDUAL", }, - "RMS_ADJ_DENSITY": { - "DESCRIPTION": "Root-mean square residual of the adjoint density.", + "RMS_DISSIPATION": { + "DESCRIPTION": "Root-mean square residual of dissipation " "(SST model).", "GROUP": "RMS_RES", - "HEADER": "rms[A_Rho]", + "HEADER": "rms[w]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_MOMENTUM-X": { - "DESCRIPTION": "Root-mean square residual of the adjoint momentum x-component.", + "RMS_ENERGY": { + "DESCRIPTION": "Root-mean square residual of the energy.", "GROUP": "RMS_RES", - "HEADER": "rms[A_RhoU]", + "HEADER": "rms[RhoE]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "Root-mean square residual of the adjoint momentum y-component.", + "RMS_ETOL": { + "DESCRIPTION": "Norm of energy/work increment", "GROUP": "RMS_RES", - "HEADER": "rms[A_RhoV]", + "HEADER": "rms[E]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "Root-mean square residual of the adjoint momentum z-component.", + "RMS_MOMENTUM-X": { + "DESCRIPTION": "Root-mean square residual of the momentum " "x-component.", "GROUP": "RMS_RES", - "HEADER": "rms[A_RhoW]", + "HEADER": "rms[RhoU]", "TYPE": "RESIDUAL", }, - "RMS_ADJ_ENERGY": { - "DESCRIPTION": "Root-mean square residual of the adjoint energy.", + "RMS_MOMENTUM-Y": { + "DESCRIPTION": "Root-mean square residual of the momentum " "y-component.", "GROUP": "RMS_RES", - "HEADER": "rms[A_E]", + "HEADER": "rms[RhoV]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_DENSITY": { - "DESCRIPTION": "Maximum residual of the adjoint density.", - "GROUP": "MAX_RES", - "HEADER": "max[A_Rho]", + "RMS_NU_TILDE": { + "DESCRIPTION": "Root-mean square residual of nu tilde (SA " "model).", + "GROUP": "RMS_RES", + "HEADER": "rms[nu]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_MOMENTUM-X": { - "DESCRIPTION": "Maximum residual of the adjoint momentum x-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoU]", + "RMS_PRESSURE": { + "DESCRIPTION": "Root-mean square residual of the pressure.", + "GROUP": "RMS_RES", + "HEADER": "rms[P]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "Maximum residual of the adjoint momentum y-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoV]", + "RMS_RTOL": { + "DESCRIPTION": "Norm of residual", + "GROUP": "RMS_RES", + "HEADER": "rms[R]", "TYPE": "RESIDUAL", }, - "MAX_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "Maximum residual of the adjoint momentum z-component", - "GROUP": "MAX_RES", - "HEADER": "max[A_RhoW]", + '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)+"]', "TYPE": "RESIDUAL", }, - "MAX_ADJ_ENERGY": { - "DESCRIPTION": "Maximum residual of the adjoint energy.", - "GROUP": "MAX_RES", - "HEADER": "max[A_E]", + "RMS_TEMPERATURE": { + "DESCRIPTION": "Root mean square residual of the " "temperature", + "GROUP": "RMS_RES", + "HEADER": "rms[T]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_DENSITY": { - "DESCRIPTION": "BGS residual of the adjoint density.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Rho]", + "RMS_ENTHALPY": { + "DESCRIPTION": "Root mean square residual of the " "enthalpy", + "GROUP": "RMS_RES", + "HEADER": "rms[h]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_MOMENTUM-X": { - "DESCRIPTION": "BGS residual of the adjoint momentum x-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoU]", + "RMS_TKE": { + "DESCRIPTION": "Root-mean square residual of kinetic energy (SST " "model).", + "GROUP": "RMS_RES", + "HEADER": "rms[k]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_MOMENTUM-Y": { - "DESCRIPTION": "BGS residual of the adjoint momentum y-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoV]", + "RMS_UTOL": { + "DESCRIPTION": "Norm of displacement increment", + "GROUP": "RMS_RES", + "HEADER": "rms[U]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_MOMENTUM-Z": { - "DESCRIPTION": "BGS residual of the adjoint momentum z-component", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_RhoW]", + "RMS_VELOCITY-X": { + "DESCRIPTION": "Root-mean square residual of the velocity " "x-component.", + "GROUP": "RMS_RES", + "HEADER": "rms[U]", "TYPE": "RESIDUAL", }, - "BGS_ADJ_ENERGY": { - "DESCRIPTION": "BGS residual of the adjoint energy.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_E]", + "RMS_VELOCITY-Y": { + "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": { + "DESCRIPTION": "d Objective / d Elasticity modulus", + "GROUP": "SENSITIVITY", + "HEADER": "Sens[E_0]", + "TYPE": "DEFAULT", + }, + "SENS_GEO": { + "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", }, - "ADJOINT_DISP_X": { - "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.", - "GROUP": "RMS_RES", - "HEADER": "rms[Uy_adj]", - "TYPE": "RESIDUAL", + "SENS_NU_0": { + "DESCRIPTION": "d Objective / d Poisson ratio", + "GROUP": "SENSITIVITY", + "HEADER": "Sens[Nu_0]", + "TYPE": "DEFAULT", }, - "ADJOINT_DISP_Z": { - "DESCRIPTION": "Root-mean square residual of the adjoint of the Z displacements.", - "GROUP": "RMS_RES", - "HEADER": "rms[Uz_adj]", - "TYPE": "RESIDUAL", + "SENS_PRESS": { + "DESCRIPTION": "Sensitivity of the objective function with " + "respect to the far-field pressure.", + "GROUP": "SENSITIVITY", + "HEADER": "Sens_Press", + "TYPE": "COEFFICIENT", }, - 'SENS_E_" + iVarS': { - "DESCRIPTION": "d Objective / d Elasticity modulus", + "SENS_PRESS_OUT": { + "DESCRIPTION": "Sensitivity of the objective function with " + "respect to the outlet pressure.", "GROUP": "SENSITIVITY", - "HEADER": "Sens[E\" + iVarS + ']'", - "TYPE": "DEFAULT", + "HEADER": "Sens_Pout", + "TYPE": "COEFFICIENT", }, - 'SENS_NU_" + iVarS': { - "DESCRIPTION": "d Objective / d Poisson ratio", + "SENS_TEMP": { + "DESCRIPTION": "Sensitivity of the objective function with " + "respect to the far-field temperature.", "GROUP": "SENSITIVITY", - "HEADER": "Sens[Nu\" + iVarS + ']'", - "TYPE": "DEFAULT", + "HEADER": "Sens_Temp", + "TYPE": "COEFFICIENT", }, - 'SENS_RHO_" + iVarS': { - "DESCRIPTION": "d Objective / d Material density", + "SENS_VEL_IN": { + "DESCRIPTION": "Sensitivity of the objective function with " + "respect to the inlet velocity.", "GROUP": "SENSITIVITY", - "HEADER": "Sens[Rho\" + iVarS + ']'", + "HEADER": "Sens_Vin", + "TYPE": "COEFFICIENT", + }, + "SIDEFORCE": { + "DESCRIPTION": "Total sideforce coefficient on all surfaces set " + "with MARKER_MONITORING", + "GROUP": "AERO_COEFF", + "HEADER": "CSF", + "TYPE": "COEFFICIENT", + }, + "STREAMWISE_DP": { + "DESCRIPTION": "Pressure drop in streamwise periodic flow", + "GROUP": "STREAMWISE_PERIODIC", + "HEADER": "SWDeltaP", "TYPE": "DEFAULT", }, - 'SENS_RHO_DL_" + iVarS': { - "DESCRIPTION": "d Objective / d Dead load density", - "GROUP": "SENSITIVITY", - "HEADER": "Sens[RhoDL\" + iVarS + ']'", + "STREAMWISE_HEAT": { + "DESCRIPTION": "Integrated heat for streamwise periodic " "flow", + "GROUP": "STREAMWISE_PERIODIC", + "HEADER": "SWHeat", "TYPE": "DEFAULT", }, - 'SENS_EFIELD_" + iVarS': { - "DESCRIPTION": "d Objective / d Electric field", - "GROUP": "SENSITIVITY", - "HEADER": "Sens[EField\" + iVarS + ']'", + "STREAMWISE_MASSFLOW": { + "DESCRIPTION": "Massflow in streamwise periodic flow", + "GROUP": "STREAMWISE_PERIODIC", + "HEADER": "SWMassflow", "TYPE": "DEFAULT", }, - "BGS_ADJ_DISP_X": { - "DESCRIPTION": "BGS residual of the adjoint X displacement.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Ux]", - "TYPE": "RESIDUAL", + "STRESS_PENALTY": { + "DESCRIPTION": "Aggregate stress penalty", + "GROUP": "STRUCT_COEFF", + "HEADER": "StressPen", + "TYPE": "COEFFICIENT", }, - "BGS_ADJ_DISP_Y": { - "DESCRIPTION": "BGS residual of the adjoint Y displacement.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Uy]", - "TYPE": "RESIDUAL", + "SURFACE_MACH": { + "DESCRIPTION": "Total average mach number on all markers set " + "in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_Mach", + "TYPE": "COEFFICIENT", }, - "BGS_ADJ_DISP_Z": { - "DESCRIPTION": "BGS residual of the adjoint Z displacement.", - "GROUP": "BGS_RES", - "HEADER": "bgs[A_Uz]", - "TYPE": "RESIDUAL", + "SURFACE_MASSFLOW": { + "DESCRIPTION": "Total average mass flow on all markers " + "set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_Massflow", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_MASSFLOW": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Massflow]", - "TYPE": "D_COEFFICIENT", + "SURFACE_MOM_DISTORTION": { + "DESCRIPTION": "Total momentum distortion on all " + "markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Momentum_Distortion", + "TYPE": "COEFFICIENT", }, - "TAVG_SURFACE_MASSFLOW": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_Massflow]", - "TYPE": "TAVG_COEFFICIENT", + "SURFACE_PRESSURE_DROP": { + "DESCRIPTION": "Total pressure drop on all markers " "set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Pressure_Drop", + "TYPE": "COEFFICIENT", }, - "TAVG_D_SURFACE_MASSFLOW": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Massflow]", - "TYPE": "TAVG_D_COEFFICIENT", + "SURFACE_SECONDARY": { + "DESCRIPTION": "Total secondary strength on all markers " + "set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Secondary_Strength", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_MACH": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Mach]", - "TYPE": "D_COEFFICIENT", + "SURFACE_SECOND_OVER_UNIFORM": { + "DESCRIPTION": "Total secondary over " + "uniformity on all markers set " + "in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Secondary_Over_Uniformity", + "TYPE": "COEFFICIENT", }, - "TAVG_SURFACE_MACH": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_Mach]", - "TYPE": "TAVG_COEFFICIENT", + '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", + "TYPE": "COEFFICIENT", }, - "TAVG_D_SURFACE_MACH": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Mach]", - "TYPE": "TAVG_D_COEFFICIENT", + "SURFACE_SPECIES_VARIANCE": { + "DESCRIPTION": "Total species variance", + "GROUP": "SPECIES_COEFF", + "HEADER": "Species_Variance", + "TYPE": "DEFAULT", }, - "D_SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Temp]", - "TYPE": "D_COEFFICIENT", + "SURFACE_STATIC_PRESSURE": { + "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", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_Temp", + "TYPE": "COEFFICIENT", }, - "TAVG_SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_Temp]", - "TYPE": "TAVG_COEFFICIENT", + "SURFACE_TOTAL_PRESSURE": { + "DESCRIPTION": "Total average total pressure on " + "all markers set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_TotalPress", + "TYPE": "COEFFICIENT", }, - "TAVG_D_SURFACE_STATIC_TEMPERATURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Temp]", - "TYPE": "TAVG_D_COEFFICIENT", + "SURFACE_TOTAL_TEMPERATURE": { + "DESCRIPTION": "Total average total temperature " + "all markers set in " + "MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Avg_TotalTemp", + "TYPE": "COEFFICIENT", }, - "D_SURFACE_STATIC_PRESSURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Press]", - "TYPE": "D_COEFFICIENT", + "SURFACE_UNIFORMITY": { + "DESCRIPTION": "Total flow uniformity on all markers " "set in MARKER_ANALYZE", + "GROUP": "FLOW_COEFF", + "HEADER": "Uniformity", + "TYPE": "COEFFICIENT", }, - "TAVG_SURFACE_STATIC_PRESSURE": { + "TAVG_ADJOINT_SOLEXTRA": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_Press]", + "GROUP": "TAVG_ADJOINT_SOLEXTRA", + "HEADER": "tavg[Adjoint_SolExtra]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_STATIC_PRESSURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Press]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_AVG_DENSITY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Density]", - "TYPE": "D_COEFFICIENT", - }, "TAVG_AVG_DENSITY": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Avg_Density]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_AVG_DENSITY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Density]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_AVG_ENTHALPY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_Enthalpy]", - "TYPE": "D_COEFFICIENT", - }, "TAVG_AVG_ENTHALPY": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Avg_Enthalpy]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_AVG_ENTHALPY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_Enthalpy]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_AVG_NORMALVEL": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_NormalVel]", - "TYPE": "D_COEFFICIENT", - }, "TAVG_AVG_NORMALVEL": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_FLOW_COEFF", "HEADER": "tavg[Avg_NormalVel]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_AVG_NORMALVEL": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_NormalVel]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_SURFACE_UNIFORMITY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Uniformity]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_SURFACE_UNIFORMITY": { + "TAVG_AVG_TEMPERATURE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Uniformity]", + "GROUP": "TAVG_HEAT", + "HEADER": "tavg[AvgTemp]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_UNIFORMITY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Uniformity]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_SURFACE_SECONDARY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Secondary_Strength]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_SURFACE_SECONDARY": { + "TAVG_BUFFET": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Secondary_Strength]", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[Buffet]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_SECONDARY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Secondary_Strength]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Momentum_Distortion]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_SURFACE_MOM_DISTORTION": { + "TAVG_COMBO": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Momentum_Distortion]", + "GROUP": "TAVG_COMBO", + "HEADER": "tavg[ComboObj]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_MOM_DISTORTION": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Momentum_Distortion]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Secondary_Over_Uniformity]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_SURFACE_SECOND_OVER_UNIFORM": { + "TAVG_DELTA_CL": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Secondary_Over_Uniformity]", + "GROUP": "TAVG_FIXED_CL", + "HEADER": "tavg[Delta_CL]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_SECOND_OVER_UNIFORM": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Secondary_Over_Uniformity]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_SURFACE_TOTAL_TEMPERATURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_TotalTemp]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_SURFACE_TOTAL_TEMPERATURE": { + "TAVG_DRAG": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_TotalTemp]", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CD]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SURFACE_TOTAL_TEMPERATURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_TotalTemp]", + "TAVG_D_ADJOINT_SOLEXTRA": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_ADJOINT_SOLEXTRA", + "HEADER": "dtavg[Adjoint_SolExtra]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Avg_TotalPress]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_SURFACE_TOTAL_PRESSURE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Avg_TotalPress]", - "TYPE": "TAVG_COEFFICIENT", - }, - "TAVG_D_SURFACE_TOTAL_PRESSURE": { + "TAVG_D_AVG_DENSITY": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Avg_TotalPress]", + "HEADER": "dtavg[Avg_Density]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FLOW_COEFF", - "HEADER": "d[Pressure_Drop]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FLOW_COEFF", - "HEADER": "tavg[Pressure_Drop]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_AVG_ENTHALPY": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Enthalpy]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SURFACE_PRESSURE_DROP": { - "DESCRIPTION": "weighted time average derivative value", + "TAVG_D_AVG_NORMALVEL": { + "DESCRIPTION": "weighted time average derivative " "value", "GROUP": "TAVG_D_FLOW_COEFF", - "HEADER": "dtavg[Pressure_Drop]", + "HEADER": "dtavg[Avg_NormalVel]", "TYPE": "TAVG_D_COEFFICIENT", }, - 'D_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SPECIES_COEFF", - "HEADER": 'd[Avg_Species_" + std::to_string(iVar]', - "TYPE": "D_COEFFICIENT", + "TAVG_D_AVG_TEMPERATURE": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_HEAT", + "HEADER": "dtavg[AvgTemp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - 'TAVG_SURFACE_SPECIES_" + std::to_string(iVar': { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SPECIES_COEFF", - "HEADER": 'tavg[Avg_Species_" + std::to_string(iVar]', - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_BUFFET": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[Buffet]", + "TYPE": "TAVG_D_COEFFICIENT", }, - 'TAVG_D_SURFACE_SPECIES_" + std::to_string(iVar': { + "TAVG_D_COMBO": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SPECIES_COEFF", - "HEADER": 'dtavg[Avg_Species_" + std::to_string(iVar]', + "GROUP": "TAVG_D_COMBO", + "HEADER": "dtavg[ComboObj]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_REFERENCE_FORCE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[RefForce]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_DELTA_CL": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_FIXED_CL", + "HEADER": "dtavg[Delta_CL]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_REFERENCE_FORCE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[RefForce]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_DRAG": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CD]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_REFERENCE_FORCE": { + "TAVG_D_EFFICIENCY": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[RefForce]", + "HEADER": "dtavg[CEff]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_DRAG": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CD]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_EQUIVALENT_AREA": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_EQUIVALENT_AREA", + "HEADER": "dtavg[CEquiv_Area]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_DRAG": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CD]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_FIGURE_OF_MERIT": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_ROTATING_FRAME", + "HEADER": "dtavg[CMerit]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_DRAG": { + "TAVG_D_FORCE_X": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CD]", + "HEADER": "dtavg[CFx]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_LIFT": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CL]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_LIFT": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CL]", - "TYPE": "TAVG_COEFFICIENT", - }, - "TAVG_D_LIFT": { + "TAVG_D_FORCE_Y": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CL]", + "HEADER": "dtavg[CFy]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_SIDEFORCE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CSF]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_FORCE_Z": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CFz]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_SIDEFORCE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CSF]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_INVERSE_DESIGN_PRESSURE": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_CP_DIFF", + "HEADER": "dtavg[Cp_Diff]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_SIDEFORCE": { + "TAVG_D_LIFT": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CSF]", + "HEADER": "dtavg[CL]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_MOMENT_X": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CMx]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_MOMENT_X": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CMx]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_MAXIMUM_HEATFLUX": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_HEAT", + "HEADER": "dtavg[MaxHF]", + "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_MOMENT_X": { "DESCRIPTION": "weighted time average derivative value", @@ -1865,215 +1570,155 @@ "HEADER": "dtavg[CMx]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_MOMENT_Y": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CMy]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_MOMENT_Y": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CMy]", - "TYPE": "TAVG_COEFFICIENT", - }, "TAVG_D_MOMENT_Y": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", "HEADER": "dtavg[CMy]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_MOMENT_Z": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CMz]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_MOMENT_Z": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CMz]", - "TYPE": "TAVG_COEFFICIENT", - }, "TAVG_D_MOMENT_Z": { "DESCRIPTION": "weighted time average derivative value", "GROUP": "TAVG_D_AERO_COEFF", "HEADER": "dtavg[CMz]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_FORCE_X": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CFx]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_REFERENCE_GEOMETRY": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[RefGeom]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_FORCE_X": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CFx]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_REFERENCE_NODE": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[RefNode]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_FORCE_X": { + "TAVG_D_SENS_AOA": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CFx]", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_AoA]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_FORCE_Y": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CFy]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_FORCE_Y": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CFy]", - "TYPE": "TAVG_COEFFICIENT", - }, - "TAVG_D_FORCE_Y": { + "TAVG_D_SENS_GEO": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CFy]", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Geo]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_FORCE_Z": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CFz]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_FORCE_Z": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CFz]", - "TYPE": "TAVG_COEFFICIENT", - }, - "TAVG_D_FORCE_Z": { + "TAVG_D_SENS_MACH": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CFz]", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Mach]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_EFFICIENCY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[CEff]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_EFFICIENCY": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[CEff]", - "TYPE": "TAVG_COEFFICIENT", - }, - "TAVG_D_EFFICIENCY": { + "TAVG_D_SENS_PRESS": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[CEff]", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Press]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_CUSTOM_OBJFUNC": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_COMBO", - "HEADER": "d[ComboObj]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_SENS_PRESS_OUT": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Pout]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_CUSTOM_OBJFUNC": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_COMBO", - "HEADER": "tavg[ComboObj]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_SENS_TEMP": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Temp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_CUSTOM_OBJFUNC": { + "TAVG_D_SENS_VEL_IN": { "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_COMBO", - "HEADER": "dtavg[ComboObj]", + "GROUP": "TAVG_D_SENSITIVITY", + "HEADER": "dtavg[Sens_Vin]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_COMBO": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_COMBO", - "HEADER": "d[ComboObj]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_SIDEFORCE": { + "DESCRIPTION": "weighted time average derivative value", + "GROUP": "TAVG_D_AERO_COEFF", + "HEADER": "dtavg[CSF]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_COMBO": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_COMBO", - "HEADER": "tavg[ComboObj]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_STRESS_PENALTY": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[StressPen]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_COMBO": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_COMBO", - "HEADER": "dtavg[ComboObj]", + "TAVG_D_SURFACE_MACH": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Mach]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_TOTAL_HEATFLUX": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_HEAT", - "HEADER": "d[HF]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_SURFACE_MASSFLOW": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Massflow]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_TOTAL_HEATFLUX": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_HEAT", - "HEADER": "tavg[HF]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_SURFACE_MOM_DISTORTION": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Momentum_Distortion]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_TOTAL_HEATFLUX": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_HEAT", - "HEADER": "dtavg[HF]", + "TAVG_D_SURFACE_PRESSURE_DROP": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Pressure_Drop]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_MAXIMUM_HEATFLUX": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_HEAT", - "HEADER": "d[maxHF]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_SURFACE_SECONDARY": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Secondary_Strength]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_MAXIMUM_HEATFLUX": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_HEAT", - "HEADER": "tavg[maxHF]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_SURFACE_SECOND_OVER_UNIFORM": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Secondary_Over_Uniformity]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_MAXIMUM_HEATFLUX": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_HEAT", - "HEADER": "dtavg[maxHF]", + '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]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_FIGURE_OF_MERIT": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_ROTATING_FRAME", - "HEADER": "d[CMerit]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_SURFACE_STATIC_PRESSURE": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Press]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_FIGURE_OF_MERIT": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_ROTATING_FRAME", - "HEADER": "tavg[CMerit]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_SURFACE_STATIC_TEMPERATURE": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_Temp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_FIGURE_OF_MERIT": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_ROTATING_FRAME", - "HEADER": "dtavg[CMerit]", + "TAVG_D_SURFACE_TOTAL_PRESSURE": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_TotalPress]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_THRUST": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_ROTATING_FRAME", - "HEADER": "d[CT]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_SURFACE_TOTAL_TEMPERATURE": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Avg_TotalTemp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_THRUST": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_ROTATING_FRAME", - "HEADER": "tavg[CT]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_SURFACE_UNIFORMITY": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_FLOW_COEFF", + "HEADER": "dtavg[Uniformity]", + "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_THRUST": { "DESCRIPTION": "weighted time average derivative value", @@ -2081,17 +1726,17 @@ "HEADER": "dtavg[CT]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_TORQUE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_ROTATING_FRAME", - "HEADER": "d[CQ]", - "TYPE": "D_COEFFICIENT", + "TAVG_D_TOPOL_COMPLIANCE": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[TopComp]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_TORQUE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_ROTATING_FRAME", - "HEADER": "tavg[CQ]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_TOPOL_DISCRETENESS": { + "DESCRIPTION": "weighted time average " "derivative value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[TopDisc]", + "TYPE": "TAVG_D_COEFFICIENT", }, "TAVG_D_TORQUE": { "DESCRIPTION": "weighted time average derivative value", @@ -2099,29 +1744,23 @@ "HEADER": "dtavg[CQ]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_CP_DIFF", - "HEADER": "d[Cp_Diff]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_CP_DIFF", - "HEADER": "tavg[Cp_Diff]", - "TYPE": "TAVG_COEFFICIENT", + "TAVG_D_TOTAL_HEATFLUX": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_HEAT", + "HEADER": "dtavg[HF]", + "TYPE": "TAVG_D_COEFFICIENT", }, - "TAVG_D_INVERSE_DESIGN_PRESSURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_CP_DIFF", - "HEADER": "dtavg[Cp_Diff]", + "TAVG_D_VOLUME_FRACTION": { + "DESCRIPTION": "weighted time average derivative " "value", + "GROUP": "TAVG_D_STRUCT_COEFF", + "HEADER": "dtavg[VolFrac]", "TYPE": "TAVG_D_COEFFICIENT", }, - "D_EQUIVALENT_AREA": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_EQUIVALENT_AREA", - "HEADER": "d[CEquiv_Area]", - "TYPE": "D_COEFFICIENT", + "TAVG_EFFICIENCY": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CEff]", + "TYPE": "TAVG_COEFFICIENT", }, "TAVG_EQUIVALENT_AREA": { "DESCRIPTION": "weighted time average value", @@ -2129,71 +1768,71 @@ "HEADER": "tavg[CEquiv_Area]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_EQUIVALENT_AREA": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_EQUIVALENT_AREA", - "HEADER": "dtavg[CEquiv_Area]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_FIGURE_OF_MERIT": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_ROTATING_FRAME", + "HEADER": "tavg[CMerit]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_AVG_TEMPERATURE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_HEAT", - "HEADER": "d[AvgTemp]", - "TYPE": "D_COEFFICIENT", + "TAVG_FORCE_X": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CFx]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_AVG_TEMPERATURE": { + "TAVG_FORCE_Y": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_HEAT", - "HEADER": "tavg[AvgTemp]", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CFy]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_AVG_TEMPERATURE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_HEAT", - "HEADER": "dtavg[AvgTemp]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_FORCE_Z": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CFz]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_DELTA_CL": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_FIXED_CL", - "HEADER": "d[Delta_CL]", - "TYPE": "D_COEFFICIENT", + "TAVG_INVERSE_DESIGN_PRESSURE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_CP_DIFF", + "HEADER": "tavg[Cp_Diff]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_DELTA_CL": { + "TAVG_LIFT": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_FIXED_CL", - "HEADER": "tavg[Delta_CL]", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CL]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_DELTA_CL": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_FIXED_CL", - "HEADER": "dtavg[Delta_CL]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_MAXIMUM_HEATFLUX": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_HEAT", + "HEADER": "tavg[MaxHF]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_BUFFET": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_AERO_COEFF", - "HEADER": "d[Buffet]", - "TYPE": "D_COEFFICIENT", + "TAVG_MOMENT_X": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CMx]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_BUFFET": { + "TAVG_MOMENT_Y": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_AERO_COEFF", - "HEADER": "tavg[Buffet]", + "HEADER": "tavg[CMy]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_BUFFET": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_AERO_COEFF", - "HEADER": "dtavg[Buffet]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_MOMENT_Z": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CMz]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_REFERENCE_NODE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[RefNode]", - "TYPE": "D_COEFFICIENT", + "TAVG_REFERENCE_GEOMETRY": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_STRUCT_COEFF", + "HEADER": "tavg[RefGeom]", + "TYPE": "TAVG_COEFFICIENT", }, "TAVG_REFERENCE_NODE": { "DESCRIPTION": "weighted time average value", @@ -2201,244 +1840,208 @@ "HEADER": "tavg[RefNode]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_REFERENCE_NODE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[RefNode]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_TOPOL_COMPLIANCE": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[TopComp]", - "TYPE": "D_COEFFICIENT", + "TAVG_SENS_AOA": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_AoA]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_TOPOL_COMPLIANCE": { + "TAVG_SENS_GEO": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[TopComp]", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Geo]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_TOPOL_COMPLIANCE": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[TopComp]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_SENS_MACH": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Mach]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_STRESS_PENALTY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[StressPen]", - "TYPE": "D_COEFFICIENT", + "TAVG_SENS_PRESS": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Press]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_STRESS_PENALTY": { + "TAVG_SENS_PRESS_OUT": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[StressPen]", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Pout]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_STRESS_PENALTY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[StressPen]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_SENS_TEMP": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Temp]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_REFERENCE_GEOMETRY": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[RefGeom]", - "TYPE": "D_COEFFICIENT", + "TAVG_SENS_VEL_IN": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_SENSITIVITY", + "HEADER": "tavg[Sens_Vin]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_REFERENCE_GEOMETRY": { + "TAVG_SIDEFORCE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[RefGeom]", + "GROUP": "TAVG_AERO_COEFF", + "HEADER": "tavg[CSF]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_REFERENCE_GEOMETRY": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[RefGeom]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_VOLUME_FRACTION": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[VolFrac]", - "TYPE": "D_COEFFICIENT", - }, - "TAVG_VOLUME_FRACTION": { + "TAVG_STRESS_PENALTY": { "DESCRIPTION": "weighted time average value", "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[VolFrac]", + "HEADER": "tavg[StressPen]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_VOLUME_FRACTION": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[VolFrac]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_TOPOL_DISCRETENESS": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_STRUCT_COEFF", - "HEADER": "d[TopDisc]", - "TYPE": "D_COEFFICIENT", + "TAVG_SURFACE_MACH": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_Mach]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_TOPOL_DISCRETENESS": { + "TAVG_SURFACE_MASSFLOW": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_STRUCT_COEFF", - "HEADER": "tavg[TopDisc]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_Massflow]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_TOPOL_DISCRETENESS": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_STRUCT_COEFF", - "HEADER": "dtavg[TopDisc]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_SURFACE_MOM_DISTORTION": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Momentum_Distortion]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_SENS_GEO": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Geo]", - "TYPE": "D_COEFFICIENT", + "TAVG_SURFACE_PRESSURE_DROP": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Pressure_Drop]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SENS_GEO": { + "TAVG_SURFACE_SECONDARY": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Geo]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Secondary_Strength]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SENS_GEO": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Geo]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_SURFACE_SECOND_OVER_UNIFORM": { + "DESCRIPTION": "weighted time average " "value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Secondary_Over_Uniformity]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_ADJOINT_SOLEXTRA": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_ADJOINT_SOLEXTRA", - "HEADER": "d[Adjoint_SolExtra]", - "TYPE": "D_COEFFICIENT", + 'TAVG_SURFACE_SPECIES_" + std::to_string(iVar': { + "DESCRIPTION": "weighted " "time average " "value", + "GROUP": "TAVG_SPECIES_COEFF", + "HEADER": 'tavg[Avg_Species_" ' "+ " "std::to_string(iVar]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_ADJOINT_SOLEXTRA": { + "TAVG_SURFACE_STATIC_PRESSURE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_ADJOINT_SOLEXTRA", - "HEADER": "tavg[Adjoint_SolExtra]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_Press]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_ADJOINT_SOLEXTRA": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_ADJOINT_SOLEXTRA", - "HEADER": "dtavg[Adjoint_SolExtra]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_SENS_PRESS": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Press]", - "TYPE": "D_COEFFICIENT", + "TAVG_SURFACE_STATIC_TEMPERATURE": { + "DESCRIPTION": "weighted time average " "value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_Temp]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SENS_PRESS": { + "TAVG_SURFACE_TOTAL_PRESSURE": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Press]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_TotalPress]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SENS_PRESS": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Press]", - "TYPE": "TAVG_D_COEFFICIENT", - }, - "D_SENS_TEMP": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Temp]", - "TYPE": "D_COEFFICIENT", + "TAVG_SURFACE_TOTAL_TEMPERATURE": { + "DESCRIPTION": "weighted time average " "value", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Avg_TotalTemp]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SENS_TEMP": { + "TAVG_SURFACE_UNIFORMITY": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Temp]", + "GROUP": "TAVG_FLOW_COEFF", + "HEADER": "tavg[Uniformity]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SENS_TEMP": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Temp]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_THRUST": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_ROTATING_FRAME", + "HEADER": "tavg[CT]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_SENS_VEL_IN": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Vin]", - "TYPE": "D_COEFFICIENT", + "TAVG_TOPOL_COMPLIANCE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_STRUCT_COEFF", + "HEADER": "tavg[TopComp]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SENS_VEL_IN": { + "TAVG_TOPOL_DISCRETENESS": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Vin]", + "GROUP": "TAVG_STRUCT_COEFF", + "HEADER": "tavg[TopDisc]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SENS_VEL_IN": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Vin]", - "TYPE": "TAVG_D_COEFFICIENT", + "TAVG_TORQUE": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_ROTATING_FRAME", + "HEADER": "tavg[CQ]", + "TYPE": "TAVG_COEFFICIENT", }, - "D_SENS_PRESS_OUT": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Pout]", - "TYPE": "D_COEFFICIENT", + "TAVG_TOTAL_HEATFLUX": { + "DESCRIPTION": "weighted time average value", + "GROUP": "TAVG_HEAT", + "HEADER": "tavg[HF]", + "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_SENS_PRESS_OUT": { + "TAVG_VOLUME_FRACTION": { "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Pout]", + "GROUP": "TAVG_STRUCT_COEFF", + "HEADER": "tavg[VolFrac]", "TYPE": "TAVG_COEFFICIENT", }, - "TAVG_D_SENS_PRESS_OUT": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Pout]", - "TYPE": "TAVG_D_COEFFICIENT", + "THRUST": { + "DESCRIPTION": "Thrust coefficient", + "GROUP": "ROTATING_FRAME", + "HEADER": "CT", + "TYPE": "COEFFICIENT", }, - "D_SENS_AOA": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_AoA]", - "TYPE": "D_COEFFICIENT", + "TOPOL_COMPLIANCE": { + "DESCRIPTION": "Structural compliance", + "GROUP": "STRUCT_COEFF", + "HEADER": "TopComp", + "TYPE": "COEFFICIENT", }, - "TAVG_SENS_AOA": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_AoA]", - "TYPE": "TAVG_COEFFICIENT", + "TOPOL_DISCRETENESS": { + "DESCRIPTION": "Discreteness of the material " "distribution", + "GROUP": "STRUCT_COEFF", + "HEADER": "TopDisc", + "TYPE": "COEFFICIENT", }, - "TAVG_D_SENS_AOA": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_AoA]", - "TYPE": "TAVG_D_COEFFICIENT", + "TORQUE": { + "DESCRIPTION": "Torque coefficient", + "GROUP": "ROTATING_FRAME", + "HEADER": "CQ", + "TYPE": "COEFFICIENT", }, - "D_SENS_MACH": { - "DESCRIPTION": "Derivative value", - "GROUP": "D_SENSITIVITY", - "HEADER": "d[Sens_Mach]", - "TYPE": "D_COEFFICIENT", + "TOTAL_HEATFLUX": { + "DESCRIPTION": "Total heatflux on all surfaces defined in " "MARKER_MONITORING", + "GROUP": "HEAT", + "HEADER": "HF", + "TYPE": "COEFFICIENT", }, - "TAVG_SENS_MACH": { - "DESCRIPTION": "weighted time average value", - "GROUP": "TAVG_SENSITIVITY", - "HEADER": "tavg[Sens_Mach]", - "TYPE": "TAVG_COEFFICIENT", + "VMS": { + "DESCRIPTION": "VMS", + "GROUP": "Maximum Von-Misses stress", + "HEADER": "VonMises", + "TYPE": "DEFAULT", }, - "TAVG_D_SENS_MACH": { - "DESCRIPTION": "weighted time average derivative value", - "GROUP": "TAVG_D_SENSITIVITY", - "HEADER": "dtavg[Sens_Mach]", - "TYPE": "TAVG_D_COEFFICIENT", + "VOLUME_FRACTION": { + "DESCRIPTION": "Fraction of solid material", + "GROUP": "STRUCT_COEFF", + "HEADER": "VolFrac", + "TYPE": "COEFFICIENT", }, } diff --git a/SU2_PY/updateHistoryMap.py b/SU2_PY/updateHistoryMap.py index bc0614d47a45..f7df492fa0e4 100644 --- a/SU2_PY/updateHistoryMap.py +++ b/SU2_PY/updateHistoryMap.py @@ -24,9 +24,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with SU2. If not, see . -import os - -dummy_list = [1, 2, 3] +import os, pprint su2_home = os.environ["SU2_HOME"] @@ -51,39 +49,24 @@ def parse_output(files): outputFields = dict() for file in files: - print(f"Parsing {file}") + print("Parsing " + file) f = open(file, "r") while 1: s = f.readline().strip(" ") if not s: break - if "AddHistoryOutput(" in s: - idx = s.find("AddHistoryOutput(") - if "//" in s[:idx]: - continue - try: - s_args = ( - s[idx:].replace("AddHistoryOutput", "").strip("()").split(",") - ) - if len(s_args) < 2: - continue - curOutputField = dict() - name = s_args[0].strip(' ()"\n;') - curOutputField["HEADER"] = s_args[1].strip(' ()"\n;') - curOutputField["GROUP"] = s_args[3].strip(' ()"\n;') - curOutputField["DESCRIPTION"] = s_args[4].strip(' ()"\n;') - if len(s_args) == 6: - type_str = s_args[5].strip(' ()"\n;') - if "::" in type_str: - curOutputField["TYPE"] = type_str.split("::")[1] - else: - curOutputField["TYPE"] = "DEFAULT" - else: - curOutputField["TYPE"] = "DEFAULT" - outputFields[name] = curOutputField - except Exception as e: - print(f"Error parsing line: {s.strip()} - {e}") - continue + if s.startswith("AddHistoryOutput("): + s = s.replace("AddHistoryOutput", "").strip("()").split(",") + curOutputField = dict() + name = s[0].strip(' ()"\n;') + curOutputField["HEADER"] = s[1].strip(' ()"\n;') + curOutputField["GROUP"] = s[3].strip(' ()"\n;') + curOutputField["DESCRIPTION"] = s[4].strip(' ()"\n;') + if len(s) == 6: + curOutputField["TYPE"] = s[5].strip(' ()"\n;').split("::")[1] + else: + curOutputField["TYPE"] = "DEFAULT" + outputFields[name] = curOutputField f.close() addedOutputFields = dict() @@ -115,30 +98,10 @@ def parse_output(files): addedOutputFields[name] = curOutputField outputFields.update(addedOutputFields) - 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") - - # IMPORTANT: Preserve insertion order. - # Some fields intentionally share the same HEADER string (e.g. COMBO vs CUSTOM_OBJFUNC both map to "ComboObj"). - # SU2.io.read_history resolves header->field by iterating the Python dict in file order and letting the last match win. - # Therefore we must emit entries in the same order that they appear in the C++ source so that COMBO comes AFTER - # CUSTOM_OBJFUNC and takes precedence. Sorting the keys breaks this and makes tests fail. - with open(out_path, "w", encoding="utf-8") as f: - f.write("history_header_map = {\n") - for key, val in outputFields.items(): - 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") + 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() parse_output(fileList)