Changeset 596 for branches

Timestamp:

Aug 12, 2008, 12:57:24 AM (15 years ago)

Author:

gerson bicca

Message:

updates

Location:

branches/gui/eml

Files:

• icon/energy_source.png (modified) (previous)
• icon/energy_source.svg (modified) (3 diffs)
• pressure_changers/compressor.mso (modified) (1 diff)
• pressure_changers/icon/CentrifugalCompressor.png (modified) (previous)
• pressure_changers/icon/CentrifugalCompressor.svg (modified) (3 diffs)
• pressure_changers/icon/HidraulicTurbine.png (modified) (previous)
• pressure_changers/icon/HidraulicTurbine.svg (modified) (5 diffs)
• pressure_changers/turbine.mso (modified) (3 diffs)

branches/gui/eml/icon/energy_source.svg

@@ -17 +17 @@
    sodipodi:docbase="/home/paula/BibliotecaSVN/eml"
    sodipodi:docname="energy_source.svg"
-   inkscape:export-filename="/home/bicca/apps/repositorio/biblioteca/trunk/eml/icon/energy_source.png"
+   inkscape:export-filename="E:\Documentos Pessoais\Gerson\repositorio\branches\gui\eml\icon\energy_source.png"
    inkscape:export-xdpi="108.27314"
    inkscape:export-ydpi="108.27314"
@@ -635 +635 @@
      inkscape:cy="433.51672"
      inkscape:window-x="0"
-     inkscape:window-y="69"
+     inkscape:window-y="67"
      inkscape:current-layer="g6591"
      showguides="true"
@@ -660 +660 @@
          x="327"
          y="605.36218">energy</tspan></text>
-    <rect
-       style="stroke:url(#radialGradient3243);stroke-width:0.10566592;stroke-opacity:1"
-       id="rect2441"
-       width="1.3175086"
-       height="22.881277"
-       x="352.69897"
-       y="614.35114" />
-    <rect
-       style="stroke:url(#radialGradient3225);stroke-width:0.10750485;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2443"
-       width="1.3567668"
-       height="22.993031"
-       x="335.98413"
-       y="614.34863" />
-    <g
-       id="g4832"
-       transform="matrix(1.0008073,0,0,0.7735814,-0.2988953,138.94169)">
-      <rect
-         transform="matrix(0.5864809,0.809963,-0.854035,0.5202156,0,0)"
-         y="75.003525"
-         x="710.57697"
-         height="10.246258"
-         width="1.8184073"
-         id="rect4810"
-         style="stroke:url(#radialGradient4836);stroke-width:0.08308172;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="matrix(0.6646523,-0.7471528,0.8503981,0.5261398,0,0)"
-         y="670.56384"
-         x="-352.13998"
-         height="10.357121"
-         width="1.8040761"
-         id="rect4814"
-         style="stroke:url(#radialGradient4838);stroke-width:0.08320016;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="335"
+       y="637.36218"
+       id="text2462"><tspan
+         sodipodi:role="line"
+         id="tspan2464"
+         x="335"
+         y="637.36218">Q</tspan></text>
   </g>
 </svg>

branches/gui/eml/pressure_changers/compressor.mso

@@ -51 +51 @@
         Mwm                     as molweight            (Brief = "Mixture Molar Weight");
 
-in              Inlet           as stream               (Brief = "Inlet stream", PosX=0.35, PosY=0, Symbol="_{in}");
-out     Outlet          as streamPH     (Brief = "Outlet stream", PosX=1, PosY=0.85, Symbol="_{out}");
+in              Inlet           as stream               (Brief = "Inlet stream", PosX=0.35, PosY=1, Symbol="_{in}");
+out     Outlet          as streamPH     (Brief = "Outlet stream", PosX=1, PosY=0.0, Symbol="_{out}");
 
-in      WorkIn          as power                (Brief = "Work Inlet", PosX=0, PosY=0.55);
+in      WorkIn          as power                (Brief = "Work Inlet", PosX=0, PosY=0.46);
 
 SET

branches/gui/eml/pressure_changers/icon/CentrifugalCompressor.svg

