From 03142aec552d78486b6549ddfbe6a25bf85ee3db Mon Sep 17 00:00:00 2001 From: Michael Cooke <48374999+mikecooke77@users.noreply.github.com> Date: Thu, 10 Oct 2024 17:11:14 +0100 Subject: [PATCH] Model Variable Naming Sprint: Part 6 (#229) Changes for skin T and surface T Co-authored-by: ss421 --- test/generate_unittest_netcdfs.py | 82 +++++++++--------- test/testinput/003_SurfaceCxField_t2.nc4 | Bin 6160 -> 6160 bytes .../testinput/013_SurfaceCxField_TskinSea.nc4 | Bin 6160 -> 6160 bytes test/testinput/cx_globalnamelist_abiclr.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_ahiclr.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_amsr.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_atms.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_atovs.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_gmihigh.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_gmilow.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_gnssro.nc4 | Bin 15944 -> 15944 bytes .../testinput/cx_globalnamelist_groundgps.nc4 | Bin 15928 -> 15928 bytes test/testinput/cx_globalnamelist_iasi.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_mwsfy3.nc4 | Bin 15944 -> 15944 bytes .../cx_globalnamelist_oceanwinds.nc4 | Bin 12261 -> 12272 bytes test/testinput/cx_globalnamelist_scatwind.nc4 | Bin 18482 -> 18198 bytes test/testinput/cx_globalnamelist_screen.nc4 | Bin 16716 -> 17048 bytes .../testinput/cx_globalnamelist_seviriclr.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_ssmis.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_globalnamelist_surface.nc4 | Bin 16358 -> 16358 bytes test/testinput/cx_ukvnamelist_seviriasr.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_ukvnamelist_seviriclr.nc4 | Bin 15944 -> 15944 bytes test/testinput/cx_ukvnamelist_surface.nc4 | Bin 17266 -> 17266 bytes 23 files changed, 41 insertions(+), 41 deletions(-) diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py index e52f86b5..6a161947 100644 --- a/test/generate_unittest_netcdfs.py +++ b/test/generate_unittest_netcdfs.py @@ -925,12 +925,12 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_1d_simulated_var_to_netcdf('dummy', 'testinput/dummy.nc4') 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 ('air_temperature_at_2m', 'testinput/003_SurfaceCxField_t2.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 ('skin_temperature_at_surface','testinput/013_SurfaceCxField_TskinSea.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') @@ -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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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','eastward_wind_at_10m', - 'northward_wind_at_10m','surface_temperature','relative_humidity_at_2m','air_pressure_at_sea_level'], + 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','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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'air_pressure_at_sea_level'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m'], + 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', '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', 'eastward_wind_at_10m', - 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'visibility_1p5m','qt_1p5m'], + 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', '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', @@ -1154,8 +1154,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_ukvnamelist_surface.nc4') # 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', 'air_pressure_at_sea_level', 'surface_temperature', + output_full_cx_to_netcdf(['friction_velocity_over_water', 'ice_area_fraction', 'obukhov_length', 'relative_humidity_at_2m', 'skin_temperature_at_surface', + 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'air_pressure_at_sea_level', 'air_temperature_at_2m', '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', @@ -1167,8 +1167,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 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', - 'eastward_wind_at_10m', 'northward_wind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', + output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface', 'skin_temperature_at_surface', 'ice_area_fraction', 'air_pressure_at_surface', + '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', 'specific_humidity', @@ -1176,7 +1176,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_screen.nc4') # Oceanwinds - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', + 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_pressure_levels'], 'testinput/cx_globalnamelist_oceanwinds.nc4') diff --git a/test/testinput/003_SurfaceCxField_t2.nc4 b/test/testinput/003_SurfaceCxField_t2.nc4 index b0ae8d92863c3a4331325e44087300f3ffa770f5..225340da3352517de2c6585b6565a65ff0a0b0f4 100644 GIT binary patch delta 63 zcmbPWFu`ELHdPGUy_jQd*Q6pI8!alsoaJBcs}6K~^o6 Nz6M^G&EAYh#Q^$75sUx; delta 61 zcmbPWFu`ELHf1#iAYf!+1W`aBTwGd|mYAFxUy_jQd*Qc@wOwQ#$-WO9TvgK M=B1mx8IOtq0N33R_y7O^ diff --git a/test/testinput/013_SurfaceCxField_TskinSea.nc4 b/test/testinput/013_SurfaceCxField_TskinSea.nc4 index 3a583ac87ef9da21eaa5afdec7b41c1651d10c61..13642eaecf52e545ac5ee5fe45b8b3a69078cd19 100644 GIT binary patch delta 68 zcmbPWFu`ELHZ45{AYf!+1W`aBU7Ven7hjT^Taa3mSW;S)8lPAaUtC(0mY6*8suQEa TWJN|5mfzlLd7Hf%kBR{Ra-0-% delta 57 zcmbPWFu`ELHhEg#Z8m diff --git a/test/testinput/cx_globalnamelist_abiclr.nc4 b/test/testinput/cx_globalnamelist_abiclr.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_ahiclr.nc4 b/test/testinput/cx_globalnamelist_ahiclr.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_amsr.nc4 b/test/testinput/cx_globalnamelist_amsr.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_atms.nc4 b/test/testinput/cx_globalnamelist_atms.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_atovs.nc4 b/test/testinput/cx_globalnamelist_atovs.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_gmihigh.nc4 b/test/testinput/cx_globalnamelist_gmihigh.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_gmilow.nc4 b/test/testinput/cx_globalnamelist_gmilow.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_gnssro.nc4 b/test/testinput/cx_globalnamelist_gnssro.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_groundgps.nc4 b/test/testinput/cx_globalnamelist_groundgps.nc4 index daac4162d28bbebcd093d169233ee1cf64418ed4..4915a589764a8af1ae97d1002cd17998e467bdfe 100644 GIT binary patch delta 431 zcmdl{v!iCiSr*2i$>&(|SrjmL>-z-yxP#{;2;Z@ySO9m654mF0U zKD)vhZUUJq3`?K(Br@<$w$zg5Drx9%VK4=nq%k>I%Sd4lP?r|Nk&@Y`8DfEgS`2e7 zOy4m)1B$9M*pyj(+pNfKz&QDV_R@NY`P>k9F+dIGfpNi(Vc>;vA;$8-xDfOBVO(C2 z^$Y?qF4#2;f-o+`9Y=fgVqqd6da^F}oy`w){TW$2HnbRTHr7AJIQg)V(&W3k*^}E0 zzq8a`+&_78qmh#u7gU#Yadu{2d`W6&(|S@!k*N}ue=dXuqpvNW5!`q_x!D7WBXR|XL_1~6b`VPN>f z2xKz0GB8v#0~vPzmbY#0WJ^*OsAOVbuw-~KVS+HjO`sCx$saV8WM0+HwPY{>a@827 z`s@m42n8xqVOaXKCy{}9vZa>v(wu6Bi;w}cL!8|Z7#4)@uF2n{t7#Ct5Ka9%^ zv`K?O0LFz_EC}O5oOJxn)Fm(x5ItF!`_ASEy8etT)4p$r-)yXZj8U2ksz9JPJ2Nl7 zBsI4nwJ5Qqv?%qG#^h_dMU&eMzq6EQ`$|u4G;*5!(?DtRd!s!f!o{UUX^F|H$m%B_ TG+sS1fM@ap-HgpwOj0-jrRiu# diff --git a/test/testinput/cx_globalnamelist_iasi.nc4 b/test/testinput/cx_globalnamelist_iasi.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_mwsfy3.nc4 b/test/testinput/cx_globalnamelist_mwsfy3.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_oceanwinds.nc4 b/test/testinput/cx_globalnamelist_oceanwinds.nc4 index 7c400e00daf715bb9d490227760294869cf9d9d9..e9898d46b87201e528968e4603cacd82eea3ff23 100644 GIT binary patch delta 792 zcmaDF{~>;Y2IGf`ntp;IN(^9do*hDeo7l0RWpiQomC4?WA&i?QFJL^+Qr?&JcylpR z0~3#jB1F}q%l-2wI!bMpWIe_twn+mb$jQJ7VKC@yTr9ZxE4!YAmL5oik%bv5AzhrE znHOJ@np==slvq+)lp3E{5?@?el$Mx0*-62HF=%qLf<9x;+S`LS~4W`%`#=k z1~T;+Ue(RDWN-yC)flGw>kc$pgW=uv+53P- z=QB=HV41vH=UF|aeqW{zvj9S;@82Ng=HcSR085-8VHM|eZbrB-So3o7lZ(AU@xd@z xK+j7WU&_kTQ)Tp+JVDQb1r#fjdlb}IK+!RIkAgB|++-FJL^+lHS2Bxw)9B zfr-af5uz%{C8=qmqts*>-GIq9Y66=pS<{%rmTN#HIT<)13`0>#;xdGRHwxdo|3i6x~)lYJE&7~LoLDd;mMPTr@WV-&0cQR$*uy2L5O!-av3 zfr){EA1Iijv0Muxhp>nD|LerfGKyi0oO7TS+@4&m6f6Ez7s_Q&y7TmoTQJZZ2B3<` zg&LxhS(GIhbtlUzi_1+~;vVl79PG+)8yXgjKs70hK&>xB<%K54sbp;4rM!WWDgFSM zeMPm8(FGO|F!SBP9)$527!p+xY!D0PADC!1m&_WFX_NUh*6VHpidr(fm@q+@Asfh4 zW_VRM*OI{%$W&vP>a#1Hp%2JZVOaXKCy~Ks@+%Dm(bqr$Erz)krtcU;feuw?n0n}! z&Spl=$&8aXX*mQcGq3;^fB{4+D~t=ViVenvm;;S^2B=vaFj*U*(HacOGuJQyjm~GB zq`)$Ho6fU(O8q`t9cBT9Zq`wo=H}tz!~jc+AmM2-N^Fd9U$ExouCa$5vRTyWAJ1HeRZbU>XR8c7Xbj^#*LEz diff --git a/test/testinput/cx_globalnamelist_scatwind.nc4 b/test/testinput/cx_globalnamelist_scatwind.nc4 index ca262bcb3130c44540f16a793b7eb9f1680b7dd2..7c4a1b3db6cd2067086d96a3d4b8af6daa06e85c 100644 GIT binary patch delta 598 zcmdlqfpJcZ02UumR1mEV0g>Oz`($$%)oG$8N?`IWawc5GR{U67!-Aa zRi0DyWD@z|1QY~<|4{HpP&jt8w#sA{84NS34`zcDOS7Ij0Mb7>NOL2rAJA~i$--K? zTnT-%Oc@k_T)oNmS~4~%K+7~3c;>9gV-RIxV9;T3xocm*un{P)!>~)iwSnOz(0wWl zIo-WY430nr3JfI;{VfclAZ?R-w2TDWfl9R)j+D$k&F~E7VSO z$&5TdH~-LPW=zmy5Cr=GNPu0#AOzz=i~#xr0w9))z_?(m7(`)Qh|yv&F2wz;E(?@_ zHqD)wz`FUb?lV@FJxtvbHa|BOWt5gK&d$t>FGp@Wh0zf)j(1(?g z1?D`_#LOae(~WZ9*+Z01mUVV#`sJ{hk*A7rk^;+QD?@?Fe2$!(4c*={iu`hbD1wn; HnM}0+Mh%s- delta 589 zcmbQ%$GB+%;{**RBae+*rHo7>Zj%=>o@4oweW7=AF;f&1-8!0>~afq{Whn1SIfBZx7Fks*Zz$T%X&u(qfZ ztn!?qCzA+=Gf)r+{zJjlO=}Ks)>fI!B7l}5E(O;HhLb>N zsW9Yp_ck#&0u?Aso~~siT?3TYVmMMV`!vHhpr95*if-RohD$(EwaGWNWVl3urm8cf z{doIhG9%B=%|Eo6855Kl1i?N45)ju2!MG69fI$EO5X(hiT(GGOqA)JRXfYTU;(nDF ztu;WK=1xpt-TYVg87qsYr-|z3=fF6z zE-gw+Oio2ok^0Vl@+;l4%~oayxhDT~kzskk$RIjd(sd>$Oq0mw-LCG8k~inDX1IB{ zI5DgT#TWBiWfk0zTsyEAdPZf4|J#0YfKAzyNII=! zWKNM_sYEY!L194{hzOZj4?(p+0ug$MUK$aEopVnYoG(2@|HD21cklOo|9Aeo){n*q z(5Q(Ucg&l+5I0eaAE9;r;$TFOIynayHwJ)n614a=Z{-^*vSuU{??Xqtr6AYNo_d;{ z^IaNF7(T3x1Nemq2i*l|Cjd5PH{VFbxh)*JhJ%K7zFw1YNJ=pd@tQn0;3W0g0MO4_qohtsML1kI z(OU$Ggdi6SlcYdqr&1sjCo7P}O;Mnn0#X&o<{wZX-Jl-S3S`SlqtHSh?2_rUrN#E6 zVE}+_Im*9H#p}Ttzt?>k z2d%|;M#$j8m3aPGhtyP(fV8Jh*Eyiu@W-C4kWQCkT6YFxy1qb8fb zRJL)R=KpX!M31EtyFMDBLb)(I{X#4r`D}_x-^x{pN}rtEC9V6LG+Y^LrLx81?L0># zb>*r;*lEw=R}rM+cKyTs@-HIXG_0Zq`@KW@0R# zJX<-R<+X!U>1IBa9u^UpQY-o9c#x^4EH`~8DP&9*)7(|>2GlCg@Lz2P2g5Zc1_o7z z7ZWB3Gjsw?R%S?>Fh`wX3s6*v;Z@ySONMJey=n{xf6Vq{PzP(9>a#1HVGU5N3d7Q; zJ&6o9K(!hSJabm$F}MQN>M*$6wJ%`!4HVU3*rnjwz_1A@s=|=d-P^=a2xKZSOpel0 zGrIsZL5tx?$?Ve%T|l*33@N&OXBkp}Of`mWtxb0rCIZzeGR(Cwea9dQ6a_lUr}^|| zL2iD=$-A^?)hjb_0TqA+43F2rOW7#E_M7siD+mk-8;SjZ3KLYyK1<3hqg5XOZB zmJo=m10o=v6b3Ot01`eT5Do(aB$Q7lr%s+M$h{jB_DXusS-NV%k8I}EuVWMtD9+Bz zi!VvdEl4d&EGaFTyv#sa&=9 z)&dCcT1>MnCr>n%Wpc8cya7n1*Z`fr5bSg-uoHl$-ZPUEDKbWN zNj39ld624Grb|H79~&gaCg_U$EKoInFhk{ElRO~=GNr@)V9jW4%O-u8&rPUiIbZE2Tkb? diff --git a/test/testinput/cx_globalnamelist_seviriclr.nc4 b/test/testinput/cx_globalnamelist_seviriclr.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_ssmis.nc4 b/test/testinput/cx_globalnamelist_ssmis.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_globalnamelist_surface.nc4 b/test/testinput/cx_globalnamelist_surface.nc4 index 89229cf0e6070bef7f5caefe754c202007fe54d3..d0df2974464142f55d95785dfb003930c678584c 100644 GIT binary patch delta 363 zcmaD>|Ezw)Sr$gq$>&(|S=hbj-kR*ldXq7JvNW5!`s|}7Gu(oMT^U5!7{Gv$oq^#e zBaq1$!N9PB8OTs`b+X>v$(E$dx`c^=!E*9%O(mIxzFDRWWk9YT!>hWvmJB999cm0q zpY|j&=uOtsQsXLV=x<>N18Ucp9IR!eeHW-yi{VJg?9&W&KtU~rZLLjr7(#)fiVSlt zOy4oE14Y#t&Ueq7zIh?HD&yn_+Q$?07jCN~;oOG_7LXXeG1q~;c+7A2OH7Ny1~ jmc$pA7NsR7PyS|Ezw)Sr$g8$>&(|Ss10*H%@kBy~&s}S(?pV{mI^l-EP6bt_&h<3}C>>&cN`K z5y)grWnh@i3}ie!I9qgcCtH%Tz)U6v21|w)6D9~VlmVH_lRs!G3BIbEYsp{&)SVo1^LJImk=WU4W2Yi+v25DHYF$S~K! z^c}+=AXA-T-%G3T%?r6z87Du`KAxb=zzcB`0|UfnJ{T8bGCzz9(JTPtDg$lMU=W0H zAr=b3xDclld{Zr$ypa3m<_EfSSy;}iu5+K&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_ukvnamelist_seviriclr.nc4 b/test/testinput/cx_ukvnamelist_seviriclr.nc4 index 1fc59bce8478344455c9814b894aea379a3ab6c6..1ac32ce12859809f194f7c59ea000b564e44186b 100644 GIT binary patch delta 468 zcmX?6bE0O$Sr$gM$>&(|SuRVO^G|kUy~!9bS(?pV{lazo^KQYxt_&h<3}C>>%)s!M z5y)ipWnkD05!E*9%O{MUJzFDRWp+K%4!>hWvmJB999cm0y zeRhR2+ypXJ7?wWmNo3#!YS&=knX@8~!4+tb4ui{G`vQh`pr{VRE(O;HhC-mI3PVXl ze+z>tNbTe}EhB|JKx4HSj+D$k%@7L|)MA)xVfv2Y8BkQ6;Z(Yd!)8ZrRmRB=w3pUH z9Ka1U1PmZH^T4=Z*D~fV%Xn%rpQq{ao+EM1(PnHOJ@ znp==slvq+)lp3E{5?@?el$MyBdP!sQeWOESqKTPB=qikICvP=gJ^6ud#^x&~C7b~0 Cv2oh~ delta 458 zcmX?6bE0O$Sr$g)$>&(|S?>!ocu{ z5y)hWWMEj%3=+$g|FpT2ElF9Rl8J%AlHtXK3Bn9Ffl8Dof6!ENd{sBslEDPXRb!ay zvn!k-6sSmrVd>MJLK%l%9LyB(SSq5z&Q;lJ+h3PwnJ3s~M45os`w>LX-t1?c0puMyn z><9*KkQ+e&Vlxkf!@vM>Eia4Z;0P)tbdGAnhUB4*nGvLgcAUZ9&Moj diff --git a/test/testinput/cx_ukvnamelist_surface.nc4 b/test/testinput/cx_ukvnamelist_surface.nc4 index f852b2475f9f3df180037963f90aded499c40529..1f010d880a61831a730a764ce68dda6f02263996 100644 GIT binary patch delta 445 zcmey=#`vj?al=^_#`}}cvE;KXJLG?OvLowFW=;l%$?+PZla1I6)Oq6CLfwLcT^U5! z7{Gv$iGkrCGmy#1&cN`K5y+@y{(N_HCtH%Tz&@ayCBuBRn`{haK&I4WHZ66FLqNq! z3<-U+Oc^Es1@#zS)y=hJFahdRV_5pMCy~Jes6c~(XU>W|23MeQIt+pvc2+VxnH;4h z%~jIS-@;G;QZTth%Sih>&;TulBPFv>Gt2-AYB6kUZMwq{3KUgjm}_DBjzJM9s?H$i zmeR0UkcWkF@&oN_^?D3^V3z|4hy(dyT!?W3FfK&1AdCxfmk^8#b_Ihlj0>?}1jdE< zQWVC00(6HIL+9EHI~gVm@vPqbKzA++OThh_(~}#GTBW6nvorJJOHy+SQi~ExN{dqC p6HDTYON-JHlP8NA9~Bc#%q&8eHp-p+-nd}$1nZ2=S4`&d0RZhHYDWM7 delta 438 zcmey=#`vj?al=^_#y6ACvE;L)3Ln*PNs3RJGd@TzXEC4&jj2sMVKPkRy>Y=NR03_NpIP6^+jo{B706U$*w)%~hanWGK#^gth3Pv6F`%eA z!{3iH95xH`urN-3pna`gnSl@Nav%Y5Akg6u05Mqr#)W7WgmEG65`u9d77D|-5T}U1 zxDc<2!noIg?vP?g(YrRCVX_d<>dg;y=d!T$nyrYK+-TG)AW)p0nHOJ@np==slvq+) pG+EL3sEBZJX;E5Yaw?K|>f}Gh1rt4aCn>N^o@Sl2`HIOrJ^*GrXAS@W