Store variable values under key 'data' instead of 'values'

Author: mhidas

ncwriter/template.py

@@ -329,7 +329,7 @@ def update_dimensinos(self):
         consistent with variable array sizes.
         """
         for name, var in self.variables.iteritems():
-            values = var.get('values')
+            values = var.get('data')
             if values is None:
                 continue
 
@@ -407,7 +407,7 @@ def createVariables(self, **kwargs):
                     varname, datatype, dimensions=dimensions, **var_c_opts)
 
             # add variable values
-            ncvar[:] = var['values']
+            ncvar[:] = var['data']
 
             # add variable attributes
             if var.get('attributes'):

test_ncwriter/test_template.py

@@ -132,8 +132,8 @@ def test_add_variable_attributes(self):
 
     def test_set_variable_values(self):
         template = DatasetTemplate.from_json(TEMPLATE_JSON)
-        template.variables['TEMP']['values'] = self.values10
-        self.assertTrue(all(template.variables['TEMP']['values'] == self.values10))
+        template.variables['TEMP']['data'] = self.values10
+        self.assertTrue(all(template.variables['TEMP']['data'] == self.values10))
 
     def test_create_empty_file(self):
         template = DatasetTemplate()
@@ -142,9 +142,9 @@ def test_create_empty_file(self):
 
     def test_create_file(self):
         template = DatasetTemplate.from_json(TEMPLATE_JSON)
-        template.variables['TIME']['values'] = self.values10
-        template.variables['DEPTH']['values'] = self.values1
-        template.variables['TEMP']['values'] = self.values10.reshape((10, 1))
+        template.variables['TIME']['data'] = self.values10
+        template.variables['DEPTH']['data'] = self.values1
+        template.variables['TEMP']['data'] = self.values10.reshape((10, 1))
         template.to_netcdf(self.temp_nc_file)
 
         dataset = Dataset(self.temp_nc_file)
@@ -180,7 +180,7 @@ def test_fill_values(self):
                                    'attributes': {'_FillValue': -999.}
                                    }
         x = np.array([-999., -999., -999., -999., -999., 1., 2., 3., 4., 5])
-        template.variables['X']['values'] = x
+        template.variables['X']['data'] = x
         template.to_netcdf(self.temp_nc_file)
 
         dataset = Dataset(self.temp_nc_file)
@@ -197,10 +197,9 @@ def test_fill_values_from_masked_array(self):
                                    'attributes': {'_FillValue': -999.}
                                    }
         x = np.array([-4, -3, -2, -1, 0, 1., 2., 3., 4., 5])
-        template.variables['X']['values'] = np.ma.masked_array(x,
-                                                               mask=[True, True, True, True, True,
-                                                                     False, False, False, False, False]
-                                                               )
+        template.variables['X']['data'] = np.ma.masked_array(x, mask=[True, True, True, True, True,
+                                                                      False, False, False, False, False]
+                                                             )
         template.to_netcdf(self.temp_nc_file)
 
         dataset = Dataset(self.temp_nc_file)