@@ -18 +18 @@
    sodipodi:docname="CentrifugalCompressor.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="D:\Apps\repositorio\branches\gui\eml\pressure_changers\icon\CentrifugalCompressor.png"
+   inkscape:export-filename="E:\Documentos Pessoais\Gerson\repositorio\branches\gui\eml\pressure_changers\icon\CentrifugalCompressor.png"
    inkscape:export-xdpi="108"
    inkscape:export-ydpi="108">
@@ -102 +102 @@
        y2="390.36218"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5321645,0,0,0.9953023,-261.39319,2.8065289)" />
+       gradientTransform="matrix(1.5321645,0,0,0.9953023,-227.34481,2.8065289)" />
   </defs>
   <sodipodi:namedview
@@ -119 +119 @@
      inkscape:zoom="2.026521"
      inkscape:cx="372.04724"
-     inkscape:cy="595.95584"
+     inkscape:cy="556.47932"
      inkscape:window-x="0"
-     inkscape:window-y="97"
+     inkscape:window-y="88"
      inkscape:current-layer="svg2124" />
   <path
      style="fill:url(#linearGradient3919);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.93958187;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 259.54292,413.23147 L 259.54292,592.38585 L 474.046,532.66772 L 474.046,453.04356 L 259.54292,393.32543 L 259.54292,413.23147 L 259.54292,413.23147"
+     d="M 293.5913,413.23147 L 293.5913,592.38585 L 508.09438,532.66772 L 508.09438,453.04356 L 293.5913,393.32543 L 293.5913,413.23147 L 293.5913,413.23147"
      id="path2131" />
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.8903805;stroke-linecap:square;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 279.28963,369.70701 C 279.79407,397.75019 279.79407,397.75019 279.79407,397.75019"
+     d="M 496.44274,447.49923 C 495.9383,419.45605 495.9383,419.45605 495.9383,419.45605"
      id="path2392" />
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.8903805;stroke-linecap:square;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 462.10585,537.48222 C 462.61029,565.5254 462.61029,565.5254 462.61029,565.5254"
+     d="M 309.66003,618.29599 C 309.15559,590.25281 309.15559,590.25281 309.15559,590.25281"
      id="path4465" />
   <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.90423274;stroke-linecap:square;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:2.90423274,2.90423274;stroke-opacity:1;stroke-dashoffset:0"
-     d="M 188.30905,495.49505 C 259.256,495.02443 259.256,495.02443 259.256,495.02443"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.47918963;stroke-linecap:square;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:6.95837932, 6.95837932;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 188.59652,494.78612 C 293.01679,495.24509 293.01679,495.24509 293.01679,495.24509"
      id="path4467" />
 </svg>

branches/gui/eml/pressure_changers/icon/HidraulicTurbine.svg

@@ -3 +3 @@
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -12 +12 @@
    id="svg2124"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.46"
    width="210mm"
    height="297mm"
    sodipodi:docbase="C:\Documents and Settings\Administrador\Meus documentos\Bolsa Simulação\Desenhos Prontos 4"
-   sodipodi:docname="Hidraulic_Turbine.svg"
-   inkscape:export-filename="C:\Documents and Settings\Administrador\Meus documentos\Bolsa Simulação\Desenhos Prontos 4\compressor.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   sodipodi:docname="HidraulicTurbine.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="D:\Apps\repositorio\branches\gui\eml\pressure_changers\icon\CentrifugalCompressor.png"
+   inkscape:export-xdpi="108"
+   inkscape:export-ydpi="108">
   <metadata
      id="metadata2129">
@@ -33 +34 @@
   <defs
      id="defs2127">
+    <marker
+       inkscape:stockid="EmptyTriangleOutL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyTriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path3328"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.8) translate(-6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyTriangleInL"
+       style="overflow:visible">
+      <path
+         id="path3319"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(-0.8) translate(-6,0)" />
+    </marker>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective19" />
     <linearGradient
        id="linearGradient3913">
@@ -68 +102 @@
        y2="390.36218"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.704551,-1.383755e-8,1.970281e-8,-1.003186,677.866,986.2929)" />
+       gradientTransform="matrix(-1.5321645,0,0,0.9953023,924.76591,2.8065289)" />
   </defs>
   <sodipodi:namedview
@@ -83 +117 @@
      id="base"
      showgrid="true"
-     inkscape:zoom="0.71648337"
+     inkscape:zoom="2.026521"
      inkscape:cx="372.04724"
-     inkscape:cy="526.18109"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
+     inkscape:cy="556.47932"
+     inkscape:window-x="0"
+     inkscape:window-y="97"
      inkscape:current-layer="svg2124" />
   <path
-     style="fill:url(#linearGradient3919);fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:3.36284566;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 438.31858,572.61704 L 438.31858,392.0436 L 339.68142,452.23475 L 339.68142,532.48961 L 438.31858,592.68076 L 438.31858,572.61704 L 438.31858,572.61704"
+     style="fill:url(#linearGradient3919);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.93958187;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 403.8298,413.23147 L 403.8298,592.38585 L 189.32672,532.66772 L 189.32672,453.04356 L 403.8298,393.32543 L 403.8298,413.23147 L 403.8298,413.23147"
      id="path2131" />
   <path
-     style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-     d="M 260.33264,492.36218 C 340.16736,492.36218 340.16736,492.36218 340.16736,492.36218"
-     id="path3921" />
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.8903805;stroke-linecap:square;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 388.03074,589.78862 C 387.5263,617.8318 387.5263,617.8318 387.5263,617.8318"
+     id="path2392" />
   <path
-     style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 436.90786,491.05839 C 516.74258,491.05839 516.74258,491.05839 516.74258,491.05839"
-     id="path5693" />
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.8903805;stroke-linecap:square;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 202.74724,418.06574 C 202.2428,446.10892 202.2428,446.10892 202.2428,446.10892"
+     id="path4465" />
   <path
-     style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.61016744px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 252.30508,482.60285 L 252.30508,502.0571 L 282.92498,492.32998 L 252.30508,482.60285 z "
-     id="path5695" />
-  <path
-     style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.61016744px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 505.07502,480.66727 L 505.07502,500.12152 L 535.69492,490.3944 L 505.07502,480.66727 z "
-     id="path6582" />
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.47918963;stroke-linecap:square;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:6.95837932, 6.95837932;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 404.40431,495.48679 C 508.82458,495.02782 508.82458,495.02782 508.82458,495.02782"
+     id="path4467" />
 </svg>

branches/gui/eml/pressure_changers/turbine.mso

@@ -21 +21 @@
 using "streams";
 
+#Needs to be reformulated
+
 Model HidraulicTurbine
         ATTRIBUTES
         Pallete         = true;
         Icon            = "icon/HidraulicTurbine"; 
-        Brief           = "Model of a Hidraulic Turbine.";
-        Info            =
-"== Assumptions ==
-* Steady State;
-* Only Liquid;
-* Adiabatic;
-* Isentropic.
-        
-== Specify ==
-* the inlet stream;
-* the Pressure Increase (Pdiff) OR the outlet pressure (Outlet.P);
-* the Turbine efficiency (Eff);
-* the Brake efficiency (Meff);
-* the Volumetric expansivity (Beta).
-";
+        Brief           = "Testing Model of a Hidraulic Turbine.";
         
         PARAMETERS
@@ -58 +46 @@
         rho             as dens_mass            (Brief = "Specific Mass");
         Cp              as cp_mol                       (Brief = "Heat Capacity");
-in      Inlet   as stream                       (Brief = "Inlet stream", PosX=0, PosY=0.5086, Symbol="_{in}");
-out     Outlet  as stream                       (Brief = "Outlet stream", PosX=1, PosY=0.5022, Symbol="_{out}");
+in              Inlet           as stream               (Brief = "Inlet stream", PosX=0.05, PosY=0.0, Symbol="_{in}");
+out     Outlet          as stream       (Brief = "Outlet stream", PosX=0.65, PosY=1, Symbol="_{out}");
+out WorkOut             as power                (Brief = "Work Outlet", PosX=1, PosY=0.46);
 
         SET
@@ -89 +78 @@
         "Calculate Brake Power"
         BPower = FPower * Eff;
+        
+        BPower = WorkOut;
         
         "Calculate Outlet Temperature"