TNO Intern

Commit 24085b57 authored by Arjo Segers's avatar Arjo Segers
Browse files

Updates from EMEP development version.

parent 4365043f

CHANGELOG

+26 −4
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ Support orbits that overlap with dateline. 
v2.7

----



Removed suppored for NO2-superobs, now create these using own classes.

Removed support for NO2-superobs, now create these using own classes.

  py/cso_s5p_superobs.py

  py/cso.py

  config/EMEP/emep-tropomi-superobs.rc
@@ -339,8 +339,11 @@ v2.7.2 
Updated url of DataSpace OpenSearch API.





vX.Y.Z

~~~~~~

v2.8

----



Improved submission of parallel jobs.

  py/utopya_jobtree.py



Added "CSO_S5p_Download" class to only download S5p files without conversion.

	py/cso_s5p.py
@@ -351,4 +354,23 @@ Added "CSO_S5p_Download" class to only download S5p files without conversion. 
	config/Copernicus/cso-s5p-so2-cobra.rc

	config/Copernicus/cso-s5p-so2.rc



Define environment variable 'CSO_RCFILE' for use in settings.

  bin/cso



Updated re-try settings for downloads based on latest experiences.

Trap download errors.

  py/cso_dataspace.py



Support creation of multiple gridded output files.

  py/cso_gridded.py



Updated plotting features.

  py/cso_inquire.py

  py/cso_plot.py



Improved plotting of maps and timeseries per country.

Support box-plot timeseries to show variation over region.

  py/cso_regions.py



Added tools to make working copy of scripts and settings.

  py/utopya_build.py

bin/cso

+11 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ History 
2023-11, Arjo Segers

  Reformatted using 'black'.

  

2023-08, Arjo Segers

  Define environment variable 'CSO_RCFILE'.



"""
@@ -56,6 +59,9 @@ utos.ArgumentsSetup(description="CAMS Satellite Operator", rcbase="cso") 
# might show help text and exit:

args, xargs = utos.ArgumentsParse()



# store full path to settings:

os.environ['CSO_RCFILE'] = os.path.abspath( args.rcfile )



# start, shout info:

logging.info(f"")

logging.info(f"** CSO - CAMS Satellite Operator **")
@@ -64,6 +70,11 @@ logging.info(f"installation prefix : {prefix}") 
logging.info(f"input rcfile         : {args.rcfile}")

logging.info(f"settings base        : {args.rcbase}")

logging.info(f"")

logging.info(f"environment:")

for key in ["CSO_PREFIX","CSO_RCFILE"]:

    logging.info(f"  {key} = {os.environ[key]}")

# endfor

logging.info(f"")



# info ...

logging.info(f"start job tree ...")

doc/source/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ copyright = "2020-2024, Arjo Segers" 
author = "Arjo Segers"



# The full version, including alpha/beta/rc tags

release = "v2.7.2"

release = "v2.8"





# -- General configuration ---------------------------------------------------

doc/source/history.rst

+15 −13
Original line number Diff line number Diff line
@@ -101,6 +101,12 @@ A summary of the versions and changes. 
  | Support orbits that overlap with dateline.

  | *(2024-01)*

  

* | *v2.8*

  | Re-introduced 'Download' class to download a series of S5P files without converting.

  | Updated re-try settings for downloading.

  | Extended support for creation of gridded averages.

  | Extended support for region plots.





To be included

==============
@@ -125,8 +131,6 @@ A wishlist of developments. 
        

  * Also output by observation operator could use the same basename.

  

* Add all S5p filename parts to listingfile, see *Product User Manual*.

    

* Add offline tool to re-create listing files.



  * Scan directories based on filename patterns.
@@ -143,11 +147,9 @@ A wishlist of developments. 
How to create a version tag

===========================



Example for tag "v2.7".



1. Ensure that all changes in source files are committed.

Example for tag "v2.8".



2. Update file formatting following conventions.

1. Update file formatting following conventions.



   a. For Python files::
@@ -155,9 +157,9 @@ Example for tag "v2.7". 
     

   b. Eventually also cleanup Fortran sources.

   

   c. Commit these layout changes.

2. Ensure that all changes in source files are committed.



2. Update change logs:

3. Update change logs:



   a. Update the `CHANGELOG <../../../CHANGELOG>`_.
@@ -167,17 +169,17 @@ Example for tag "v2.7". 
      `doc/source/conf.py <../../source/conf.py>`_::



        # The full version, including alpha/beta/rc tags

        release = "v2.7"

        release = "v2.8"

    

   d. Commit and push these changes::



       git commit -m 'Defined v2.7' .

       git commit -m 'Defined v2.8' .

       git push



3. Tag and push the code to the git repository::

4. Tag and push the code to the git repository::



      git tag -a 'v2.7' -m 'Tagged v2.7'

      git push origin v2.7

      git tag -a 'v2.8' -m 'Tagged v2.8'

      git push origin v2.8

doc/source/pymod-utopya_build.rst

0 → 100644
+5 −0
Original line number Diff line number Diff line 
.. Documentation for module.



.. Import documentation from ".py" file:

.. automodule:: utopya_build