Skip to content

Commit

Permalink
expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
vruge committed Dec 15, 2015
1 parent a647eac commit a971be1
Show file tree
Hide file tree
Showing 17 changed files with 148 additions and 147 deletions.
8 changes: 4 additions & 4 deletions flattening/libraries/3rdParty/Buildings/System2.mo
View file
Expand Up @@ -7575,7 +7575,7 @@ end System2;
// y_d := delta ^ n;
// yP_d := n * delta ^ (-1.0 + n);
// yPP_d := n * (-1.0 + n) * delta ^ (-2.0 + n);
// a1 := (yPP_d - yP_d / delta) / (delta2 * 8.0);
// a1 := -0.125 * (yP_d / delta - yPP_d) / delta2;
// a3 := 0.5 * yPP_d + -6.0 * a1 * delta2;
// a5 := y_d - delta2 * (a3 + delta2 * a1);
// y := a5 + x2 * (a3 + x2 * a1);
Expand Down Expand Up @@ -8673,7 +8673,7 @@ end System2;
// parameter Real Q_flow_nominal(quantity = "Power", unit = "W") = 20000.0;
// parameter Real TRadSup_nominal(quantity = "ThermodynamicTemperature", unit = "K", displayUnit = "degC", min = 0.0, start = 288.15, nominal = 300.0) = 323.15;
// parameter Real TRadRet_nominal(quantity = "ThermodynamicTemperature", unit = "K", displayUnit = "degC", min = 0.0, start = 288.15, nominal = 300.0) = 313.15;
// parameter Real mRad_flow_nominal(quantity = "MassFlowRate", unit = "kg/s") = Q_flow_nominal / ((TRadSup_nominal - TRadRet_nominal) * 4200.0);
// parameter Real mRad_flow_nominal(quantity = "MassFlowRate", unit = "kg/s") = 0.0002380952380952381 * Q_flow_nominal / (TRadSup_nominal - TRadRet_nominal);
// parameter Real system.p_ambient(quantity = "Pressure", unit = "Pa", displayUnit = "bar", min = 0.0, nominal = 100000.0) = 101325.0;
// parameter Real system.T_ambient(quantity = "ThermodynamicTemperature", unit = "K", displayUnit = "degC", min = 0.0, start = 288.15, nominal = 300.0) = 293.15;
// parameter Real system.g(quantity = "Acceleration", unit = "m/s2") = 9.806649999999999;
Expand Down Expand Up @@ -9649,9 +9649,9 @@ end System2;
// vol.dynBal.medium.state.T = vol.dynBal.medium.T;
// vol.dynBal.medium.state.X[1] = vol.dynBal.medium.X[1];
// vol.dynBal.medium.state.X[2] = vol.dynBal.medium.X[2];
// vol.dynBal.medium.x_sat = steam.MM * vol.dynBal.medium.p_steam_sat / (max(1e-13, vol.dynBal.medium.p - vol.dynBal.medium.p_steam_sat) * dryair.MM);
// vol.dynBal.medium.x_sat = steam.MM * vol.dynBal.medium.p_steam_sat / (dryair.MM * max(1e-13, vol.dynBal.medium.p - vol.dynBal.medium.p_steam_sat));
// vol.dynBal.medium.x_water = vol.dynBal.medium.Xi[1] / max(vol.dynBal.medium.X_air, 1e-13);
// vol.dynBal.medium.phi = vol.dynBal.medium.p * vol.dynBal.medium.Xi[1] / ((vol.dynBal.medium.Xi[1] + steam.MM * vol.dynBal.medium.X_air / dryair.MM) * vol.dynBal.medium.p_steam_sat);
// vol.dynBal.medium.phi = vol.dynBal.medium.p * vol.dynBal.medium.Xi[1] / (vol.dynBal.medium.p_steam_sat * (vol.dynBal.medium.Xi[1] + steam.MM * vol.dynBal.medium.X_air / dryair.MM));
// vol.dynBal.medium.Xi[1] = vol.dynBal.medium.X[1];
// vol.dynBal.medium.X[2] = 1.0 - vol.dynBal.medium.Xi[1];
// assert(vol.dynBal.medium.X[1] >= -1e-05 and vol.dynBal.medium.X[1] <= 1.00001, "Mass fraction X[1] = " + String(vol.dynBal.medium.X[1], 0, true, 6) + "of substance " + "water" + "
Expand Down
4 changes: 2 additions & 2 deletions flattening/libraries/biochem/BiochemModels.mos
View file
Expand Up @@ -1098,7 +1098,7 @@ checkModel(BioChem.Examples.MultiCompartments.Utilities.SmallCompartment); getEr
// cytosol.vpfk.s1.r = cytosol.vpfk.nS1 * cytosol.vpfk.rr;
// cytosol.vpfk.p1.r = (-cytosol.vpfk.nP1) * cytosol.vpfk.rr;
// cytosol.vpfk.p2.r = (-cytosol.vpfk.nP2) * cytosol.vpfk.rr;
// cytosol.vldh.rr = cytosol.vldh.e0 * (cytosol.vldh.s2.c * cytosol.vldh.s1.c * cytosol.vldh.kf / (cytosol.vldh.kmb * cytosol.vldh.kia) - cytosol.vldh.kr * cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq)) / (cytosol.vldh.s2.c * (1.0 / cytosol.vldh.kia + (1.0 / (cytosol.vldh.kmb * cytosol.vldh.kia) + cytosol.vldh.p1.c / (cytosol.vldh.kmb * cytosol.vldh.kip * cytosol.vldh.kia)) * cytosol.vldh.s1.c + cytosol.vldh.kmq * cytosol.vldh.p1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq * cytosol.vldh.kia)) + (1.0 + cytosol.vldh.s1.c / cytosol.vldh.k1ib) * (1.0 + cytosol.vldh.s1.c * cytosol.vldh.kma / (cytosol.vldh.kmb * cytosol.vldh.kia) + cytosol.vldh.kmq * cytosol.vldh.p1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq)) + cytosol.vldh.m1.c / cytosol.vldh.kiq + cytosol.vldh.s1.c * cytosol.vldh.kma * cytosol.vldh.m1.c / (cytosol.vldh.kia * cytosol.vldh.kiq * cytosol.vldh.kmb) + cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq) + cytosol.vldh.s1.c * cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kib * cytosol.vldh.kiq * cytosol.vldh.kmp));
// cytosol.vldh.rr = cytosol.vldh.e0 * (cytosol.vldh.s2.c * cytosol.vldh.s1.c * cytosol.vldh.kf / (cytosol.vldh.kmb * cytosol.vldh.kia) - cytosol.vldh.kr * cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq)) / (cytosol.vldh.s2.c * (1.0 / cytosol.vldh.kia + (1.0 / (cytosol.vldh.kmb * cytosol.vldh.kia) + cytosol.vldh.p1.c / (cytosol.vldh.kia * cytosol.vldh.kip * cytosol.vldh.kmb)) * cytosol.vldh.s1.c + cytosol.vldh.kmq * cytosol.vldh.p1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq * cytosol.vldh.kia)) + (1.0 + cytosol.vldh.s1.c / cytosol.vldh.k1ib) * (1.0 + cytosol.vldh.s1.c * cytosol.vldh.kma / (cytosol.vldh.kmb * cytosol.vldh.kia) + cytosol.vldh.kmq * cytosol.vldh.p1.c / (cytosol.vldh.kiq * cytosol.vldh.kmp)) + cytosol.vldh.m1.c / cytosol.vldh.kiq + cytosol.vldh.s1.c * cytosol.vldh.kma * cytosol.vldh.m1.c / (cytosol.vldh.kia * cytosol.vldh.kiq * cytosol.vldh.kmb) + cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kmp * cytosol.vldh.kiq) + cytosol.vldh.s1.c * cytosol.vldh.p1.c * cytosol.vldh.m1.c / (cytosol.vldh.kib * cytosol.vldh.kiq * cytosol.vldh.kmp));
// cytosol.vldh.s1.r = cytosol.vldh.nS1 * cytosol.vldh.rr;
// cytosol.vldh.s2.r = cytosol.vldh.nS2 * cytosol.vldh.rr;
// cytosol.vldh.p1.r = (-cytosol.vldh.nP1) * cytosol.vldh.rr;
Expand Down Expand Up @@ -1160,7 +1160,7 @@ checkModel(BioChem.Examples.MultiCompartments.Utilities.SmallCompartment); getEr
// cytosol.G3P.c = cytosol.G3P.n1.c;
// cytosol.V = cytosol.G3P.n1.V;
// cytosol.G3P.c = cytosol.G3P.n / cytosol.V;
// cytosol.vgpdh_1.rr = cytosol.vgpdh_1.KcatGPDH * cytosol.vgpdh_1.s2.c * cytosol.vgpdh_1.s1.c * cytosol.vgpdh_1.m1.c / ((cytosol.vgpdh_1.m1.c + cytosol.vgpdh_1.KmPN) * (cytosol.vgpdh_1.s1.c + cytosol.vgpdh_1.KmADP) * (cytosol.vgpdh_1.KmGPDH + cytosol.vgpdh_1.s2.c));
// cytosol.vgpdh_1.rr = cytosol.vgpdh_1.KcatGPDH * cytosol.vgpdh_1.s2.c * cytosol.vgpdh_1.s1.c * cytosol.vgpdh_1.m1.c / ((cytosol.vgpdh_1.KmGPDH + cytosol.vgpdh_1.s2.c) * (cytosol.vgpdh_1.s1.c + cytosol.vgpdh_1.KmADP) * (cytosol.vgpdh_1.m1.c + cytosol.vgpdh_1.KmPN));
// cytosol.vgpdh_1.s1.r = cytosol.vgpdh_1.nS1 * cytosol.vgpdh_1.rr;
// cytosol.vgpdh_1.s2.r = cytosol.vgpdh_1.nS2 * cytosol.vgpdh_1.rr;
// cytosol.vgpdh_1.p1.r = (-cytosol.vgpdh_1.nP1) * cytosol.vgpdh_1.rr;
Expand Down
6 changes: 3 additions & 3 deletions flattening/modelica/arrays/FillSubscriptsTest.mo
View file
Expand Up @@ -5075,7 +5075,7 @@ end Manifold;
// y0d := yd0;
// else
// w := x2 / x1;
// y0d := 0.5 * ((3.0 * y2 - x2 * y2d) / w + (x1 * y1d + -3.0 * y1) * w) / ((1.0 - w) * x1);
// y0d := 0.5 * ((3.0 * y2 - x2 * y2d) / w + (x1 * y1d + -3.0 * y1) * w) / (x1 * (1.0 - w));
// end if;
// w1 := 2.23606797749979 * k1 * x1;
// w2 := 2.23606797749979 * k2 * abs(x2);
Expand Down Expand Up @@ -6403,7 +6403,7 @@ end Manifold;
// sou_2.medium.state.X[2] = sou_2.medium.X[2];
// sou_2.medium.x_sat = 0.6219647130774989 * sou_2.medium.p_steam_sat / max(1e-13, sou_2.medium.p - sou_2.medium.p_steam_sat);
// sou_2.medium.x_water = sou_2.medium.Xi[1] / max(sou_2.medium.X_air, 1e-13);
// sou_2.medium.phi = sou_2.medium.p * sou_2.medium.Xi[1] / ((sou_2.medium.Xi[1] + 0.6219647130774989 * sou_2.medium.X_air) * sou_2.medium.p_steam_sat);
// sou_2.medium.phi = sou_2.medium.p * sou_2.medium.Xi[1] / (sou_2.medium.p_steam_sat * (sou_2.medium.Xi[1] + 0.6219647130774989 * sou_2.medium.X_air));
// sou_2.medium.Xi[1] = sou_2.medium.X[1];
// sou_2.medium.X[2] = 1.0 - sou_2.medium.Xi[1];
// assert(sou_2.medium.X[1] >= -1e-05 and sou_2.medium.X[1] <= 1.00001, "Mass fraction X[1] = " + String(sou_2.medium.X[1], 0, true, 6) + "of substance " + "water" + "
Expand Down Expand Up @@ -6440,7 +6440,7 @@ end Manifold;
// sin_2.medium.state.X[2] = sin_2.medium.X[2];
// sin_2.medium.x_sat = 0.6219647130774989 * sin_2.medium.p_steam_sat / max(1e-13, sin_2.medium.p - sin_2.medium.p_steam_sat);
// sin_2.medium.x_water = sin_2.medium.Xi[1] / max(sin_2.medium.X_air, 1e-13);
// sin_2.medium.phi = sin_2.medium.p * sin_2.medium.Xi[1] / ((sin_2.medium.Xi[1] + 0.6219647130774989 * sin_2.medium.X_air) * sin_2.medium.p_steam_sat);
// sin_2.medium.phi = sin_2.medium.p * sin_2.medium.Xi[1] / (sin_2.medium.p_steam_sat * (sin_2.medium.Xi[1] + 0.6219647130774989 * sin_2.medium.X_air));
// sin_2.medium.Xi[1] = sin_2.medium.X[1];
// sin_2.medium.X[2] = 1.0 - sin_2.medium.Xi[1];
// assert(sin_2.medium.X[1] >= -1e-05 and sin_2.medium.X[1] <= 1.00001, "Mass fraction X[1] = " + String(sin_2.medium.X[1], 0, true, 6) + "of substance " + "water" + "
Expand Down
4 changes: 2 additions & 2 deletions flattening/modelica/modification/Modification17.mo
View file
Expand Up @@ -60,9 +60,9 @@ end Modification17;
// final parameter Real areas[1] = c / /*Real*/(n);
// final parameter Real areas[2] = c / /*Real*/(n);
// final parameter Real areas[3] = c / /*Real*/(n);
// final parameter Real lengths[1] = if myDivision == MyType.divisionType1 then b / (/*Real*/(n + -1) * 2.0) else b / /*Real*/(n);
// final parameter Real lengths[1] = if myDivision == MyType.divisionType1 then 0.5 * b / /*Real*/(n + -1) else b / /*Real*/(n);
// final parameter Real lengths[2] = if myDivision == MyType.divisionType1 then b / /*Real*/(n + -1) else b / /*Real*/(n);
// final parameter Real lengths[3] = if myDivision == MyType.divisionType1 then b / (/*Real*/(n + -1) * 2.0) else b / /*Real*/(n);
// final parameter Real lengths[3] = if myDivision == MyType.divisionType1 then 0.5 * b / /*Real*/(n + -1) else b / /*Real*/(n);
// final parameter Real volumes[1] = areas[1] * lengths[1];
// final parameter Real volumes[2] = areas[2] * lengths[2];
// final parameter Real volumes[3] = areas[3] * lengths[3];
Expand Down
4 changes: 2 additions & 2 deletions flattening/modelica/operators/Cat1.mo
View file
Expand Up @@ -47,8 +47,8 @@ end Cat1;
// parameter Real b;
// final parameter Real aDivisions[1] = a / /*Real*/(n);
// final parameter Real aDivisions[2] = a / /*Real*/(n);
// final parameter Real bDivisions[1] = if myDivision == MyType.divisionType1 then b / (/*Real*/(n + -1) * 2.0) else b / /*Real*/(n);
// final parameter Real bDivisions[2] = if myDivision == MyType.divisionType1 then b / (/*Real*/(n + -1) * 2.0) else b / /*Real*/(n);
// final parameter Real bDivisions[1] = if myDivision == MyType.divisionType1 then 0.5 * b / /*Real*/(n + -1) else b / /*Real*/(n);
// final parameter Real bDivisions[2] = if myDivision == MyType.divisionType1 then 0.5 * b / /*Real*/(n + -1) else b / /*Real*/(n);
// equation
// z[1] = x[1] * y[1];
// z[2] = x[2] * y[2];
Expand Down
2 changes: 1 addition & 1 deletion flattening/modelica/others/EndUnknown.mo
View file
Expand Up @@ -34,7 +34,7 @@ end EndUnknown;
// output Real res;
// algorithm
// if size(vals, 1) >= 3 then
// res := (b - a) * (vals[1] + 2.0 * sum(vals[3:2:size(vals, 1) + -1]) + 4.0 * sum(vals[2:2:size(vals, 1) + -1]) + vals[size(vals, 1)]) * 0.3333333333333333 / /*Real*/(size(vals, 1) + -1);
// res := 0.3333333333333333 * (b - a) * (vals[1] + 2.0 * sum(vals[3:2:size(vals, 1) + -1]) + 4.0 * sum(vals[2:2:size(vals, 1) + -1]) + vals[size(vals, 1)]) / /*Real*/(size(vals, 1) + -1);
// else
// res := 0.5 * (b - a) * sum(vals);
// end if;
Expand Down

0 comments on commit a971be1

Please sign in to comment.