From ae97bdd4e0bbceecc0cbc772748f7341ecbc02f7 Mon Sep 17 00:00:00 2001 From: ss421 Date: Mon, 7 Oct 2024 14:37:32 +0100 Subject: [PATCH] Updated with sprint names --- README.md | 4 +- test/generate_unittest_netcdfs.py | 68 +++++++++++++++---------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 78c1b836..3fc82d72 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ The following YAML snippet demonstrates the use of `VarObsWriter`. st ObsDataIn: obsfile: observations.nc4 simulate: - variables: [surface_pressure] + variables: [air_pressure_at_surface] - Filter: VarObs Writer # The filter will output an .varobs file # in the directory specified in the output_directory option. @@ -94,7 +94,7 @@ And here is a YAML snippet demonstrating the use of `CxWriter`. ObsDataIn: obsfile: observations.nc4 simulate: - variables: [surface_pressure] + variables: [air_pressure_at_surface] - Filter: Cx Writer # The filter will output an .cx file # in the directory specified in the output_directory option. diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py index 8089babc..13a5c2ad 100644 --- a/test/generate_unittest_netcdfs.py +++ b/test/generate_unittest_netcdfs.py @@ -923,10 +923,10 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Cx output_1d_simulated_var_to_netcdf('dummy', 'testinput/dummy.nc4') - output_1d_geoval_to_netcdf ('surface_altitude', 'testinput/001_SurfaceCxField_Orog.nc4') - output_1d_geoval_to_netcdf ('surface_pressure', 'testinput/002_SurfaceCxField_pstar.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 ('relative_humidity_at_2m', 'testinput/004_SurfaceCxField_rh2.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 ('visibility_1p5m', 'testinput/008_SurfaceCxField_visibility_1p5m.nc4') @@ -960,7 +960,7 @@ 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', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -968,7 +968,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_abiclr.nc4') # AHIClr - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -976,7 +976,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_ahiclr.nc4') # AMSR - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -984,7 +984,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_amsr.nc4') # GMIlow - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -992,7 +992,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_gmilow.nc4') # GMIhigh - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1000,7 +1000,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_gmihigh.nc4') # ATMS - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1008,7 +1008,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_atms.nc4') # ATOVS - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1016,7 +1016,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_atovs.nc4') # SSMIS - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1024,7 +1024,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_ssmis.nc4') # MWSFY3 - output_full_cx_to_netcdf(['skin_temperature','ice_area_fraction','surface_altitude','surface_pressure','uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature','ice_area_fraction','height_above_mean_sea_level_at_surface','air_pressure_at_surface','uwind_at_10m', 'vwind_at_10m','surface_temperature','relative_humidity_at_2m','surface_pressure_at_mean_sea_level'], ['potential_temperature','specific_humidity','cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water','air_pressure_levels', @@ -1032,7 +1032,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_mwsfy3.nc4') # GNSS-RO - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1041,8 +1041,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Sonde output_full_cx_to_netcdf(['ice_area_fraction', - 'surface_altitude', - 'surface_pressure'], + 'height_above_mean_sea_level_at_surface', + 'air_pressure_at_surface'], ['eastward_wind', 'northward_wind', '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', @@ -1054,8 +1054,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Sonde - UKV output_full_cx_to_netcdf(['ice_area_fraction', - 'surface_altitude', - 'surface_pressure'], + 'height_above_mean_sea_level_at_surface', + 'air_pressure_at_surface'], ['eastward_wind', 'northward_wind', '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', @@ -1066,8 +1066,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_ukvnamelist_sonde.nc4') # SurfaceCloud - UKV - output_full_cx_to_netcdf(['surface_altitude', - 'surface_pressure', + output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface', + 'air_pressure_at_surface', 'ice_area_fraction', 'total_cloud_amount'], ['potential_temperature', 'specific_humidity', 'air_pressure_levels', 'cloud_layer', @@ -1076,14 +1076,14 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_ukvnamelist_surfacecloud.nc4') # SatTCWV - output_full_cx_to_netcdf(['surface_altitude', 'surface_pressure', 'ice_area_fraction', 'total_cloud_amount'], + output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'ice_area_fraction', 'total_cloud_amount'], ['potential_temperature', 'specific_humidity', 'air_pressure_levels', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', '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') # IASI - this tests the variable_for_quality_control option - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1091,7 +1091,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_iasi.nc4') # SEVIRIClr - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1099,7 +1099,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_seviriclr.nc4') # SEVIRIClr UKV - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1107,7 +1107,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_ukvnamelist_seviriclr.nc4') # SEVIRIASR UKV - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'surface_pressure_at_mean_sea_level'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1115,7 +1115,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_ukvnamelist_seviriasr.nc4') # GroundGPS - output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'ice_area_fraction', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1124,8 +1124,8 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # Aircraft output_full_cx_to_netcdf(['ice_area_fraction', - 'surface_altitude', - 'surface_pressure'], + 'height_above_mean_sea_level_at_surface', + 'air_pressure_at_surface'], ['eastward_wind', 'northward_wind', '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', @@ -1136,7 +1136,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_aircraft.nc4') # Surface - output_full_cx_to_netcdf(['skin_temperature', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1145,7 +1145,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): 'testinput/cx_globalnamelist_surface.nc4') # Surface - UKV - output_full_cx_to_netcdf(['skin_temperature', 'surface_altitude', 'surface_pressure', 'uwind_at_10m', + output_full_cx_to_netcdf(['skin_temperature', 'height_above_mean_sea_level_at_surface', 'air_pressure_at_surface', 'uwind_at_10m', 'vwind_at_10m', 'surface_temperature', 'relative_humidity_at_2m', 'visibility_1p5m','qt_1p5m'], ['potential_temperature', 'specific_humidity', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', 'air_pressure_levels', @@ -1155,7 +1155,7 @@ 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', - 'surface_altitude', 'surface_pressure', 'surface_pressure_at_mean_sea_level', 'surface_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'], ['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,7 +1167,7 @@ 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(['surface_altitude', 'skin_temperature', 'ice_area_fraction', 'surface_pressure', + 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', 'surf_param_a', 'surf_param_b'], @@ -1176,18 +1176,18 @@ 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', 'surface_altitude', 'surface_pressure', + 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'], ['air_pressure_levels'], 'testinput/cx_globalnamelist_oceanwinds.nc4') # Radar doppler wind - UKV - output_full_cx_to_netcdf(['surface_altitude'], + output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface'], ['eastward_wind', 'northward_wind', 'upward_air_velocity'], 'testinput/cx_ukvnamelist_radar_doppler_wind.nc4') # Radar reflectivity - UKV - output_full_cx_to_netcdf(['surface_altitude'], + output_full_cx_to_netcdf(['height_above_mean_sea_level_at_surface'], ['potential_temperature', 'specific_humidity', 'air_pressure_levels', 'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', 'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water',