Changes In Branch origin/merging-ode2odes-exe Through [247243a401] Excluding Merge-Ins
This is equivalent to a diff from 74c9df0d75 to 247243a401
2001-03-19
| ||
02:28:53 | Branch merge: merging-ode2odes-exe back to MAIN. check-in: 62ceda890f user: geraint@users.sourceforge.net tags: origin/master, trunk | |
00:29:08 |
Parse switches (-A) before calling def2write_r. Update $1_def.* instead of removing. check-in: d1ee2bdeb3 user: geraint@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk | |
2001-03-17
| ||
09:51:07 | Implemented Runge-Kutta IV fixed-step method (-i rk4). check-in: 247243a401 user: geraint@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk | |
2001-03-16
| ||
03:56:54 | Convert variable names to lower case. check-in: 2dfeaa8a10 user: geraint@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk | |
2001-02-19
| ||
06:33:20 | Created branch merging-ode2odes-exe check-in: ce97158db9 user: gawthrop@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk | |
06:33:19 | Removed operation form loop. check-in: 74c9df0d75 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
06:32:02 | Octave path change, remove libblas check-in: cdf1d3ec4d user: geraint@users.sourceforge.net tags: origin/master, trunk | |
Deleted CVSROOT/checkoutlist version [3854d49239].
| - - - - - - - - - - - - - |
|
Deleted CVSROOT/commitinfo version [85654ac9a8].
| - - - - - - - - - - - - - - - |
|
Deleted CVSROOT/config version [28e7a42550].
| - - - - - - - - - - - |
|
Deleted CVSROOT/cvswrappers version [9d41597c29].
| - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted CVSROOT/editinfo version [dfa5fb459c].
| - - - - - - - - - - - - - - - - - - - - - |
|
Deleted CVSROOT/loginfo version [4503d4cd47].
| - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted CVSROOT/modules version [84b74e5335].
| - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted CVSROOT/notify version [2a5259e3c5].
| - - - - - - - - - - - - |
|
Deleted CVSROOT/rcsinfo version [c276b88ba1].
| - - - - - - - - - - - - - |
|
Deleted CVSROOT/taginfo version [364dad5373].
| - - - - - - - - - - - - - - - - - - - - |
|
Deleted CVSROOT/verifymsg version [cbc796537d].
| - - - - - - - - - - - - - - - - - - - - - |
|
Modified mttroot/mtt/bin/mtt from [7a138278c5] to [c2edfed68a].
︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | + + + + + + + + + + + + + + + + + + + + + + | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## Revision 1.293.2.6 2001/03/03 06:50:38 geraint ## Added #SUMMARY lines for ode2odes. ## ## Revision 1.293.2.5 2001/03/03 00:27:14 geraint ## Fixed ar options to work with GNU ar. Allow mtt to create dependencies for mtt_%.cc when making mtt_%.oct. ## ## Revision 1.293.2.4 2001/03/02 00:45:21 geraint ## Separated Euler and Implicit methods in .cc code and dependencies. ## ## Revision 1.293.2.3 2001/03/01 05:05:53 geraint ## Minor revisions. ## ## Revision 1.293.2.2 2001/02/23 03:53:53 geraint ## Minor revisions. (ode2odes.exe works on GNU/Linux and ~GNU/Irix) ## ## Revision 1.293.2.1 2001/02/22 06:41:40 geraint ## Initial merge of ode2odes.exe into main mtt. ## standalone_rep.make deleted: rules moved to mtt, variables to mttrc. ## ## Revision 1.293 2001/02/06 04:39:08 geraint ## Added _standalone.exe representation. ## ## Revision 1.292 2001/02/05 17:27:40 gawthrop ## Make sure _def.r exists before creating _state.txt ## ## Revision 1.291 2000/12/27 14:50:40 peterg ## This is the first CVS version (4.9). ## Commented out code now deleted ## |
︙ | |||
1060 1061 1062 1063 1064 1065 1066 1067 | 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 | + + + + - + | integration_method=euler; mtt_switches="$mtt_switches euler"; ;; implicit) integration_method=implicit; mtt_switches="$mtt_switches implicit"; ;; rk4) integration_method=rk4; mtt_switches="$mtt_switches rk4"; ;; *) |
︙ | |||
1198 1199 1200 1201 1202 1203 1204 | 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 | - + | 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' |
︙ | |||
1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 | 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 | + + + + + + + - - - + + - + + + + - - - - + + + + + + + + + + + + + + + + | fi if [ -n "$sensitivity" ]; then sys=`echo $1 | cut -c 2-` sys_abg=$sys"_abg" fi ## Check octave version if [ `octave --version | awk -F\. '{print $2}'` ]; then define_octave_dev="-DOCTAVE_DEV" else define_octave_dev="" fi ################################ # This is the main mtt programme ################################ ##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 # MTT implicit rules ## .oct files |
︙ | |||
2008 2009 2010 2011 2012 2013 2014 | 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 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 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 | - + - - - + - - - - + - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | #SUMMARY simpar simulation information (m) $1_simpar.m: $1_simpar.txt $1_def.r $1_sympar.txt mtt_txt2m $1 simpar #SUMMARY numpar numerical parameter declaration -- default (txt) |
︙ | |||
2196 2197 2198 2199 2200 2201 2202 | 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 | - + | touch $1_aliased.txt $1_struc.tex: $1_struc.txt struc_txt2tex $1 $1_struc.m: $1_struc.txt struc_txt2m $1 $1_def.m: $1_def.r def_r2m $1; matlab_tidy $1_def.m; |
︙ | |||
2344 2345 2346 2347 2348 2349 2350 | 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 | - - - - - - - - - - - - + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + | # The main simulation programme ifeq ($integration_method,implicit) $1_ode2odes.m : $1_def.r $1_sympars.txt \ $1_smxa.m $1_smxax.m\ $1_simpar.m $1_numpar.m $1_state.m $1_input.m \ $1_csex.m $1_cseo.m $1_logic.m ifeq ($using_oct,yes) |
︙ | |||
2427 2428 2429 2430 2431 2432 2433 | 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 | - + | ifeq ($integration_method,implicit) $1_ode2odes.p : $1_ode2odes.m $1_def.r $1_smxa.p $1_smxax.p\ $1_simpar.p $1_numpar.p $1_state.p $1_input.p \ $1_csex.p $1_cseo.p $1_logic.p mtt_m2p $1_ode2odes.m $integration_method $stdin endif |
︙ | |||
2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 | 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 | + + + + + | m2dat $1_sro 1_odes.c: $1_ode.c $1_def.r $1_sympar.r ode2odes_r2c $1 $1_sms.c: $1_sm.c $1_def.r $1_sympar.r sm2sms_r2c $1 ifeq ($computation,octave) ifeq ($using_oct,yes) $1_odes.dat2: $1_ode2odes.oct time octave_ode2odes $1 else $1_odes.dat2: $1_ode2odes.m time octave_ode2odes $1 endif endif ifeq ($computation,c) $1_ode2odes.out: $1_ode2odes.c echo Creating $1_odes.out $CC $1_ode2odes.c -lp2c -lm -o $1_ode2odes.out |
︙ |
Modified mttroot/mtt/bin/mtt_check_vars from [65d9a8cff0] to [f001c2c57d].
︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | + + + | ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.8 2000/12/27 13:11:42 peterg ## *** empty log message *** ## ## Revision 1.7 2000/08/04 15:48:30 peterg ## Added PDF ## ## Revision 1.6 2000/05/22 12:37:24 peterg ## *** empty log message *** ## ## Revision 1.5 2000/05/22 12:34:07 peterg |
︙ | |||
71 72 73 74 75 76 77 | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | - + + + + + + | mtt_check_var "$FIG" "FIG" "$print" "MTT" mtt_check_var "$PSVIEW" "PSVIEW" "$print" "MTT" mtt_check_var "$PDFVIEW" "PDFVIEW" "$print" "MTT" mtt_check_var "$HTMLVIEW" "HTMLVIEW" "$print" "MTT" mtt_check_var "$DVIVIEW" "DVIVIEW" "$print" "MTT" mtt_check_var "$CC" "CC" "$print" "MTT" mtt_check_var "$LATEX2HTML" "LATEX2HTML" "$print" "MTT" |
Modified mttroot/mtt/bin/mttrc from [7b899869da] to [3ae226d26c].
︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | + + + + + + + + + + + + + | ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.17.2.3 2001/03/01 05:05:53 geraint ## Minor revisions. ## ## Revision 1.17.2.2 2001/02/23 03:53:53 geraint ## Minor revisions. (ode2odes.exe works on GNU/Linux and ~GNU/Irix) ## ## Revision 1.17.2.1 2001/02/22 06:41:40 geraint ## Initial merge of ode2odes.exe into main mtt. ## standalone_rep.make deleted: rules moved to mtt, variables to mttrc. ## ## Revision 1.17 2000/12/27 16:46:13 peterg ## Stripped the mtt- from paths ## ## Revision 1.16 2000/12/27 15:16:44 peterg ## If then else format ## ## Revision 1.15 2000/12/27 14:57:43 peterg ## Now takes the base path as an argument ## ## Revision 1.14 2000/12/27 13:11:43 peterg |
︙ | |||
130 131 132 133 134 135 136 137 | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | export LATEX2HTML="latex2html -contents_in_navigation -index_in_navigation -address http://mtt.sourceforge.net" # Ascend stuff export ASCENDLIBRARY=$MTTPATH/ascend/lib # Oct file generation - use version with no optimisation. export MKOCTFILE=$MTT_LIB/octave/mkoctfile # ode2odes.exe stuff # local system PLAT="i686-pc-linux-gnu" PREFIX="/usr/local" GCCVERS="2.95.2" SRCOCTAVE="/cvs/octave" # PLAT="mips-sgi-irix6.5" # PREFIX="/usr/people/bevangp/GNU" # GCCVERS="2.95.2" # SRCOCTAVE="${PREFIX}/../build/octave-2.1.33" # include paths IOCTAVE="-I${PREFIX}/include/octave" # library paths LOCTAVE="-L${PREFIX}/lib/octave -loctave -lcruft -loctinterp" LKPATHSEA="-L${SRCOCTAVE}/kpathsea -lkpathsea" LREADLINE=" -L${SRCOCTAVE}/readline -lreadline" LSYSTEM="-ldl -lm -lncurses" LF2C="-L${PREFIX}/lib/gcc-lib/${PLAT}/${GCCVERS} -lg2c" # compiler options DEBUG="-g" OPTIM="-O3" FLAGS="-fno-rtti -fno-exceptions -fno-implicit-templates" # exported variables export MTT_CXX="g++" export MTT_CXXFLAGS="${DEBUG} ${OPTIM} ${FLAGS}" export MTT_CXXLIBS="${LOCTAVE} ${LKPATHSEA} ${LREADLINE} ${LF2C} ${LSYSTEM}" export MTT_CXXINCS="-I. ${IOCTAVE}" export MTT_LDFLAGS=" " fi |
Modified mttroot/mtt/bin/trans/m/args2arg.m from [88e206959b] to [b6ee5ada28].
︙ | |||
24 25 26 27 28 29 30 31 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | + + + + + + + + + + + + + + + + + + + + + + | % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Field separator if nargin<3 FS = ';'; end; arg = ''; if strcmp(args, '')==0 L = length(args); args_count = 0; for i=1:n arg_count = 0; arg = ''; if args_count == L break; end; while args_count < L args_count = args_count+1; arg_count = arg_count+1; ch = str2ch(args,args_count); if ch==FS break; end; arg = [arg ch]; end; end; end; |
Modified mttroot/mtt/bin/trans/make_ode2odes from [9dc2d47b21] to [1a5aa47365].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | + + + + + + + + + + + + + + + + + + + + + + + + | #! /bin/sh ###################################### ##### Model Transformation Tools ##### ###################################### ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.51.2.6 2001/03/16 03:56:13 geraint ## Removed psignal/siginfo.h - problematic and unnecessary. ## ## Revision 1.51.2.5 2001/03/12 23:16:37 geraint ## Minor improvements to signal handling (.exe). ## ## Revision 1.51.2.4 2001/03/12 03:59:30 geraint ## SIGINT (C-c C-c) now causes simulation data to be dumped to MTT.core. ## SIGQUIT (C-c C-\) as for SIGINT, then raises default SIGQUIT. ## SIGFPE as for SIGINT, then raises default SIGABRT. ## ## Revision 1.51.2.3 2001/03/07 04:06:55 geraint ## Irix: catch SIGFPE and write data before aborting (.exe). ## GNU/Linux: nada. ## ## Revision 1.51.2.2 2001/03/02 00:45:21 geraint ## Separated Euler and Implicit methods in .cc code and dependencies. ## ## Revision 1.51.2.1 2001/03/01 05:05:53 geraint ## Minor revisions. ## ## Revision 1.51 2001/02/19 06:33:19 geraint ## Removed operation form loop. ## ## Revision 1.50 2001/02/18 09:18:49 geraint ## Removed temporary Matrices from mtt_implicit.cc ## ## Revision 1.49 2001/02/14 06:06:34 geraint ## Removed octave_value_list wrappers from standalone.exe - speed improvements ## ## Revision 1.48 2001/02/11 07:08:59 geraint |
︙ | |||
231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | + + + + + + + + + + + + + | mttj = 0; for it = 1:ilast #Integration loop [u] = ${sys}_input(x,y,t,par); # Input [y] = ${sys}_$odeo(x,u,t,par); # Output if mttj==0 mtt_write(t,x,y,$Nx,$Ny); # Write it out endif EOF if [ "$method" = "rk4" ]; then cat << EOF >> $filename [k1] = ddt * ${sys}_${ode}(x,u,t,par); [k2] = ddt * ${sys}_${ode}(x+k1/2,u,t+ddt/2,par); [k3] = ddt * ${sys}_${ode}(x+k2/2,u,t+ddt/2,par); [k4] = ddt * ${sys}_${ode}(x+k3,u,t+ddt,par); [dx] = [k1 + 2.0 * [k2 + k3] + k4] / (6.0 * ddt); EOF else cat << EOF >> $filename [dx] = ${sys}_$ode(x,u,t,par); # State derivative EOF fi if [ "$method" = "implicit" ]; then cat<< EOF >> $filename [AA] = ${sys}_smxa(x,u,ddt,par); # (I-Adt) and (I-Adt)x [AAx] = ${sys}_smxax(x,u,ddt,par); # (I-Adt) and (I-Adt)x |
︙ | |||
278 279 280 281 282 283 284 | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 | - + + + + - + - - + + - - - - + + + - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | vector_value=vector_value feval_header=toplev.h fi cat <<EOF > $filename #include <octave/oct.h> #include <octave/ov-struct.h> |
︙ | |||
391 392 393 394 395 396 397 398 399 400 401 402 403 404 | 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 | + + + + + + + + + + + + + + + + + + + + + + + + + + + | args (2) = octave_value (t); args (3) = octave_value (par); f = feval ("${sys}_${odeo}", args, 1); return f(0).${vector_value} (); #endif } EOF if [ "$method" != "implicit" ];then cat <<EOF >> $filename inline ColumnVector mtt_euler (ColumnVector &x, const ColumnVector &dx, const double &ddt, const int &nx, const ColumnVector &open_switches) { #ifdef STANDALONE return Fmtt_euler (x, dx, ddt, nx, open_switches); #else static octave_value_list args, f; args (0) = octave_value (x); args (1) = octave_value (dx); args (2) = octave_value (ddt); args (3) = octave_value ((double)nx); args (4) = octave_value (open_switches); f = feval ("mtt_euler", args, 1); return f(0).${vector_value} (); #endif } EOF else cat <<EOF >> $filename inline ColumnVector mtt_implicit (ColumnVector &x, ColumnVector &dx, Matrix &AA, ColumnVector &AAx, const double &ddt, const int &nx, |
︙ | |||
416 417 418 419 420 421 422 | 576 577 578 579 580 581 582 583 584 585 586 587 588 589 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | args (5) = octave_value ((double)nx); args (6) = octave_value (open_switches); f = feval ("mtt_implicit", args, 1); return f(0).${vector_value} (); #endif } |
︙ | |||
526 527 528 529 530 531 532 | 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 | - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - + - - + - + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + | args (2) = octave_value (t); args (3) = octave_value (par); f = feval ("${sys}_smxax", args, 1); return f(0).${vector_value} (); #endif } |
︙ | |||
667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 | 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | static ColumnVector open_switches (MTTNX); register double t = 0.0; const double ddt = dt / stepfactor; const int ilast = static_cast<int> (round ((last - first) / ddt)) + 1; const int nrows = static_cast<int> (round ((last - first) / dt)) + 1; for (register int i = 0; i < MTTNU; i++) { u (i) = 0.0; } for (register int j = 0, i = 1; i <= ilast; i++) { y = mtt_${odeo} (x, u, t, par); u = mtt_input (x, y, t, par); if (0 == j) { mtt_write (t, x, y, nrows); } EOF if [ "$method" = "rk4" ]; then cat << EOF >> $filename { static ColumnVector k1 (MTTNX,0.0), k2 (MTTNX,0.0), k3 (MTTNX,0.0), k4 (MTTNX,0.0); const double t1 = t + ddt/2.0, t2 = t + ddt; ColumnVector x1 (x), x2 (x), x3 (x); k1 = ddt * mtt_${ode} (x , u, t , par); x1 += k1 * 0.5; k2 = ddt * mtt_${ode} (x1, u, t1, par); x2 += k2 * 0.5; k3 = ddt * mtt_${ode} (x2, u, t1, par); x3 += k3; k4 = ddt * mtt_${ode} (x3, u, t2, par); dx = (k1 + 2.0 * (k2 + k3) + k4) / (6.0 * ddt); } EOF else cat << EOF >> $filename dx = mtt_${ode} (x, u, t, par); EOF fi if [ "$method" = "implicit" ]; then cat <<EOF >> $filename AA = mtt_smxa (x, u, ddt, par); AAx = mtt_smxax (x, u, ddt, par); EOF |
︙ |
Added mttroot/mtt/bin/trans/struc_txt2m version [da921fb492].
|
Modified mttroot/mtt/cc/Makefile from [10f25bc91c] to [873ef71cfa].
︙ | |||
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | - - + + | mkoctfile $< endif all: $(sys)_$(rep).cc |
︙ |
Modified mttroot/mtt/cc/include/useful-functions.hh from [bc3e893dc8] to [6bacf30342].
|
Modified mttroot/mtt/cc/parse_m2cc.cc from [3b05b7d2a2] to [6a7d5a9a81].
1 2 3 4 5 6 7 8 9 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | + + + + + + | /* $Id$ * $Log$ * Revision 1.1.2.1 2001/03/09 02:59:26 geraint * got_comment: (char)c no longer compared to (int)EOF. * * Revision 1.1 2000/12/28 09:46:05 peterg * put under RCS * * Revision 1.1 2000/10/31 04:29:50 geraint * Initial revision * */ |
︙ | |||
197 198 199 200 201 202 203 | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | - + - - - + + - | { /* * get remainder of line in case there are any commented keywords */ char c; cout << " // "; cin >> c; |
︙ | |||
307 308 309 310 311 312 313 314 315 316 317 318 319 320 | 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 | + + + + + + + + + + + + | /* * EOL is end-of-statement in Octave, add ; */ << indent () << ';' << endl << indent (); } buf = ""; break; case '\\': cin >> c; if ('\n' == c) { buf += '\n'; } else { buf += '\\'; buf += c; } break; default: buf += c; } if (lbrace->get_nesting_depth ()) { cout.setf (ios::skipws); |
︙ |
Modified mttroot/mtt/cc/sympar_txt2h.sh from [9ef7c9027a] to [21b8e13116].
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | + + + + | #! /bin/sh # $Id$ # $Log$ # Revision 1.2 2001/02/05 13:03:19 geraint # Restrict scope of variables to file (static). # Warn GCC that variables may be unused. # # Revision 1.7 2001/01/09 15:43:50 geraint # Warn gcc that variables may be unused. # # Revision 1.6 2001/01/08 05:47:56 geraint # Restrict scope of variables to file (static) # # Revision 1.5 2000/12/05 12:44:55 peterg |
︙ | |||
39 40 41 42 43 44 45 | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | - + | TMP_VAR_NAMES="mtt_tmp mtt_o $*" IN=${SYS}_sympar.txt OUT=${SYS}_sympar.h declare_sys_param () { |
︙ |
Modified mttroot/mtt/lib/cc/mtt_implicit.cc from [66ec9e6cff] to [a2b6319245].
︙ | |||
12 13 14 15 16 17 18 | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | - - - - - - + + + + + + - - - - - - + + + + + + - + + - + | { #else // !STANDALONE DEFUN_DLD (mtt_implicit, args, , "implicit integration method") { #ifdef OCTAVE_DEV static ColumnVector x = args(0).column_vector_value (); |
︙ |
Deleted mttroot/mtt/lib/rep/standalone_rep.make version [6e1ac4004e].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|