Overview
| Comment: | Now loads _subs.r with _cr.r file when using -cr option |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | origin/master | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
62c331227c5fec1a500380fc71eea7f2 |
| User & Date: | gawthrop@users.sourceforge.net on 2001-07-13 04:19:03 |
| Other Links: | branch diff | manifest | tags |
Context
|
2001-07-13
| ||
| 04:54:06 | Branch merge: numerical-algebraic-solution back to main. check-in: 31c33491a9 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
| 04:19:03 | Now loads _subs.r with _cr.r file when using -cr option check-in: 62c331227c user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
| 03:40:01 |
New sensitivity components (lbl does not auto-generate properly check-in: 42898762fe user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
Changes
Modified mttroot/mtt/bin/mtt from [87f3f3beff] to [6369d2b780].
| ︙ | ︙ | |||
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.312 2001/06/11 19:43:49 gawthrop ## MTT is now much more sophisticated in generating lbl files ## Labels can contain maths ## Repetative components are now broken ## ## Revision 1.311 2001/05/26 18:36:43 gawthrop ## Further modifications. Now works on rcPPP | > > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | # Copyright (C) 2001 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## Revision 1.313 2001/06/13 14:53:59 gawthrop ## MTT now gas the double-colon option in the abg.fig file ## eg R:r:a^2+3*b ## ## Revision 1.312 2001/06/11 19:43:49 gawthrop ## MTT is now much more sophisticated in generating lbl files ## Labels can contain maths ## Repetative components are now broken ## ## Revision 1.311 2001/05/26 18:36:43 gawthrop ## Further modifications. Now works on rcPPP |
| ︙ | ︙ | |||
1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 |
matrix_smxa="-matrix";
computation=c ;;
-cc )
fixcc='-fixcc'
mtt_switches="$mtt_switches $1";
matrix_smxa="-matrix";
computation=cc ;;
-o )
mtt_switches="$mtt_switches $1";
dae_is_ode=1 ;;
-nocr )
mtt_switches="$mtt_switches $1";
rdae_is_dae=1 ;;
-i )
| > > > > | 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 |
matrix_smxa="-matrix";
computation=c ;;
-cc )
fixcc='-fixcc'
mtt_switches="$mtt_switches $1";
matrix_smxa="-matrix";
computation=cc ;;
-cr )
mtt_switches="$mtt_switches $1";
rdae_is_dae=1 ;
cr_first='-cr';;
-o )
mtt_switches="$mtt_switches $1";
dae_is_ode=1 ;;
-nocr )
mtt_switches="$mtt_switches $1";
rdae_is_dae=1 ;;
-i )
|
| ︙ | ︙ | |||
1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 |
mtt_switches="$mtt_switches rk4";
;;
*)
echo $1 is an unknown integration method - use euler, rk4 or implicit;
exit;;
esac;;
-s )
mtt_switches="$mtt_switches $1";
sensitivity=sensitivity ;;
-ss )
mtt_switches="$mtt_switches $1";
steadystate_computation=yes ;;
-d )
directory=$2; cd $directory; shift ;;
| > | 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 |
mtt_switches="$mtt_switches rk4";
;;
*)
echo $1 is an unknown integration method - use euler, rk4 or implicit;
exit;;
esac;;
-s )
sensitivity_switch='-s';
mtt_switches="$mtt_switches $1";
sensitivity=sensitivity ;;
-ss )
mtt_switches="$mtt_switches $1";
steadystate_computation=yes ;;
-d )
directory=$2; cd $directory; shift ;;
|
| ︙ | ︙ | |||
1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 |
echo ' mtt <system_name> <representation> <language> <parameters>'
echo 'Options: -q quiet mode -- suppress MTT banner'
echo ' -A solve algebraic equations symbolically'
echo ' -D debug -- leave log files etc'
echo ' -I prints more information'
echo ' -abg start at abg.m representation'
echo ' -c c-code generation'
echo ' -d <dir> use directory <dir>'
echo ' -dc Maximise derivative (not integral) causality'
echo ' -dc Maximise derivative (not integral) causality'
echo ' -i <implicit|euler|rk4> Use implicit, euler or rk4 integration'
echo ' -o ode is same as dae'
echo ' -oct use oct files in place of m files where appropriate'
echo ' -opt optimise code generation'
| > | 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 |
echo ' mtt <system_name> <representation> <language> <parameters>'
echo 'Options: -q quiet mode -- suppress MTT banner'
echo ' -A solve algebraic equations symbolically'
echo ' -D debug -- leave log files etc'
echo ' -I prints more information'
echo ' -abg start at abg.m representation'
echo ' -c c-code generation'
echo ' -cr Use cr before resolving equations'
echo ' -d <dir> use directory <dir>'
echo ' -dc Maximise derivative (not integral) causality'
echo ' -dc Maximise derivative (not integral) causality'
echo ' -i <implicit|euler|rk4> Use implicit, euler or rk4 integration'
echo ' -o ode is same as dae'
echo ' -oct use oct files in place of m files where appropriate'
echo ' -opt optimise code generation'
|
| ︙ | ︙ | |||
2397 2398 2399 2400 2401 2402 2403 | #SUMMARY dae differential-algebraic equations (r) #SUMMARY dae* differential-algebraic equations (m) #SUMMARY dae differential-algebraic equations (tex) #SUMMARY dae* differential-algebraic equations (view) #SUMMARY dae differential-algebraic equations (ps) #Differential-algebraic equations | | | | 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 |
#SUMMARY dae differential-algebraic equations (r)
#SUMMARY dae* differential-algebraic equations (m)
#SUMMARY dae differential-algebraic equations (tex)
#SUMMARY dae* differential-algebraic equations (view)
#SUMMARY dae differential-algebraic equations (ps)
#Differential-algebraic equations
${sys}_rdae.r: ${sys}_ese.r ${sys}_def.r $1_modpar.r ${Subsystem}_cr.r ${Subsystem}_subs.r
ifneq ($partition,)
echo Doing subsystems
mtt_make_subsystems ${sys} rdae r
endif
mtt_prepend.sh -p $1_modpar.r $1_ese.r # Add modulated parameters to start
ese2rdae_r ${cr_first} ${Subsystem}; tidy ${Subsystem}_rdae.r
${sys}_dae.r: ${Subsystem}_rdae.r ${Subsystem}_def.r ${Subsystem}_subs.r ${Subsystem}_cr.r
ifneq ($partition,)
echo Doing subsystems
mtt_make_subsystems ${sys} dae r
endif
ifeq ($rdae_is_dae,1)
|
| ︙ | ︙ | |||
3186 3187 3188 3189 3190 3191 3192 | rep_txt2sh $1 "$mtt_switches"; touch $1_reps_made $1_rep.tex: $1_rep.txt $1_reps_made rep_txt2tex $1 "$documenttype" "$directory"; #SUMMARY abg Acausal bond graph report (tex) $1_abg.tex: $1_sub.sh | | | 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 |
rep_txt2sh $1 "$mtt_switches"; touch $1_reps_made
$1_rep.tex: $1_rep.txt $1_reps_made
rep_txt2tex $1 "$documenttype" "$directory";
#SUMMARY abg Acausal bond graph report (tex)
$1_abg.tex: $1_sub.sh
abg2tex $pdf ${sensitivity_switch} $1
#SUMMARY tf Transfer function (mml)
$1_$2.mml: $1_$2.r
mtt_r2mml $1 $2
# Version control system - uses RCS
|
| ︙ | ︙ |