Changeset 8e25f42 in OpenModelica


Ignore:
Timestamp:
2012-11-19T14:46:16+01:00 (11 years ago)
Author:
Adrian Pop <adrian.pop@…>
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, maintenance/v1.23, master, omlib-staging
Children:
d8d7974
Parents:
a0c994d
Message:
  • small fixes in OpenTURNS connection: write the input/output variables in the correct form (x.y not x_y) and order in the wrapper xml file

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Compiler/BackEnd/OpenTURNS.mo

    r30af8936 r8e25f42  
    215215  varLst := BackendDAEUtil.getAllVarLst(dae);
    216216  varLst := List.select(varLst,BackendVariable.varHasUncertaintyAttribute);
     217  varLst := listReverse(varLst);
    217218  inputs := stringDelimitList(generateXMLLibraryInputs(varLst),"\n");
    218219  outputs := stringDelimitList(generateXMLLibraryOutputs(varLst),"\n");
     
    260261      equation
    261262       DAE.GIVEN() = BackendVariable.varUncertainty(v);
    262        varName = ComponentReference.crefModelicaStr(BackendVariable.varCref(v));
     263       varName = ComponentReference.crefStr(BackendVariable.varCref(v));
    263264       varStr =  "    <variable id=\""+&varName+&"\" type=\"in\" />";
    264        strLst = generateXMLLibraryInputs(rest);   
     265       strLst = generateXMLLibraryInputs(rest);
    265266      then varStr::strLst;
    266267    case (v::rest)
    267268      equation
    268269       DAE.REFINE() = BackendVariable.varUncertainty(v);
    269        varName = ComponentReference.crefModelicaStr(BackendVariable.varCref(v));
     270       varName = ComponentReference.crefStr(BackendVariable.varCref(v));
    270271       varStr =  "    <variable id=\""+&varName+&"\" type=\"in\" />";
    271272       strLst = generateXMLLibraryInputs(rest);   
     
    290291  case(v::rest) equation
    291292     DAE.SOUGHT() = BackendVariable.varUncertainty(v);
    292      varName = ComponentReference.crefModelicaStr(BackendVariable.varCref(v));
     293     varName = ComponentReference.crefStr(BackendVariable.varCref(v));
    293294     varStr =  "    <variable id=\""+&varName+&"\" type=\"out\" />";
    294295     strLst = generateXMLLibraryOutputs(rest);   
     
    408409      // add LogNormal.MUSIGMA!
    409410      str = distVar+& " = " +& name +& "(" +& args+& ", " +& "LogNormal.MUSIGMA)\n";
    410     then (str,(varName,distVar));   
     411    then (str,(varName,distVar));
    411412   
    412413    case((DAE.DISTRIBUTION(DAE.SCONST(name),DAE.ARRAY(array=expl1),DAE.ARRAY(array=expl2)),cr),_) equation
Note: See TracChangeset for help on using the changeset viewer.