disabled write parameter vars for csv in cpp template

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21717 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/Template/CodegenCpp.tpl

@@ -106,8 +106,8 @@ case SIMCODE(modelInfo=MODELINFO(vars=SIMVARS(__)),fileNamePrefix=fileNamePrefix
     <%List.partition(vars.paramVars, 100) |> ls hasindex idx => 'void initializeParameterVars_<%idx%>();';separator="\n"%>
     <%List.partition(vars.intParamVars, 100) |> ls hasindex idx => 'void initializeIntParameterVars_<%idx%>();';separator="\n"%>
     <%List.partition(vars.boolParamVars, 100) |> ls hasindex idx => 'void initializeBoolParameterVars_<%idx%>();';separator="\n"%>
-
-
+ 
+    
     void initializeParameterVars();
     void initializeIntParameterVars();
     void initializeBoolParameterVars();
@@ -246,14 +246,16 @@ template simulationWriteOutputHeaderFile(SimCode simCode)
 ::=
 match simCode
 case SIMCODE(modelInfo=MODELINFO(__),simulationSettingsOpt = SOME(settings as SIMULATION_SETTINGS(__))) then
+  let n = numParamVars(modelInfo)
   let outputtype = match   settings.outputFormat case "mat" then "MatFileWriter" else "TextFileWriter"
+  let numparams = match   settings.outputFormat case "csv" then "1" else n
   <<
    #pragma once
     #include "OMCpp<%fileNamePrefix%>.h"
-    typedef HistoryImpl<<%outputtype%>,<%numAlgvars(modelInfo)%>+<%numInOutvars(modelInfo)%>+<%numAliasvars(modelInfo)%>+<%numStatevars(modelInfo)%>,<%numDerivativevars(modelInfo)%>,0,<%numParamVars(modelInfo)%>> HistoryImplType;
-
-
-
+    typedef HistoryImpl<<%outputtype%>,<%numAlgvars(modelInfo)%>+<%numInOutvars(modelInfo)%>+<%numAliasvars(modelInfo)%>+<%numStatevars(modelInfo)%>,<%numDerivativevars(modelInfo)%>,0,<%numparams%>> HistoryImplType;
+    
+   
+ 
   /*****************************************************************************
   *
   * Simulation code to write simulation file
@@ -1368,7 +1370,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   # /MDd link with MSVCRTD.LIB debug lib
   # lib names should not be appended with a d just switch to lib/omc/cpp
 
-
+ 
 
   FILEPREFIX=<%fileNamePrefix%>
   FUNCTIONFILE=OMCpp<%fileNamePrefix%>Functions.cpp
@@ -1492,8 +1494,8 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
 
     }
 
-
-
+    
+    
     /* Destructor */
     <%className%>::~<%className%>()
     {
@@ -3031,7 +3033,7 @@ case modelInfo as MODELINFO(vars=SIMVARS(__))  then
    let init10  =initValstWithSplit(varDecls10,"Real",'<%lastIdentOfPath(modelInfo.name)%>Initialize::initializeParameterVars',vars.paramVars, simCode,contextOther,useFlatArrayNotation)
    let init11  =initValstWithSplit(varDecls11,"Int",'<%lastIdentOfPath(modelInfo.name)%>Initialize::initializeIntParameterVars',vars.intParamVars, simCode,contextOther,useFlatArrayNotation)
    let init12  =initValstWithSplit(varDecls12,"Bool",'<%lastIdentOfPath(modelInfo.name)%>Initialize::initializeBoolParameterVars',vars.boolParamVars, simCode,contextOther,useFlatArrayNotation)
-
+   
    <<
    void <%lastIdentOfPath(modelInfo.name)%>Initialize::initializeStateVars()
    {
@@ -3082,7 +3084,7 @@ case modelInfo as MODELINFO(vars=SIMVARS(__))  then
     <%init10%>
     <%init11%>
     <%init12%>
-
+    
    >>
 end init2;
 
@@ -3644,7 +3646,8 @@ end InitializeEquationsArray;
 template writeoutput(SimCode simCode, Boolean useFlatArrayNotation)
 ::=
 match simCode
-case SIMCODE(modelInfo = MODELINFO(__)) then
+case SIMCODE(modelInfo = MODELINFO(__),simulationSettingsOpt = SOME(settings as SIMULATION_SETTINGS(__))) then
+  let numParamvars = numParamVars(modelInfo)
   <<
    void <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeOutput(const IWriteOutput::OUTPUT command)
    {
@@ -3667,12 +3670,15 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
       writeBoolAliasVarsResultNames(varsnames);
       writeStateVarsResultNames(varsnames);
       writeDerivativeVarsResultNames(varsnames);
+      
+      <% 
+      match   settings.outputFormat case "mat" 
+      then 
+      <<
       writeParametertNames(paramnames);
       writeIntParameterNames(paramnames);
       writeBoolParameterNames(paramnames);
       writeStringParameterNames(paramnames);
-
-
       writeAlgVarsResultDescription(vardescs);
       writeDiscreteAlgVarsResultDescription(vardescs);
       writeIntAlgVarsResultDescription(vardescs);
@@ -3687,17 +3693,22 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
       writeParameterDescription(paramdecs);
       writeIntParameterDescription(paramdecs);
       writeBoolParameterDescription(paramdecs);
-
-
-
+      >>
+      %>
       _historyImpl->write(varsnames,vardescs,paramnames,paramdecs);
-
-       /* workarround ced*/
-
-       HistoryImplType::value_type_p params(<%numParamVars(modelInfo)%>);
+      <% 
+      match   settings.outputFormat case "mat" 
+      then 
+      <<
+        HistoryImplType::value_type_p params(<%numParamvars%>);
        <%writeoutputparams(modelInfo,simCode,useFlatArrayNotation)%>
-
-        _historyImpl->write(params,_global_settings->getStartTime(),_global_settings->getEndTime());
+      >>
+      else
+      <<      
+       HistoryImplType::value_type_p params(1);
+      >>
+      %>
+       _historyImpl->write(params,_global_settings->getStartTime(),_global_settings->getEndTime());
     }
     //Write the current values
     else
@@ -5394,11 +5405,11 @@ case modelInfo as MODELINFO(vars=SIMVARS(__)) then
         void   <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeParametertNames(vector<string>& names)
         {
          /*workarround ced*/
-
+         
          <% if vars.paramVars then
           'names += <%(vars.paramVars |> SIMVAR(__) =>
           '"<%crefStr(name)%>"' ;separator=",";align=10;alignSeparator=";\n names += " )%>;' %>
-
+         
         }
 
          void   <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeIntParameterNames(vector<string>& names)
@@ -5503,7 +5514,7 @@ case modelInfo as MODELINFO(vars=SIMVARS(__)) then
          <% if vars.paramVars then
           'names += <%(vars.paramVars |> SIMVAR(__) =>
           '"<%Util.escapeModelicaStringToCString(comment)%>"' ;separator=",";align=10;alignSeparator=";\n names += " )%>;' %>
-
+          
         }
 
          void   <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeIntParameterDescription(vector<string>& names)