Index: mttroot/mtt/bin/trans/mtt_units.sh ================================================================== --- mttroot/mtt/bin/trans/mtt_units.sh +++ mttroot/mtt/bin/trans/mtt_units.sh @@ -20,11 +20,11 @@ base_effort='newton' base_flow='m/s' ;; rotational) base_effort='newton*m' - base_flow='rad/s' + base_flow='radians/s' ;; fluid) base_effort='Pa' base_flow='m^3/s' ;; Index: mttroot/mtt/lib/comp/compound/Electromechanical/DC/DC_lbl.txt ================================================================== --- mttroot/mtt/lib/comp/compound/Electromechanical/DC/DC_lbl.txt +++ mttroot/mtt/lib/comp/compound/Electromechanical/DC/DC_lbl.txt @@ -4,11 +4,11 @@ %ALIAS in Electrical %ALIAS out Mechanical %% Unit definition %UNITS Electrical electrical volt amp -%UNITS Mechanical rotational N*m rad/s +%UNITS Mechanical rotational N*m radians/s %ALIAS $1 k_m %ALIAS $2 l_a %ALIAS $3 r_a %ALIAS $4 j_m @@ -20,10 +20,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.6 2000/11/16 09:45:51 peterg +% %% Added unit definitions +% %% % %% Revision 1.5 1998/07/26 12:49:24 peterg % %% Corrected some errors % %% % %% Revision 1.4 1998/07/26 12:45:33 peterg % %% Added ports Index: mttroot/mtt/lib/examples/Electromechanical/MotorGenerator/MotorGenerator_desc.tex ================================================================== --- mttroot/mtt/lib/examples/Electromechanical/MotorGenerator/MotorGenerator_desc.tex +++ mttroot/mtt/lib/examples/Electromechanical/MotorGenerator/MotorGenerator_desc.tex @@ -5,10 +5,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.1 2000/12/28 17:43:16 peterg +% %% To RCS +% %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% The acausal bond graph of system \textbf{MotorGenerator} is displayed in Figure \Ref{fig:MotorGenerator_abg.ps} and its label file is listed in Section \Ref{sec:MotorGenerator_lbl}. @@ -102,13 +105,13 @@ ... INFORMATION: Component MotorGenerator connects ports with units volt and volt INFORMATION: Component MotorGenerator connects ports with units amp and amp ... INFORMATION: Component MotorGenerator connects ports with units N*m and N*m -INFORMATION: Component MotorGenerator connects ports with units rad/s and rad/s +INFORMATION: Component MotorGenerator connects ports with units radians/s and radians/s ... INFORMATION: Component MotorGenerator connects ports with units N*m and N*m -INFORMATION: Component MotorGenerator connects ports with units rad/s and rad/s +INFORMATION: Component MotorGenerator connects ports with units radians/s and radians/s Creating MotorGenerator_aliased.txt Copying MotorGenerator_ese.r \end{verbatim} Index: mttroot/mtt/lib/examples/Electromechanical/MotorGenerator/Shaft_lbl.txt ================================================================== --- mttroot/mtt/lib/examples/Electromechanical/MotorGenerator/Shaft_lbl.txt +++ mttroot/mtt/lib/examples/Electromechanical/MotorGenerator/Shaft_lbl.txt @@ -5,19 +5,22 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.1 2000/12/28 17:43:16 peterg +% %% To RCS +% %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Port aliases % Unit definitions -%UNITS in rotational N*m rad/s -%UNITS out rotational N*m rad/s +%UNITS in rotational N*m radians/s +%UNITS out rotational N*m radians/s % Argument aliases %ALIAS $1 c_s %% Each line should be of one of the following forms: