Index: mttroot/mtt/lib/comp/compound/Thermal/CT/CT_abg.fig ================================================================== --- mttroot/mtt/lib/comp/compound/Thermal/CT/CT_abg.fig +++ mttroot/mtt/lib/comp/compound/Thermal/CT/CT_abg.fig @@ -1,22 +1,26 @@ -#FIG 3.1 +#FIG 3.2 Portrait Center Metric +A4 +100.00 +Single +-2 1200 2 -2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 - 3825 2700 5175 2700 4950 2925 2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 2025 2700 3375 2700 3150 2925 2 4 0 2 31 7 1 0 -1 0.000 0 0 7 0 0 5 5850 3825 5850 1575 225 1575 225 3825 5850 3825 -4 1 4 0 0 0 20 0.0000000 4 270 360 3960 2475 [p]\001 -4 1 -1 0 0 0 20 0.0000000 4 210 330 3645 2790 FP\001 -4 1 4 0 0 0 20 0.0000000 4 240 315 3285 2475 [f]\001 -4 1 1 1 0 3 20 0.0000000 4 210 165 2475 3105 S\001 -4 1 1 1 0 3 20 0.0000000 4 210 180 2475 2475 T\001 -4 1 1 1 0 3 30 0.0000000 4 60 105 2520 2835 .\001 -4 1 1 1 0 3 20 0.0000000 4 270 210 4500 3105 Q\001 -4 1 1 1 0 3 20 0.0000000 4 210 180 4500 2475 T\001 -4 1 1 1 0 3 30 0.0000000 4 60 105 4545 2835 .\001 -4 1 -1 0 0 0 20 0.0000000 4 210 420 5490 2790 C:c\001 -4 2 4 0 0 0 20 0.0000000 4 240 1665 1980 2790 SS:[Thermal]\001 +2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 + 4275 2700 5625 2700 5400 2925 +4 1 4 0 0 0 20 0.0000 4 240 270 3285 2475 [f]\001 +4 1 1 1 0 3 20 0.0000 4 195 165 2475 3105 S\001 +4 1 1 1 0 3 20 0.0000 4 195 165 2475 2475 T\001 +4 1 1 1 0 3 30 0.0000 4 60 105 2520 2835 .\001 +4 2 4 0 0 0 20 0.0000 4 240 810 1980 2790 SS:[in]\001 +4 1 -1 0 0 0 20 0.0000 4 255 630 3825 2790 FP:fp\001 +4 1 4 0 0 0 20 0.0000 4 255 315 4410 2475 [p]\001 +4 1 1 1 0 3 20 0.0000 4 240 210 4950 3105 Q\001 +4 1 1 1 0 3 20 0.0000 4 195 165 4950 2475 T\001 +4 1 1 1 0 3 30 0.0000 4 60 105 4995 2835 .\001 +4 1 -1 0 0 0 20 0.0000 4 195 390 5940 2790 C:c\001 Index: mttroot/mtt/lib/comp/compound/Thermal/CT/CT_lbl.txt ================================================================== --- mttroot/mtt/lib/comp/compound/Thermal/CT/CT_lbl.txt +++ mttroot/mtt/lib/comp/compound/Thermal/CT/CT_lbl.txt @@ -4,11 +4,11 @@ %DESCRIPTION Example label file entry: %DESCRIPTION % Component type CT %DESCRIPTION c lin effort,c %Port aliases -%ALIAS in|out Thermal +%ALIAS Thermal|out in %CR aliases %ALIAS $1 effort,c_t %ALIAS $a1 lin @@ -17,10 +17,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.7 2001/07/03 22:59:10 gawthrop +% %% Fixed problems with argument passing for CRs +% %% % %% Revision 1.6 2001/06/13 17:10:26 gawthrop % %% Alias for the cr (ie ALIAS $1 lin) % %% % %% Revision 1.5 2001/06/11 15:09:18 gawthrop % %% Removed spurious parameter @@ -47,8 +50,11 @@ % Component type C c lin effort,c_t + +% Component type FP + fp % Component type SS - [Thermal] SS external,external + [in] SS external,external Index: mttroot/mtt/lib/comp/compound/Thermal/RT/RT_abg.fig ================================================================== --- mttroot/mtt/lib/comp/compound/Thermal/RT/RT_abg.fig +++ mttroot/mtt/lib/comp/compound/Thermal/RT/RT_abg.fig @@ -1,45 +1,49 @@ -#FIG 3.1 +#FIG 3.2 Portrait Center Metric +A4 +100.00 +Single +-2 1200 2 2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 4275 2701 5625 2701 5400 2926 2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 6075 2701 7425 2701 7200 2926 2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 5850 2476 5850 1126 6075 1351 -2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 - 2475 2701 3825 2701 3600 2926 -2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 - 7875 2701 9225 2701 9000 2926 2 4 0 2 31 7 1 0 -1 0.000 0 0 7 0 0 5 11475 3600 450 3600 450 451 11475 451 11475 3600 -4 2 4 0 0 0 20 0.0000000 4 240 1920 2430 2790 SS:[ThermalIn]\001 -4 1 -1 0 0 0 20 0.0000000 4 210 150 5850 2791 1\001 -4 1 -1 0 0 0 20 0.0000000 4 210 390 5850 991 R:r\001 -4 1 4 0 0 0 20 0.0000000 4 270 360 4410 2476 [p]\001 -4 1 4 0 0 0 20 0.0000000 4 270 360 7290 2476 [p]\001 -4 1 -1 0 0 0 20 0.0000000 4 210 330 4050 2791 FP\001 -4 1 -1 0 0 0 20 0.0000000 4 210 330 7695 2791 FP\001 -4 1 4 0 0 0 20 0.0000000 4 240 315 3735 2476 [f]\001 -4 1 4 0 0 0 20 0.0000000 4 240 315 8055 2476 [f]\001 -4 1 1 1 0 3 20 0.0000000 4 210 165 2925 3106 S\001 -4 1 1 1 0 3 30 0.0000000 4 60 105 2970 2836 .\001 -4 1 1 1 0 3 20 0.0000000 4 270 210 5040 3106 Q\001 -4 1 1 1 0 3 30 0.0000000 4 60 105 5085 2836 .\001 -4 1 1 1 0 3 20 0.0000000 4 210 180 5040 2521 T\001 -4 1 1 1 0 3 20 0.0000000 4 270 210 6615 3106 Q\001 -4 1 1 1 0 3 30 0.0000000 4 60 105 6660 2836 .\001 -4 1 1 1 0 3 20 0.0000000 4 210 180 6615 2521 T\001 -4 1 1 1 0 3 20 0.0000000 4 210 165 8640 3106 S\001 -4 1 1 1 0 3 30 0.0000000 4 60 105 8685 2836 .\001 -4 1 1 1 0 3 20 0.0000000 4 210 180 8640 2521 T\001 -4 1 1 1 0 3 20 0.0000000 4 210 180 2925 2521 T\001 -4 1 1 1 0 3 20 0.0000000 4 210 150 3060 2611 1\001 -4 1 1 1 0 3 20 0.0000000 4 210 150 3060 3241 1\001 -4 1 1 1 0 3 20 0.0000000 4 210 150 6795 2611 2\001 -4 1 1 1 0 3 20 0.0000000 4 210 150 8820 3241 2\001 -4 1 1 1 0 3 20 0.0000000 4 210 150 8820 2611 2\001 -4 1 1 1 0 3 20 0.0000000 4 210 150 5220 2611 1\001 -4 0 4 0 0 0 20 0.0000000 4 240 2115 9360 2791 SS:[ThermalOut]\001 +2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 + 2025 2701 3375 2701 3150 2926 +2 1 0 2 -1 7 0 0 -1 0.000 0 0 -1 0 0 3 + 8325 2701 9675 2701 9450 2926 +4 1 -1 0 0 0 20 0.0000 4 195 135 5850 2791 1\001 +4 1 -1 0 0 0 20 0.0000 4 195 375 5850 991 R:r\001 +4 1 4 0 0 0 20 0.0000 4 255 315 4410 2476 [p]\001 +4 1 4 0 0 0 20 0.0000 4 255 315 7290 2476 [p]\001 +4 1 1 1 0 3 20 0.0000 4 240 210 5040 3106 Q\001 +4 1 1 1 0 3 30 0.0000 4 60 105 5085 2836 .\001 +4 1 1 1 0 3 20 0.0000 4 195 165 5040 2521 T\001 +4 1 1 1 0 3 20 0.0000 4 240 210 6615 3106 Q\001 +4 1 1 1 0 3 30 0.0000 4 60 105 6660 2836 .\001 +4 1 1 1 0 3 20 0.0000 4 195 165 6615 2521 T\001 +4 1 1 1 0 3 20 0.0000 4 195 135 6795 2611 2\001 +4 1 1 1 0 3 20 0.0000 4 195 135 5220 2611 1\001 +4 1 -1 0 0 0 20 0.0000 4 255 765 3825 2790 FP:fp1\001 +4 2 4 0 0 0 20 0.0000 4 240 810 1980 2790 SS:[in]\001 +4 1 4 0 0 0 20 0.0000 4 240 270 3285 2476 [f]\001 +4 1 1 1 0 3 20 0.0000 4 195 165 2475 3106 S\001 +4 1 1 1 0 3 30 0.0000 4 60 105 2520 2836 .\001 +4 1 1 1 0 3 20 0.0000 4 195 165 2475 2521 T\001 +4 1 1 1 0 3 20 0.0000 4 195 135 2610 2611 1\001 +4 1 1 1 0 3 20 0.0000 4 195 135 2610 3241 1\001 +4 1 -1 0 0 0 20 0.0000 4 255 765 7920 2790 FP:fp2\001 +4 1 4 0 0 0 20 0.0000 4 240 270 8505 2476 [f]\001 +4 1 1 1 0 3 20 0.0000 4 195 165 9090 3106 S\001 +4 1 1 1 0 3 30 0.0000 4 60 105 9135 2836 .\001 +4 1 1 1 0 3 20 0.0000 4 195 165 9090 2521 T\001 +4 1 1 1 0 3 20 0.0000 4 195 135 9270 3241 2\001 +4 1 1 1 0 3 20 0.0000 4 195 135 9270 2611 2\001 +4 0 4 0 0 0 20 0.0000 4 240 960 9810 2791 SS:[out]\001 Index: mttroot/mtt/lib/comp/compound/Thermal/RT/RT_lbl.txt ================================================================== --- mttroot/mtt/lib/comp/compound/Thermal/RT/RT_lbl.txt +++ mttroot/mtt/lib/comp/compound/Thermal/RT/RT_lbl.txt @@ -5,12 +5,12 @@ %DESCRIPTION Internally pseudo bond graph %DESCRIPTION Example label file entry: %DESCRIPTION % Component type RT %DESCRIPTION r lin flow,r -%ALIAS in ThermalIn -%ALIAS out ThermalOut +%ALIAS ThermalIn in +%ALIAS ThermalOut out %ALIAS $1 flow,r %ALIAS $a1 lin @@ -19,10 +19,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.7 2001/07/03 22:59:10 gawthrop +% %% Fixed problems with argument passing for CRs +% %% % %% Revision 1.6 2001/06/13 17:10:26 gawthrop % %% Alias for the cr (ie ALIAS $1 lin) % %% % %% Revision 1.5 2001/06/11 19:51:08 gawthrop % %% Zapped spurious $1 alias @@ -48,9 +51,13 @@ % blank % Component type R r lin flow,r + +% Component type FP + fp1 + fp2 % Component type SS - [ThermalIn] SS external,external - [ThermalOut] SS external,external + [in] SS external,external + [out] SS external,external