diff --git a/src/opsinputs/opsinputs_cxfields_mod.F90 b/src/opsinputs/opsinputs_cxfields_mod.F90 index 1753b829..aa01fc5c 100644 --- a/src/opsinputs/opsinputs_cxfields_mod.F90 +++ b/src/opsinputs/opsinputs_cxfields_mod.F90 @@ -59,7 +59,7 @@ module opsinputs_cxfields_mod character(len=*), parameter, public :: opsinputs_cxfields_NO2_AQ = opsinputs_cxfields_unknown character(len=*), parameter, public :: opsinputs_cxfields_CO_AQ = opsinputs_cxfields_unknown character(len=*), parameter, public :: opsinputs_cxfields_BLtype = opsinputs_cxfields_unknown -character(len=*), parameter, public :: opsinputs_cxfields_theta = "potential_temperature" +character(len=*), parameter, public :: opsinputs_cxfields_theta = "air_potential_temperature" character(len=*), parameter, public :: opsinputs_cxfields_rh = var_rh character(len=*), parameter, public :: opsinputs_cxfields_u = var_u character(len=*), parameter, public :: opsinputs_cxfields_v = var_v @@ -87,7 +87,7 @@ module opsinputs_cxfields_mod character(len=*), parameter, public :: opsinputs_cxfields_Cl = "liquid_cloud_volume_fraction_in_atmosphere_layer" character(len=*), parameter, public :: opsinputs_cxfields_Cf = "ice_cloud_volume_fraction_in_atmosphere_layer" character(len=*), parameter, public :: opsinputs_cxfields_qrain = "qrain" -character(len=*), parameter, public :: opsinputs_cxfields_ExnerA = "exner_levels" +character(len=*), parameter, public :: opsinputs_cxfields_ExnerA = "dimensionless_exner_function_levels" character(len=*), parameter, public :: opsinputs_cxfields_RichNumber = opsinputs_cxfields_unknown character(len=*), parameter, public :: opsinputs_cxfields_SoilMoisture = opsinputs_cxfields_unknown character(len=*), parameter, public :: opsinputs_cxfields_SoilTemp = opsinputs_cxfields_unknown diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py index 13a5c2ad..bb77e5d9 100644 --- a/test/generate_unittest_netcdfs.py +++ b/test/generate_unittest_netcdfs.py @@ -938,7 +938,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_1d_geoval_to_netcdf ('total_cloud_amount', 'testinput/024_SurfaceCxField_CloudAmount.nc4') output_1d_geoval_to_netcdf ('obukhov_length', 'testinput/056_SurfaceCxField_obukhov_length.nc4') output_1d_geoval_to_netcdf ('friction_velocity_over_water', 'testinput/057_SurfaceCxField_friction_velocity_over_water.nc4') - output_2d_geoval_to_netcdf ('potential_temperature', 'testinput/001_UpperAirCxField_theta.nc4') + output_2d_geoval_to_netcdf ('air_potential_temperature', 'testinput/001_UpperAirCxField_theta.nc4') output_2d_geoval_to_netcdf ('relative_humidity', 'testinput/002_UpperAirCxField_relative_humidity.nc4') output_2d_geoval_to_netcdf ('eastward_wind', 'testinput/003_UpperAirCxField_u.nc4') output_2d_geoval_to_netcdf ('northward_wind', 'testinput/004_UpperAirCxField_v.nc4') @@ -953,7 +953,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_2d_geoval_to_netcdf ('liquid_cloud_volume_fraction_in_atmosphere_layer', 'testinput/035_UpperAirCxField_Cl.nc4') output_2d_geovals_to_netcdf (['mass_fraction_of_dust00%s_in_air' % i for i in range(1, 7)], 'testinput/041-046_UpperAirCxField_dust1-dust6.nc4') output_2d_geovals_to_netcdf (['eastward_wind', 'northward_wind'], 'testinput/CxWriter_UnRotateWinds.nc4', shift_by_varindex=False) - output_2d_geoval_to_netcdf ('exner_levels', 'testinput/039_UpperAirCxField_Exner.nc4') + output_2d_geoval_to_netcdf ('dimensionless_exner_function_levels', 'testinput/039_UpperAirCxField_Exner.nc4') output_2d_geoval_to_netcdf ('qrain', 'testinput/040_UpperAirCxField_Qrain.nc4') # Cx full output for an obsgroup testing @@ -962,7 +962,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # ABIClr output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_abiclr.nc4') @@ -970,7 +970,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # AHIClr output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_ahiclr.nc4') @@ -978,7 +978,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # AMSR output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_amsr.nc4') @@ -986,7 +986,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # GMIlow output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_gmilow.nc4') @@ -994,7 +994,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # GMIhigh output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_gmihigh.nc4') @@ -1002,7 +1002,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # ATMS output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_atms.nc4') @@ -1010,7 +1010,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # ATOVS output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_atovs.nc4') @@ -1018,7 +1018,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # SSMIS output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_ssmis.nc4') @@ -1026,7 +1026,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # MWSFY3 output_full_cx_to_netcdf(['skin_temperature','ice_area_fraction','height_above_mean_sea_level_at_surface','air_pressure_at_surface','uwind_at_10m', 'vwind_at_10m','surface_temperature','relative_humidity_at_2m','surface_pressure_at_mean_sea_level'], - ['potential_temperature','specific_humidity','cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature','specific_humidity','cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water','air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer','liquid_cloud_volume_fraction_in_atmosphere_layer','ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_mwsfy3.nc4') @@ -1034,7 +1034,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # GNSS-RO output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_gnssro.nc4') @@ -1043,7 +1043,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_full_cx_to_netcdf(['ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface'], - ['eastward_wind', 'northward_wind', 'potential_temperature', 'specific_humidity', + ['eastward_wind', 'northward_wind', 'air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1056,7 +1056,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_full_cx_to_netcdf(['ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface'], - ['eastward_wind', 'northward_wind', 'potential_temperature', 'specific_humidity', + ['eastward_wind', 'northward_wind', 'air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1070,14 +1070,14 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'air_pressure_at_surface', 'ice_area_fraction', 'total_cloud_amount'], - ['potential_temperature', 'specific_humidity', 'air_pressure_levels', 'cloud_layer', + ['air_potential_temperature', 'specific_humidity', 'air_pressure_levels', 'cloud_layer', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water'], 'testinput/cx_ukvnamelist_surfacecloud.nc4') # SatTCWV output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'ice_area_fraction', 'total_cloud_amount'], - ['potential_temperature', 'specific_humidity', 'air_pressure_levels', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'air_pressure_levels', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_sattcwv.nc4') @@ -1085,7 +1085,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # IASI - this tests the variable_for_quality_control option output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_iasi.nc4') @@ -1093,7 +1093,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # SEVIRIClr output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_seviriclr.nc4') @@ -1101,7 +1101,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # SEVIRIClr UKV output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_ukvnamelist_seviriclr.nc4') @@ -1109,7 +1109,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # SEVIRIASR UKV output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_ukvnamelist_seviriasr.nc4') @@ -1117,7 +1117,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # GroundGPS output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer'], 'testinput/cx_globalnamelist_groundgps.nc4') @@ -1126,7 +1126,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_full_cx_to_netcdf(['ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface'], - ['eastward_wind', 'northward_wind', 'potential_temperature', 'specific_humidity', + ['eastward_wind', 'northward_wind', 'air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1138,7 +1138,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Surface output_full_cx_to_netcdf(['skin_temperature', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer', 'eastward_wind', 'northward_wind'], @@ -1147,7 +1147,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Surface - UKV output_full_cx_to_netcdf(['skin_temperature', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'visibility_1p5m','qt_1p5m'], - ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer', 'eastward_wind', 'northward_wind', 'aerosol'], @@ -1159,7 +1159,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'uwind_at_10m', 'vwind_at_10m'], ['air_pressure_levels', 'cloud_volume_fraction_in_atmosphere_layer', 'ice_cloud_volume_fraction_in_atmosphere_layer', 'liquid_cloud_volume_fraction_in_atmosphere_layer', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', - 'specific_humidity', 'potential_temperature', 'eastward_wind', 'northward_wind'], + 'specific_humidity', 'air_potential_temperature', 'eastward_wind', 'northward_wind'], 'testinput/cx_globalnamelist_scatwind.nc4') # Unrotate 10m winds output_full_cx_to_netcdf (['uwind_at_10m', 'vwind_at_10m'],[], 'testinput/CxWriter_UnRotateWinds10M.nc4') @@ -1171,7 +1171,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'visibility_1p5m', 'total_cloud_amount', 'surface_pressure_at_mean_sea_level', 'surf_param_a', 'surf_param_b'], - ['potential_temperature', 'eastward_wind', 'northward_wind', 'specific_humidity', + ['air_potential_temperature', 'eastward_wind', 'northward_wind', 'specific_humidity', 'air_pressure_levels', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water'], 'testinput/cx_globalnamelist_screen.nc4') @@ -1188,9 +1188,9 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Radar reflectivity - UKV output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface'], - ['potential_temperature', 'specific_humidity', 'air_pressure_levels', + ['air_potential_temperature', 'specific_humidity', 'air_pressure_levels', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', - 'exner_levels', 'qrain'], + 'dimensionless_exner_function_levels', 'qrain'], 'testinput/cx_ukvnamelist_radar_reflectivity.nc4') diff --git a/test/testinput/001_SurfaceCxField_Orog.nc4 b/test/testinput/001_SurfaceCxField_Orog.nc4 index 1f0daf41..13579fab 100644 Binary files a/test/testinput/001_SurfaceCxField_Orog.nc4 and b/test/testinput/001_SurfaceCxField_Orog.nc4 differ diff --git a/test/testinput/001_UpperAirCxField_theta.nc4 b/test/testinput/001_UpperAirCxField_theta.nc4 index 655adad0..8d81b97b 100644 Binary files a/test/testinput/001_UpperAirCxField_theta.nc4 and b/test/testinput/001_UpperAirCxField_theta.nc4 differ diff --git a/test/testinput/001_VarField_pstar.nc4 b/test/testinput/001_VarField_pstar.nc4 index 8e936062..9bc19da0 100644 Binary files a/test/testinput/001_VarField_pstar.nc4 and b/test/testinput/001_VarField_pstar.nc4 differ diff --git a/test/testinput/001_VarField_pstar_stationID_integer.nc4 b/test/testinput/001_VarField_pstar_stationID_integer.nc4 index cdc81217..0457b0c5 100644 Binary files a/test/testinput/001_VarField_pstar_stationID_integer.nc4 and b/test/testinput/001_VarField_pstar_stationID_integer.nc4 differ diff --git a/test/testinput/002_SurfaceCxField_pstar.nc4 b/test/testinput/002_SurfaceCxField_pstar.nc4 index 2959944e..720d61b5 100644 Binary files a/test/testinput/002_SurfaceCxField_pstar.nc4 and b/test/testinput/002_SurfaceCxField_pstar.nc4 differ diff --git a/test/testinput/002_UpperAirCxFieldForMultiLevelObs_relative_humidity.nc4 b/test/testinput/002_UpperAirCxFieldForMultiLevelObs_relative_humidity.nc4 index faf85dfc..81b5f450 100644 Binary files a/test/testinput/002_UpperAirCxFieldForMultiLevelObs_relative_humidity.nc4 and b/test/testinput/002_UpperAirCxFieldForMultiLevelObs_relative_humidity.nc4 differ diff --git a/test/testinput/002_UpperAirCxField_relative_humidity.nc4 b/test/testinput/002_UpperAirCxField_relative_humidity.nc4 index 39d604e6..f29fb0c4 100644 Binary files a/test/testinput/002_UpperAirCxField_relative_humidity.nc4 and b/test/testinput/002_UpperAirCxField_relative_humidity.nc4 differ diff --git a/test/testinput/002_VarField_temperature_RadarZ.nc4 b/test/testinput/002_VarField_temperature_RadarZ.nc4 index 818ffce9..32b20a45 100644 Binary files a/test/testinput/002_VarField_temperature_RadarZ.nc4 and b/test/testinput/002_VarField_temperature_RadarZ.nc4 differ diff --git a/test/testinput/002_VarField_temperature_Surface.nc4 b/test/testinput/002_VarField_temperature_Surface.nc4 index e0d0ac42..c0a13aec 100644 Binary files a/test/testinput/002_VarField_temperature_Surface.nc4 and b/test/testinput/002_VarField_temperature_Surface.nc4 differ diff --git a/test/testinput/003_SurfaceCxField_t2.nc4 b/test/testinput/003_SurfaceCxField_t2.nc4 index 20a8ed31..b0ae8d92 100644 Binary files a/test/testinput/003_SurfaceCxField_t2.nc4 and b/test/testinput/003_SurfaceCxField_t2.nc4 differ diff --git a/test/testinput/003_UpperAirCxField_u.nc4 b/test/testinput/003_UpperAirCxField_u.nc4 index 36a8e271..15c7ad51 100644 Binary files a/test/testinput/003_UpperAirCxField_u.nc4 and b/test/testinput/003_UpperAirCxField_u.nc4 differ diff --git a/test/testinput/003_VarField_rh_Sonde.nc4 b/test/testinput/003_VarField_rh_Sonde.nc4 index 5228f15e..a6ad37b4 100644 Binary files a/test/testinput/003_VarField_rh_Sonde.nc4 and b/test/testinput/003_VarField_rh_Sonde.nc4 differ diff --git a/test/testinput/003_VarField_rh_Surface.nc4 b/test/testinput/003_VarField_rh_Surface.nc4 index 03dbf356..bdaaf7dd 100644 Binary files a/test/testinput/003_VarField_rh_Surface.nc4 and b/test/testinput/003_VarField_rh_Surface.nc4 differ diff --git a/test/testinput/004_SurfaceCxField_rh2.nc4 b/test/testinput/004_SurfaceCxField_rh2.nc4 index 36a34113..8330ec03 100644 Binary files a/test/testinput/004_SurfaceCxField_rh2.nc4 and b/test/testinput/004_SurfaceCxField_rh2.nc4 differ diff --git a/test/testinput/004_UpperAirCxField_v.nc4 b/test/testinput/004_UpperAirCxField_v.nc4 index 8880a445..0c707713 100644 Binary files a/test/testinput/004_UpperAirCxField_v.nc4 and b/test/testinput/004_UpperAirCxField_v.nc4 differ diff --git a/test/testinput/004_VarField_u_ScatwindChosen.nc4 b/test/testinput/004_VarField_u_ScatwindChosen.nc4 index 1be98c5f..11812318 100644 Binary files a/test/testinput/004_VarField_u_ScatwindChosen.nc4 and b/test/testinput/004_VarField_u_ScatwindChosen.nc4 differ diff --git a/test/testinput/004_VarField_u_Sonde.nc4 b/test/testinput/004_VarField_u_Sonde.nc4 index b8f7c994..f48f6846 100644 Binary files a/test/testinput/004_VarField_u_Sonde.nc4 and b/test/testinput/004_VarField_u_Sonde.nc4 differ diff --git a/test/testinput/004_VarField_u_Surface.nc4 b/test/testinput/004_VarField_u_Surface.nc4 index 5657fabd..fe22a8b8 100644 Binary files a/test/testinput/004_VarField_u_Surface.nc4 and b/test/testinput/004_VarField_u_Surface.nc4 differ diff --git a/test/testinput/005_SurfaceCxField_u10.nc4 b/test/testinput/005_SurfaceCxField_u10.nc4 index ef1a5efa..993ede74 100644 Binary files a/test/testinput/005_SurfaceCxField_u10.nc4 and b/test/testinput/005_SurfaceCxField_u10.nc4 differ diff --git a/test/testinput/005_UpperAirCxField_q.nc4 b/test/testinput/005_UpperAirCxField_q.nc4 index afde62f1..9cbfc776 100644 Binary files a/test/testinput/005_UpperAirCxField_q.nc4 and b/test/testinput/005_UpperAirCxField_q.nc4 differ diff --git a/test/testinput/005_VarField_v_ScatwindChosen.nc4 b/test/testinput/005_VarField_v_ScatwindChosen.nc4 index 1212e501..353fe50b 100644 Binary files a/test/testinput/005_VarField_v_ScatwindChosen.nc4 and b/test/testinput/005_VarField_v_ScatwindChosen.nc4 differ diff --git a/test/testinput/005_VarField_v_Sonde.nc4 b/test/testinput/005_VarField_v_Sonde.nc4 index e40ecb76..b58673a6 100644 Binary files a/test/testinput/005_VarField_v_Sonde.nc4 and b/test/testinput/005_VarField_v_Sonde.nc4 differ diff --git a/test/testinput/005_VarField_v_Surface.nc4 b/test/testinput/005_VarField_v_Surface.nc4 index 0106f3d4..2c790302 100644 Binary files a/test/testinput/005_VarField_v_Surface.nc4 and b/test/testinput/005_VarField_v_Surface.nc4 differ diff --git a/test/testinput/006_SurfaceCxField_v10.nc4 b/test/testinput/006_SurfaceCxField_v10.nc4 index 2a1e938b..50ab2e0f 100644 Binary files a/test/testinput/006_SurfaceCxField_v10.nc4 and b/test/testinput/006_SurfaceCxField_v10.nc4 differ diff --git a/test/testinput/007_VarField_tcwv.nc4 b/test/testinput/007_VarField_tcwv.nc4 index 5e9cefe1..f0ee8548 100644 Binary files a/test/testinput/007_VarField_tcwv.nc4 and b/test/testinput/007_VarField_tcwv.nc4 differ diff --git a/test/testinput/008_SurfaceCxField_visibility_1p5m.nc4 b/test/testinput/008_SurfaceCxField_visibility_1p5m.nc4 index c8e54255..68bb1b96 100644 Binary files a/test/testinput/008_SurfaceCxField_visibility_1p5m.nc4 and b/test/testinput/008_SurfaceCxField_visibility_1p5m.nc4 differ diff --git a/test/testinput/008_VarField_WindSpeed.nc4 b/test/testinput/008_VarField_WindSpeed.nc4 index 2cd53070..fc1d1928 100644 Binary files a/test/testinput/008_VarField_WindSpeed.nc4 and b/test/testinput/008_VarField_WindSpeed.nc4 differ diff --git a/test/testinput/009_VarField_horizontalVisibility.nc4 b/test/testinput/009_VarField_horizontalVisibility.nc4 index 116934ce..63a5c6c7 100644 Binary files a/test/testinput/009_VarField_horizontalVisibility.nc4 and b/test/testinput/009_VarField_horizontalVisibility.nc4 differ diff --git a/test/testinput/010_VarField_britemp.nc4 b/test/testinput/010_VarField_britemp.nc4 index a22c63e1..798bda8f 100644 Binary files a/test/testinput/010_VarField_britemp.nc4 and b/test/testinput/010_VarField_britemp.nc4 differ diff --git a/test/testinput/011_UpperAirCxField_P.nc4 b/test/testinput/011_UpperAirCxField_P.nc4 index 3d7fd79e..63024943 100644 Binary files a/test/testinput/011_UpperAirCxField_P.nc4 and b/test/testinput/011_UpperAirCxField_P.nc4 differ diff --git a/test/testinput/011_VarField_tskin.nc4 b/test/testinput/011_VarField_tskin.nc4 index 941766cc..f6559338 100644 Binary files a/test/testinput/011_VarField_tskin.nc4 and b/test/testinput/011_VarField_tskin.nc4 differ diff --git a/test/testinput/012_VarField_gpstzdelay.nc4 b/test/testinput/012_VarField_gpstzdelay.nc4 index 9125ab58..6bec29d1 100644 Binary files a/test/testinput/012_VarField_gpstzdelay.nc4 and b/test/testinput/012_VarField_gpstzdelay.nc4 differ diff --git a/test/testinput/013_SurfaceCxField_TskinSea.nc4 b/test/testinput/013_SurfaceCxField_TskinSea.nc4 index b74a1cda..3a583ac8 100644 Binary files a/test/testinput/013_SurfaceCxField_TskinSea.nc4 and b/test/testinput/013_SurfaceCxField_TskinSea.nc4 differ diff --git a/test/testinput/015_UpperAirCxField_cloud_layer.nc4 b/test/testinput/015_UpperAirCxField_cloud_layer.nc4 index b675353f..1bf685ec 100644 Binary files a/test/testinput/015_UpperAirCxField_cloud_layer.nc4 and b/test/testinput/015_UpperAirCxField_cloud_layer.nc4 differ diff --git a/test/testinput/015_VarField_cloud.nc4 b/test/testinput/015_VarField_cloud.nc4 index 4a3dee6c..952fc0e1 100644 Binary files a/test/testinput/015_VarField_cloud.nc4 and b/test/testinput/015_VarField_cloud.nc4 differ diff --git a/test/testinput/016_SurfaceCxField_pmsl.nc4 b/test/testinput/016_SurfaceCxField_pmsl.nc4 index b5372a46..551f2b17 100644 Binary files a/test/testinput/016_SurfaceCxField_pmsl.nc4 and b/test/testinput/016_SurfaceCxField_pmsl.nc4 differ diff --git a/test/testinput/017_SurfaceCxField_SeaIce.nc4 b/test/testinput/017_SurfaceCxField_SeaIce.nc4 index 76e82c1f..0c80f61f 100644 Binary files a/test/testinput/017_SurfaceCxField_SeaIce.nc4 and b/test/testinput/017_SurfaceCxField_SeaIce.nc4 differ diff --git a/test/testinput/017_VarField_mwemiss.nc4 b/test/testinput/017_VarField_mwemiss.nc4 index f4d74864..c7663c8c 100644 Binary files a/test/testinput/017_VarField_mwemiss.nc4 and b/test/testinput/017_VarField_mwemiss.nc4 differ diff --git a/test/testinput/018_VarField_tcozone.nc4 b/test/testinput/018_VarField_tcozone.nc4 index 1013e072..cbf84cd9 100644 Binary files a/test/testinput/018_VarField_tcozone.nc4 and b/test/testinput/018_VarField_tcozone.nc4 differ diff --git a/test/testinput/019_VarField_satzenith.nc4 b/test/testinput/019_VarField_satzenith.nc4 index 07297ae4..0d1ccc56 100644 Binary files a/test/testinput/019_VarField_satzenith.nc4 and b/test/testinput/019_VarField_satzenith.nc4 differ diff --git a/test/testinput/021_VarField_surface.nc4 b/test/testinput/021_VarField_surface.nc4 index c86b3014..de816d74 100644 Binary files a/test/testinput/021_VarField_surface.nc4 and b/test/testinput/021_VarField_surface.nc4 differ diff --git a/test/testinput/022_SurfaceCxField_surf_param_a.nc4 b/test/testinput/022_SurfaceCxField_surf_param_a.nc4 index 25c0a3e8..29e385aa 100644 Binary files a/test/testinput/022_SurfaceCxField_surf_param_a.nc4 and b/test/testinput/022_SurfaceCxField_surf_param_a.nc4 differ diff --git a/test/testinput/023_SurfaceCxField_surf_param_b.nc4 b/test/testinput/023_SurfaceCxField_surf_param_b.nc4 index 728da893..e5015844 100644 Binary files a/test/testinput/023_SurfaceCxField_surf_param_b.nc4 and b/test/testinput/023_SurfaceCxField_surf_param_b.nc4 differ diff --git a/test/testinput/023_VarField_modelsurface_geoval.nc4 b/test/testinput/023_VarField_modelsurface_geoval.nc4 index fb0385bd..44211ab6 100644 Binary files a/test/testinput/023_VarField_modelsurface_geoval.nc4 and b/test/testinput/023_VarField_modelsurface_geoval.nc4 differ diff --git a/test/testinput/024_SurfaceCxField_CloudAmount.nc4 b/test/testinput/024_SurfaceCxField_CloudAmount.nc4 index ea3b9d14..8ad0416b 100644 Binary files a/test/testinput/024_SurfaceCxField_CloudAmount.nc4 and b/test/testinput/024_SurfaceCxField_CloudAmount.nc4 differ diff --git a/test/testinput/028_VarField_satid.nc4 b/test/testinput/028_VarField_satid.nc4 index b315a7cf..c80537b3 100644 Binary files a/test/testinput/028_VarField_satid.nc4 and b/test/testinput/028_VarField_satid.nc4 differ diff --git a/test/testinput/029_UpperAirCxField_qcf.nc4 b/test/testinput/029_UpperAirCxField_qcf.nc4 index a10ea087..8503d0f2 100644 Binary files a/test/testinput/029_UpperAirCxField_qcf.nc4 and b/test/testinput/029_UpperAirCxField_qcf.nc4 differ diff --git a/test/testinput/030_UpperAirCxField_qcl.nc4 b/test/testinput/030_UpperAirCxField_qcl.nc4 index d6b424c0..1625c4e6 100644 Binary files a/test/testinput/030_UpperAirCxField_qcl.nc4 and b/test/testinput/030_UpperAirCxField_qcl.nc4 differ diff --git a/test/testinput/031_UpperAirCxField_cloud_bulk.nc4 b/test/testinput/031_UpperAirCxField_cloud_bulk.nc4 index 3c99c98e..4f1ea002 100644 Binary files a/test/testinput/031_UpperAirCxField_cloud_bulk.nc4 and b/test/testinput/031_UpperAirCxField_cloud_bulk.nc4 differ diff --git a/test/testinput/031_VarField_solzenith.nc4 b/test/testinput/031_VarField_solzenith.nc4 index aeead956..0a27b503 100644 Binary files a/test/testinput/031_VarField_solzenith.nc4 and b/test/testinput/031_VarField_solzenith.nc4 differ diff --git a/test/testinput/033_UpperAirCxField_p_bar.nc4 b/test/testinput/033_UpperAirCxField_p_bar.nc4 index f5fec822..1b178859 100644 Binary files a/test/testinput/033_UpperAirCxField_p_bar.nc4 and b/test/testinput/033_UpperAirCxField_p_bar.nc4 differ diff --git a/test/testinput/034_UpperAirCxField_Cf.nc4 b/test/testinput/034_UpperAirCxField_Cf.nc4 index a2d3589e..732a6b71 100644 Binary files a/test/testinput/034_UpperAirCxField_Cf.nc4 and b/test/testinput/034_UpperAirCxField_Cf.nc4 differ diff --git a/test/testinput/034_VarField_iremiss.nc4 b/test/testinput/034_VarField_iremiss.nc4 index 966531ef..4ef3a0b3 100644 Binary files a/test/testinput/034_VarField_iremiss.nc4 and b/test/testinput/034_VarField_iremiss.nc4 differ diff --git a/test/testinput/035_UpperAirCxField_Cl.nc4 b/test/testinput/035_UpperAirCxField_Cl.nc4 index 997c4430..f831072b 100644 Binary files a/test/testinput/035_UpperAirCxField_Cl.nc4 and b/test/testinput/035_UpperAirCxField_Cl.nc4 differ diff --git a/test/testinput/035_VarField_cloudtopp.nc4 b/test/testinput/035_VarField_cloudtopp.nc4 index a84bb63b..e13d7b06 100644 Binary files a/test/testinput/035_VarField_cloudtopp.nc4 and b/test/testinput/035_VarField_cloudtopp.nc4 differ diff --git a/test/testinput/036_VarField_cloudfrac.nc4 b/test/testinput/036_VarField_cloudfrac.nc4 index a22d5fba..98568d6f 100644 Binary files a/test/testinput/036_VarField_cloudfrac.nc4 and b/test/testinput/036_VarField_cloudfrac.nc4 differ diff --git a/test/testinput/039_UpperAirCxField_Exner.nc4 b/test/testinput/039_UpperAirCxField_Exner.nc4 index 69d0057d..89cadeb4 100644 Binary files a/test/testinput/039_UpperAirCxField_Exner.nc4 and b/test/testinput/039_UpperAirCxField_Exner.nc4 differ diff --git a/test/testinput/040_UpperAirCxField_Qrain.nc4 b/test/testinput/040_UpperAirCxField_Qrain.nc4 index 47220260..be30126d 100644 Binary files a/test/testinput/040_UpperAirCxField_Qrain.nc4 and b/test/testinput/040_UpperAirCxField_Qrain.nc4 differ diff --git a/test/testinput/041-046_UpperAirCxField_dust1-dust6.nc4 b/test/testinput/041-046_UpperAirCxField_dust1-dust6.nc4 index 03d89cb6..117ab84b 100644 Binary files a/test/testinput/041-046_UpperAirCxField_dust1-dust6.nc4 and b/test/testinput/041-046_UpperAirCxField_dust1-dust6.nc4 differ diff --git a/test/testinput/051_VarField_u10ambwind.nc4 b/test/testinput/051_VarField_u10ambwind.nc4 index 0f31255a..4ba444d3 100644 Binary files a/test/testinput/051_VarField_u10ambwind.nc4 and b/test/testinput/051_VarField_u10ambwind.nc4 differ diff --git a/test/testinput/052_VarField_v10ambwind.nc4 b/test/testinput/052_VarField_v10ambwind.nc4 index c2acf77b..40622709 100644 Binary files a/test/testinput/052_VarField_v10ambwind.nc4 and b/test/testinput/052_VarField_v10ambwind.nc4 differ diff --git a/test/testinput/053_VarField_awpriorpcorrect.nc4 b/test/testinput/053_VarField_awpriorpcorrect.nc4 index e87f2cc5..5e7a37a6 100644 Binary files a/test/testinput/053_VarField_awpriorpcorrect.nc4 and b/test/testinput/053_VarField_awpriorpcorrect.nc4 differ diff --git a/test/testinput/056_SurfaceCxField_obukhov_length.nc4 b/test/testinput/056_SurfaceCxField_obukhov_length.nc4 index a868f8f4..9f299767 100644 Binary files a/test/testinput/056_SurfaceCxField_obukhov_length.nc4 and b/test/testinput/056_SurfaceCxField_obukhov_length.nc4 differ diff --git a/test/testinput/057_SurfaceCxField_friction_velocity_over_water.nc4 b/test/testinput/057_SurfaceCxField_friction_velocity_over_water.nc4 index 09570836..64c1d099 100644 Binary files a/test/testinput/057_SurfaceCxField_friction_velocity_over_water.nc4 and b/test/testinput/057_SurfaceCxField_friction_velocity_over_water.nc4 differ diff --git a/test/testinput/057_VarField_emissivity.nc4 b/test/testinput/057_VarField_emissivity.nc4 index f053ba27..064d02be 100644 Binary files a/test/testinput/057_VarField_emissivity.nc4 and b/test/testinput/057_VarField_emissivity.nc4 differ diff --git a/test/testinput/063_VarField_radialVelocity.nc4 b/test/testinput/063_VarField_radialVelocity.nc4 index cd40d646..1c5d5717 100644 Binary files a/test/testinput/063_VarField_radialVelocity.nc4 and b/test/testinput/063_VarField_radialVelocity.nc4 differ diff --git a/test/testinput/067_VarField_GPS_Station_Height.nc4 b/test/testinput/067_VarField_GPS_Station_Height.nc4 index 0b1e2ab6..640f5caa 100644 Binary files a/test/testinput/067_VarField_GPS_Station_Height.nc4 and b/test/testinput/067_VarField_GPS_Station_Height.nc4 differ diff --git a/test/testinput/068_VarField_clw.nc4 b/test/testinput/068_VarField_clw.nc4 index fe86b6f7..ed007d29 100644 Binary files a/test/testinput/068_VarField_clw.nc4 and b/test/testinput/068_VarField_clw.nc4 differ diff --git a/test/testinput/070_VarField_reflectivity.nc4 b/test/testinput/070_VarField_reflectivity.nc4 index deace054..a5f38136 100644 Binary files a/test/testinput/070_VarField_reflectivity.nc4 and b/test/testinput/070_VarField_reflectivity.nc4 differ diff --git a/test/testinput/071_VarField_bendingangle.nc4 b/test/testinput/071_VarField_bendingangle.nc4 index 8df43478..a7ca18da 100644 Binary files a/test/testinput/071_VarField_bendingangle.nc4 and b/test/testinput/071_VarField_bendingangle.nc4 differ diff --git a/test/testinput/072_VarField_impactparam.nc4 b/test/testinput/072_VarField_impactparam.nc4 index 902e25b6..31a9d0db 100644 Binary files a/test/testinput/072_VarField_impactparam.nc4 and b/test/testinput/072_VarField_impactparam.nc4 differ diff --git a/test/testinput/073_VarField_ro_rad_curv.nc4 b/test/testinput/073_VarField_ro_rad_curv.nc4 index bd6f8f6f..96c24fc0 100644 Binary files a/test/testinput/073_VarField_ro_rad_curv.nc4 and b/test/testinput/073_VarField_ro_rad_curv.nc4 differ diff --git a/test/testinput/074_VarField_ro_geoid_und.nc4 b/test/testinput/074_VarField_ro_geoid_und.nc4 index fe6dca21..fdba8bcf 100644 Binary files a/test/testinput/074_VarField_ro_geoid_und.nc4 and b/test/testinput/074_VarField_ro_geoid_und.nc4 differ diff --git a/test/testinput/076_VarField_britempvarerror.nc4 b/test/testinput/076_VarField_britempvarerror.nc4 index da087139..a39288e2 100644 Binary files a/test/testinput/076_VarField_britempvarerror.nc4 and b/test/testinput/076_VarField_britempvarerror.nc4 differ diff --git a/test/testinput/077_VarField_aod.nc4 b/test/testinput/077_VarField_aod.nc4 index 1201160a..e5addef8 100644 Binary files a/test/testinput/077_VarField_aod.nc4 and b/test/testinput/077_VarField_aod.nc4 differ diff --git a/test/testinput/078_VarField_theta.nc4 b/test/testinput/078_VarField_theta.nc4 index b37c9c6f..02499d13 100644 Binary files a/test/testinput/078_VarField_theta.nc4 and b/test/testinput/078_VarField_theta.nc4 differ diff --git a/test/testinput/080_VarField_biaspredictors.nc4 b/test/testinput/080_VarField_biaspredictors.nc4 index 05de6cf7..cc5588cd 100644 Binary files a/test/testinput/080_VarField_biaspredictors.nc4 and b/test/testinput/080_VarField_biaspredictors.nc4 differ diff --git a/test/testinput/CxWriter_UnRotateWinds.nc4 b/test/testinput/CxWriter_UnRotateWinds.nc4 index d39ea1cc..c8d8d06d 100644 Binary files a/test/testinput/CxWriter_UnRotateWinds.nc4 and b/test/testinput/CxWriter_UnRotateWinds.nc4 differ diff --git a/test/testinput/CxWriter_UnRotateWinds10M.nc4 b/test/testinput/CxWriter_UnRotateWinds10M.nc4 index 04d23bd7..dfb5f7f7 100644 Binary files a/test/testinput/CxWriter_UnRotateWinds10M.nc4 and b/test/testinput/CxWriter_UnRotateWinds10M.nc4 differ diff --git a/test/testinput/cx_globalnamelist_abiclr.nc4 b/test/testinput/cx_globalnamelist_abiclr.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_abiclr.nc4 and b/test/testinput/cx_globalnamelist_abiclr.nc4 differ diff --git a/test/testinput/cx_globalnamelist_ahiclr.nc4 b/test/testinput/cx_globalnamelist_ahiclr.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_ahiclr.nc4 and b/test/testinput/cx_globalnamelist_ahiclr.nc4 differ diff --git a/test/testinput/cx_globalnamelist_aircraft.nc4 b/test/testinput/cx_globalnamelist_aircraft.nc4 index 05fc62d0..d5a4a4e5 100644 Binary files a/test/testinput/cx_globalnamelist_aircraft.nc4 and b/test/testinput/cx_globalnamelist_aircraft.nc4 differ diff --git a/test/testinput/cx_globalnamelist_amsr.nc4 b/test/testinput/cx_globalnamelist_amsr.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_amsr.nc4 and b/test/testinput/cx_globalnamelist_amsr.nc4 differ diff --git a/test/testinput/cx_globalnamelist_atms.nc4 b/test/testinput/cx_globalnamelist_atms.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_atms.nc4 and b/test/testinput/cx_globalnamelist_atms.nc4 differ diff --git a/test/testinput/cx_globalnamelist_atovs.nc4 b/test/testinput/cx_globalnamelist_atovs.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_atovs.nc4 and b/test/testinput/cx_globalnamelist_atovs.nc4 differ diff --git a/test/testinput/cx_globalnamelist_gmihigh.nc4 b/test/testinput/cx_globalnamelist_gmihigh.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_gmihigh.nc4 and b/test/testinput/cx_globalnamelist_gmihigh.nc4 differ diff --git a/test/testinput/cx_globalnamelist_gmilow.nc4 b/test/testinput/cx_globalnamelist_gmilow.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_gmilow.nc4 and b/test/testinput/cx_globalnamelist_gmilow.nc4 differ diff --git a/test/testinput/cx_globalnamelist_gnssro.nc4 b/test/testinput/cx_globalnamelist_gnssro.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_gnssro.nc4 and b/test/testinput/cx_globalnamelist_gnssro.nc4 differ diff --git a/test/testinput/cx_globalnamelist_groundgps.nc4 b/test/testinput/cx_globalnamelist_groundgps.nc4 index 9dc92f5b..ccdbf013 100644 Binary files a/test/testinput/cx_globalnamelist_groundgps.nc4 and b/test/testinput/cx_globalnamelist_groundgps.nc4 differ diff --git a/test/testinput/cx_globalnamelist_iasi.nc4 b/test/testinput/cx_globalnamelist_iasi.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_iasi.nc4 and b/test/testinput/cx_globalnamelist_iasi.nc4 differ diff --git a/test/testinput/cx_globalnamelist_mwsfy3.nc4 b/test/testinput/cx_globalnamelist_mwsfy3.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_mwsfy3.nc4 and b/test/testinput/cx_globalnamelist_mwsfy3.nc4 differ diff --git a/test/testinput/cx_globalnamelist_oceanwinds.nc4 b/test/testinput/cx_globalnamelist_oceanwinds.nc4 index 778d04b1..1176c8ea 100644 Binary files a/test/testinput/cx_globalnamelist_oceanwinds.nc4 and b/test/testinput/cx_globalnamelist_oceanwinds.nc4 differ diff --git a/test/testinput/cx_globalnamelist_sattcwv.nc4 b/test/testinput/cx_globalnamelist_sattcwv.nc4 index bb153b5c..83fd29cf 100644 Binary files a/test/testinput/cx_globalnamelist_sattcwv.nc4 and b/test/testinput/cx_globalnamelist_sattcwv.nc4 differ diff --git a/test/testinput/cx_globalnamelist_scatwind.nc4 b/test/testinput/cx_globalnamelist_scatwind.nc4 index f3198f28..2086801c 100644 Binary files a/test/testinput/cx_globalnamelist_scatwind.nc4 and b/test/testinput/cx_globalnamelist_scatwind.nc4 differ diff --git a/test/testinput/cx_globalnamelist_screen.nc4 b/test/testinput/cx_globalnamelist_screen.nc4 index 466a85bd..ddfa5f0e 100644 Binary files a/test/testinput/cx_globalnamelist_screen.nc4 and b/test/testinput/cx_globalnamelist_screen.nc4 differ diff --git a/test/testinput/cx_globalnamelist_seviriclr.nc4 b/test/testinput/cx_globalnamelist_seviriclr.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_seviriclr.nc4 and b/test/testinput/cx_globalnamelist_seviriclr.nc4 differ diff --git a/test/testinput/cx_globalnamelist_sonde.nc4 b/test/testinput/cx_globalnamelist_sonde.nc4 index 05fc62d0..d5a4a4e5 100644 Binary files a/test/testinput/cx_globalnamelist_sonde.nc4 and b/test/testinput/cx_globalnamelist_sonde.nc4 differ diff --git a/test/testinput/cx_globalnamelist_ssmis.nc4 b/test/testinput/cx_globalnamelist_ssmis.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_globalnamelist_ssmis.nc4 and b/test/testinput/cx_globalnamelist_ssmis.nc4 differ diff --git a/test/testinput/cx_globalnamelist_surface.nc4 b/test/testinput/cx_globalnamelist_surface.nc4 index afd06ffa..5f898dec 100644 Binary files a/test/testinput/cx_globalnamelist_surface.nc4 and b/test/testinput/cx_globalnamelist_surface.nc4 differ diff --git a/test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4 b/test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4 index cb35bf68..a9a1d594 100644 Binary files a/test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4 and b/test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4 differ diff --git a/test/testinput/cx_ukvnamelist_radar_reflectivity.nc4 b/test/testinput/cx_ukvnamelist_radar_reflectivity.nc4 index 305d9cd0..c69a3a22 100644 Binary files a/test/testinput/cx_ukvnamelist_radar_reflectivity.nc4 and b/test/testinput/cx_ukvnamelist_radar_reflectivity.nc4 differ diff --git a/test/testinput/cx_ukvnamelist_seviriasr.nc4 b/test/testinput/cx_ukvnamelist_seviriasr.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_ukvnamelist_seviriasr.nc4 and b/test/testinput/cx_ukvnamelist_seviriasr.nc4 differ diff --git a/test/testinput/cx_ukvnamelist_seviriclr.nc4 b/test/testinput/cx_ukvnamelist_seviriclr.nc4 index d23e4558..9a8942f4 100644 Binary files a/test/testinput/cx_ukvnamelist_seviriclr.nc4 and b/test/testinput/cx_ukvnamelist_seviriclr.nc4 differ diff --git a/test/testinput/cx_ukvnamelist_sonde.nc4 b/test/testinput/cx_ukvnamelist_sonde.nc4 index 05fc62d0..d5a4a4e5 100644 Binary files a/test/testinput/cx_ukvnamelist_sonde.nc4 and b/test/testinput/cx_ukvnamelist_sonde.nc4 differ diff --git a/test/testinput/cx_ukvnamelist_surface.nc4 b/test/testinput/cx_ukvnamelist_surface.nc4 index d7417bf9..48028eab 100644 Binary files a/test/testinput/cx_ukvnamelist_surface.nc4 and b/test/testinput/cx_ukvnamelist_surface.nc4 differ diff --git a/test/testinput/cx_ukvnamelist_surfacecloud.nc4 b/test/testinput/cx_ukvnamelist_surfacecloud.nc4 index 26ba5a68..b3b9a64d 100644 Binary files a/test/testinput/cx_ukvnamelist_surfacecloud.nc4 and b/test/testinput/cx_ukvnamelist_surfacecloud.nc4 differ diff --git a/test/testinput/dummy.nc4 b/test/testinput/dummy.nc4 index 893c915d..d719ca8a 100644 Binary files a/test/testinput/dummy.nc4 and b/test/testinput/dummy.nc4 differ diff --git a/test/testinput/reject_obs_with_all_variables_failing_qc.nc4 b/test/testinput/reject_obs_with_all_variables_failing_qc.nc4 index 9c6f1210..d4b16abc 100644 Binary files a/test/testinput/reject_obs_with_all_variables_failing_qc.nc4 and b/test/testinput/reject_obs_with_all_variables_failing_qc.nc4 differ diff --git a/test/testinput/reject_obs_with_all_variables_failing_qc_satellite.nc4 b/test/testinput/reject_obs_with_all_variables_failing_qc_satellite.nc4 index d909bf3d..d05536e6 100644 Binary files a/test/testinput/reject_obs_with_all_variables_failing_qc_satellite.nc4 and b/test/testinput/reject_obs_with_all_variables_failing_qc_satellite.nc4 differ diff --git a/test/testinput/relative_humidity_Sonde.nc4 b/test/testinput/relative_humidity_Sonde.nc4 index 22723f9e..a6e356fa 100644 Binary files a/test/testinput/relative_humidity_Sonde.nc4 and b/test/testinput/relative_humidity_Sonde.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_abiclr.nc4 b/test/testinput/varobs_globalnamelist_abiclr.nc4 index 97ed996d..73391c8a 100644 Binary files a/test/testinput/varobs_globalnamelist_abiclr.nc4 and b/test/testinput/varobs_globalnamelist_abiclr.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_ahiclr.nc4 b/test/testinput/varobs_globalnamelist_ahiclr.nc4 index 97ed996d..73391c8a 100644 Binary files a/test/testinput/varobs_globalnamelist_ahiclr.nc4 and b/test/testinput/varobs_globalnamelist_ahiclr.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_aircraft.nc4 b/test/testinput/varobs_globalnamelist_aircraft.nc4 index 1bd58c1a..ac6842b9 100644 Binary files a/test/testinput/varobs_globalnamelist_aircraft.nc4 and b/test/testinput/varobs_globalnamelist_aircraft.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_atms.nc4 b/test/testinput/varobs_globalnamelist_atms.nc4 index 214c2fac..6695269f 100644 Binary files a/test/testinput/varobs_globalnamelist_atms.nc4 and b/test/testinput/varobs_globalnamelist_atms.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_atovs.nc4 b/test/testinput/varobs_globalnamelist_atovs.nc4 index fbd9fd80..e0e57cf0 100644 Binary files a/test/testinput/varobs_globalnamelist_atovs.nc4 and b/test/testinput/varobs_globalnamelist_atovs.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_gnssro.nc4 b/test/testinput/varobs_globalnamelist_gnssro.nc4 index 007b994b..4959731e 100644 Binary files a/test/testinput/varobs_globalnamelist_gnssro.nc4 and b/test/testinput/varobs_globalnamelist_gnssro.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_iasi.nc4 b/test/testinput/varobs_globalnamelist_iasi.nc4 index 36c68a7d..34aadd5e 100644 Binary files a/test/testinput/varobs_globalnamelist_iasi.nc4 and b/test/testinput/varobs_globalnamelist_iasi.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_scatwind.nc4 b/test/testinput/varobs_globalnamelist_scatwind.nc4 index e037d6da..18fd6ea4 100644 Binary files a/test/testinput/varobs_globalnamelist_scatwind.nc4 and b/test/testinput/varobs_globalnamelist_scatwind.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_seviriclr.nc4 b/test/testinput/varobs_globalnamelist_seviriclr.nc4 index 97ed996d..73391c8a 100644 Binary files a/test/testinput/varobs_globalnamelist_seviriclr.nc4 and b/test/testinput/varobs_globalnamelist_seviriclr.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_sonde.nc4 b/test/testinput/varobs_globalnamelist_sonde.nc4 index 1bd58c1a..ac6842b9 100644 Binary files a/test/testinput/varobs_globalnamelist_sonde.nc4 and b/test/testinput/varobs_globalnamelist_sonde.nc4 differ diff --git a/test/testinput/varobs_ukvnamelist_radar_doppler_wind.nc4 b/test/testinput/varobs_ukvnamelist_radar_doppler_wind.nc4 index a8336711..78398085 100644 Binary files a/test/testinput/varobs_ukvnamelist_radar_doppler_wind.nc4 and b/test/testinput/varobs_ukvnamelist_radar_doppler_wind.nc4 differ diff --git a/test/testinput/varobs_ukvnamelist_radar_reflectivity.nc4 b/test/testinput/varobs_ukvnamelist_radar_reflectivity.nc4 index 042ad932..fea31c8c 100644 Binary files a/test/testinput/varobs_ukvnamelist_radar_reflectivity.nc4 and b/test/testinput/varobs_ukvnamelist_radar_reflectivity.nc4 differ diff --git a/test/testinput/varobs_ukvnamelist_seviriasr.nc4 b/test/testinput/varobs_ukvnamelist_seviriasr.nc4 index 238df66d..025e7058 100644 Binary files a/test/testinput/varobs_ukvnamelist_seviriasr.nc4 and b/test/testinput/varobs_ukvnamelist_seviriasr.nc4 differ diff --git a/test/testinput/varobs_ukvnamelist_seviriclr.nc4 b/test/testinput/varobs_ukvnamelist_seviriclr.nc4 index 238df66d..025e7058 100644 Binary files a/test/testinput/varobs_ukvnamelist_seviriclr.nc4 and b/test/testinput/varobs_ukvnamelist_seviriclr.nc4 differ diff --git a/test/testinput/varobs_ukvnamelist_sonde.nc4 b/test/testinput/varobs_ukvnamelist_sonde.nc4 index 1bd58c1a..ac6842b9 100644 Binary files a/test/testinput/varobs_ukvnamelist_sonde.nc4 and b/test/testinput/varobs_ukvnamelist_sonde.nc4 differ diff --git a/test/testinput/varobs_ukvnamelist_surfacecloud.nc4 b/test/testinput/varobs_ukvnamelist_surfacecloud.nc4 index b19c73a5..666f62b7 100644 Binary files a/test/testinput/varobs_ukvnamelist_surfacecloud.nc4 and b/test/testinput/varobs_ukvnamelist_surfacecloud.nc4 differ