Removed depricated references to S5p-Hub. (bbe0f3d3) · Commits · CAMS / CSO

CHANGELOG

+8 −0

Original line number	Diff line number	Diff line
		@@ -262,3 +262,11 @@ Patch 2.5.1
		Fixed bug in S5P orbit selection.
		py/cso_s5p.py


		v2.7
		----

		Removed depricated references to S5p-Hub.
		doc/source

config/tutorial/tutorial.rc

+13 −11

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ my.work : /Scratch/${USER}/CSO-Tutorial

		!======================================================================
		!===
		!=== Inquire - S-5P Hub
		!=== Inquire DataSpace
		!===
		!======================================================================

		@@ -322,8 +322,11 @@ cso.tutorial.convert.timerange.end : ${my.timerange.end}

		! listing of available source files, created by 'inquire' job:
		cso.tutorial.convert.inquire.file : ${my.work}/Copernicus/Copernicus_S5p_NO2_dataspace__%Y-%m-%d.csv
		!~ historic inquire ...
		cso.tutorial.convert.inquire.filedate : 2023-11-06
		!!~ historic inquire ...
		!cso.tutorial.convert.inquire.filedate : 2024-01-18

		! selection keyword:
		my.tutorial.selection : C03

		! Provide ';' seperated list of to decide if a particular orbit file should be processed.
		! If more than one file is available for a particular orbit (from "OFFL" and "RPRO" processing),
		@@ -385,7 +388,7 @@ cso.tutorial.convert.filter.quality.units : 1
		! - times are taken from mid of selection, rounded to hours
		! - use '%{processing}' for the processing name
		! - use '%{orbit}' for orbit number
		cso.tutorial.convert.output.filename : ${my.work}/CSO-data/S5p/%{processing}/NO2/${my.region}/%Y/%m/S5p_%{processing}_NO2_%{orbit}.nc
		cso.tutorial.convert.output.filename : ${my.work}/CSO-data/${my.region}/S5p/NO2/${my.tutorial.selection}/%Y/%m/S5p_%{processing}_NO2_%{orbit}.nc

		! pack variables on output:
		cso.tutorial.convert.output.packed : True
		@@ -565,7 +568,7 @@ cso.tutorial.convert.output.var.qa_value.attrs : { 'valid_min
		! csv file that will hold records per file with:
		! - timerange of pixels in file
		! - orbit number
		cso.tutorial.listing.file : ${my.work}/CSO-data/S5p/listing-NO2-${my.region}.csv
		cso.tutorial.listing.file : ${my.work}/CSO-data/${my.region}/S5p/NO2/${my.tutorial.selection}/listing.csv

		! renew table if file already exists?
		cso.tutorial.listing.renew : True
		@@ -578,8 +581,7 @@ cso.tutorial.listing.timerange.end : ${my.timerange.end}
		! names could include time templates ;
		! if same orbit is found in multiple directories, the first found is used;
		! remove existing table for safety to ensure that this is done correctly ...
		cso.tutorial.listing.patterns : RPRO/NO2/${my.region}/%Y/%m/S5p_*.nc \
		OFFL/NO2/${my.region}/%Y/%m/S5p_*.nc
		cso.tutorial.listing.patterns : %Y/%m/S5p_*.nc

		! extra columns to be added, read from global attributes:
		cso.tutorial.listing.xcolumns : orbit
		@@ -602,7 +604,7 @@ cso.tutorial.catalogue.timerange.end : ${my.timerange.end}
		! - time values
		! - %{orbit} : from listing
		! - %{varname} for variable
		cso.tutorial.catalogue.output.file : ${my.work}/CSO-data-catalogue/S5p/NO2/${my.region}/%Y/%m/%d/S5p_NO2_%{orbit}__%{varname}.png
		cso.tutorial.catalogue.output.file : ${my.work}/CSO-data-catalogue/${my.region}/S5p/NO2/${my.tutorial.selection}/%Y/%m/%d/S5p_NO2_%{orbit}__%{varname}.png

		! map domain (west east south north)
		cso.tutorial.catalogue.domain : ${my.region.west} ${my.region.east} ${my.region.south} ${my.region.north}
		@@ -611,8 +613,8 @@ cso.tutorial.catalogue.domain : ${my.region.west} ${my.reg
		cso.tutorial.catalogue.figsize : ${my.region.figsize}

		! renew existing files?
		cso.tutorial.catalogue.renew : False
		!cso.tutorial.catalogue.renew : True
		!cso.tutorial.catalogue.renew : False
		cso.tutorial.catalogue.renew : True

		! variables to be plotted:
		cso.tutorial.catalogue.vars : vcd vcd_errvar qa_value \
		@@ -667,7 +669,7 @@ cso.tutorial.catalogue.var.cloud_radiance_fraction.colors : ['blue','cyan',
		!-----------------------------------------------------------

		! target location:
		cso.tutorial.catalogue-index.outdir : ${my.work}/CSO-data-catalogue/S5p/NO2/${my.region}
		cso.tutorial.catalogue-index.outdir : ${my.work}/CSO-data-catalogue/${my.region}/S5p/NO2/${my.tutorial.selection}

		! title:
		cso.tutorial.catalogue-index.header : CSO catalogue

doc/source/figs/s5p-hub-advanced-search.png

deleted100644 → 0

−754 KiB

Loading image diff...

doc/source/figs/sci-hub.png

deleted100644 → 0

−232 KiB

Loading image diff...

doc/source/s5p-chocho.rst

+21 −16

Original line number	Diff line number	Diff line
		@@ -148,12 +148,16 @@ The processing stream is identified by a 4-character key:
		* ``RPRO`` : re-processing of all previously made observations.
		* ``PAL_`` : processed data stored on the Product Algorithm Laboratory portal.

		The two archives need to be inquired seperately.
		The portals provide data files created with the same retrieval algorithm, but most recent data
		(latest processor version) might be available on only one of the portals.
		It is therefore necessary to first inquire both archives to see which data is available where,
		and what the version numbers are.

		* The :py:class:`CSO_SciHub_Listing <cso_scihub.CSO_SciHub_Listing>` class is available to list the content
		of the downloaded orbit files.
		The result is a csv file which with columns for keywords such orbit number and processor version,
		as well as the filename relative to the location of the csv file::
		The :py:class:`CSO_DataSpace_Inquire <cso_dataspace.CSO_DataSpace_Inquire>` class is available to inquire the
		Copernicus DataSpace. The settings used by this class allow selection
		on for example time range and intersection area.
		The result is a csv file which with columns for keywords such as orbit number and processor version,
		as well as the filename of the data and the url that should be used to actually download the data::

		filename ;start_time ;end_time ;mission;processing;product_id;orbit;collection;processor_version;processing_time
		2020/01/01/S5P_OFFL_L2__CHOCHO___20200101T005246_20200101T023416_11487_01_010000_20210128.nc;2020-01-01 00:52:46;2020-01-01 02:34:16;S5P ;OFFL ;L2__CHOCHO;11487;01 ;010000 ;2021-01-28
		@@ -163,8 +167,9 @@ The two archives need to be inquired seperately.
		See the section on File name convention in the Product User Manual for the meaning of all
		parts of the filename.

		* The :py:class:`CSO_PAL_Inquire <cso_pal.CSO_PAL_Inquire>` class is available to list the content of
		the PAL archive.
		A similar class :py:class:`CSO_S5p_Download_Listing <cso_s5p.CSO_S5p_Download_Listing>`
		class is available to list the content of the downloaded GlyRetro files.
		Also this will produce a table file.

		To visualize what is available from the portal, the
		:py:class:`CSO_Inquire_Plot <cso_inquire.CSO_Inquire_Plot>` could be used to create an overview figure:
		@@ -183,7 +188,7 @@ The jobtree configuration to inquire the portals and create the overview figure
		cso.s5p.chocho.inquire.tasks : table-glyretro table-pal plot

		!~ inquire files downloaded from GlyRetro:
		cso.s5p.chocho.inquire.table-glyretro.class : cso.CSO_SciHub_Listing
		cso.s5p.chocho.inquire.table-glyretro.class : cso.CSO_S5p_Download_Listing
		cso.s5p.chocho.inquire.table-glyretro.args : '${PWD}/config/Copernicus/cso-s5p-chocho.rc', \
		rcbase='cso.s5p.chocho.inquire-table-glyretro'
		!~ inquire files available on PAL: