diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py index bb77e5d9..e52f86b5 100644 --- a/test/generate_unittest_netcdfs.py +++ b/test/generate_unittest_netcdfs.py @@ -926,12 +926,12 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_1d_geoval_to_netcdf ('height_above_mean_sea_level_at_surface', 'testinput/001_SurfaceCxField_Orog.nc4') output_1d_geoval_to_netcdf ('air_pressure_at_surface', 'testinput/002_SurfaceCxField_pstar.nc4') output_1d_geoval_to_netcdf ('surface_temperature', 'testinput/003_SurfaceCxField_t2.nc4') - output_1d_geoval_to_netcdf ('relative_humidity_at_2m', 'testinput/004_SurfaceCxField_rh2.nc4') - output_1d_geoval_to_netcdf ('uwind_at_10m', 'testinput/005_SurfaceCxField_u10.nc4') - output_1d_geoval_to_netcdf ('vwind_at_10m', 'testinput/006_SurfaceCxField_v10.nc4') + output_1d_geoval_to_netcdf ('relative_humidity_at_2m', 'testinput/004_SurfaceCxField_rh2.nc4') + output_1d_geoval_to_netcdf ('eastward_wind_at_10m', 'testinput/005_SurfaceCxField_u10.nc4') + output_1d_geoval_to_netcdf ('northward_wind_at_10m', 'testinput/006_SurfaceCxField_v10.nc4') output_1d_geoval_to_netcdf ('visibility_1p5m', 'testinput/008_SurfaceCxField_visibility_1p5m.nc4') output_1d_geoval_to_netcdf ('skin_temperature', 'testinput/013_SurfaceCxField_TskinSea.nc4') - output_1d_geoval_to_netcdf ('surface_pressure_at_mean_sea_level', 'testinput/016_SurfaceCxField_pmsl.nc4') + output_1d_geoval_to_netcdf ('air_pressure_at_sea_level', 'testinput/016_SurfaceCxField_pmsl.nc4') output_1d_geoval_to_netcdf ('ice_area_fraction', 'testinput/017_SurfaceCxField_SeaIce.nc4') output_1d_geoval_to_netcdf ('surf_param_a', 'testinput/022_SurfaceCxField_surf_param_a.nc4') output_1d_geoval_to_netcdf ('surf_param_b', 'testinput/023_SurfaceCxField_surf_param_b.nc4') @@ -960,80 +960,80 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # list of 1d-variables; list of 2d-variables; filename for output # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature','ice_area_fraction','height_above_mean_sea_level_at_surface','air_pressure_at_surface','eastward_wind_at_10m', + 'northward_wind_at_10m','surface_temperature','relative_humidity_at_2m','air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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'], @@ -1083,40 +1083,40 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_sattcwv.nc4') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], ['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') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m'], ['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'], @@ -1136,8 +1136,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_aircraft.nc4') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m'], ['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', @@ -1145,8 +1145,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_surface.nc4') # 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'], + output_full_cx_to_netcdf(['skin_temperature', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'eastward_wind_at_10m', + 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'visibility_1p5m','qt_1p5m'], ['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', @@ -1155,21 +1155,21 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Scatwind output_full_cx_to_netcdf(['friction_velocity_over_water', 'ice_area_fraction', 'obukhov_length', 'relative_humidity_at_2m', 'skin_temperature', - 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'surface_pressure_at_mean_sea_level', 'surface_temperature', - 'uwind_at_10m', 'vwind_at_10m'], + 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'air_pressure_at_sea_level', 'surface_temperature', + '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', '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') + output_full_cx_to_netcdf (['eastward_wind_at_10m', 'northward_wind_at_10m'],[], 'testinput/CxWriter_UnRotateWinds10M.nc4') output_1d_multi_level_simulated_var_to_netcdf('relativeHumidity', 'testinput/relative_humidity_Sonde.nc4') output_2d_geoval_for_multi_level_obs_to_netcdf('relative_humidity', 'testinput/002_UpperAirCxFieldForMultiLevelObs_relative_humidity.nc4') # Screen output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface', 'skin_temperature', 'ice_area_fraction', 'air_pressure_at_surface', - 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', - 'visibility_1p5m', 'total_cloud_amount', 'surface_pressure_at_mean_sea_level', + 'eastward_wind_at_10m', 'northward_wind_at_10m', 'surface_temperature', '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', 'specific_humidity', 'air_pressure_levels', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water'], @@ -1177,7 +1177,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Oceanwinds 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'], + 'eastward_wind_at_10m', 'northward_wind_at_10m'], ['air_pressure_levels'], 'testinput/cx_globalnamelist_oceanwinds.nc4') diff --git a/test/testinput/005_SurfaceCxField_u10.nc4 b/test/testinput/005_SurfaceCxField_u10.nc4 index 993ede74..dcc29b09 100644 Binary files a/test/testinput/005_SurfaceCxField_u10.nc4 and b/test/testinput/005_SurfaceCxField_u10.nc4 differ diff --git a/test/testinput/006_SurfaceCxField_v10.nc4 b/test/testinput/006_SurfaceCxField_v10.nc4 index 50ab2e0f..bbcfa773 100644 Binary files a/test/testinput/006_SurfaceCxField_v10.nc4 and b/test/testinput/006_SurfaceCxField_v10.nc4 differ diff --git a/test/testinput/016_SurfaceCxField_pmsl.nc4 b/test/testinput/016_SurfaceCxField_pmsl.nc4 index 551f2b17..70a1f901 100644 Binary files a/test/testinput/016_SurfaceCxField_pmsl.nc4 and b/test/testinput/016_SurfaceCxField_pmsl.nc4 differ diff --git a/test/testinput/CxWriter_UnRotateWinds10M.nc4 b/test/testinput/CxWriter_UnRotateWinds10M.nc4 index dfb5f7f7..53456c29 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 9a8942f4..1fc59bce 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 9a8942f4..1fc59bce 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_amsr.nc4 b/test/testinput/cx_globalnamelist_amsr.nc4 index 9a8942f4..1fc59bce 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 9a8942f4..1fc59bce 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 9a8942f4..1fc59bce 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 9a8942f4..1fc59bce 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 9a8942f4..1fc59bce 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 9a8942f4..1fc59bce 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 ccdbf013..daac4162 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 9a8942f4..1fc59bce 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 9a8942f4..1fc59bce 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 1176c8ea..7c400e00 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_scatwind.nc4 b/test/testinput/cx_globalnamelist_scatwind.nc4 index 2086801c..ca262bcb 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 ddfa5f0e..81258342 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 9a8942f4..1fc59bce 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_ssmis.nc4 b/test/testinput/cx_globalnamelist_ssmis.nc4 index 9a8942f4..1fc59bce 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 5f898dec..89229cf0 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_seviriasr.nc4 b/test/testinput/cx_ukvnamelist_seviriasr.nc4 index 9a8942f4..1fc59bce 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 9a8942f4..1fc59bce 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_surface.nc4 b/test/testinput/cx_ukvnamelist_surface.nc4 index 48028eab..f852b247 100644 Binary files a/test/testinput/cx_ukvnamelist_surface.nc4 and b/test/testinput/cx_ukvnamelist_surface.nc4 differ