Changeset 6e3121a4 in OpenModelica


Ignore:
Timestamp:
2016-04-08T18:53:29+02:00 (8 years ago)
Author:
Rüdiger Franke <rdgfranke@…>
Branches:
Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, master, omlib-staging
Children:
25dbe82
Parents:
f11f59c2
Message:

Skip min/max for derivatives (work around ticket:3832)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Compiler/Template/CodegenCpp.tpl

    r058fd5a r6e3121a4  
    66306630    crefStrForWriteOutput(cref)
    66316631
    6632   let nominalStr = match var case SIMVAR(nominalValue=SOME(exp)) then
    6633     let expPart = daeExp(exp, context, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
    6634     '<%expPart%>'
    6635     else "1.0"
    6636 
    6637   let minStr = match var case SIMVAR(minValue=SOME(exp)) then
    6638     let expPart = daeExp(exp, context, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
    6639     '<%expPart%>'
    6640     else "-1e60"
    6641 
    6642   let maxStr = match var case SIMVAR(maxValue=SOME(exp)) then
    6643     let expPart = daeExp(exp, context, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
    6644     '<%expPart%>'
    6645     else "1e60"
     6632  let nominalStr = match var
     6633    case SIMVAR(nominalValue=SOME(exp)) then
     6634      let expPart = daeExp(exp, context, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     6635      '<%expPart%>'
     6636    else
     6637      '1.0'
     6638
     6639  let minStr = match var
     6640    case SIMVAR(varKind=STATE_DER()) then
     6641      '-HUGE_VAL'
     6642    case SIMVAR(minValue=SOME(exp)) then
     6643      let expPart = daeExp(exp, context, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     6644      '<%expPart%>'
     6645    else
     6646      '-HUGE_VAL'
     6647
     6648  let maxStr = match var
     6649    case SIMVAR(varKind=STATE_DER()) then
     6650      'HUGE_VAL'
     6651    case SIMVAR(maxValue=SOME(exp)) then
     6652      let expPart = daeExp(exp, context, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     6653      '<%expPart%>'
     6654    else
     6655      'HUGE_VAL'
    66466656
    66476657  '{"<%nameStr%>", <%nominalStr%>, <%minStr%>, <%maxStr%>}'
Note: See TracChangeset for help on using the changeset viewer.