Index: mttroot/mtt/lib/cc/mtt_euler.cc ================================================================== --- mttroot/mtt/lib/cc/mtt_euler.cc +++ mttroot/mtt/lib/cc/mtt_euler.cc @@ -1,7 +1,13 @@ #include +#ifdef OCTAVE_DEV +#define VECTOR_VALUE column_vector_value +#else // !OCTAVE_DEV +#define VECTOR_VALUE vector_value +#endif // OCTAVE_DEV + #ifdef STANDALONE ColumnVector Fmtt_euler ( ColumnVector &x, const ColumnVector &dx, const double &ddt, const int &Nx, @@ -9,23 +15,15 @@ { #else // !STANDALONE DEFUN_DLD (mtt_euler, args, , "euler integration method") { -#ifdef OCTAVE_DEV - ColumnVector x = args(0).column_vector_value (); - const ColumnVector dx = args(1).column_vector_value (); + ColumnVector x = args(0).VECTOR_VALUE (); + const ColumnVector dx = args(1).VECTOR_VALUE (); const double ddt = args(2).double_value (); const int Nx = static_cast (args(3).double_value ()); - const ColumnVector openx = args(4).column_vector_value (); -#else // !OCTAVE_DEV - ColumnVector x = args(0).vector_value (); - const ColumnVector dx = args(1).vector_value (); - const double ddt = args(2).double_value (); - const int Nx = static_cast (args(3).double_value ()); - const ColumnVector openx = args(4).vector_value (); -#endif // OCTAVE_DEV + const ColumnVector openx = args(4).VECTOR_VALUE (); #endif // STANDALONE register int i, n; n = Nx; Index: mttroot/mtt/lib/cc/mtt_implicit.cc ================================================================== --- mttroot/mtt/lib/cc/mtt_implicit.cc +++ mttroot/mtt/lib/cc/mtt_implicit.cc @@ -1,8 +1,14 @@ #include #include +#ifdef OCTAVE_DEV +#define VECTOR_VALUE column_vector_value +#else // !OCTAVE_DEV +#define VECTOR_VALUE vector_value +#endif // OCTAVE_DEV + #ifdef STANDALONE ColumnVector Fmtt_implicit ( ColumnVector &x, ColumnVector &dx, Matrix &AA, ColumnVector &AAx, @@ -12,27 +18,17 @@ { #else // !STANDALONE DEFUN_DLD (mtt_implicit, args, , "implicit integration method") { -#ifdef OCTAVE_DEV - ColumnVector x = args(0).column_vector_value (); - ColumnVector dx = args(1).column_vector_value (); - Matrix AA = args(2).matrix_value (); - ColumnVector AAx = args(3).column_vector_value (); - const double t = args(4).double_value (); - const int Nx = (int) (args(5).double_value ()); - const ColumnVector openx = args(6).column_vector_value (); -#else // !OCTAVE_DEV - ColumnVector x = args(0).vector_value (); - ColumnVector dx = args(1).vector_value (); - Matrix AA = args(2).matrix_value (); - ColumnVector AAx = args(3).vector_value (); - const double t = args(4).double_value (); - const int Nx = (int) (args(5).double_value ()); - const ColumnVector openx = args(6).vector_value (); -#endif // OCTAVE_DEV + ColumnVector x = args(0).VECTOR_VALUE (); + ColumnVector dx = args(1).VECTOR_VALUE (); + Matrix AA = args(2).matrix_value (); + ColumnVector AAx = args(3).VECTOR_VALUE (); + const double t = args(4).double_value (); + const int Nx = (int) (args(5).double_value ()); + const ColumnVector openx = args(6).VECTOR_VALUE (); #endif // STANDALONE register int row, col; for (row = 0; row < Nx; row++)