diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/from_netcdf/integer.b_0.cml b/lib/iris/tests/results/usecases/pp_to_cf_conversion/from_netcdf/integer.b_0.cml index 7c02f46e8b..3106b4d188 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/from_netcdf/integer.b_0.cml +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/from_netcdf/integer.b_0.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/from_pp/integer.b.cml b/lib/iris/tests/results/usecases/pp_to_cf_conversion/from_pp/integer.b.cml index 0fe668f9e4..c3ba2a523a 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/from_pp/integer.b.cml +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/from_pp/integer.b.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.000128.1990.12.01.00.00.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.000128.1990.12.01.00.00.b_0.cdl index f6ef6fc338..7d4a1577aa 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.000128.1990.12.01.00.00.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.000128.1990.12.01.00.00.b_0.cdl @@ -4,6 +4,7 @@ dimensions: longitude = 96 ; variables: float air_temperature(latitude, longitude) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:um_stash_source = "m01s03i236" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.004224.1990.12.01.00.00.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.004224.1990.12.01.00.00.b_0.cdl index f6ef6fc338..7d4a1577aa 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.004224.1990.12.01.00.00.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.004224.1990.12.01.00.00.b_0.cdl @@ -4,6 +4,7 @@ dimensions: longitude = 96 ; variables: float air_temperature(latitude, longitude) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:um_stash_source = "m01s03i236" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.008320.1990.12.01.00.00.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.008320.1990.12.01.00.00.b_0.cdl index 06de0a4383..42834e9d9a 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.008320.1990.12.01.00.00.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.03.236.008320.1990.12.01.00.00.b_0.cdl @@ -4,6 +4,7 @@ dimensions: longitude = 96 ; variables: float air_temperature(latitude, longitude) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:um_stash_source = "m01s03i236" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.16.202.000128.1860.09.01.00.00.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.16.202.000128.1860.09.01.00.00.b_0.cdl index 8d0636d30d..92c2fa47e1 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.16.202.000128.1860.09.01.00.00.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/000003000000.16.202.000128.1860.09.01.00.00.b_0.cdl @@ -5,6 +5,7 @@ dimensions: longitude = 96 ; variables: float geopotential_height(pressure, latitude, longitude) ; + geopotential_height:_FillValue = 9.96921e+36f ; geopotential_height:standard_name = "geopotential_height" ; geopotential_height:units = "m" ; geopotential_height:um_stash_source = "m01s16i202" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/001000000000.00.000.000000.1860.01.01.00.00.f.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/001000000000.00.000.000000.1860.01.01.00.00.f.b_0.cdl index 3a09e7359f..9d0d1ec455 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/001000000000.00.000.000000.1860.01.01.00.00.f.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/001000000000.00.000.000000.1860.01.01.00.00.f.b_0.cdl @@ -4,7 +4,7 @@ dimensions: longitude = 128 ; variables: float sea_surface_height_above_geoid(latitude, longitude) ; - sea_surface_height_above_geoid:_FillValue = -1.e+30f ; + sea_surface_height_above_geoid:_FillValue = 9.96921e+36f ; sea_surface_height_above_geoid:standard_name = "sea_surface_height_above_geoid" ; sea_surface_height_above_geoid:units = "m" ; sea_surface_height_above_geoid:grid_mapping = "latitude_longitude" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/002000000000.44.101.131200.1920.09.01.00.00.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/002000000000.44.101.131200.1920.09.01.00.00.b_0.cdl index e10f7c021c..14ff4b3a42 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/002000000000.44.101.131200.1920.09.01.00.00.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/002000000000.44.101.131200.1920.09.01.00.00.b_0.cdl @@ -4,7 +4,7 @@ dimensions: latitude = 73 ; variables: float unknown(depth, latitude) ; - unknown:_FillValue = -1.e+30f ; + unknown:_FillValue = 9.96921e+36f ; unknown:um_stash_source = "m??s44i101" ; unknown:ukmo__process_flags = "Mean_over_an_ensemble_of_parallel_runs Time_mean_field" ; unknown:grid_mapping = "latitude_longitude" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/008000000000.44.101.000128.1890.09.01.00.00.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/008000000000.44.101.000128.1890.09.01.00.00.b_0.cdl index 29594070f4..d465f8b3a6 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/008000000000.44.101.000128.1890.09.01.00.00.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/008000000000.44.101.000128.1890.09.01.00.00.b_0.cdl @@ -3,6 +3,7 @@ dimensions: time = 16 ; variables: float unknown(depth, time) ; + unknown:_FillValue = 9.96921e+36f ; unknown:um_stash_source = "m??s44i101" ; unknown:cell_methods = "time: mean (interval: 24 hour)" ; float depth(depth) ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/12187.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/12187.b_0.cdl index 33b42c9ce7..00cf494bef 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/12187.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/12187.b_0.cdl @@ -5,6 +5,7 @@ dimensions: longitude = 192 ; variables: float change_over_time_in_upward_air_velocity_due_to_advection(model_level_number, latitude, longitude) ; + change_over_time_in_upward_air_velocity_due_to_advection:_FillValue = 9.96921e+36f ; change_over_time_in_upward_air_velocity_due_to_advection:long_name = "change_over_time_in_upward_air_velocity_due_to_advection" ; change_over_time_in_upward_air_velocity_due_to_advection:units = "m s-1" ; change_over_time_in_upward_air_velocity_due_to_advection:um_stash_source = "m01s12i187" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/HadCM2_ts_SAT_ann_18602100.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/HadCM2_ts_SAT_ann_18602100.b_0.cdl index 651d180cc9..71c1c516ee 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/HadCM2_ts_SAT_ann_18602100.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/HadCM2_ts_SAT_ann_18602100.b_0.cdl @@ -4,6 +4,7 @@ dimensions: site_number = 3 ; variables: float air_temperature(time, site_number) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "Celsius" ; air_temperature:um_stash_source = "m01s03i236" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_level_lat_orig.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_level_lat_orig.b_0.cdl index 525e42a535..273d1c8634 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_level_lat_orig.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_level_lat_orig.b_0.cdl @@ -5,6 +5,7 @@ dimensions: pressure = 15 ; variables: float geopotential_height(time, pressure, latitude) ; + geopotential_height:_FillValue = 9.96921e+36f ; geopotential_height:standard_name = "geopotential_height" ; geopotential_height:units = "m" ; geopotential_height:um_stash_source = "m01s16i202" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_lon_lat_press_orig.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_lon_lat_press_orig.b_0.cdl index fcfc191673..60400cb7c0 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_lon_lat_press_orig.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_lon_lat_press_orig.b_0.cdl @@ -6,6 +6,7 @@ dimensions: pressure = 15 ; variables: float geopotential_height(time, pressure, latitude, longitude) ; + geopotential_height:_FillValue = 9.96921e+36f ; geopotential_height:standard_name = "geopotential_height" ; geopotential_height:units = "m" ; geopotential_height:um_stash_source = "m01s16i202" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_lon_lat_several.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_lon_lat_several.b_0.cdl index 74ef70f5cd..e1174f5cf8 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_lon_lat_several.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_lon_lat_several.b_0.cdl @@ -5,6 +5,7 @@ dimensions: longitude = 96 ; variables: float air_temperature(time, latitude, longitude) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:um_stash_source = "m01s03i236" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_n10r13xy.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_n10r13xy.b_0.cdl index 6f2b5180b6..b9c962ddf5 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_n10r13xy.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_n10r13xy.b_0.cdl @@ -5,6 +5,7 @@ dimensions: longitude = 10 ; variables: float air_temperature(time, latitude, longitude) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:cell_methods = "time: mean (interval: 1 hour)" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_time_press.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_time_press.b_0.cdl index 0467e0fc22..1e990524df 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_time_press.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_time_press.b_0.cdl @@ -3,6 +3,7 @@ dimensions: time = 4 ; variables: float geopotential_height(pressure, time) ; + geopotential_height:_FillValue = 9.96921e+36f ; geopotential_height:standard_name = "geopotential_height" ; geopotential_height:units = "m" ; geopotential_height:um_stash_source = "m01s16i202" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_tseries.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_tseries.b_0.cdl index dbaf0b7a81..30a9d12e97 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_tseries.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/aaxzc_tseries.b_0.cdl @@ -3,6 +3,7 @@ dimensions: site_number = 1 ; variables: float air_temperature(time, site_number) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:um_stash_source = "m01s03i236" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_0.cdl index 5fcbcc29cb..5e77e54332 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_0.cdl @@ -5,6 +5,7 @@ dimensions: longitude = 96 ; variables: float air_temperature(time, latitude, longitude) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:um_stash_source = "m01s03i236" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_1.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_1.cdl index eb1343fddb..6951afe6d7 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_1.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_1.cdl @@ -5,6 +5,7 @@ dimensions: longitude = 96 ; variables: float air_temperature(time, latitude, longitude) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:um_stash_source = "m01s03i236" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_2.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_2.cdl index 40a700b5d3..108846b703 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_2.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abcza_pa19591997_daily_29.b_2.cdl @@ -5,6 +5,7 @@ dimensions: longitude = 96 ; variables: float precipitation_flux(time, latitude, longitude) ; + precipitation_flux:_FillValue = 9.96921e+36f ; precipitation_flux:standard_name = "precipitation_flux" ; precipitation_flux:units = "kg m-2 s-1" ; precipitation_flux:um_stash_source = "m01s05i216" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abxpa_press_lat.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abxpa_press_lat.b_0.cdl index 9ccd351432..b7e699fda4 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abxpa_press_lat.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/abxpa_press_lat.b_0.cdl @@ -4,6 +4,7 @@ dimensions: latitude = 73 ; variables: float geopotential_height(pressure, latitude) ; + geopotential_height:_FillValue = 9.96921e+36f ; geopotential_height:standard_name = "geopotential_height" ; geopotential_height:units = "m" ; geopotential_height:um_stash_source = "m01s16i202" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/integer.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/integer.b_0.cdl index 0f3ee2f2ed..291871abf5 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/integer.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/integer.b_0.cdl @@ -4,6 +4,7 @@ dimensions: longitude = 96 ; variables: int land_binary_mask(latitude, longitude) ; + land_binary_mask:_FillValue = -2147483647 ; land_binary_mask:standard_name = "land_binary_mask" ; land_binary_mask:units = "1" ; land_binary_mask:cell_methods = "time: mean" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/model.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/model.b_0.cdl index 99d7609f61..142d0aa9ef 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/model.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/model.b_0.cdl @@ -6,6 +6,7 @@ dimensions: pressure = 9 ; variables: float air_temperature(time, pressure, latitude, longitude) ; + air_temperature:_FillValue = 9.96921e+36f ; air_temperature:standard_name = "air_temperature" ; air_temperature:units = "K" ; air_temperature:um_stash_source = "m01s16i203" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/ocean_xsect.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/ocean_xsect.b_0.cdl index 84525d1817..a5b6197a61 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/ocean_xsect.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/ocean_xsect.b_0.cdl @@ -4,7 +4,7 @@ dimensions: latitude = 144 ; variables: float sea_water_potential_temperature(depth, latitude) ; - sea_water_potential_temperature:_FillValue = -1.e+30f ; + sea_water_potential_temperature:_FillValue = 9.96921e+36f ; sea_water_potential_temperature:standard_name = "sea_water_potential_temperature" ; sea_water_potential_temperature:units = "degC" ; sea_water_potential_temperature:um_stash_source = "m02s00i101" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st0fc699.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st0fc699.b_0.cdl index 7e299d5f00..b5102174c5 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st0fc699.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st0fc699.b_0.cdl @@ -4,7 +4,7 @@ dimensions: longitude = 288 ; variables: float unknown(latitude, longitude) ; - unknown:_FillValue = -1.e+30f ; + unknown:_FillValue = 9.96921e+36f ; unknown:um_stash_source = "m02s00i???" ; unknown:cell_methods = "time: mean (interval: 2 hour)" ; unknown:grid_mapping = "latitude_longitude" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st0fc942.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st0fc942.b_0.cdl index a877931e9b..4e8ba591e0 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st0fc942.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st0fc942.b_0.cdl @@ -6,7 +6,7 @@ dimensions: time = 4 ; variables: float unknown(pseudo_level, time, depth, grid_latitude) ; - unknown:_FillValue = -1.e+30f ; + unknown:_FillValue = 9.96921e+36f ; unknown:um_stash_source = "m02s00i???" ; unknown:cell_methods = "time: mean" ; unknown:grid_mapping = "rotated_latitude_longitude" ; diff --git a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st30211.b_0.cdl b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st30211.b_0.cdl index 9e6d264d70..d97780986a 100644 --- a/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st30211.b_0.cdl +++ b/lib/iris/tests/results/usecases/pp_to_cf_conversion/to_netcdf/st30211.b_0.cdl @@ -6,7 +6,7 @@ dimensions: time = 4 ; variables: float northward_ocean_heat_transport(pseudo_level, time, latitude, longitude) ; - northward_ocean_heat_transport:_FillValue = -1.e+30f ; + northward_ocean_heat_transport:_FillValue = 9.96921e+36f ; northward_ocean_heat_transport:standard_name = "northward_ocean_heat_transport" ; northward_ocean_heat_transport:units = "PW" ; northward_ocean_heat_transport:um_stash_source = "m02s30i211" ; diff --git a/lib/iris/tests/test_pp_cf.py b/lib/iris/tests/test_pp_cf.py index af1d31c47d..a2c3aa0514 100644 --- a/lib/iris/tests/test_pp_cf.py +++ b/lib/iris/tests/test_pp_cf.py @@ -28,6 +28,8 @@ import types import warnings +import netCDF4 + import iris import iris.tests.pp as pp import iris.util @@ -80,7 +82,6 @@ def callback_aaxzc_n10r13xy_b_pp(cube, field, filename): cube.add_aux_coord(height_coord) -@tests.skip_dask_mask @tests.skip_data class TestAll(tests.IrisTest, pp.PPTest): _ref_dir = ('usecases', 'pp_to_cf_conversion') @@ -105,8 +106,13 @@ def _test_file(self, name): nc_filenames = [] for index, cube in enumerate(cubes): + # Explicitly set a fill-value as a workaround for + # https://github.com/Unidata/netcdf4-python/issues/725 + fill_value = netCDF4.default_fillvals[cube.dtype.str[1:]]; + file_nc = tempfile.NamedTemporaryFile(suffix='.nc', delete=False).name - iris.save(cube, file_nc, netcdf_format='NETCDF3_CLASSIC') + iris.save(cube, file_nc, netcdf_format='NETCDF3_CLASSIC', + fill_value=fill_value) # Check the netCDF file against CDL expected output. self.assertCDL(file_nc, self._ref_dir + ('to_netcdf', '%s_%d.cdl' % (fname_name, index)))