Index: trunk/SDToolBox/output_data.py
===================================================================
diff -u -r63 -r65
--- trunk/SDToolBox/output_data.py	(.../output_data.py)	(revision 63)
+++ trunk/SDToolBox/output_data.py	(.../output_data.py)	(revision 65)
@@ -160,8 +160,8 @@
         self.__cleanup_data_dict()
         with Dataset(nc_filename, mode='w', format="NETCDF4") as netcdf:
             self.__set_dataset_structure(netcdf)
-            self.__set_wave_variables(netcdf, dataset_code)
-            self.__set_wave_data(netcdf, dataset_code)
+            self.__set_dataset_variables(netcdf, dataset_code)
+            self.__set_variables_data(netcdf, dataset_code)
             self.__set_global_data(netcdf, dataset_code)
 
         self.__output_netcdf_file = nc_filename
@@ -233,13 +233,14 @@
         netcdf.featureType = 'timeSeries'
         netcdf.Conventions = 'CF-1.4'
         netcdf.standard_name_vocabulary = 'CF Standard Name Table v68'
-        stored_keys = string.join(data_dict[self.var_val_key].keys())
+        stored_keys = ', '.join(
+            self.data_dict[self.var_val_key].keys())
         netcdf.title = 'ERA5 {} data.'.format(stored_keys)
         netcdf.summary = 'ERA5 {} hourly timeseries'.format(stored_keys)
 
         netcdf.period = '{} - {}'.format(
-            str(data_dict[self.var_time_key][0]),
-            str(data_dict[self.var_time_key][-1]))
+            str(self.data_dict[self.var_time_key][0]),
+            str(self.data_dict[self.var_time_key][-1]))
         netcdf.keywords = 'Time ({}), '.format(self.var_time_key) + \
             'Latitude ({}), '.format(self.var_lat_key) + \
             'Longitude ({})'.format(self.var_lon_key)
@@ -382,7 +383,7 @@
 
         return netcdf
 
-    def __set_wave_data(
+    def __set_variables_data(
             self,
             netcdf: Dataset, dataset_code: str):
         """ Sets the variables and values for the waves.
@@ -405,7 +406,10 @@
             print('writing variable {}'.format(var_name))
             netcdf.variables[var_name.upper()][:] = variables[var_name]
 
-    def __set_wave_variables(self, netcdf: Dataset, dataset_code: str):
+    def __set_dataset_variables(
+            self,
+            netcdf: Dataset,
+            dataset_code: str):
         """Sets all sort of variables for the wave model.
 
         Arguments: