Mercurial > forge

changeset 11993:58964b699239 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean-up formatting
author abarth93
date Tue, 30 Jul 2013 11:57:05 +0000
parents 6f80e9b5a5cb
children 19477d7ae7d4
files main/netcdf/INDEX main/netcdf/src/__netcdf__.cc
diffstat 2 files changed, 335 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/main/netcdf/INDEX	Tue Jul 30 09:41:59 2013 +0000
+++ b/main/netcdf/INDEX	Tue Jul 30 11:57:05 2013 +0000
@@ -1,6 +1,5 @@
 netcdf >> NetCDF interface
 High-level functions
- test_netcdf
  nccreate     
  ncdisp       
  ncinfo       
@@ -62,3 +61,5 @@
  netcdf_inqGrpParent
  netcdf_inqGrpFullNcid
  netcdf_inqNcid
+Test function
+ test_netcdf
--- a/main/netcdf/src/__netcdf__.cc	Tue Jul 30 09:41:59 2013 +0000
+++ b/main/netcdf/src/__netcdf__.cc	Tue Jul 30 11:57:05 2013 +0000
@@ -185,7 +185,8 @@
 @seealso{netcdf_getConstant}\n")
 {
 
-  if (args.length() != 0) {
+  if (args.length() != 0) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -215,7 +216,8 @@
 @end deftypefn\n\
 @seealso{netcdf_open}\n")
 {
-  if (args.length() != 0) {
+  if (args.length() != 0) 
+    {
       print_usage ();
       return octave_value ();
     }
@@ -240,6 +242,12 @@
   int format = netcdf_get_constant(args(0)).int_value();
   int old_format;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_set_default_format(format, &old_format));
 
   return octave_value(old_format);
@@ -344,6 +352,12 @@
   int mode = netcdf_get_constant(args(1)).int_value();
   int ncid;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_create(filename.c_str(), mode, &ncid));
 
   return octave_value(ncid);
@@ -357,7 +371,8 @@
 @seealso{netcdf_close}\n")
 {
 
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -366,6 +381,12 @@
   int mode = netcdf_get_constant(args(1)).int_value();
   int ncid;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_open(filename.c_str(), mode, &ncid));
 
   return octave_value(ncid);
@@ -469,7 +490,8 @@
 @end deftypefn\n\
 @seealso{netcdf_inqUnlimDims}\n")
 {
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -478,6 +500,12 @@
   int ndims, nvars, ngatts, unlimdimid;
   octave_value_list retval;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq(ncid,&ndims,&nvars,&ngatts,&unlimdimid));
     
   retval(0) = octave_value(ndims);
@@ -495,7 +523,8 @@
 @end deftypefn\n\
 @seealso{netcdf_inq}\n")
 {
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -503,6 +532,12 @@
   int ncid = args(0).scalar_value();
   int nunlimdims;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_unlimdims(ncid, &nunlimdims, NULL));
   Array<int> unlimdimids = Array<int>(dim_vector(1,nunlimdims));
   check_err(nc_inq_unlimdims(ncid, &nunlimdims, unlimdimids.fortran_vec()));
@@ -522,13 +557,21 @@
 @seealso{netcdf_inq}\n")
 {
 
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value();
     }
 
   int ncid = args(0).scalar_value();
   int format;
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_format(ncid, &format));
 
   if (format == NC_FORMAT_CLASSIC) {
@@ -554,7 +597,8 @@
 @seealso{netcdf_defVar}\n")
 {
 
-  if (args.length() != 3) {
+  if (args.length() != 3) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -564,6 +608,12 @@
   size_t len = args(2).scalar_value();
   int dimid;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_def_dim (ncid, name.c_str(), len, &dimid));
 
   return octave_value(dimid);
@@ -613,7 +663,8 @@
 @seealso{netcdf_open,netcdf_defDim}\n")
 {
 
-  if (args.length() != 4) {
+  if (args.length() != 4) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -621,6 +672,13 @@
   int ncid = args(0).scalar_value();
   std::string name = args(1).string_value (); 
   int xtype = netcdf_get_constant(args(2)).int_value();;
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   Array<double> tmp;
 
   if (!args(3).is_empty()) {
@@ -685,7 +743,8 @@
 @seealso{netcdf_inqVarFill}\n")
 {
 
-  if (args.length() != 4) {
+  if (args.length() != 4) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -695,6 +754,13 @@
   int no_fill = args(2).scalar_value(); // boolean
   octave_value fill_value = args(3); 
   nc_type xtype;
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_vartype (ncid, varid, &xtype));
 
   switch (xtype)
@@ -736,7 +802,8 @@
 @seealso{netcdf_defVarFill}\n")
 {
 
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -747,8 +814,20 @@
   nc_type xtype;
   octave_value_list retval;
   octave_value data;
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_vartype (ncid, varid, &xtype));
 
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
   switch (xtype)
     {
 #define OV_NETCDF_INQ_VAR_FILL(netcdf_type,c_type)	                        \
@@ -796,7 +875,8 @@
 @seealso{netcdf_inqVarDeflate}\n")
 {
 
-  if (args.length() != 5) {
+  if (args.length() != 5) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -807,6 +887,12 @@
   int deflate = args(3).scalar_value(); // boolean
   int deflate_level = args(4).scalar_value();
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_def_var_deflate (ncid, varid, shuffle, deflate, deflate_level));
   return octave_value();
 }
@@ -823,7 +909,8 @@
 @seealso{netcdf_defVarDeflate}\n")
 {
 
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -868,7 +955,8 @@
 @seealso{netcdf_inqVarChunking}\n")
 {
 
-  if (args.length() != 3 && args.length() != 4) {
+  if (args.length() != 3 && args.length() != 4) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -922,7 +1010,8 @@
 @seealso{netcdf_defVarChunking}\n")
 {
 
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1043,6 +1132,13 @@
     }
 
   int ncid = args(0).scalar_value();
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_enddef (ncid));
   
   return octave_value();
@@ -1062,6 +1158,13 @@
     }
 
   int ncid = args(0).scalar_value();
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_redef (ncid));
   
   return octave_value();
@@ -1097,9 +1200,20 @@
   ptrdiff_t stride[NC_MAX_VAR_DIMS];
   nc_type xtype;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_vartype (ncid, varid, &xtype));
   //int sliced_numel = tmp.numel();
 
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
   start_count_stride(ncid, varid, args, args.length()-1, start, count, stride);
 
   // check if count matched size(data)
@@ -1167,8 +1281,26 @@
   octave_value data;
   nc_type xtype;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_vartype (ncid, varid, &xtype));
+
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
   check_err(nc_inq_varndims (ncid, varid, &ndims));
+
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
   int sz = 1;
 
   dim_vector sliced_dim_vector;
@@ -1252,12 +1384,20 @@
 @seealso{netcdf_open}\n")
 {
 
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value();
     }
 
   int ncid = args(0).scalar_value();
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_close(ncid));
   return octave_value ();
 }
@@ -1286,6 +1426,12 @@
   int attnum = args(2).scalar_value();
   char name[NC_MAX_NAME+1];
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_attname(ncid, varid, attnum, name));
 
   return octave_value(std::string(name));  
@@ -1333,10 +1479,11 @@
 @seealso{netcdf_inqAttName}\n\
 @end deftypefn")
 {
-  if (args.length() != 3) {
-    print_usage ();
-    return octave_value();
-  }
+  if (args.length() != 3) 
+    {
+      print_usage ();
+      return octave_value();
+    }
 
   int ncid = args(0).scalar_value();
   int varid = args(1).scalar_value();
@@ -1344,10 +1491,12 @@
   int xtype;
   size_t len;
   octave_value_list retval;
-  
-  if (error_state) {
-    return octave_value();    
-  }
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
 
   check_err(nc_inq_att(ncid, varid, name.c_str(), &xtype, &len));
   
@@ -1367,10 +1516,11 @@
 @seealso{netcdf_putAtt}\n\
 @end deftypefn")
 {
-  if (args.length() != 3) {
-    print_usage ();
-    return octave_value();
-  }
+  if (args.length() != 3) 
+    {
+      print_usage ();
+      return octave_value();
+    }
 
   int ncid = args(0).scalar_value();
   int varid = args(1).scalar_value();
@@ -1379,8 +1529,19 @@
   size_t len;
   octave_value data;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_att(ncid, varid, attname.c_str(), &xtype, &len));
 
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
 #define OV_NETCDF_GET_ATT_CASE(netcdf_type,c_type)	                        \
   if (xtype == netcdf_type)						        \
       {                                                                         \
@@ -1418,10 +1579,11 @@
 @seealso{netcdf_getAtt}\n\
 @end deftypefn")
 {
-  if (args.length() != 4) {
-    print_usage ();
-    return octave_value();
-  }
+  if (args.length() != 4) 
+    {
+      print_usage ();
+      return octave_value();
+    }
 
   int ncid = args(0).scalar_value();
   int varid = args(1).scalar_value();
@@ -1429,7 +1591,12 @@
   octave_value data = args(3);
 
   nc_type xtype;
-  xtype = NC_BYTE;
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
 
   // get matching netcdf type
 
@@ -1597,7 +1764,8 @@
 @end deftypefn")
 {
 
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1606,6 +1774,12 @@
   std::string varname = args(1).string_value();
   int varid;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_varid(ncid,varname.c_str(), &varid));
 
   return octave_value(varid);
@@ -1620,7 +1794,8 @@
 @end deftypefn")
 {
 
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value ();
     }
@@ -1628,7 +1803,19 @@
   int ncid = args(0).scalar_value();
   int nvars;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_varids(ncid, &nvars, NULL));
+
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
   Array<int> varids = Array<int>(dim_vector(1,nvars));
   check_err(nc_inq_varids(ncid, &nvars, varids.fortran_vec()));
 
@@ -1701,7 +1888,8 @@
 @end deftypefn")
 {
 
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1710,14 +1898,15 @@
   int dimid = args(1).scalar_value();
   octave_value_list retval;
 
-  if (! error_state) {
-    char name[NC_MAX_NAME+1];
-    size_t length;
-    check_err(nc_inq_dim(ncid, dimid, name, &length));
-    
-    retval(0) = octave_value(std::string(name));
-    retval(1) = octave_value(length);
-  }
+  if (! error_state) 
+    {
+      char name[NC_MAX_NAME+1];
+      size_t length;
+      check_err(nc_inq_dim(ncid, dimid, name, &length));
+      
+      retval(0) = octave_value(std::string(name));
+      retval(1) = octave_value(length);
+    }
 
   return retval;
 }
@@ -1731,7 +1920,8 @@
 @end deftypefn")
 {
 
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1741,11 +1931,11 @@
   int id;
   octave_value_list retval;
 
-  if (! error_state) {
-    check_err(nc_inq_dimid(ncid, dimname.c_str(), &id));
-    
-    retval(0) = octave_value(id);
-  }
+  if (! error_state) 
+    {
+      check_err(nc_inq_dimid(ncid, dimname.c_str(), &id));      
+      retval(0) = octave_value(id);
+    }
 
   return retval;
 }
@@ -1761,16 +1951,24 @@
 @seealso{netcdf_inqDim}\n\
 @end deftypefn")
 {
-  if (args.length() != 1 && args.length() != 2) {
+  if (args.length() != 1 && args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
 
   int ncid = args(0).scalar_value();
   int include_parents = 0;
-  if (args.length() == 2) {
-    include_parents = args(0).scalar_value();  
-  }
+  if (args.length() == 2) 
+    {
+      include_parents = args(0).scalar_value();  
+    }
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
 
   int ndims;
   check_err(nc_inq_ndims(ncid, &ndims));
@@ -1794,7 +1992,8 @@
 @end deftypefn")
 {
 
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1803,6 +2002,12 @@
   std::string name = args(1).string_value();
   int new_ncid;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_def_grp(parent_ncid, name.c_str(), &new_ncid));
   return octave_value(new_ncid);
 }
@@ -1816,7 +2021,8 @@
 @seealso{netcdf_inqGrps}\n\
 @end deftypefn")
 {
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1824,7 +2030,19 @@
   int ncid = args(0).scalar_value();
   int numgrps;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_grps(ncid, &numgrps, NULL));
+
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
   Array<int> ncids = Array<int>(dim_vector(1,numgrps));
   check_err(nc_inq_grps(ncid, NULL, ncids.fortran_vec()));
     
@@ -1839,7 +2057,8 @@
 @seealso{netcdf_inqGrps}\n\
 @end deftypefn")
 {
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1847,7 +2066,19 @@
   int ncid = args(0).scalar_value();
   char name[NC_MAX_NAME+1];
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_grpname(ncid, name));    
+
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
   return octave_value(std::string(name));
 }
 
@@ -1859,18 +2090,38 @@
 @seealso{netcdf_inqGrpName}\n\
 @end deftypefn")
 {
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value();
     }
 
   int ncid = args(0).scalar_value();
   size_t len;
+
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_grpname_len(ncid,&len));
+
+  if (error_state)
+    {
+      return octave_value();      
+    }
+
   char* name = new char[len+1];
   octave_value retval;
+  check_err(nc_inq_grpname_full(ncid, &len, name));
 
-  check_err(nc_inq_grpname_full(ncid, &len, name));
+  if (error_state)
+    {
+      delete name;
+      return octave_value();      
+    }
+
   retval = octave_value(std::string(name));
   delete name;
   return retval;
@@ -1884,7 +2135,8 @@
 @seealso{netcdf_inqGrpName}\n\
 @end deftypefn")
 {
-  if (args.length() != 1) {
+  if (args.length() != 1) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1892,6 +2144,12 @@
   int ncid = args(0).scalar_value();
   int parent_ncid;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_grp_parent(ncid, &parent_ncid));
   return octave_value(parent_ncid);
 }
@@ -1904,7 +2162,8 @@
 @seealso{netcdf_inqGrpName}\n\
 @end deftypefn")
 {
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1913,6 +2172,12 @@
   std::string name = args(1).string_value();
   int grp_ncid;
 
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   int format;
   check_err(nc_inq_format(ncid, &format));
 
@@ -1950,7 +2215,8 @@
 @seealso{netcdf_inqGrpFullNcid}\n\
 @end deftypefn")
 {
-  if (args.length() != 2) {
+  if (args.length() != 2) 
+    {
       print_usage ();
       return octave_value();
     }
@@ -1959,6 +2225,12 @@
   std::string name = args(1).string_value();
   int grp_ncid;
   
+  if (error_state)
+    {
+      print_usage ();
+      return octave_value();      
+    }
+
   check_err(nc_inq_ncid(ncid, name.c_str(), &grp_ncid));    
   return octave_value(grp_ncid);
 }