Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -13,10 +13,14 @@ ############################################################### ## 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 @@ -2069,22 +2073,22 @@ 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 ; @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 +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 @@ -2395,19 +2399,13 @@ endif endif $1_ode2odes.exe: $1_def.h $1_sympar.h\ - $1_ode2odes.o ode2odes_common.o ode2odes_${integration_method}.o\ - libmttcxx.a + $1_ode2odes.o ode2odes_common.o ode2odes_${integration_method}.o echo Creating $1_ode2odes.exe - ${MTT_CXX} ${MTT_LDFLAGS} $1_*.o ${MTT_CXXLIBS} -o $1_ode2odes.exe - -libmttcxx.a: mtt_euler.o mtt_implicit.o - echo Creating libmttcxx.a - ar rc libmttcxx.a $^ - ranlib libmttcxx.a + ${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 Index: mttroot/mtt/bin/mttrc ================================================================== --- mttroot/mtt/bin/mttrc +++ mttroot/mtt/bin/mttrc @@ -13,10 +13,14 @@ ############################################################### ## 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 @@ -136,28 +140,45 @@ export ASCENDLIBRARY=$MTTPATH/ascend/lib # Oct file generation - use version with no optimisation. export MKOCTFILE=$MTT_LIB/octave/mkoctfile - # ode2odes.exe stuff + # ode2odes.exe stuff + # local system - PREFIX="/usr/local" + 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" - LMTTCXX="-L. -lmttcxx" + # compiler options + + DEBUG="-g" + OPTIM="-O3" + FLAGS="-fno-rtti -fno-exceptions -fno-implicit-templates" + + # exported variables + export MTT_CXX="g++" - export MTT_CXXFLAGS="-g -O3" - export MTT_LD="ld" - export MTT_CXXLIBS="${LOCTAVE} ${LKPATHSEA} ${LREADLINE} ${LF2C} ${LSYSTEM} ${LMTTCXX}" + export MTT_CXXFLAGS="${DEBUG} ${OPTIM} ${FLAGS}" + export MTT_CXXLIBS="${LOCTAVE} ${LKPATHSEA} ${LREADLINE} ${LF2C} ${LSYSTEM}" export MTT_CXXINCS="-I. ${IOCTAVE}" fi Index: mttroot/mtt/lib/cc/mtt_implicit.cc ================================================================== --- mttroot/mtt/lib/cc/mtt_implicit.cc +++ mttroot/mtt/lib/cc/mtt_implicit.cc @@ -39,14 +39,17 @@ { 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 (xleftdiv (AA, static_cast(AAx + dx * t)));