Skip to content

Commit

Permalink
Fix test for clang
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15887 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Apr 23, 2013
1 parent 8c02217 commit 4d37fb2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions Compiler/Template/CodegenC.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -1565,8 +1565,12 @@ template functionODE(list<list<SimEqSystem>> derivativEquations, Text method)

void function_initMemoryState()
{
push_memory_states(<% if Flags.isSet(Flags.OPENMP) then (match noProc() case 0 then "omp_get_max_threads()" else noProc()) else 1 %>);
<% if Flags.isSet(Flags.OPENMP) then "get_thread_index = omp_get_thread_num;" %>
#ifdef _OPENMP
push_memory_states(<% match noProc() case 0 then "omp_get_max_threads()" else noProc() %>);
get_thread_index = omp_get_thread_num;
#else
push_memory_states(1);
#endif
}

int functionODE(DATA *data)
Expand Down
4 changes: 2 additions & 2 deletions Examples/BuildModelRecursive.mos
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ulimitExe:="180"; // 3 minutes to initialize and run the simulation
loadModel(library,{libraryVersion});
getErrorString();
libraryVersionTmp:=getVersion(library);
libraryVersion := if libraryVersionTmp == "" then libraryVersion else libraryVersionTmp;
libraryVersionTmp := if libraryVersionTmp == "" then libraryVersion else libraryVersionTmp;
libraryString:=typeNameString(library);

system("date +'%Y-%m-%d %H:%M:%S' > tmp.date");
Expand Down Expand Up @@ -108,7 +108,7 @@ str:="<h1>Recursive BuildModel Test</h1>
<p>Total time taken: "+OpenModelica.Scripting.Internal.Time.readableTime(OpenModelica.Scripting.Internal.Time.timerTock(OpenModelica.Scripting.Internal.Time.RT_CLOCK_USER_RESERVED))+"</p>
<p>OpenModelica Version: "+OpenModelica.Scripting.getVersion()+"</p>
<p>Test started: "+dateAndTime+"</p>
<p>Tested Library: "+libraryString+" "+libraryVersion+"</p>
<p>Tested Library: "+libraryString+" "+libraryVersionTmp+"</p>
<p>BuildModel time limit: "+ulimitOmc+"s</p>
<p>Simulation time limit: "+ulimitExe+"s</p>
<p>Flags: setCommandLineOptions(\"+d=nogen\"); setMatchingAlgorithm(\"PFPlusExt\"); setIndexReductionMethod(\"dynamicStateSelection\");</p>
Expand Down

0 comments on commit 4d37fb2

Please sign in to comment.