diff --git a/src/opsinputs/opsinputs_cxfields_mod.F90 b/src/opsinputs/opsinputs_cxfields_mod.F90 index aee8d832..aa01fc5c 100644 --- a/src/opsinputs/opsinputs_cxfields_mod.F90 +++ b/src/opsinputs/opsinputs_cxfields_mod.F90 @@ -64,7 +64,7 @@ module opsinputs_cxfields_mod character(len=*), parameter, public :: opsinputs_cxfields_u = var_u character(len=*), parameter, public :: opsinputs_cxfields_v = var_v character(len=*), parameter, public :: opsinputs_cxfields_w = var_w -character(len=*), parameter, public :: opsinputs_cxfields_q = var_qcon +character(len=*), parameter, public :: opsinputs_cxfields_q = var_q character(len=*), parameter, public :: opsinputs_cxfields_qc = opsinputs_cxfields_unknown character(len=*), parameter, public :: opsinputs_cxfields_p_bar = var_prs character(len=*), parameter, public :: opsinputs_cxfields_cloud = opsinputs_cxfields_unknown diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py index da8b2e48..e85e173f 100644 --- a/test/generate_unittest_netcdfs.py +++ b/test/generate_unittest_netcdfs.py @@ -942,7 +942,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 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') - output_2d_geoval_to_netcdf ('water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'testinput/005_UpperAirCxField_q.nc4') + output_2d_geoval_to_netcdf ('water_vapor_mixing_ratio_wrt_moist_air', 'testinput/005_UpperAirCxField_q.nc4') output_2d_geoval_to_netcdf ('air_pressure', 'testinput/033_UpperAirCxField_p_bar.nc4') output_2d_geoval_to_netcdf ('air_pressure_levels', 'testinput/011_UpperAirCxField_P.nc4') output_2d_geoval_to_netcdf ('cloud_layer', 'testinput/015_UpperAirCxField_cloud_layer.nc4') @@ -962,7 +962,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # ABIClr output_full_cx_to_netcdf(['skin_temperature_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface','ice_area_fraction','height_above_mean_sea_level_at_surface','air_pressure_at_surface','eastward_wind_at_10m', 'northward_wind_at_10m','air_temperature_at_2m','relative_humidity_at_2m','air_pressure_at_sea_level'], - ['air_potential_temperature','water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water','cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature','water_vapor_mixing_ratio_wrt_moist_air','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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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', 'air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', + ['eastward_wind', 'northward_wind', 'air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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', 'air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', + ['eastward_wind', 'northward_wind', 'air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_layer', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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', 'air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', + ['eastward_wind', 'northward_wind', 'air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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_at_surface', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'visibility_1p5m','qt_1p5m'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', '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): 'eastward_wind_at_10m', 'northward_wind_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', - 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_potential_temperature', 'eastward_wind', 'northward_wind'], + 'water_vapor_mixing_ratio_wrt_moist_air', 'air_potential_temperature', 'eastward_wind', 'northward_wind'], 'testinput/cx_globalnamelist_scatwind.nc4') # Unrotate 10m winds output_full_cx_to_netcdf (['eastward_wind_at_10m', 'northward_wind_at_10m'],[], 'testinput/CxWriter_UnRotateWinds10M.nc4') @@ -1171,7 +1171,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'eastward_wind_at_10m', 'northward_wind_at_10m', 'air_temperature_at_2m', 'relative_humidity_at_2m', 'visibility_1p5m', 'total_cloud_amount', 'air_pressure_at_sea_level', 'surf_param_a', 'surf_param_b'], - ['air_potential_temperature', 'eastward_wind', 'northward_wind', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', + ['air_potential_temperature', 'eastward_wind', 'northward_wind', 'water_vapor_mixing_ratio_wrt_moist_air', 'air_pressure_levels', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water'], 'testinput/cx_globalnamelist_screen.nc4') @@ -1188,7 +1188,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Radar reflectivity - UKV output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface'], - ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', + ['air_potential_temperature', 'water_vapor_mixing_ratio_wrt_moist_air', 'air_pressure_levels', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'dimensionless_exner_function_levels', 'qrain'], diff --git a/test/testinput/001_SurfaceCxField_Orog.nc4 b/test/testinput/001_SurfaceCxField_Orog.nc4 index 13579fab..290472d2 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 8d81b97b..dcff3977 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 9bc19da0..58175d4e 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 0457b0c5..147c8f32 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 720d61b5..2eb44e29 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 81b5f450..acb46949 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 f29fb0c4..03fa8b23 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 32b20a45..c02a1fb5 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 c0a13aec..490350c2 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 225340da..e6a1f813 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 15c7ad51..76ab8252 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 a6ad37b4..c7d60be9 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 bdaaf7dd..d9840653 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 8330ec03..f2f74fbb 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 0c707713..2b781f76 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 11812318..3cbdaebb 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 f48f6846..3c6caefa 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 fe22a8b8..653207be 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 dcc29b09..da6a4e13 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 aa45880b..c2504fcd 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 353fe50b..be93255f 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 b58673a6..adaed3a5 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 2c790302..769ef194 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 bbcfa773..15d64566 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 f0ee8548..8f6fb1e5 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 68bb1b96..dbf439ce 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 fc1d1928..359ecd73 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 63a5c6c7..cc45f051 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 798bda8f..54a5c644 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 63024943..31775767 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 f6559338..c9b1a510 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 6bec29d1..48c9af58 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 13642eae..04ed8ecc 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 1bf685ec..c577046d 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 952fc0e1..c9026332 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 70a1f901..ed7d7dae 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 0c80f61f..b21f8d2c 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 c7663c8c..8307a527 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 cbf84cd9..f244f0ef 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 0d1ccc56..8598a8f0 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 de816d74..fabdf03c 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 29e385aa..8ee20ef3 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 e5015844..0a0e21c5 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 44211ab6..9bc856f1 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 8ad0416b..804a2dd1 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 c80537b3..d470be2c 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 8503d0f2..017f321f 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 1625c4e6..7b928f75 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 4f1ea002..4e7db9d9 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 0a27b503..94d3da4c 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 1b178859..d859e473 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 732a6b71..b62add0a 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 4ef3a0b3..fb401777 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 f831072b..4c2cbca3 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 e13d7b06..bb38a9d2 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 98568d6f..990e36b7 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 89cadeb4..347d6c6f 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 be30126d..23196689 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 117ab84b..102322e1 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 4ba444d3..7b13b984 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 40622709..21373ccd 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 5e7a37a6..a6e5dd85 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 9f299767..89cde1b3 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 64c1d099..97e4eab6 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 064d02be..c340c204 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 1c5d5717..76262b25 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 640f5caa..a0bee4ca 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 ed007d29..bc0ddea4 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 a5f38136..353ff4ac 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 a7ca18da..e0477903 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 31a9d0db..54929f64 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 96c24fc0..95aa90f2 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 fdba8bcf..45f612bd 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 a39288e2..07993fff 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 e5addef8..a27de905 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 02499d13..014c623e 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 cc5588cd..21b2c4f4 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 c8d8d06d..735b49ab 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 53456c29..086a9016 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 585f7465..ac7dd545 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 585f7465..ac7dd545 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 e5c3de93..1f49f75e 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 585f7465..ac7dd545 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 585f7465..ac7dd545 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 585f7465..ac7dd545 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 585f7465..ac7dd545 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 585f7465..ac7dd545 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 585f7465..ac7dd545 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 084d4503..5842ca1a 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 585f7465..ac7dd545 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 585f7465..ac7dd545 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 e9898d46..55009111 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 e9ff5b26..fb996a17 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 72e759df..ffac2a7b 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 9396ca9f..117f40a9 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 585f7465..ac7dd545 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 e5c3de93..1f49f75e 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 585f7465..ac7dd545 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 2d646984..a5845dc1 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 a9a1d594..626b1272 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 29763264..4d07b87b 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 585f7465..ac7dd545 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 585f7465..ac7dd545 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 e5c3de93..1f49f75e 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 687a2243..7b36650f 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 6dda04a8..402ca3ba 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 d719ca8a..f71e295b 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 d4b16abc..6308b85f 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 d05536e6..314ac86f 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 a6e356fa..0d5cc6d6 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 73391c8a..4779e4b6 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 73391c8a..4779e4b6 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 ac6842b9..4d469e1a 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 6695269f..48dd7462 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 e0e57cf0..141ca1ab 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 4959731e..128ef239 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 34aadd5e..c0403c2a 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 18fd6ea4..4183a795 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 73391c8a..4779e4b6 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 ac6842b9..4d469e1a 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 78398085..588ab014 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 fea31c8c..00c19f83 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 025e7058..890b51f4 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 025e7058..890b51f4 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 ac6842b9..4d469e1a 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 666f62b7..6ee74b55 100644 Binary files a/test/testinput/varobs_ukvnamelist_surfacecloud.nc4 and b/test/testinput/varobs_ukvnamelist_surfacecloud.nc4 differ