Changeset 5bf163a in flex_extract.git

Timestamp:

Jun 19, 2020, 7:51:02 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

2c3c135

Parents:

3a54479

Message:

prepared testscripts and install/usage scripts for the manuscript; used 4 digits for year for CERA-20C data;

Files:

• For_developers/mk_upload_tarball.sh (modified) (1 diff)
• Source/Python/Classes/EcFlexpart.py (modified) (1 diff)
• Testing/Installation/Api_testscripts/README.md (added)
• Testing/Installation/Api_testscripts/test_cdsapi_modellevel.py (added)
• Testing/Installation/Api_testscripts/test_cdsapi_pressurelevel.py (added)
• Testing/Installation/Api_testscripts/test_ecmwfapi_member.py (added)
• Testing/Installation/Api_testscripts/test_ecmwfapi_public.py (added)
• Testing/Installation/Calc_etadot/README (moved) (moved from Testing/Installation/Convert/README)
• Testing/Installation/Calc_etadot/fort.10 (moved) (moved from Testing/Installation/Convert/fort.10)
• Testing/Installation/Calc_etadot/fort.11 (moved) (moved from Testing/Installation/Convert/fort.11)
• Testing/Installation/Calc_etadot/fort.12 (moved) (moved from Testing/Installation/Convert/fort.12)
• Testing/Installation/Calc_etadot/fort.13 (moved) (moved from Testing/Installation/Convert/fort.13)
• Testing/Installation/Calc_etadot/fort.16 (moved) (moved from Testing/Installation/Convert/fort.16)
• Testing/Installation/Calc_etadot/fort.17 (moved) (moved from Testing/Installation/Convert/fort.17)
• Testing/Installation/Calc_etadot/fort.18 (moved) (moved from Testing/Installation/Convert/fort.18)
• Testing/Installation/Calc_etadot/fort.19 (moved) (moved from Testing/Installation/Convert/fort.19)
• Testing/Installation/Calc_etadot/fort.21 (moved) (moved from Testing/Installation/Convert/fort.21)
• Testing/Installation/Calc_etadot/fort.22 (moved) (moved from Testing/Installation/Convert/fort.22)
• Testing/Installation/Calc_etadot/fort.4 (moved) (moved from Testing/Installation/Convert/fort.4)
• Testing/Installation/First_extraction/README.md (added)
• Testing/Installation/First_extraction/run.sh (added)
• Testing/Installation/First_extraction/run_local.sh (added)
• Testing/Installation/First_extraction/run_local_public.sh (added)
• Testing/Installation/testecmwfapi_member.py (deleted)
• Testing/Installation/testecmwfapi_public.py (deleted)

For_developers/mk_upload_tarball.sh

@@ -18 +18 @@
 #
 
-tarname='flex_extract_v7.1.tar.gz'
-tardir='flex_extract_v7.1'
+tarname='flex_extract_v7.1.2.tar.gz'
+tardir='flex_extract_v7.1.2'
 
 # go back to directory which is above flex_extract directory

Source/Python/Classes/EcFlexpart.py

@@ -1722 +1722 @@
 # ============================================================================================
             # create name of final output file, e.g. EN13040500 (ENYYMMDDHH)
+            # for CERA-20C we need all 4 digits for the year sinc 1900 - 2010
             if c.purefc:
-                suffix = cdate[2:8] + '.' + ctime + '.' + cstep
+                if c.marsclass == 'EP':
+                    suffix = cdate[0:8] + '.' + ctime + '.' + cstep
+                else:
+                    suffix = cdate[2:8] + '.' + ctime + '.' + cstep
             else:
-                suffix = cdate_hour[2:10]
+                if c.marsclass == 'EP':
+                    suffix = cdate_hour[0:10]
+                else:
+                    suffix = cdate_hour[2:10]
 
             # if necessary, add ensemble member number to filename suffix