Index: mttroot/mtt/bin/trans/mtt_m2p ================================================================== --- mttroot/mtt/bin/trans/mtt_m2p +++ mttroot/mtt/bin/trans/mtt_m2p @@ -13,10 +13,13 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.54 2000/09/30 14:10:06 peterg +## Zap lines containing "Remove in mtt_m2p" +## ## Revision 1.53 2000/08/24 17:10:59 peterg ## New dummy variables mtt_o (for optimisation), mtt_s (for segmentation) ## ## Revision 1.52 2000/08/24 08:30:45 peterg ## *** empty log message *** @@ -250,12 +253,12 @@ echo " mttx : StateVector;" echo " mttu : InputVector;" echo " mttt : REAL;" echo " mttpar : ParameterVector);" ;; - cse) - echo "PROCEDURE $Sys_rep(VAR mttdx: StateVector;" + csex) + echo "PROCEDURE $Sys_rep(VAR mttedx: StateVector;" echo " mttx : StateVector;" echo " mttu : InputVector;" echo " mttt : REAL;" echo " mttpar : ParameterVector);" ;; @@ -316,22 +319,24 @@ echo "" echo "VAR" echo " simpar : SimulationParameters;" echo " t,ddt : REAL;" echo " x,dx,AAx : StateVector;" - echo " u : InputVector;" - echo " y : OutputVector;" + echo " mttx,mttdx,mttAAx,mttedx : StateVector;" + echo " u,mttu : InputVector;" + echo " y,mtty : OutputVector;" echo " par : ParameterVector;" echo " mttpar : ParameterVector;" echo " mttnpar : INTEGER;" - echo " AA : StateMatrix;" + echo " AA,mtte : StateMatrix;" echo " MTTi,MTTj,it,iLast: INTEGER;" ##echo " mttSTEPFACTOR,mttWSTEPS,mttSTEPS,mttINPUT : INTEGER;" ## echo " mttMETHOD : IntegrationMethod;" echo " open_switches : StateVector;" echo " numparfile, statefile, simparfile : TEXT;" echo "" + sympar_txt2declare $Sys p ;; switchopen) echo "PROCEDURE $Sys_rep(VAR open : StateVector; mttx : StateVector);" echo "VAR" echo " MTTi,MTTj : INTEGER;" @@ -394,12 +399,12 @@ } BEGIN{ comment_regexp = "{" doing_header = 0 doing_globals = 0 - No = 500; - Ns = 10; + No = 1; + Ns = 1; inc ="$I" } { if ($1=="global") doing_globals = 1 @@ -435,11 +440,11 @@ if (Method=="euler") { printf("{%s %s_ode.p}\n",inc,Sys) printf("{%s %s_odeo.p}\n",inc,Sys) } if (Method=="implicit") { - printf("{%s %s_cse.p}\n",inc,Sys) + printf("{%s %s_csex.p}\n",inc,Sys) printf("{%s %s_cseo.p}\n",inc,Sys) printf("\n{%s %s_smxa.p}\n",inc,Sys); printf("\n{%s %s_smxax.p}\n",inc,Sys); } printf("{%s %s_switchopen.p}\n\n",inc,Sys) @@ -455,13 +460,13 @@ for (k=1;k<=j;k++) printf("%s\n", comment[k]) printf("\n") printf("VAR \n"); for (k=1;k