Tidy-up odds and ends after QC

  - corrected cell_methods
  - cleaned up global attributes

Author: jkrasting

tools/analysis/refineDiag_ocean_month.py

@@ -120,7 +120,7 @@ def main(args):
     hfbasin.long_name = 'Northward Ocean Heat Transport'
     hfbasin.units = 'W'
     hfbasin.coordinates = 'region'
-    hfbasin.cell_methods = 'yq:sum time:mean'
+    hfbasin.cell_methods = 'yq:point time:mean'
     hfbasin.comment = 'Indo-Pacific heat transport begins at 34 S'
     hfbasin.time_avg_info = 'average_T1,average_T2,average_DT'
     hfbasin.standard_name = 'northward_ocean_heat_transport'
@@ -157,8 +157,9 @@ def main(args):
 
     f_out     = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC')
     f_out.setncatts(f_in.__dict__)
-    f_out.filename = args.outfile
-    
+    f_out.filename = os.path.basename(args.outfile)
+    f_out.delncattr('associated_files')  # not needed for these fields     
+
     time_dim = f_out.createDimension('time', size=None)
     basin_dim = f_out.createDimension('basin', size=3)
     strlen_dim = f_out.createDimension('strlen', size=21)

tools/analysis/refineDiag_ocean_month_rho2.py

@@ -65,7 +65,7 @@ def main(args):
     msftyrho.long_name = 'Ocean Y Overturning Mass Streamfunction'
     msftyrho.units = 'kg s-1'
     msftyrho.coordinates = 'region'
-    msftyrho.cell_methods = 'rho2_i:sum yq:sum time:mean'
+    msftyrho.cell_methods = 'rho2_i:point yq:point time:mean'
     msftyrho.time_avg_info = 'average_T1,average_T2,average_DT'
     msftyrho.standard_name = 'ocean_y_overturning_mass_streamfunction'
 
@@ -80,7 +80,7 @@ def main(args):
     msftyrhompa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection'
     msftyrhompa.units = 'kg s-1'
     msftyrhompa.coordinates = 'region'
-    msftyrhompa.cell_methods = 'rho2_i:sum yq:sum time:mean'
+    msftyrhompa.cell_methods = 'rho2_i:point yq:point time:mean'
     msftyrhompa.time_avg_info = 'average_T1,average_T2,average_DT'
     msftyrhompa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\
                               'mesoscale_advection'
@@ -118,8 +118,9 @@ def main(args):
 
     f_out     = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC')
     f_out.setncatts(f_in.__dict__)
-    f_out.filename = args.outfile
-    
+    f_out.filename = os.path.basename(args.outfile)
+    f_out.delncattr('associated_files')  # not needed for these fields   
+ 
     time_dim = f_out.createDimension('time', size=None)
     basin_dim = f_out.createDimension('basin', size=3)
     strlen_dim = f_out.createDimension('strlen', size=21)

tools/analysis/refineDiag_ocean_month_z.py

@@ -111,7 +111,7 @@ def main(args):
     msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction'
     msftyyz.units = 'kg s-1'
     msftyyz.coordinates = 'region'
-    msftyyz.cell_methods = 'z_i:sum yq:sum time:mean'
+    msftyyz.cell_methods = 'z_i:point yq:point time:mean'
     msftyyz.time_avg_info = 'average_T1,average_T2,average_DT'
     msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction'
 
@@ -126,7 +126,7 @@ def main(args):
     msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection'
     msftyzmpa.units = 'kg s-1'
     msftyzmpa.coordinates = 'region'
-    msftyzmpa.cell_methods = 'z_i:sum yq:sum time:mean'
+    msftyzmpa.cell_methods = 'z_i:point yq:point time:mean'
     msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT'
     msftyzmpa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\
                               'mesoscale_advection'
@@ -142,7 +142,7 @@ def main(args):
     msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection'
     msftyzsmpa.units = 'kg s-1'
     msftyzsmpa.coordinates = 'region'
-    msftyzsmpa.cell_methods = 'z_i:sum yq:sum time:mean'
+    msftyzsmpa.cell_methods = 'z_i:point yq:point time:mean'
     msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT'
     msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\
                                'submesoscale_advection'
@@ -154,9 +154,10 @@ def main(args):
     wmo = np.ma.array(wmo,fill_value=nc_misval)
     wmo.long_name = 'Upward mass transport from resolved and parameterized advective transport'
     wmo.units = 'kg s-1'
-    wmo.cell_methods = 'z_i:sum xh:sum yh:sum time:mean'
+    wmo.cell_methods = 'z_i:point xh:sum yh:sum time:mean'
     wmo.time_avg_info = 'average_T1,average_T2,average_DT'
     wmo.standard_name = 'upward_ocean_mass_transport'
+    wmo.cell_measures = 'area:areacello'
 
     #-- mfo
     _, mfo, straits = sum_transport_in_straits(args.straitdir, monthly_average = True)
@@ -202,7 +203,7 @@ def main(args):
 
     f_out     = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC')
     f_out.setncatts(f_in.__dict__)
-    f_out.filename = args.outfile
+    f_out.filename = os.path.basename(args.outfile)
 
     time_dim = f_out.createDimension('time', size=None)
     basin_dim = f_out.createDimension('basin', size=3)