Skip to content

Commit

Permalink
Fix testsuite.
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14160 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@adeas31
adeas31 committed Nov 30, 2012
1 parent e2fda47 commit c19d131
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 48 deletions.
30 changes: 15 additions & 15 deletions Compiler/OpenModelicaBootstrappingHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extern struct record_description FMI_ExperimentAnnotation_EXPERIMENTANNOTATION__
#ifdef ADD_METARECORD_DEFINTIONS
#ifndef FMI_ModelVariables_REALVARIABLE__desc_added
#define FMI_ModelVariables_REALVARIABLE__desc_added
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_REALVARIABLE__desc__fields[11] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","placementAnnotation"};
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_REALVARIABLE__desc__fields[14] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","x1Placement","x2Placement","y1Placement","y2Placement"};
ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_REALVARIABLE__desc = {
"FMI_ModelVariables_REALVARIABLE",
"FMI.ModelVariables.REALVARIABLE",
Expand All @@ -45,12 +45,12 @@ ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_REALVARIA
#else /* Only use the file as a header */
extern struct record_description FMI_ModelVariables_REALVARIABLE__desc;
#endif
#define FMI__REALVARIABLE_3dBOX11 3
#define FMI__REALVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation) (mmc_mk_box(12, 3,&FMI_ModelVariables_REALVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation))
#define FMI__REALVARIABLE_3dBOX14 3
#define FMI__REALVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement) (mmc_mk_box(15, 3,&FMI_ModelVariables_REALVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement))
#ifdef ADD_METARECORD_DEFINTIONS
#ifndef FMI_ModelVariables_INTEGERVARIABLE__desc_added
#define FMI_ModelVariables_INTEGERVARIABLE__desc_added
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_INTEGERVARIABLE__desc__fields[11] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","placementAnnotation"};
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_INTEGERVARIABLE__desc__fields[14] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","x1Placement","x2Placement","y1Placement","y2Placement"};
ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_INTEGERVARIABLE__desc = {
"FMI_ModelVariables_INTEGERVARIABLE",
"FMI.ModelVariables.INTEGERVARIABLE",
Expand All @@ -60,12 +60,12 @@ ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_INTEGERVA
#else /* Only use the file as a header */
extern struct record_description FMI_ModelVariables_INTEGERVARIABLE__desc;
#endif
#define FMI__INTEGERVARIABLE_3dBOX11 4
#define FMI__INTEGERVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation) (mmc_mk_box(12, 4,&FMI_ModelVariables_INTEGERVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation))
#define FMI__INTEGERVARIABLE_3dBOX14 4
#define FMI__INTEGERVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement) (mmc_mk_box(15, 4,&FMI_ModelVariables_INTEGERVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement))
#ifdef ADD_METARECORD_DEFINTIONS
#ifndef FMI_ModelVariables_BOOLEANVARIABLE__desc_added
#define FMI_ModelVariables_BOOLEANVARIABLE__desc_added
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_BOOLEANVARIABLE__desc__fields[11] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","placementAnnotation"};
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_BOOLEANVARIABLE__desc__fields[14] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","x1Placement","x2Placement","y1Placement","y2Placement"};
ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_BOOLEANVARIABLE__desc = {
"FMI_ModelVariables_BOOLEANVARIABLE",
"FMI.ModelVariables.BOOLEANVARIABLE",
Expand All @@ -75,12 +75,12 @@ ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_BOOLEANVA
#else /* Only use the file as a header */
extern struct record_description FMI_ModelVariables_BOOLEANVARIABLE__desc;
#endif
#define FMI__BOOLEANVARIABLE_3dBOX11 5
#define FMI__BOOLEANVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation) (mmc_mk_box(12, 5,&FMI_ModelVariables_BOOLEANVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation))
#define FMI__BOOLEANVARIABLE_3dBOX14 5
#define FMI__BOOLEANVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement) (mmc_mk_box(15, 5,&FMI_ModelVariables_BOOLEANVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement))
#ifdef ADD_METARECORD_DEFINTIONS
#ifndef FMI_ModelVariables_STRINGVARIABLE__desc_added
#define FMI_ModelVariables_STRINGVARIABLE__desc_added
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_STRINGVARIABLE__desc__fields[11] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","placementAnnotation"};
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_STRINGVARIABLE__desc__fields[14] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","x1Placement","x2Placement","y1Placement","y2Placement"};
ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_STRINGVARIABLE__desc = {
"FMI_ModelVariables_STRINGVARIABLE",
"FMI.ModelVariables.STRINGVARIABLE",
Expand All @@ -90,12 +90,12 @@ ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_STRINGVAR
#else /* Only use the file as a header */
extern struct record_description FMI_ModelVariables_STRINGVARIABLE__desc;
#endif
#define FMI__STRINGVARIABLE_3dBOX11 6
#define FMI__STRINGVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation) (mmc_mk_box(12, 6,&FMI_ModelVariables_STRINGVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation))
#define FMI__STRINGVARIABLE_3dBOX14 6
#define FMI__STRINGVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement) (mmc_mk_box(15, 6,&FMI_ModelVariables_STRINGVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement))
#ifdef ADD_METARECORD_DEFINTIONS
#ifndef FMI_ModelVariables_ENUMERATIONVARIABLE__desc_added
#define FMI_ModelVariables_ENUMERATIONVARIABLE__desc_added
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_ENUMERATIONVARIABLE__desc__fields[11] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","placementAnnotation"};
ADD_METARECORD_DEFINTIONS const char* FMI_ModelVariables_ENUMERATIONVARIABLE__desc__fields[14] = {"instance","name","description","baseType","variability","causality","hasStartValue","startValue","isFixed","valueReference","x1Placement","x2Placement","y1Placement","y2Placement"};
ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_ENUMERATIONVARIABLE__desc = {
"FMI_ModelVariables_ENUMERATIONVARIABLE",
"FMI.ModelVariables.ENUMERATIONVARIABLE",
Expand All @@ -105,8 +105,8 @@ ADD_METARECORD_DEFINTIONS struct record_description FMI_ModelVariables_ENUMERATI
#else /* Only use the file as a header */
extern struct record_description FMI_ModelVariables_ENUMERATIONVARIABLE__desc;
#endif
#define FMI__ENUMERATIONVARIABLE_3dBOX11 7
#define FMI__ENUMERATIONVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation) (mmc_mk_box(12, 7,&FMI_ModelVariables_ENUMERATIONVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,placementAnnotation))
#define FMI__ENUMERATIONVARIABLE_3dBOX14 7
#define FMI__ENUMERATIONVARIABLE(instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement) (mmc_mk_box(15, 7,&FMI_ModelVariables_ENUMERATIONVARIABLE__desc,instance,name,description,baseType,variability,causality,hasStartValue,startValue,isFixed,valueReference,x1Placement,x2Placement,y1Placement,y2Placement))
#ifdef ADD_METARECORD_DEFINTIONS
#ifndef FMI_FmiImport_FMIIMPORT__desc_added
#define FMI_FmiImport_FMIIMPORT__desc_added
Expand Down
17 changes: 8 additions & 9 deletions Compiler/Template/CodegenFMU.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1578,23 +1578,23 @@ template dumpFMIModelVariable(ModelVariables fmiModelVariable, Boolean generateI
match fmiModelVariable
case REALVARIABLE(__) then
<<
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIRealModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(placementAnnotation)%>;
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIRealModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(x1Placement, x2Placement, y1Placement, y2Placement, generateInputConnectors, generateOutputConnectors, causality)%>;
>>
case INTEGERVARIABLE(__) then
<<
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIIntegerModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(placementAnnotation)%>;
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIIntegerModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(x1Placement, x2Placement, y1Placement, y2Placement, generateInputConnectors, generateOutputConnectors, causality)%>;
>>
case BOOLEANVARIABLE(__) then
<<
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIBooleanModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(placementAnnotation)%>;
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIBooleanModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(x1Placement, x2Placement, y1Placement, y2Placement, generateInputConnectors, generateOutputConnectors, causality)%>;
>>
case STRINGVARIABLE(__) then
<<
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIStringModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(placementAnnotation)%>;
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIStringModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(x1Placement, x2Placement, y1Placement, y2Placement, generateInputConnectors, generateOutputConnectors, causality)%>;
>>
case ENUMERATIONVARIABLE(__) then
<<
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIIntegerModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(placementAnnotation)%>;
<%dumpFMIModelVariableVariability(variability)%><%dumpFMIModelVariableCausalityAndBaseType(causality, baseType, generateInputConnectors, generateOutputConnectors)%> <%name%><%dumpFMIIntegerModelVariableStartValue(hasStartValue, startValue, isFixed)%><%dumpFMIModelVariableDescription(description)%><%dumpFMIModelVariablePlacementAnnotation(x1Placement, x2Placement, y1Placement, y2Placement, generateInputConnectors, generateOutputConnectors, causality)%>;
>>
end dumpFMIModelVariable;

Expand Down Expand Up @@ -1658,11 +1658,10 @@ template dumpFMIModelVariableDescription(String description)
>>
end dumpFMIModelVariableDescription;

template dumpFMIModelVariablePlacementAnnotation(String placementAnnotation)
template dumpFMIModelVariablePlacementAnnotation(Integer x1Placement, Integer x2Placement, Integer y1Placement, Integer y2Placement, Boolean generateInputConnectors, Boolean generateOutputConnectors, String causality)
::=
<<
<%if stringEq(placementAnnotation, "") then "" else " "+placementAnnotation%>
>>
if boolAnd(generateInputConnectors, stringEq(causality, "input")) then " annotation(Placement(transformation(extent={{"+x1Placement+","+y1Placement+"},{"+x2Placement+","+y2Placement+"}})))"
else if boolAnd(generateOutputConnectors, stringEq(causality, "output")) then " annotation(Placement(transformation(extent={{"+x1Placement+","+y1Placement+"},{"+x2Placement+","+y2Placement+"}})))"
end dumpFMIModelVariablePlacementAnnotation;

template dumpRealVariablesVR(list<ModelVariables> fmiModelVariablesList)
Expand Down
25 changes: 20 additions & 5 deletions Compiler/Template/SimCodeTV.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2658,7 +2658,10 @@ package FMI
Real startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end REALVARIABLE;

record INTEGERVARIABLE
Expand All @@ -2672,7 +2675,10 @@ package FMI
Integer startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end INTEGERVARIABLE;

record BOOLEANVARIABLE
Expand All @@ -2686,7 +2692,10 @@ package FMI
Boolean startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end BOOLEANVARIABLE;

record STRINGVARIABLE
Expand All @@ -2700,7 +2709,10 @@ package FMI
String startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end STRINGVARIABLE;

record ENUMERATIONVARIABLE
Expand All @@ -2714,7 +2726,10 @@ package FMI
Integer startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end ENUMERATIONVARIABLE;
end ModelVariables;

Expand Down
25 changes: 20 additions & 5 deletions Compiler/Util/FMI.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ public uniontype ModelVariables
Real startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end REALVARIABLE;

record INTEGERVARIABLE
Expand All @@ -83,7 +86,10 @@ public uniontype ModelVariables
Integer startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end INTEGERVARIABLE;

record BOOLEANVARIABLE
Expand All @@ -97,7 +103,10 @@ public uniontype ModelVariables
Boolean startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end BOOLEANVARIABLE;

record STRINGVARIABLE
Expand All @@ -111,7 +120,10 @@ public uniontype ModelVariables
String startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end STRINGVARIABLE;

record ENUMERATIONVARIABLE
Expand All @@ -125,7 +137,10 @@ public uniontype ModelVariables
Integer startValue;
Boolean isFixed;
Real valueReference;
String placementAnnotation;
Integer x1Placement;
Integer x2Placement;
Integer y1Placement;
Integer y2Placement;
end ENUMERATIONVARIABLE;
end ModelVariables;

Expand Down

0 comments on commit c19d131

Please sign in to comment.