From: alex <aba...@us...> - 2006-01-25 20:35:59
|
Update of /cvsroot/octave/octave-forge/main/octcdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20725 Modified Files: ov-netcdf.cc Log Message: Bug fix: Octave function ncdim uses now ncdimvec (NetCDF conventions) instead of dimvec (Octave conventions) Index: ov-netcdf.cc =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/ov-netcdf.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ov-netcdf.cc 9 Jan 2006 21:02:37 -0000 1.3 +++ ov-netcdf.cc 25 Jan 2006 20:35:48 -0000 1.4 @@ -106,9 +106,9 @@ return octave_value(); - octave_ncfile *b = new octave_ncfile(args(0).string_value(), args(1).string_value()); + octave_ncfile *nc = new octave_ncfile(args(0).string_value(), args(1).string_value()); - return octave_value(b); + return octave_value(nc); } @@ -328,9 +328,10 @@ else if (args(0).class_name() == "ncvar") { octave_ncvar& ncvar = (octave_ncvar&)args(0).get_rep(); - Cell vars = Cell (dim_vector(1,ncvar.ndims())); + // Cell vars = Cell (dim_vector(1,ncvar.ndims())); + Cell vars = Cell (dim_vector(1,ncvar.ncdims().length() )); - for (int i=0; i<ncvar.ndims(); i++) { + for (int i=0; i < ncvar.ncdims().length(); i++) { octave_ncdim *d = new octave_ncdim(ncvar.get_ncfile(),ncvar.get_dimid(i)); vars(i) = octave_value(d); } |