Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21047 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@OpenModelica-Hudson
OpenModelica-Hudson committed Jun 11, 2014
1 parent 8257764 commit 482fa41
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
60 changes: 30 additions & 30 deletions Compiler/Template/CodegenCpp.tpl
View file
Expand Up @@ -270,7 +270,7 @@ case SIMCODE(modelInfo=MODELINFO(__)) then
void writeIntParameterNames(vector<string>& names);
void writeBoolParameterNames(vector<string>& names);
void writeStringParameterNames(vector<string>& names);
void writeAlgVarsResultDescription(vector<string>& names);
void writeDiscreteAlgVarsResultDescription(vector<string>& names);
void writeIntAlgVarsResultDescription(vector<string>& names);
Expand All @@ -286,7 +286,7 @@ case SIMCODE(modelInfo=MODELINFO(__)) then
void writeIntParameterDescription(vector<string>& names);
void writeBoolParameterDescription(vector<string>& names);
void writeStringParameterDescription(vector<string>& names);
HistoryImplType* _historyImpl;
};
>>
Expand Down Expand Up @@ -3483,8 +3483,8 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
writeIntParameterNames(paramnames);
writeBoolParameterNames(paramnames);
writeStringParameterNames(paramnames);
writeAlgVarsResultDescription(vardescs);
writeDiscreteAlgVarsResultDescription(vardescs);
writeIntAlgVarsResultDescription(vardescs);
Expand All @@ -3499,7 +3499,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
writeParameterDescription(paramdecs);
writeIntParameterDescription(paramdecs);
writeBoolParameterDescription(paramdecs);
_historyImpl->write(varsnames,vardescs,paramnames,paramdecs);
Expand Down Expand Up @@ -3684,8 +3684,8 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
<%generateEquationMemberFuncDecls(allEquations)%>
/*! Equations Array. pointers to all the equation functions listed above stored in this
array. It is used to randomly access and evaluate a single equation by index.
*/
Expand Down Expand Up @@ -5115,15 +5115,15 @@ case modelInfo as MODELINFO(vars=SIMVARS(__)) then
'names += <%(vars.derivativeVars |> SIMVAR(__) =>
'"<%crefStr(name)%>"' ;separator=",";align=10;alignSeparator=";\n names += " )%>;' %>
}
void <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeParametertNames(vector<string>& names)
{
<% 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)
{
<% if vars.intParamVars then
Expand All @@ -5142,8 +5142,8 @@ case modelInfo as MODELINFO(vars=SIMVARS(__)) then
'names += <%(vars.stringParamVars |> SIMVAR(__) =>
'"<%crefStr(name)%>"' ;separator=",";align=10;alignSeparator=";\n names += " )%>;' %>
}
void <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeAlgVarsResultDescription(vector<string>& description)
{
<% if vars.algVars then
Expand Down Expand Up @@ -5219,28 +5219,28 @@ case modelInfo as MODELINFO(vars=SIMVARS(__)) then
'description += <%(vars.derivativeVars |> SIMVAR(__) =>
'"<%Util.escapeModelicaStringToXmlString(comment)%>"' ;separator=",";align=10;alignSeparator=";\n description += " )%>;' %>
}
void <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeParameterDescription(vector<string>& names)
{
<% if vars.paramVars then
'names += <%(vars.paramVars |> SIMVAR(__) =>
'"<%Util.escapeModelicaStringToXmlString(comment)%>"' ;separator=",";align=10;alignSeparator=";\n names += " )%>;' %>
}
void <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeIntParameterDescription(vector<string>& names)
{
<% if vars.intParamVars then
'names += <%(vars.intParamVars |> SIMVAR(__) =>
'"<%Util.escapeModelicaStringToXmlString(comment)%>"' ;separator=",";align=10;alignSeparator=";\n names += " )%>;' %>
}
void <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeBoolParameterDescription(vector<string>& names)
{
<% if vars.boolParamVars then
'names += <%(vars.boolParamVars |> SIMVAR(__) =>
'"<%Util.escapeModelicaStringToXmlString(comment)%>"' ;separator=",";align=10;alignSeparator=";\n names += " )%>;' %>
}
void <%lastIdentOfPath(modelInfo.name)%>WriteOutput::writeStringParameterDescription(vector<string>& names)
{
<% if vars.stringParamVars then
Expand Down Expand Up @@ -5500,15 +5500,15 @@ case MODELINFO(vars=SIMVARS(__),varInfo=VARINFO(__)) then
const int paramVarsStart = 0;
const int intParamVarsStart = paramVarsStart + <%varInfo.numParams%>;
const int boolparamVarsStart = intParamVarsStart + <%varInfo.numIntParams%>;
<%vars.paramVars |> SIMVAR(__) hasindex i0 =>'params(paramVarsStart+<%i0%>)=<%cref(name)%>;';align=8 %>
<%vars.intParamVars |> SIMVAR(__) hasindex i0 =>'params(intParamVarsStart+<%i0%>)=<%cref(name)%>;';align=8 %>
<%vars.boolParamVars |> SIMVAR(__) hasindex i1 =>'params(boolparamVarsStart+<%i1%>)=<%cref(name)%>;';align=8%>
>>
end writeoutputparams;
//const int stringParamVarsStart = boolparamVarsStart + <%varInfo.numBoolParams%>;
Expand Down Expand Up @@ -6262,8 +6262,8 @@ template equation_(SimEqSystem eq, Context context, Text &varDecls, SimCode simC
/*<%equationMixed(e, context, &varDecls, simCode)%>*/
then
<<


throw std::runtime_error("Mixed systems are not supported yet");
>>
else
Expand Down Expand Up @@ -6322,7 +6322,7 @@ template equation_function_create_single_func(SimEqSystem eq, Context context,
/*<%equationMixed(e, context, &varDeclsLocal, simCode)%>*/
then
<<

throw std::runtime_error("Mixed systems are not supported yet");
>>
else
Expand Down Expand Up @@ -9498,7 +9498,7 @@ template handleSystemEvents(list<ZeroCrossing> zeroCrossings,list<SimWhenClause>
bool <%lastIdentOfPath(modelInfo.name)%>::handleSystemEvents(bool* events)
{
_callType = IContinuous::DISCRETE;
bool restart=true;
bool state_vars_reinitialized = false;
int iter=0;
Expand All @@ -9521,7 +9521,7 @@ template handleSystemEvents(list<ZeroCrossing> zeroCrossings,list<SimWhenClause>
if(iter>100 && restart ){
throw std::runtime_error("Number of event iteration steps exceeded at time: " + boost::lexical_cast<string>(_simTime) );}
_callType = IContinuous::CONTINUOUS;

return state_vars_reinitialized;
}
>>
Expand Down Expand Up @@ -9893,11 +9893,11 @@ template equationFunctions( list<SimEqSystem> allEquationsPlusWhen,list<SimWhenC
let equation_func_calls = (allEquationsPlusWhen |> eq =>
equation_function_create_single_func(eq, context/*BUFC*/, simCode)
;separator="\n")





<<

<%equation_func_calls%>
Expand Down
20 changes: 10 additions & 10 deletions SimulationRuntime/cpp/Include/Core/DataExchange/Policies/TextfileWriter.h
View file
Expand Up @@ -68,27 +68,27 @@ typedef ublas::vector<double, ublas::bounded_array<double,dim_4> > value_type_p;
//not supported for file output

}


/*writes pramater values to results file
@v_list values of parameter
@start_time
@end_time
@start_time
@end_time
*/
void write(const value_type_v& v_list,double start_time,double end_time)
{

//not supported for file output
}


/*
writes header of results file with the variable names
@s_list name of variables
@s_desc_list description of variables
@s_parameter_list name of parameter
@s_desc_parameter_list description of parameter
*/
@s_list name of variables
@s_desc_list description of variables
@s_parameter_list name of parameter
@s_desc_parameter_list description of parameter
*/
void write(const std::vector<std::string>& s_list,const std::vector<std::string>& s_desc_list,const std::vector<std::string>& s_parameter_list,const std::vector<std::string>& s_desc_parameter_list)
{

Expand Down

0 comments on commit 482fa41

Please sign in to comment.