Index: mttroot/mtt/bin/trans/ode2odes_m ================================================================== --- mttroot/mtt/bin/trans/ode2odes_m +++ mttroot/mtt/bin/trans/ode2odes_m @@ -13,10 +13,13 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.16 1998/06/25 08:47:23 peterg +## Put correct arguments for _input -- (x,t) +## ## Revision 1.15 1998/05/21 16:20:27 peterg ## Modified to include explicit algebraic loop solution ## ## Revision 1.14 1998/05/19 19:48:02 peterg ## Read the simpar file now. @@ -81,17 +84,18 @@ #fi # PARAMS="$PARAMS ;" -$MATRIX << EOF > ode2odes_m.log 2>mtt_error.txt +$MATRIX --verbose << EOF > ode2odes_m.log 2>mtt_error.txt + %System structure [nx,ny,nu,nz,nyz] = $1_def; %Read in parameters $1_numpar; - + %Read in state x = $1_state; %Set the initial output %if ny>0 @@ -131,10 +135,11 @@ if nx>0 if strcmp(method,'lsode') X = lsode('$1_ode', x, T); elseif strcmp(method,'euler') %Euler integration + disp("Euler") X=[]; dt = (T(2)-T(1))/STEPFACTOR; for t=T' X = [X; xx']; ts = t; @@ -195,12 +200,12 @@ end; if ny>0 % compute y and print it i = 0; Y=[]; for t=T' - i = i+1, X(i,:) - y = $1_odeo(X(i,:),t); + i = i+1; X(i,:); + y = $1_odeo(X(i,:)',t); Y = [Y; y']; end; write_matrix([T,Y], '$1_odeso'); end;