diff --git a/OMCompiler/Compiler/Template/CodegenCpp.tpl b/OMCompiler/Compiler/Template/CodegenCpp.tpl index ef7e0886a22..4a632a6d609 100644 --- a/OMCompiler/Compiler/Template/CodegenCpp.tpl +++ b/OMCompiler/Compiler/Template/CodegenCpp.tpl @@ -6539,14 +6539,14 @@ case SIMCODE(modelInfo = MODELINFO(__),simulationSettingsOpt = SOME(settings as //Write head line if (command & IWriteOutput::HEAD_LINE) { - const all_names_t outputVarNames = make_tuple(outputRealVars.ourputVarNames,outputIntVars.ourputVarNames,outputBoolVars.ourputVarNames,outputDerVars.ourputVarNames,outputResVars.ourputVarNames); - const all_description_t outputVarDescription = make_tuple(outputRealVars.ourputVarDescription,outputIntVars.ourputVarDescription,outputBoolVars.ourputVarDescription,outputDerVars.ourputVarDescription,outputResVars.ourputVarDescription); + const all_names_t outputVarNames = make_tuple(outputRealVars.outputVarNames,outputIntVars.outputVarNames,outputBoolVars.outputVarNames,outputDerVars.outputVarNames,outputResVars.outputVarNames); + const all_description_t outputVarDescription = make_tuple(outputRealVars.outputVarDescription,outputIntVars.outputVarDescription,outputBoolVars.outputVarDescription,outputDerVars.outputVarDescription,outputResVars.outputVarDescription); <% match settings.outputFormat case "mat" then << - const all_names_t parameterVarNames = make_tuple(outputRealVars.parameterNames,outputIntVars.parameterNames,outputBoolVars.parameterNames,outputDerVars.ourputVarNames,outputResVars.ourputVarNames); - const all_description_t parameterVarDescription = make_tuple(outputRealVars.parameterDescription,outputIntVars.parameterDescription,outputBoolVars.parameterDescription,outputDerVars.ourputVarDescription,outputResVars.ourputVarDescription); + const all_names_t parameterVarNames = make_tuple(outputRealVars.parameterNames,outputIntVars.parameterNames,outputBoolVars.parameterNames,outputDerVars.outputVarNames,outputResVars.outputVarNames); + const all_description_t parameterVarDescription = make_tuple(outputRealVars.parameterDescription,outputIntVars.parameterDescription,outputBoolVars.parameterDescription,outputDerVars.outputVarDescription,outputResVars.outputVarDescription); >> else << diff --git a/OMCompiler/Compiler/Template/CodegenCppOMSI.tpl b/OMCompiler/Compiler/Template/CodegenCppOMSI.tpl index 791145502dd..c243dac0ddf 100644 --- a/OMCompiler/Compiler/Template/CodegenCppOMSI.tpl +++ b/OMCompiler/Compiler/Template/CodegenCppOMSI.tpl @@ -6337,14 +6337,14 @@ match Config.simCodeTarget() //Write head line if (command & IWriteOutput::HEAD_LINE) { - const all_names_t outputVarNames = make_tuple(outputRealVars.ourputVarNames,outputIntVars.ourputVarNames,outputBoolVars.ourputVarNames,outputDerVars.ourputVarNames,outputResVars.ourputVarNames); - const all_description_t outputVarDescription = make_tuple(outputRealVars.ourputVarDescription,outputIntVars.ourputVarDescription,outputBoolVars.ourputVarDescription,outputDerVars.ourputVarDescription,outputResVars.ourputVarDescription); + const all_names_t outputVarNames = make_tuple(outputRealVars.outputVarNames,outputIntVars.outputVarNames,outputBoolVars.outputVarNames,outputDerVars.outputVarNames,outputResVars.outputVarNames); + const all_description_t outputVarDescription = make_tuple(outputRealVars.outputVarDescription,outputIntVars.outputVarDescription,outputBoolVars.outputVarDescription,outputDerVars.outputVarDescription,outputResVars.outputVarDescription); <% match settings.outputFormat case "mat" then << - const all_names_t parameterVarNames = make_tuple(outputRealVars.parameterNames,outputIntVars.parameterNames,outputBoolVars.parameterNames,outputDerVars.ourputVarNames,outputResVars.ourputVarNames); - const all_description_t parameterVarDescription = make_tuple(outputRealVars.parameterDescription,outputIntVars.parameterDescription,outputBoolVars.parameterDescription,outputDerVars.ourputVarDescription,outputResVars.ourputVarDescription); + const all_names_t parameterVarNames = make_tuple(outputRealVars.parameterNames,outputIntVars.parameterNames,outputBoolVars.parameterNames,outputDerVars.outputVarNames,outputResVars.outputVarNames); + const all_description_t parameterVarDescription = make_tuple(outputRealVars.parameterDescription,outputIntVars.parameterDescription,outputBoolVars.parameterDescription,outputDerVars.outputVarDescription,outputResVars.outputVarDescription); >> else << diff --git a/OMCompiler/SimulationRuntime/cpp/Core/DataExchange/IHistory.h b/OMCompiler/SimulationRuntime/cpp/Core/DataExchange/IHistory.h index f165c7b702d..3eefdbcedbe 100644 --- a/OMCompiler/SimulationRuntime/cpp/Core/DataExchange/IHistory.h +++ b/OMCompiler/SimulationRuntime/cpp/Core/DataExchange/IHistory.h @@ -37,9 +37,9 @@ struct SimulationOutput /** Container for all output parameter description*/ var_names_t parameterDescription; /** Container for all output variable names*/ - var_names_t ourputVarNames; + var_names_t outputVarNames; /** Container for all output variable descriptions*/ - var_names_t ourputVarDescription; + var_names_t outputVarDescription; /** Container for all output variables*/ values_t outputVars; /** Container for all output parameter*/ @@ -68,8 +68,8 @@ struct SimulationOutput */ void addOutputVar(string& name,string& description,const T* var,bool negate) { - ourputVarNames.push_back(name); - ourputVarDescription.push_back(description); + outputVarNames.push_back(name); + outputVarDescription.push_back(description); outputVars.push_back(var); negateOutputVars.push_back(negate); }