From ba4afb4b2af2db99c54681a18ecf24476b4f4734 Mon Sep 17 00:00:00 2001 From: Benjamin Adams Date: Mon, 17 Oct 2016 14:00:58 -0400 Subject: [PATCH] Resize dimensions and rename CDL used in flag_masks test (cherry picked from commit 435a3d920d358de614be44859f3427a30f4d74d6) Conflicts: compliance_checker/tests/resources.py - resolved --- ...000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn_truncate.cdl} | 8 ++++---- compliance_checker/tests/resources.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename compliance_checker/tests/data/{20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn.cdl => 20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn_truncate.cdl} (98%) diff --git a/compliance_checker/tests/data/20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn.cdl b/compliance_checker/tests/data/20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn_truncate.cdl similarity index 98% rename from compliance_checker/tests/data/20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn.cdl rename to compliance_checker/tests/data/20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn_truncate.cdl index 805610c6..96aeee5f 100644 --- a/compliance_checker/tests/data/20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn.cdl +++ b/compliance_checker/tests/data/20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn_truncate.cdl @@ -1,7 +1,7 @@ -netcdf \20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn { +netcdf \20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn_truncate { dimensions: - lon = 6000 ; - lat = 4500 ; + lon = 2 ; + lat = 2 ; time = 1 ; variables: float lat(lat) ; @@ -243,7 +243,7 @@ variables: :publisher_url = "http://www.ghrsst.org" ; :processing_level = "L3S" ; :cdm_data_type = "grid" ; - :history = "platform_counts=NOAA-19=2;NOAA-18=2,quality_counts=archive=4,platform=NOAA-19;NOAA-18,quality_source=archive,ice_source=SSMI-NCEP-Analysis-ICE-5min,adi_source=unknown,wind_source=ACCESSG-ABOM-Forecast-WSP,analysis_source=ABOM-L4LRfnd-GLOB-GAMSSA_28km,source_file=20160919152000-ABOM-L3C_GHRSST-SSTskin-AVHRR19_D-1d_night-v02.0-fv01.0.nc;20160919032000-ABOM-L3C_GHRSST-SSTskin-AVHRR19_D-1d_day-v02.0-fv01.0.nc;20160919152000-ABOM-L3C_GHRSST-SSTskin-AVHRR18_D-1d_night-v02.0-fv01.0.nc;20160919032000-ABOM-L3C_GHRSST-SSTskin-AVHRR18_D-1d_day-v02.0-fv01.0.nc,l3_file=20160919152000-ABOM-L3C_GHRSST-SSTskin-AVHRR19_D-1d_night-v02.0-fv01.0.nc;20160919032000-ABOM-L3C_GHRSST-SSTskin-AVHRR19_D-1d_day-v02.0-fv01.0.nc;20160919152000-ABOM-L3C_GHRSST-SSTskin-AVHRR18_D-1d_night-v02.0-fv01.0.nc;20160919032000-ABOM-L3C_GHRSST-SSTskin-AVHRR18_D-1d_day-v02.0-fv01.0.nc,l3_source=AVHRR19_D-ABOM-L3C-v01.0;AVHRR18_D-ABOM-L3C-v01.0,global_source=wind_source=ACCESSG-ABOM-Forecast-WSP,analysis_source=ABOM-L4LRfnd-GLOB-GAMSSA_28km,adi_source=unknown,ice_source=SSMI-NCEP-Analysis-ICE-5min,l3_source=AVHRR19_D-ABOM-L3C-v01.0;AVHRR18_D-ABOM-L3C-v01.0,landmask_file=lsmask.dist5.5.nc,landmask_reference=Naval Oceanographic Office (NAVOCEANO),landmask_URL=https://www.ghrsst.org/data/ghrsst-data-tools/navo-ghrsst-pp-land-sea-mask/,landmask_source=NAVOCEANO 1km Version 5.5,ice_reference=US National Weather Service - NCEP,ice_URL=http://polar.ncep.noaa.gov/seaice/Analyses.html,ice_file=20160918.ice_data.5min.nc,ice_jdate=2457650,merge_tool=mergeL3U,mergeL3U_version=6637,quality=archive,mergeL3U_quality=archive" ; + :history = "platform_counts=NOAA-19=2;NOAA-18=2,quality_counts=archive=4,platform=NOAA-19;NOAA-18,quality_source=archive,ice_source=SSMI-NCEP-Analysis-ICE-5min,adi_source=unknown,wind_source=ACCESSG-ABOM-Forecast-WSP,analysis_source=ABOM-L4LRfnd-GLOB-GAMSSA_28km,source_file=20160919152000-ABOM-L3C_GHRSST-SSTskin-AVHRR19_D-1d_night-v02.0-fv01.0.nc;20160919032000-ABOM-L3C_GHRSST-SSTskin-AVHRR19_D-1d_day-v02.0-fv01.0.nc;20160919152000-ABOM-L3C_GHRSST-SSTskin-AVHRR18_D-1d_night-v02.0-fv01.0.nc;20160919032000-ABOM-L3C_GHRSST-SSTskin-AVHRR18_D-1d_day-v02.0-fv01.0.nc,l3_file=20160919152000-ABOM-L3C_GHRSST-SSTskin-AVHRR19_D-1d_night-v02.0-fv01.0.nc;20160919032000-ABOM-L3C_GHRSST-SSTskin-AVHRR19_D-1d_day-v02.0-fv01.0.nc;20160919152000-ABOM-L3C_GHRSST-SSTskin-AVHRR18_D-1d_night-v02.0-fv01.0.nc;20160919032000-ABOM-L3C_GHRSST-SSTskin-AVHRR18_D-1d_day-v02.0-fv01.0.nc,l3_source=AVHRR19_D-ABOM-L3C-v01.0;AVHRR18_D-ABOM-L3C-v01.0,global_source=wind_source=ACCESSG-ABOM-Forecast-WSP,analysis_source=ABOM-L4LRfnd-GLOB-GAMSSA_28km,adi_source=unknown,ice_source=SSMI-NCEP-Analysis-ICE-5min,l3_source=AVHRR19_D-ABOM-L3C-v01.0;AVHRR18_D-ABOM-L3C-v01.0,landmask_file=lsmask.dist5.5.nc,landmask_reference=Naval Oceanographic Office (NAVOCEANO),landmask_URL=https://www.ghrsst.org/data/ghrsst-data-tools/navo-ghrsst-pp-land-sea-mask/,landmask_source=NAVOCEANO 1km Version 5.5,ice_reference=US National Weather Service - NCEP,ice_URL=http://polar.ncep.noaa.gov/seaice/Analyses.html,ice_file=20160918.ice_data.5min.nc,ice_jdate=2457650,merge_tool=mergeL3U,mergeL3U_version=6637,quality=archive,mergeL3U_quality=archive\n2016-10-17T17:53+0000 Benjamin Adams Renamed file 20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn.cdl to 20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn_truncate.cdl. Truncated lon/lat dimensions to 2 elements each" ; :Conventions = "CF-1.6" ; :acknowledgment = "Any use of these data requires the following acknowledgment:\n \"HRPT AVHRR SSTfnd retrievals were produced by the Australian Bureau of Meteorology as a contribution to the Integrated Marine Observing System - an initiative of the Australian Government being conducted as part of the National Collaborative Research Infrastructure Strategy and the Super Science Initiative.\"\n The imagery data were acquired from NOAA spacecraft by the Bureau, Australian Institute of Marine Science, Australian Commonwealth Scientific and Industrial Research Organization, Geoscience Australia, and Western Australian Satellite Technology and Applications Consortium. " ; } diff --git a/compliance_checker/tests/resources.py b/compliance_checker/tests/resources.py index 3ae5d673..9bb80b74 100644 --- a/compliance_checker/tests/resources.py +++ b/compliance_checker/tests/resources.py @@ -62,5 +62,5 @@ def generate_dataset(cdl_path, nc_path): 'trajectory-profile-incomplete' : get_filename('tests/data/trajectory-profile-incomplete.cdl'), '2d-regular-grid' : get_filename('tests/data/2d-regular-grid.cdl'), '3d-regular-grid' : get_filename('tests/data/3d-regular-grid.cdl'), - 'ghrsst' : get_filename('tests/data/20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn.cdl'), + 'ghrsst' : get_filename('tests/data/20160919092000-ABOM-L3S_GHRSST-SSTfnd-AVHRR_D-1d_dn_truncate.cdl'), }