Index: mttroot/mtt/bin/mttrc ================================================================== --- mttroot/mtt/bin/mttrc +++ mttroot/mtt/bin/mttrc @@ -13,10 +13,13 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.37 2002/09/19 08:08:15 gawthrop +## Updated documentation documentation +## ## Revision 1.36 2002/08/28 15:48:00 geraint ## Updated mttrc to make standalone C++ compilation configuration clearer. ## ## Revision 1.35 2002/08/06 09:56:54 geraint ## Updated to work with changes in unstable version of Octave 2.1.36. @@ -234,16 +237,11 @@ IOCTAVE="-I${OCTAVEPREFIX}/include/octave/ -I${OCTAVEPREFIX}/include/octave/octave" # library paths for Octave OCTAVEVERS=`octave --version | head -1 | gawk '{ print $4 }'` - OCTAVEMINOR=`echo ${OCTAVEVERS} | gawk -F\. '{print $2}'` - if [ "${OCTAVEMINOR}" = "0" ] ; then # stable - LOCTAVE="-L${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS}" - else - LOCTAVE="-L${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS} -loct-pathsearch -loct-readline" - fi + LOCTAVE="-L${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS}" LSYSTEM="-ldl -lm -lncurses -lkpathsea -lreadline -lblas -llapack -lfftw -lg2c" # C++ compiler options DEBUG="-g" Index: mttroot/mtt/lib/cc/mtt_implicit.cc ================================================================== --- mttroot/mtt/lib/cc/mtt_implicit.cc +++ mttroot/mtt/lib/cc/mtt_implicit.cc @@ -51,11 +51,11 @@ } } } #ifdef OCTAVE_DEV - x = static_cast (xleftdiv (AA, static_cast(AAx + dx * t))); + x = xleftdiv (AA, Matrix(AAx + dx * t)).column (0); #else // !OCTAVE_DEV Matrix tmp = xleftdiv (AA, static_cast(static_cast(AAx + dx * t))); for (row = 0; row < Nx; row++) { x (row) = tmp (row,0);