Skip to content

Commit

Permalink
expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
vruge committed Dec 13, 2015
1 parent a75e3e8 commit 5432a80
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions flattening/libraries/3rdParty/Buildings/System2.mo
View file
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 / (dryair.MM * max(1e-13, vol.dynBal.medium.p - vol.dynBal.medium.p_steam_sat));
// 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_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.p_steam_sat * (vol.dynBal.medium.Xi[1] + steam.MM * vol.dynBal.medium.X_air / dryair.MM));
// 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.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
6 changes: 3 additions & 3 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.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.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.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 @@ -1136,7 +1136,7 @@ checkModel(BioChem.Examples.MultiCompartments.Utilities.SmallCompartment); getEr
// cytosol.mitochondria.NADm.c = cytosol.mitochondria.NADm.n1.c;
// cytosol.mitochondria.V = cytosol.mitochondria.NADm.n1.V;
// cytosol.mitochondria.NADm.c = cytosol.mitochondria.NADm.n / cytosol.mitochondria.V;
// cytosol.mitochondria.jox.rr = 10000.0 * cytosol.mitochondria.jox.s1.c * cytosol.mitochondria.jox.s2.c / ((0.01 + cytosol.mitochondria.jox.s1.c) * (0.15 + cytosol.mitochondria.jox.s2.c));
// cytosol.mitochondria.jox.rr = 10000.0 * cytosol.mitochondria.jox.s1.c * cytosol.mitochondria.jox.s2.c / ((0.15 + cytosol.mitochondria.jox.s2.c) * (0.01 + cytosol.mitochondria.jox.s1.c));
// cytosol.mitochondria.jox.s1.r = cytosol.mitochondria.jox.nS1 * cytosol.mitochondria.jox.rr;
// cytosol.mitochondria.jox.s2.r = cytosol.mitochondria.jox.nS2 * cytosol.mitochondria.jox.rr;
// cytosol.mitochondria.jox.p1.r = (-cytosol.mitochondria.jox.nP1) * cytosol.mitochondria.jox.rr;
Expand All @@ -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.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.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.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
4 changes: 2 additions & 2 deletions flattening/modelica/arrays/FillSubscriptsTest.mo
View file
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.p_steam_sat * (sou_2.medium.Xi[1] + 0.6219647130774989 * sou_2.medium.X_air));
// 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.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.p_steam_sat * (sin_2.medium.Xi[1] + 0.6219647130774989 * sin_2.medium.X_air));
// 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.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
2 changes: 1 addition & 1 deletion flattening/modelica/redeclare/AttributesPropagation.mo
View file
Expand Up @@ -3076,7 +3076,7 @@ end BoreholeSegment;
// for i in 1:iSam + -1 loop
// QL_flow := Buildings.Fluid.HeatExchangers.Boreholes.BaseClasses.exchangeValues(table, iSam, Q_flow, 1 + iSam - i);
// QU_flow := Buildings.Fluid.HeatExchangers.Boreholes.BaseClasses.exchangeValues(table, iSam, Q_flow, iSam - i);
// dT := dT + 0.07957747154594767 * Buildings.Fluid.HeatExchangers.Boreholes.BaseClasses.powerSeries(0.25 * c * d * rExt ^ 2.0 / (k * /*Real*/(i) * samplePeriod), 10) * (QL_flow - QU_flow) / (k * hSeg);
// dT := dT + 0.07957747154594767 * Buildings.Fluid.HeatExchangers.Boreholes.BaseClasses.powerSeries(0.25 * c * d * rExt ^ 2.0 / (samplePeriod * /*Real*/(i) * k), 10) * (QL_flow - QU_flow) / (hSeg * k);
// end for;
// end if;
// end Buildings.Fluid.HeatExchangers.Boreholes.BaseClasses.temperatureDrop;
Expand Down
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/TestMedia/TestSteam.mos
View file
Expand Up @@ -1467,7 +1467,7 @@ simulate(TestMedia.TestModels.TestSteam); getErrorString();
// output Real rho_der \"derivative of density\";
// algorithm
// if aux.region == 4 then
// rho_der := aux.rho * (1.0 + aux.rho * aux.cv / aux.dpT) * p_der / (aux.T * aux.dpT) - h_der * aux.rho ^ 2.0 / (aux.T * aux.dpT);
// rho_der := aux.rho * (1.0 + aux.rho * aux.cv / aux.dpT) * p_der / (aux.T * aux.dpT) - h_der * aux.rho ^ 2.0 / (aux.dpT * aux.T);
// elseif aux.region == 3 then
// rho_der := aux.rho * (aux.cv * aux.rho + aux.pt) * p_der / (aux.rho ^ 2.0 * aux.pd * aux.cv + aux.T * aux.pt ^ 2.0) - aux.rho ^ 2.0 * aux.pt * h_der / (aux.rho ^ 2.0 * aux.pd * aux.cv + aux.T * aux.pt ^ 2.0);
// else
Expand Down
2 changes: 1 addition & 1 deletion simulation/libraries/3rdParty/TestMedia/TestWater.mos
View file
Expand Up @@ -1467,7 +1467,7 @@ simulate(TestMedia.TestModels.TestWater); getErrorString();
// output Real rho_der \"derivative of density\";
// algorithm
// if aux.region == 4 then
// rho_der := aux.rho * (1.0 + aux.rho * aux.cv / aux.dpT) * p_der / (aux.T * aux.dpT) - h_der * aux.rho ^ 2.0 / (aux.T * aux.dpT);
// rho_der := aux.rho * (1.0 + aux.rho * aux.cv / aux.dpT) * p_der / (aux.T * aux.dpT) - h_der * aux.rho ^ 2.0 / (aux.dpT * aux.T);
// elseif aux.region == 3 then
// rho_der := aux.rho * (aux.cv * aux.rho + aux.pt) * p_der / (aux.rho ^ 2.0 * aux.pd * aux.cv + aux.T * aux.pt ^ 2.0) - aux.rho ^ 2.0 * aux.pt * h_der / (aux.rho ^ 2.0 * aux.pd * aux.cv + aux.T * aux.pt ^ 2.0);
// else
Expand Down

0 comments on commit 5432a80

Please sign in to comment.