Changeset 13962

Timestamp:

2012-11-19T14:46:16+01:00 (11 years ago)

Author:

adrpo

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

File:

• trunk/Compiler/BackEnd/OpenTURNS.mo (modified) (4 diffs)

trunk/Compiler/BackEnd/OpenTURNS.mo

@@ -215 +215 @@
   varLst := BackendDAEUtil.getAllVarLst(dae);
   varLst := List.select(varLst,BackendVariable.varHasUncertaintyAttribute);
+  varLst := listReverse(varLst); 
   inputs := stringDelimitList(generateXMLLibraryInputs(varLst),"\n");
   outputs := stringDelimitList(generateXMLLibraryOutputs(varLst),"\n");
@@ -260 +261 @@
       equation
        DAE.GIVEN() = BackendVariable.varUncertainty(v);
-       varName = ComponentReference.crefModelicaStr(BackendVariable.varCref(v));
+       varName = ComponentReference.crefStr(BackendVariable.varCref(v));
        varStr =  "    <variable id=\""+&varName+&"\" type=\"in\" />";
-       strLst = generateXMLLibraryInputs(rest);    
+       strLst = generateXMLLibraryInputs(rest);
       then varStr::strLst;
     case (v::rest)
       equation
        DAE.REFINE() = BackendVariable.varUncertainty(v);
-       varName = ComponentReference.crefModelicaStr(BackendVariable.varCref(v));
+       varName = ComponentReference.crefStr(BackendVariable.varCref(v));
        varStr =  "    <variable id=\""+&varName+&"\" type=\"in\" />";
        strLst = generateXMLLibraryInputs(rest);    
@@ -290 +291 @@
   case(v::rest) equation
      DAE.SOUGHT() = BackendVariable.varUncertainty(v);
-     varName = ComponentReference.crefModelicaStr(BackendVariable.varCref(v));
+     varName = ComponentReference.crefStr(BackendVariable.varCref(v));
      varStr =  "    <variable id=\""+&varName+&"\" type=\"out\" />";
      strLst = generateXMLLibraryOutputs(rest);    
@@ -408 +409 @@
       // add LogNormal.MUSIGMA!
       str = distVar+& " = " +& name +& "(" +& args+& ", " +& "LogNormal.MUSIGMA)\n";
-    then (str,(varName,distVar));    
+    then (str,(varName,distVar));
     
     case((DAE.DISTRIBUTION(DAE.SCONST(name),DAE.ARRAY(array=expl1),DAE.ARRAY(array=expl2)),cr),_) equation