Index: mttroot/mtt/bin/mtt
==================================================================
--- mttroot/mtt/bin/mtt
+++ mttroot/mtt/bin/mtt
@@ -13,10 +13,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Header$
 ## $Log$
+## Revision 1.298  2001/04/02 17:36:20  gawthrop
+## Resolved $sys name clash when using -s
+##
 ## Revision 1.297  2001/03/29 19:20:45  gawthrop
 ## Can now use c representations of crs when using -c option
 ##
 ## Revision 1.296  2001/03/27 01:07:34  geraint
 ## Improved determination of Octave version for ode2odes.exe creation.
@@ -1536,11 +1539,13 @@
       if [ "$n_found" = "1" ]; then
          echo Copying $2 from $comp_path to $destination
          cp $comp_path/*_*.* $destination
          exit 0
       elif [ "$n_found" = "0" ]; then
-         echo Component $2 not found - is MTT_COMPONENTS set correctly?
+	if [ "$quiet" != "quiet" ]; then    
+           echo Component $2 not found - is MTT_COMPONENTS set correctly?
+        fi
          exit 1
       elif [ "$n_found" > "1" ]; then
          echo "Multiple versions of $2 found (see below) - use a more explicit alias"
          mtt -q find $2
          exit 2
@@ -1853,11 +1858,11 @@
 ################################
 # This is the main mtt programme
 ################################
 
 
-echo Target is $target, Subsystem is $Subsystem, options are $mtt_switches
+#echo Target is $target, Subsystem is $Subsystem, options are $mtt_switches
 $MAKE -S $verbose  -f  -  $target << EOF
 
 # Cancel implicit rules I don't want
 %.dvi: %.tex
 
@@ -1898,11 +1903,11 @@
 ifeq ("$level","0")
 $1_abg.fig: $sys_abg.fig
 	abg2sensitivity_fig $sys_s
 else # Either find the sensitivity model or fetch the model and create sensitivity model
 $1_abg.fig:
-	mtt -q -u $mtt_switches compcopy $1 || abg2sensitivity_fig $sys
+	mtt -q -u $mtt_switches compcopy $1 || abg2sensitivity_fig $sys_s
 endif
 endif
 
 ifneq ("$sensitivity","sensitivity")
 ifneq ("$level","0")
@@ -2163,15 +2168,11 @@
 $1_numpar.c:  $1_numpar.txt $1_sympar.c
 	txt2c $1 numpar
 
 
 
-#SUMMARY input	numerical input declaration (m) 
-$1_input.m:  $1_input.txt $1_sympars.txt
-	mtt_txt2m $1 input
-
-#SUMMARY input	numerical input declaration (m) 
+#SUMMARY logic	logic input declaration (m) 
 $1_logic.m:  $1_logic.txt $1_switch.txt
 	mtt_txt2m $1 logic
 
 #SUMMARY state	state declaration  -- default (txt)
 #$1_state.txt: 
@@ -2503,14 +2504,19 @@
 $1_numpar.p : $1_def.r $1_numpar.m
 	mtt_m2p $1_numpar.m
 $1_state.p : $1_def.r $1_state.m
 	mtt_m2p $1_state.m
 
+#SUMMARY input	numerical input declaration (m) 
 ifeq ($stdin,stdin)
+$1_input.m : $1_def.r
+	make_stdin $1 m
 $1_input.p : $1_def.r
 	make_stdin $1 p
 else
+$1_input.m:  $1_input.txt $1_sympars.txt
+	mtt_txt2m $1 input
 $1_input.p : $1_def.r $1_input.m
 	mtt_m2p $1_input.m
 endif
 
 $1_ode.p : $1_def.r $1_ode.m

ADDED   mttroot/mtt/bin/trans/make_ssim
Index: mttroot/mtt/bin/trans/make_ssim
==================================================================
--- /dev/null
+++ mttroot/mtt/bin/trans/make_ssim
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+## Makes the sensitivity simulation
+## Copyright (C) 2001 by Peter J. Gawthrop
+
+sys=$1
+lang=$2
+
+outfile=${sys}_ssim.${lang}
+
+echo Creating $outfile
+make_m() {
+mtt_header ${sys} ssim m >  ${outfile}
+cat >> ${outfile} <<EOF
+
+  ## Pass input as a global
+  global MTT_input MTT_input_index MTT_input_last
+
+  [nx2,ny2] = ${sys}_def;
+  ny = ny2/2;
+  y_par = [];
+  MTT_input = u;
+  [MTT_input_last,m] = size(u);
+
+  for i=index
+    MTT_input_index = 0;
+    p = par;
+    p(i) = 1;
+    [mtt_data] = ${sys}_ode2odes(x0,p,simpar);
+    if (i==index(1))
+      y = mtt_data(:,2:1+ny);
+    endif
+    y_par = [y_par, mtt_data(:,2+ny:1+2*ny)];
+  endfor
+endfunction
+
+EOF
+
+}
+
+case ${lang} in
+    m)
+	make_m
+	;;
+    *)
+	echo Language ${lang} not supported - sorry
+esac

Index: mttroot/mtt/bin/trans/make_stdin
==================================================================
--- mttroot/mtt/bin/trans/make_stdin
+++ mttroot/mtt/bin/trans/make_stdin
@@ -4,24 +4,30 @@
      ##### Model Transformation Tools #####
      ######################################
 
 ## 	$Id$	
 
-# Copyright (C) 1999 by Peter J. Gawthrop
+# Copyright (C) 1999,2000 by Peter J. Gawthrop
 
 # Tell user
 Sys=$1
 lang=$2
 date=`date`
-Nu=`grep "MTTNu " <$Sys\_def.r | awk '{print $3}' | sed 's/;//'`
-echo  "Creating $1_input.$2 for standard input"
+outfile=$1_input.$2
+
+Nu=`mtt_getsize $Sys u` # Inputs 
+echo  "Creating $outfile for standard input"
 
-cat <<EOF > $1_input.$2 
+## Pascal code
+make_p()
+{
+cat <<EOF > $outfile
 PROCEDURE $1_input(VAR mttu : InputVector;
-                       mttt : REAL;
                        mttx : StateVector;
-                       mtty : OutputVector);
+                       mtty : OutputVector;
+                       mttt : REAL;
+                       par  : ParameterVector);
 
 {Created by MTT on $date for standard input to simulation}
 
 VAR t : REAL; Start:BOOLEAN;
 
@@ -39,5 +45,56 @@
   readln; {Next line}
 
 
 END{$1_input};
 EOF
+}
+
+make_m() {
+mtt_header $Sys input m stdin > $outfile
+cat >> $outfile <<EOF
+## The "standard input"
+global MTT_input MTT_input_index MTT_input_last
+  
+  MTT_input_index = min(++MTT_input_index,MTT_input_last);
+  mttu = MTT_input(MTT_input_index,:);
+## END Code
+endfunction
+EOF
+
+}
+
+
+make_cc() {
+cat > $outfile <<EOF
+#include "${Sys}_def.h"
+
+DEFUN_DLD (sidRC_input, args, ,
+"Usage: [mttu] = sidRC_input(mttx,mtty,mttt,mttpar)
+Octave input representation of system sidRC");
+
+{
+  static ColumnVector	u (MTTNU);
+  static Matrix mtt_input;
+  octave_value_list retval;
+  
+  mtt_input = octave_value (get_global_value ("MTT_input"));
+
+  retval (0)	= octave_value (mtt_input);
+  return (retval);
+}
+EOF
+}
+
+case $lang in
+    p)
+	make_p
+	;;
+    m)
+	make_m
+	;;
+    cc)
+	make_cc
+	;;
+    *)
+	echo language $lang not supported - sorry
+esac

Index: mttroot/mtt/bin/trans/mtt_header
==================================================================
--- mttroot/mtt/bin/trans/mtt_header
+++ mttroot/mtt/bin/trans/mtt_header
@@ -10,10 +10,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.30  2001/03/30 15:13:58  gawthrop
+## Rationalised simulation modes to each return mtt_data
+##
 ## Revision 1.29  2001/03/27 13:10:23  geraint
 ## Improved determination of Octave version.
 ##
 ## Revision 1.28  2001/02/17 03:48:17  geraint
 ## Use assignment LHS to gather tmp variable names.
@@ -123,13 +126,17 @@
 # Arguments
 system=$1
 rep=$2
 language=$3
 fun_name=${1}_${2}
-#args=$4
-#output=$5
-#extras=$6
+
+other=$4 # Anything else eg stdin
+
+if [ -z "$system" ]; then
+  echo 'Usage: mtt_header sys rep lang [stdin]'
+  exit
+fi
 
 # Find system constants
 Nx=`mtt_getsize $system x` # States
 Nxx=`mtt_getsize $system xx` # States x States
 Nu=`mtt_getsize $system u` # Inputs 
@@ -185,16 +192,22 @@
         output='mtta,mttb,mttc,mttd,mtte'
         args=mttpar
         zeromatrices='a b c d e';
 	;;
    input)
-	states=yes;
 	inputs=no;
-	parameters=yes;
         output=mttu
         args=$inputeqnargs
-        declareinputs=yes
+        if [ "$other" = "stdin" ]; then
+	  states=no;
+	  parameters=no;
+          declareinputs=no;
+        else
+	  states=yes;
+	  parameters=yes;
+          declareinputs=yes
+        fi
 	;;
     logic)
 	states=no;
 	inputs=no;
 	parameters=yes;
@@ -265,10 +278,17 @@
 	parameters=yes;
         output=mttx
         args=mttpar
         declarestates=yes
 	;;
+    ssim)
+	states=no;
+        inputs=no;
+	parameters=no;
+        output='y,y_par'
+        args='x0,par,simpar,u,index'
+	;;
     *)
 	echo Representation $rep not supported - sorry; exit 1
 esac
 
 ## Sort out parentheses
@@ -287,11 +307,13 @@
 	Rc='';
 	Lb='(';
 	Rb=')';
 	function="function"
 	declaration="$Output$1_$rep$Args;"
-	noglobals=true; # Fudge to make mtt_m2p work
+        if [ "$other" != "stdin" ]; then
+	  noglobals=true; # Fudge to make mtt_m2p work
+        fi     
         start='## BEGIN Code'
         finish='## END Code'
         var_declaration=
         declarestates=no
         declareinputs=no