Overview
Comment: | Minor revisions. (ode2odes.exe works on GNU/Linux and ~GNU/Irix) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | origin/merging-ode2odes-exe | trunk |
Files: | files | file ages | folders |
SHA3-256: |
7f5b9f0bd7a24d78a4c4efab5b944330 |
User & Date: | geraint@users.sourceforge.net on 2001-02-23 03:53:55 |
Other Links: | branch diff | manifest | tags |
Context
2001-03-01
| ||
05:05:53 | Minor revisions. check-in: 449e55e2e4 user: geraint@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk | |
2001-02-23
| ||
03:53:55 | Minor revisions. (ode2odes.exe works on GNU/Linux and ~GNU/Irix) check-in: 7f5b9f0bd7 user: geraint@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk | |
2001-02-22
| ||
06:41:40 |
Initial merge of ode2odes.exe into main mtt. standalone_rep.make deleted: rules moved to mtt, variables to mttrc. check-in: 63813a1049 user: geraint@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk | |
Changes
Modified mttroot/mtt/bin/mtt from [77362b82e6] to [8319231524].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## 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 | > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## 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 |
︙ | ︙ | |||
2067 2068 2069 2070 2071 2072 2073 | else mtt_update $1 logic endif # Dummy target FORCE: | | | | | | | | | | | | | | 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 | else mtt_update $1 logic endif # Dummy target FORCE: ode2odes_common.m : $1_input.m $1_logic.m $1_numpar.m $1_simpar.m $1_state.m ; @echo > /dev/null ode2odes_common.cc : $1_input.cc $1_logic.cc $1_numpar.cc $1_simpar.cc $1_state.cc ; @echo > /dev/null ode2odes_common.o : $1_input.o $1_logic.o $1_numpar.o $1_simpar.o $1_state.o mtt_euler.o mtt_implicit.o ; @echo > /dev/null ode2odes_common.oct : $1_input.oct $1_logic.oct $1_numpar.oct $1_simpar.oct $1_state.oct ; @echo > /dev/null ode2odes_euler.m : $1_ode.m $1_odeo.m ; @echo > /dev/null ode2odes_euler.cc : $1_ode.cc $1_odeo.cc ; @echo > /dev/null ode2odes_euler.o : $1_ode.o $1_odeo.o ; @echo > /dev/null ode2odes_euler.oct : $1_ode.oct $1_odeo.oct ; @echo > /dev/null ode2odes_implicit.m : $1_cseo.m $1_csex.m $1_smxa.m $1_smxax.m ; @echo > /dev/null ode2odes_implicit.cc : $1_cseo.cc $1_csex.cc $1_smxa.cc $1_smxax.cc ; @echo > /dev/null ode2odes_implicit.o : $1_cseo.o $1_csex.o $1_smxa.o $1_smxax.o ; @echo > /dev/null ode2odes_implicit.oct: $1_cseo.oct $1_csex.oct $1_smxa.oct $1_smxax.oct ; @echo > /dev/null #SUMMARY numpar numerical parameter declaration (m) $1_numpar.m: $1_numpar.txt $1_sympars.txt mtt_txt2m $1 numpar #SUMMARY numpar numerical parameter declaration (c) |
︙ | ︙ | |||
2393 2394 2395 2396 2397 2398 2399 | else make_ode2odes $1 m $integration_method endif endif $1_ode2odes.exe: $1_def.h $1_sympar.h\ | | < | < < < < < | 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 | else make_ode2odes $1 m $integration_method endif endif $1_ode2odes.exe: $1_def.h $1_sympar.h\ $1_ode2odes.o ode2odes_common.o ode2odes_${integration_method}.o echo Creating $1_ode2odes.exe ${MTT_CXX} ${MTT_CXXFLAGS} ${MTT_LDFLAGS} *.o ${MTT_CXXLIBS} -o $1_ode2odes.exe $1_ode2odes.o: $1_ode2odes.cc ode2odes_common.o ode2odes_${integration_method}.o echo Creating $1_ode2odes.o ${MTT_CXX} ${MTT_CXXFLAGS} ${MTT_CXXINCS} -c $1_ode2odes.cc -DSTANDALONE $1_ode2odes.oct: $1_ode2odes.cc ode2odes_common.oct ode2odes_${integration_method}.oct touch $1_ode2odes.m |
︙ | ︙ |
Modified mttroot/mtt/bin/mttrc from [1359c3287d] to [0f6510249d].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## 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 | > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## 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 |
︙ | ︙ | |||
134 135 136 137 138 139 140 | # Ascend stuff export ASCENDLIBRARY=$MTTPATH/ascend/lib # Oct file generation - use version with no optimisation. export MKOCTFILE=$MTT_LIB/octave/mkoctfile | | > | > > > > > > > > > > | > > > > > > > | < | | 138 139 140 141 142 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 | # 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}" fi |
Modified mttroot/mtt/lib/cc/mtt_implicit.cc from [66ec9e6cff] to [f27f1345e2].
︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | for (row = 0; row < Nx; row++) { if (0 != openx (row)) { AAx (row) = 0.0; dx (row) = 0.0; for (col = 0; col < Nx; col++) { AA (row,col) = 0.0; } } } x = static_cast<ColumnVector> (xleftdiv (AA, static_cast<Matrix>(AAx + dx * t))); for (row = 0; row < Nx; row++) { | > > > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | for (row = 0; row < Nx; row++) { if (0 != openx (row)) { AAx (row) = 0.0; dx (row) = 0.0; #ifndef RISKLEAKS for (col = 0; col < Nx; col++) { AA (row,col) = 0.0; AA (col,row) = 0.0; } #endif } } x = static_cast<ColumnVector> (xleftdiv (AA, static_cast<Matrix>(AAx + dx * t))); for (row = 0; row < Nx; row++) { |
︙ | ︙ |