Index: mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_input.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_input.txt +++ mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_input.txt @@ -4,17 +4,21 @@ # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% Version control history # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% $Id$ # %% $Log$ +# %% Revision 1.3 2000/05/18 11:30:14 peterg +# %% Moved switch logic to logic.txt +# %% # %% Revision 1.2 1998/10/01 19:20:33 peterg # %% Cahged switch function # %% # %% Revision 1.1 1998/07/25 18:35:02 peterg # %% Initial revision # %% # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # Set the inputs -mttu(1) = 9.81; +## Removed by MTT on Fri Oct 5 10:37:56 BST 2001: mttu(1) = 9.81; +bounce_gravity = 9.81; # Added by MTT on Fri Oct 05 10:37:59 BST 2001 Index: mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_lbl.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_lbl.txt +++ mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_lbl.txt @@ -5,10 +5,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.1 1997/09/11 09:54:22 peterg +% %% Initial revision +% %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Each line should be of one of the following forms: % a comment (ie starting with %) % Component-name CR_name arg1,arg2,..argn @@ -18,17 +21,17 @@ % Component type INTF intf % Component type CSW - ground lin state,k + ground lin state,k_g % Component type I ball_mass lin flow,m % Component type R air_resistance lin flow,r % Component type SS - gravity external internal - x external 0 + gravity SS external,internal + x SS external,0 Index: mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_numpar.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_numpar.txt +++ mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_numpar.txt @@ -4,11 +4,14 @@ # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% Version control history # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% $Id$ # %% $Log$ +# %% Revision 1.1 2000/12/28 17:45:24 peterg +# %% To RCS +# %% # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # Parameters -k = 100.0; # Ground stiffness +k_g = 100.0; # Ground stiffness m = 1.0; # Ball mass r = 1.0; # Air resistance Index: mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_rep.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_rep.txt +++ mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_rep.txt @@ -3,10 +3,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.1 2000/05/19 07:09:19 peterg +% %% Initial revision +% %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% mtt Bounce abg tex mtt Bounce struc tex mtt Bounce ode tex @@ -15,8 +18,8 @@ mtt Bounce simpar txt mtt Bounce input txt mtt Bounce logic txt mtt Bounce numpar txt -mtt -c Bounce odeso ps +mtt Bounce odeso ps mtt Bounce rep txt Index: mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_state.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_state.txt +++ mttroot/mtt/lib/examples/Hybrid/Bounce/Bounce_state.txt @@ -3,15 +3,21 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.2 1998/07/25 20:34:05 peterg +## *** empty log message *** +## ## Revision 1.1 1998/07/25 14:59:11 peterg ## Initial revision ## ############################################################### # Set the states -mttx(1) = 10.0; # 3 (Bounce_intf) -mttx(2) = 0.0; # MTT_SWITCH (Bounce_ground) -mttx(3) = 0.0; # ball_mass (Bounce) +## Removed by MTT on Fri Oct 5 10:38:29 BST 2001: mttx(1) = 10.0; # 3 (Bounce_intf) +## Removed by MTT on Fri Oct 5 10:38:29 BST 2001: mttx(2) = 0.0; # MTT_SWITCH (Bounce_ground) +## Removed by MTT on Fri Oct 5 10:38:29 BST 2001: mttx(3) = 0.0; # ball_mass (Bounce) +bounce_ball_mass = 0.0; # Added by MTT on Fri Oct 05 10:38:33 BST 2001 +bounce_ground_1_mtt_switch = 0.0; # Added by MTT on Fri Oct 05 10:38:33 BST 2001 +bounce_intf_1_mtt3 = 10.0; # Added by MTT on Fri Oct 05 10:38:33 BST 2001 Index: mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_lbl.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_lbl.txt +++ mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_lbl.txt @@ -1,18 +1,19 @@ %SUMMARY BouncingRod: Two-dimensional bouncing rod (hybrid) %DESCRIPTION A uniform rod bounces on a compliant surface -- the %DESCRIPTION CSW component is used. -#PAR pi - %% Label file for system BouncingRod (BouncingRod_lbl.txt) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.5 2000/12/04 08:36:23 peterg +% %% Declare pi +% %% % %% Revision 1.4 2000/05/18 10:30:39 peterg % %% New SS form % %% % %% Revision 1.3 1997/09/11 09:55:25 peterg % %% Added documentation Index: mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_numpar.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_numpar.txt +++ mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_numpar.txt @@ -4,10 +4,13 @@ # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% Version control history # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% $Id$ # %% $Log$ +# %% Revision 1.2 2000/12/28 17:45:59 peterg +# %% To RCS +# %% # %% Revision 1.1 1997/07/06 16:17:27 peterg # %% Initial revision # %% # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -15,10 +18,7 @@ epsilon = 0.01; l = 1.0; # Default value m = 1.0; # Default value j = l*l*m/3; -## Declare pi -pi = 3.142; - Index: mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_rep.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_rep.txt +++ mttroot/mtt/lib/examples/Hybrid/BouncingRod/BouncingRod_rep.txt @@ -3,10 +3,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.2 2000/12/28 17:45:59 peterg +% %% To RCS +% %% % %% Revision 1.1 1997/07/06 16:20:44 peterg % %% Initial revision % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14,9 +17,9 @@ mtt BouncingRod struc tex mtt BouncingRod ode tex mtt BouncingRod numpar txt mtt BouncingRod input txt mtt BouncingRod logic txt -mtt -c BouncingRod odeso ps +mtt BouncingRod odeso ps Index: mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_logic.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_logic.txt +++ mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_logic.txt @@ -4,13 +4,17 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.1 2000/05/19 07:11:36 peterg +## Initial revision +## ## Revision 1.1 2000/05/18 11:29:58 peterg ## Initial revision ## ############################################################### # Set the switches -clutch_drive_clutch= (t>=5)&&(t<15); +## Removed by MTT on Fri Oct 5 11:47:34 BST 2001: clutch_drive_clutch= (t>=5)&&(t<15); +clutch_drive_1_clutch_1_mtt_switch_logic = (t>=5)&&(t<15); # Added by MTT on Fri Oct 05 11:47:40 BST 2001 Index: mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_rep.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_rep.txt +++ mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_rep.txt @@ -3,10 +3,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.2 2000/05/19 07:16:07 peterg +% %% Added logic +% %% % %% Revision 1.1 1999/02/21 08:18:25 peterg % %% Initial revision % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -18,8 +21,8 @@ mtt Clutch simpar txt mtt Clutch input txt mtt Clutch logic txt mtt Clutch numpar txt -mtt -c Clutch odeso ps +mtt Clutch odeso ps mtt Clutch rep txt Index: mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_simpar.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_simpar.txt +++ mttroot/mtt/lib/examples/Hybrid/Clutch/Clutch_simpar.txt @@ -3,11 +3,14 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.1 1999/12/21 09:13:19 peterg +## Initial revision +## ############################################################### LAST=20.0; -DT=0.01; -STEPFACTOR=10; +DT=0.1; +STEPFACTOR=1; Index: mttroot/mtt/lib/examples/Hybrid/Weirs/Weir_lbl.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Weirs/Weir_lbl.txt +++ mttroot/mtt/lib/examples/Hybrid/Weirs/Weir_lbl.txt @@ -1,44 +1,54 @@ -%SUMMARY Weir: Tank with weirs (hybrid) -%DESCRIPTION Each weir is modeled by two {\bf ISW} components: -%DESCRIPTION one for flow left-right -%DESCRIPTION one for flow right-left. -%DESCRIPTION The switching is such that they become non-return valves -%DESCRIPTION when the left hand (respectively right-hand) level reaches -%DESCRIPTION an appropriate value -%% Label file for system Weir (Weir_lbl.txt) - -% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% %% Version control history -% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% %% $Id$ -% %% $Log$ -% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%% Each line should be of one of the following forms: -% a comment (ie starting with %) -% Component-name CR_name arg1,arg2,..argn -% blank - - - -% Component type C - tank1 lin effort,c_1 - tank2 lin effort,c_2 - tank3 lin effort,c_3 - -% Component type ISW - weir1L lin flow,epsilon - weir1R lin flow,epsilon - weir2L lin flow,epsilon - weir2R lin flow,epsilon - -% Component type R - leak lin flow,r_l - -% Component type SS - f internal external - - p1 external 0 - p2 external 0 - p3 external 0 +#SUMMARY Weir +#DESCRIPTION Detailed description here + +## System Weir, representation lbl, language txt +## File Weir_lbl.txt +## Generated by MTT on Fri Oct 5 10:50:46 BST 2001 + + ###################################### + ##### Model Transformation Tools ##### + ###################################### + + ############################################################### + ## Version control history + ############################################################### + ## $Id$ + ## $Log$ + ## Revision 1.2 2001/07/03 22:59:10 gawthrop + ## Fixed problems with argument passing for CRs + ## + ############################################################### + +## Port aliases +#ALIAS in in +#ALIAS out out + +## Argument aliases +#ALIAS $1 i_s +#ALIAS $2 r + +## Each line should be of one of the following forms: +## a comment (ie starting with #) +## component-name cr_name arg1,arg2,..argn +## blank + +## ---- Component labels ---- + +## Component type ISW + isw lin flow,i_s + +## Component type R + r lin flow,r + +## Component type R + [in] SS external,external + [out] SS external,external + + + + + + + + Index: mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_input.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_input.txt +++ mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_input.txt @@ -4,12 +4,18 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.1 2000/05/19 07:12:04 peterg +## Initial revision +## ############################################################### # Set the inputs -mttu(1) = 1.0*(t<10); # f (Weirs) +## Removed by MTT on Fri Oct 5 10:47:20 BST 2001: mttu(1) = 1.0*(t<10); # f (Weirs) + + +weirs_f = 1.0*(t<10); # Added by MTT on Fri Oct 05 10:48:01 BST 2001 Index: mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_lbl.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_lbl.txt +++ mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_lbl.txt @@ -5,10 +5,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.1 1999/03/09 00:12:12 peterg +% %% Initial revision +% %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Port aliases @@ -38,7 +41,7 @@ p1 SS external,0 p2 SS external,0 p3 SS external,0 % Component type Weir - w1 - w2 + w1 none epsilon_i;epsilon_r + w2 none epsilon_i;epsilon_r Index: mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_logic.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_logic.txt +++ mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_logic.txt @@ -4,14 +4,19 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.1 2000/05/19 07:13:29 peterg +## Initial revision +## ## Revision 1.1 2000/05/18 11:29:58 peterg ## Initial revision ## ############################################################### # Set the switches -weirs_w1_isw = (mttx(1)>1)|(mttx(2)>1); # First weir - height 1 -weirs_w2_isw = (mttx(2)>2)|(mttx(3)>2); # Second weir - height 2 +## Removed by MTT on Fri Oct 5 11:28:40 BST 2001: weirs_w1_isw = (mttx(1)>1)|(mttx(2)>1); # First weir - height 1 +## Removed by MTT on Fri Oct 5 11:28:40 BST 2001: weirs_w2_isw = (mttx(2)>2)|(mttx(3)>2); # Second weir - height 2 +weirs_w1_1_isw_1_mtt_switch_logic = (mttx(1)>1)|(mttx(2)>1); # First weir - height 1 +weirs_w2_1_isw_1_mtt_switch_logic = (mttx(2)>2)|(mttx(3)>2); # Second weir - height 2 Index: mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_rep.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_rep.txt +++ mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_rep.txt @@ -5,10 +5,13 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.5 2000/05/19 07:15:04 peterg +## Added logic +## ## Revision 1.4 1999/12/21 09:24:26 peterg ## Euler integration - compiled ## ## Revision 1.3 1999/03/02 22:19:22 peterg ## Added switch rep @@ -36,8 +39,8 @@ ## mtt Weirs lmfr ps # log modulus of frequency response (of linearised system) mtt Weirs simpar tex # Simulation parameters mtt Weirs numpar tex # Numerical simulation parameters mtt Weirs input tex # Simulation input mtt Weirs logic tex # Switch logic -mtt -c Weirs odeso ps # Simulation output +mtt Weirs odeso ps # Simulation output mtt Weirs rep txt Index: mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_simpar.txt ================================================================== --- mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_simpar.txt +++ mttroot/mtt/lib/examples/Hybrid/Weirs/Weirs_simpar.txt @@ -3,12 +3,14 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.1 1999/12/21 09:22:43 peterg +## Initial revision +## ############################################################### -LAST=20; +LAST=19.9; DT=0.01; -STEPFACTOR=100; - +STEPFACTOR=1;