Changeset 481 for branches/maintenance/2.2.1
- Timestamp:
- 01/29/07 17:49:00 (19 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
branches/maintenance/2.2.1/Modelica/Electrical/MultiPhase.mo
r463 r481 2 2 extends Modelica.Icons.Library2; 3 3 annotation ( 4 version="1. 2", versionDate="2006-05-12",4 version="1.3.0", versionDate="2007-01-23", 5 5 classOrder={"Examples", "*"}, 6 6 preferedView="info", Documentation(info="<HTML> … … 54 54 removed annotation from pin of Interfaces.Plug<br> 55 55 corrected usage of resistance/conductance</li> 56 <li>v1.3.0 2007/01/23 Anton Haumer<br> 57 improved some icons</li> 56 58 </ul> 57 59 </html>"), … … 184 186 final max=m) = 1 "phase index"; 185 187 Interfaces.PositivePlug plug_p(final m=m) 186 annotation (extent=[- 110, -10; -90,10]);188 annotation (extent=[-30,-10; -10,10]); 187 189 Modelica.Electrical.Analog.Interfaces.PositivePin pin_p 188 annotation (extent=[ 90, -10; 110,10]);190 annotation (extent=[10,-10; 30,10]); 189 191 annotation ( 190 192 Icon( 191 Line(points=[-90, 0; 90, 0]),192 193 Text(extent=[-150,100; 150,40],string="%name"), 193 194 Text(extent=[-100,-60; 100,-100],string="k = %k", 194 195 style(color=0, rgbcolor={0,0,0})), 195 Polygon(points=[-100, 10; 90, 0; -100, -10; -100, 10], style( 196 color=3, 197 fillColor=3, 196 Line(points=[-20,20; 40,20; 40,-20; -20,-20], style( 197 color=0, 198 rgbcolor={0,0,0}, 199 fillColor=30, 200 rgbfillColor={215,215,215}, 201 fillPattern=1)), 202 Rectangle(extent=[-20,20; 40,-20], style( 203 pattern=0, 204 fillColor=30, 205 rgbfillColor={215,215,215}, 206 fillPattern=1)), 207 Ellipse(extent=[-40,20; 0,-20], style( 208 color=0, 209 rgbcolor={0,0,0}, 210 fillColor=30, 211 rgbfillColor={215,215,215}, 212 fillPattern=1)), 213 Line(points=[-20,20; 40,20; 40,-20; -20,-20], style( 214 color=0, 215 rgbcolor={0,0,0}, 216 fillColor=30, 217 rgbfillColor={215,215,215}, 198 218 fillPattern=1))), 199 219 Documentation(info="<HTML> … … 216 236 final max=m) = 1 "phase index"; 217 237 Interfaces.NegativePlug plug_n(final m=m) 218 annotation (extent=[- 110, -10; -90,10]);238 annotation (extent=[-30,-10; -10,10]); 219 239 Modelica.Electrical.Analog.Interfaces.NegativePin pin_n 220 annotation (extent=[ 92, -10; 112,10]);240 annotation (extent=[10,-10; 30,10]); 221 241 annotation (Icon( 222 Line(points=[-90, 0; 92, 0]),223 242 Text(extent=[-150,100; 150,40],string="%name"), 224 243 Text(extent=[-100,-60; 100,-100],string="k = %k", 225 244 style(color=0, rgbcolor={0,0,0})), 226 Polygon(points=[-100, 10; 92, 0; -100, -10; -100, 10], style(color=3))), 245 Line(points=[-20,20; 40,20; 40,-20; -20,-20], style( 246 color=0, 247 rgbcolor={0,0,0}, 248 fillColor=30, 249 rgbfillColor={215,215,215}, 250 fillPattern=1)), 251 Rectangle(extent=[-20,20; 40,-20], style( 252 pattern=0, 253 fillColor=30, 254 rgbfillColor={215,215,215}, 255 fillPattern=1)), 256 Ellipse(extent=[-40,20; 0,-20], style( 257 color=0, 258 rgbcolor={0,0,0}, 259 fillColor=30, 260 rgbfillColor={215,215,215}, 261 fillPattern=1)), 262 Line(points=[-20,20; 40,20; 40,-20; -20,-20], style( 263 color=0, 264 rgbcolor={0,0,0}, 265 fillColor=30, 266 rgbfillColor={215,215,215}, 267 fillPattern=1))), 227 268 Documentation(info="<HTML> 228 269 <p> 229 270 Connects pin <i>k</i> of plug_n to pin_n, leaving the other pins of plug_n unconnected. 230 271 </p> 231 </HTML>")); 272 </HTML>"), 273 Diagram); 232 274 equation 233 275 pin_n.v = plug_n.pin[k].v; … … 830 872 m=m, 831 873 V=fill(V, m), 832 freqHz=fill(f, m)) annotation (extent=[-70, -10; -90,10]);874 freqHz=fill(f, m)) annotation (extent=[-70,10; -90,-10]); 833 875 Basic.Star StarS(m=m) 834 876 annotation (extent=[-100, -60; -80, -40], rotation=-90); … … 1981 2023 rgbfillColor={0,0,255}, 1982 2024 fillPattern=1), 1983 string="%m")), 2025 string="%m"), 2026 Text( 2027 extent=[30,60; 110,0], 2028 style(color=3, rgbcolor={0,0,255}), 2029 string="-"), 2030 Text( 2031 extent=[-110,60; -30,0], 2032 style(color=3, rgbcolor={0,0,255}), 2033 string="+")), 1984 2034 Documentation(info="<HTML> 1985 2035 <p> … … 2019 2069 fillColor=3, 2020 2070 rgbfillColor={0,0,255}, 2021 fillPattern=1))), 2071 fillPattern=1)), 2072 Text( 2073 extent=[30,60; 110,0], 2074 style(color=3, rgbcolor={0,0,255}), 2075 string="-"), 2076 Text( 2077 extent=[-110,60; -30,0], 2078 style(color=3, rgbcolor={0,0,255}), 2079 string="+")), 2022 2080 Documentation(info="<HTML> 2023 2081 <p> … … 2069 2127 fillColor=3, 2070 2128 rgbfillColor={0,0,255}, 2071 fillPattern=1))), 2129 fillPattern=1)), 2130 Text( 2131 extent=[30,60; 110,0], 2132 style(color=3, rgbcolor={0,0,255}), 2133 string="-"), 2134 Text( 2135 extent=[-110,60; -30,0], 2136 style(color=3, rgbcolor={0,0,255}), 2137 string="+")), 2072 2138 Documentation(info="<HTML> 2073 2139 <p> … … 2119 2185 rgbfillColor={0,0,255}, 2120 2186 fillPattern=1), 2121 string="%m")), 2187 string="%m"), 2188 Polygon(points=[90,0; 60,10; 60,-10; 90,0], style( 2189 color=3, 2190 rgbcolor={0,0,255}, 2191 fillColor=3, 2192 rgbfillColor={0,0,255}))), 2122 2193 Documentation(info="<HTML> 2123 2194 <p> … … 2157 2228 fillColor=3, 2158 2229 rgbfillColor={0,0,255}, 2159 fillPattern=1))), 2230 fillPattern=1)), 2231 Polygon(points=[90,0; 60,10; 60,-10; 90,0], style( 2232 color=3, 2233 rgbcolor={0,0,255}, 2234 fillColor=3, 2235 rgbfillColor={0,0,255}))), 2160 2236 Documentation(info="<HTML> 2161 2237 <p> … … 2207 2283 fillColor=3, 2208 2284 rgbfillColor={0,0,255}, 2209 fillPattern=1))), 2285 fillPattern=1)), 2286 Polygon(points=[90,0; 60,10; 60,-10; 90,0], style( 2287 color=3, 2288 rgbcolor={0,0,255}, 2289 fillColor=3, 2290 rgbfillColor={0,0,255}))), 2210 2291 Documentation(info="<HTML> 2211 2292 <p>
