Overview
Comment: | Resolved clashes -- marked with ## >>> |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | origin/master | trunk |
Files: | files | file ages | folders |
SHA3-256: |
586aea5bdc2070a0ef8a2b15bc292ca7 |
User & Date: | gawthrop@users.sourceforge.net on 2001-07-24 00:55:17 |
Other Links: | branch diff | manifest | tags |
Context
2001-07-24
| ||
04:16:25 | Added to distribution -- needed for xmtt check-in: 173fa672d4 user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
00:55:17 | Resolved clashes -- marked with ## >>> check-in: 586aea5bdc user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
2001-07-23
| ||
23:43:15 | header only version does not need to compute sizes from _def.r check-in: 30623ff1dd user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
Changes
Modified mttroot/mtt/bin/mtt from [75b39eb50d] to [f353e0a206].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | # Copyright (C) 2001 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## Revision 1.315 2001/07/13 04:54:04 geraint ## Branch merge: numerical-algebraic-solution back to main. ## ## Revision 1.314 2001/07/13 04:19:03 gawthrop ## Now loads _subs.r with _cr.r file when using -cr option ## ## Revision 1.313 2001/06/13 14:53:59 gawthrop | > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | # Copyright (C) 2001 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## Revision 1.316 2001/07/22 19:24:03 geraint ## Multiple '-v' increases verbosity. ## ## Revision 1.315 2001/07/13 04:54:04 geraint ## Branch merge: numerical-algebraic-solution back to main. ## ## Revision 1.314 2001/07/13 04:19:03 gawthrop ## Now loads _subs.r with _cr.r file when using -cr option ## ## Revision 1.313 2001/06/13 14:53:59 gawthrop |
︙ | ︙ | |||
1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 | if [ $verbosity -ge 3 ]; then verbose_make=' -d '; fi; ;; -I ) mtt_switches="$mtt_switches $1"; info_switch='-I' ;; -t ) tidy=tidy ;; -T ) tidy=tidy; verytidy=verytidy ;; -u ) tidy=untidy ; mtt_switches="$mtt_switches $1"; ;; | > > > | 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 | if [ $verbosity -ge 3 ]; then verbose_make=' -d '; fi; ;; -I ) mtt_switches="$mtt_switches $1"; info_switch='-I' ;; -t ) tidy=tidy ;; -trace ) mtt_switches="$mtt_switches $1"; trace='-n' ;; -T ) tidy=tidy; verytidy=verytidy ;; -u ) tidy=untidy ; mtt_switches="$mtt_switches $1"; ;; |
︙ | ︙ | |||
1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 | echo ' -pdf generate pdf in place of ps' echo ' -r reset time stamp on representation' echo ' -s generate sensitivity BG (use mtt -s sSys rep lang)' echo ' -ss use steady-state info to initialise simulations' echo ' -stdin read input data from standard input for simulations' echo ' -sub <subsystem> operate on this subsystem' echo ' -t tidy mode (default)' echo ' -u untidy mode (leaves files in current dir)' echo ' -v verbose mode (multiple uses of -v increase the verbosity level)' echo ' -viewlevel <N> View N levels of hierachy' echo ' --version print version and exit' echo ' --versions print version of mtt and components and exit' exit fi | > | 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 | echo ' -pdf generate pdf in place of ps' echo ' -r reset time stamp on representation' echo ' -s generate sensitivity BG (use mtt -s sSys rep lang)' echo ' -ss use steady-state info to initialise simulations' echo ' -stdin read input data from standard input for simulations' echo ' -sub <subsystem> operate on this subsystem' echo ' -t tidy mode (default)' echo ' -trace Just indicate what mtt will do - but do not do it' echo ' -u untidy mode (leaves files in current dir)' echo ' -v verbose mode (multiple uses of -v increase the verbosity level)' echo ' -viewlevel <N> View N levels of hierachy' echo ' --version print version and exit' echo ' --versions print version of mtt and components and exit' exit fi |
︙ | ︙ | |||
1973 1974 1975 1976 1977 1978 1979 | *) define_octave_dev="-DOCTAVE_DEV";; esac ################################ # This is the main mtt programme ################################ | < > > > | > > | 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 | *) define_octave_dev="-DOCTAVE_DEV";; esac ################################ # This is the main mtt programme ################################ #echo Target is $target, Subsystem is $Subsystem, options are $mtt_switches ##<<<<<<< mtt ##$MAKE -S ${trace} ${verbose} -f - ${target} << EOF ##======= ##$MAKE -S $verbose $verbose_make -f - $target << EOF ##>>>>>>> 1.316 $MAKE -S ${trace} $verbose $verbose_make -f - $target << EOF # Cancel implicit rules I don't want %.dvi: %.tex # MTT implicit rules ## .oct files $1_%.oct: $1_%.cc $1_def.h $1_sympar.h $1_cr.h |
︙ | ︙ | |||
2067 2068 2069 2070 2071 2072 2073 | $1_modpar.r: $1_modpar.txt $1_struc.txt modpar_txt2r $1 #SUMMARY alias name aliases for each subsystem (m) $1_alias.m: $1_alias.txt alias_txt2m $1 | | | | | | | | 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 | $1_modpar.r: $1_modpar.txt $1_struc.txt modpar_txt2r $1 #SUMMARY alias name aliases for each subsystem (m) $1_alias.m: $1_alias.txt alias_txt2m $1 ##SUMMARY icd interface definition for system (c) ##SUMMARY icd interface definition for system (cc) ##SUMMARY icd interface definition for system (m) ##SUMMARY icd interface definition for system (txt) $1_ICD.c: $1_ICD.txt ICD_txt2lang.sh $1 c $1_ICD.cc: $1_ICD.txt ICD_txt2lang.sh $1 cc $1_ICD.m: $1_ICD.txt ICD_txt2lang.sh $1 m $1_ICD.txt: $1_icd.txt2 icd2ICD_txt22txt.sh $1 $1_icd.txt2: $1_ese.r touch $1_icd.txt2 #SUMMARY icd interface definitions for each subsystem (m) $1_icd.m: $1_icd.txt icd_txt2m.sh $1 #SUMMARY icd interface definitions for each subsystem (txt) $1_icd.txt: $1_lbl.txt lbl2icd_txt2txt.sh $1 #SUMMARY cr constitutive relationship for each subsystem (txt) $1_cr.txt: $1_abg.m $1_sub.sh abg2cr_m2txt $1 |
︙ | ︙ | |||
2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 | mtt_update $1 logic update else mtt_update $1 logic endif # Dummy target FORCE: $1_ode2odes_common.m : $1_ae.m $1_input.m $1_logic.m $1_numpar.m $1_simpar.m $1_state.m @echo > /dev/null $1_ode2odes_common.cc : $1_ae.cc $1_input.cc $1_logic.cc $1_numpar.cc $1_simpar.cc $1_state.cc @echo > /dev/null $1_ode2odes_common.o : $1_ae.o $1_input.o $1_logic.o $1_numpar.o $1_simpar.o $1_state.o @echo "Creating $1_ode2odes_common.o" ar -cr \$@ \$^ $1_ode2odes_common.oct : $1_ae.oct $1_input.oct $1_logic.oct $1_numpar.oct $1_simpar.oct $1_state.oct @echo > /dev/null | > > > > > > | 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 | mtt_update $1 logic update else mtt_update $1 logic endif # Dummy target FORCE: ##$1_ode2odes_common.m : $1_input.m $1_logic.m $1_numpar.m $1_simpar.m $1_state.m ## @echo > /dev/null ##<<<<<<< mtt ##$1_ode2odes_common.cc : $1_input.cc $1_logic.cc $1_numpar.cc $1_simpar.cc $1_state.cc ##======= $1_ode2odes_common.m : $1_ae.m $1_input.m $1_logic.m $1_numpar.m $1_simpar.m $1_state.m @echo > /dev/null $1_ode2odes_common.cc : $1_ae.cc $1_input.cc $1_logic.cc $1_numpar.cc $1_simpar.cc $1_state.cc ##>>>>>>> 1.316 @echo > /dev/null $1_ode2odes_common.o : $1_ae.o $1_input.o $1_logic.o $1_numpar.o $1_simpar.o $1_state.o @echo "Creating $1_ode2odes_common.o" ar -cr \$@ \$^ $1_ode2odes_common.oct : $1_ae.oct $1_input.oct $1_logic.oct $1_numpar.oct $1_simpar.oct $1_state.oct @echo > /dev/null |
︙ | ︙ | |||
2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 | #SUMMARY cbg* causal bond graph (m) #Acausal bond graph to causal bond graph: mfile $1_cbg.m: $1_abg.m abg2cbg_m $info_switch $causality_switch $1 $1_type.sh: $1_cbg.m #SUMMARY cbg* causal bond graph (fig) #SUMMARY cbg* causal bond graph (ps) #SUMMARY cbg* causal bond graph (view) #Causal bond graph: mfile to fig conversion $1_cbg.fig: $1_cbg.m $1_fig.fig $1_type.sh sh $1_type.sh 'echo cbg_m2fig ' ' ' ' ' | sh | > | 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 | #SUMMARY cbg* causal bond graph (m) #Acausal bond graph to causal bond graph: mfile $1_cbg.m: $1_abg.m abg2cbg_m $info_switch $causality_switch $1 $1_type.sh: $1_cbg.m touch $1_type.sh #SUMMARY cbg* causal bond graph (fig) #SUMMARY cbg* causal bond graph (ps) #SUMMARY cbg* causal bond graph (view) #Causal bond graph: mfile to fig conversion $1_cbg.fig: $1_cbg.m $1_fig.fig $1_type.sh sh $1_type.sh 'echo cbg_m2fig ' ' ' ' ' | sh |
︙ | ︙ | |||
2859 2860 2861 2862 2863 2864 2865 | #SUMMARY smxtx Sparse computation of ATx (m) $1_smx.r: $1_def.r $1_def.m $1_ode.r $1_subs.r ode2smx_lang $1 r; tidy $1_smx.r $1_smx.m: $1_def.r $1_def.m $1_cse.r $1_sympars.txt $1_subs.r cse2smx_lang $fixcc $optimise -parameters $1 smx m | | | 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 | #SUMMARY smxtx Sparse computation of ATx (m) $1_smx.r: $1_def.r $1_def.m $1_ode.r $1_subs.r ode2smx_lang $1 r; tidy $1_smx.r $1_smx.m: $1_def.r $1_def.m $1_cse.r $1_sympars.txt $1_subs.r cse2smx_lang $fixcc $optimise -parameters $1 smx m $1_smxa.m: $1_def.r $1_def.m $1_cse.r $1_sympars.txt $1_subs.r cse2smx_lang $fixcc $optimise -parameters $matrix_smxa $1 smxa m $1_smxax.m: $1_def.r $1_def.m $1_cse.r $1_sympars.txt $1_subs.r cse2smx_lang $fixcc $optimise -parameters $1 smxax m #SUMMARY smc controller form state matrices etc. - siso only (r) #SUMMARY smc controller form state matrices etc. - siso only (tex) |
︙ | ︙ |