Changeset e7708b2 in flex_extract.git

Timestamp:

Jul 29, 2019, 10:01:49 AM (5 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

8ce3be6

Parents:

7c7e672

Message:

python2 downgrade/ bug fix of queue checks/improvement of grid check/

File:

• source/python/mods/checks.py (modified) (9 diffs)

source/python/mods/checks.py

@@ -1 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #*******************************************************************************
@@ -24 +24 @@
 # ------------------------------------------------------------------------------
 
+from __future__ import print_function
 import os
 import sys
+
 import _config
 try:
@@ -32 +34 @@
     import builtins as exceptions
 from datetime import datetime
-import numpy as np
 from mods.tools import my_error, silent_remove
 # ------------------------------------------------------------------------------
@@ -86 +87 @@
             grid = gridx
         else:
-            raise ValueError('GRID parameter contains two values '
-                             'which are unequal %s' (grid))
+            raise ValueError('GRID parameter contains two '
+                             'different values: %s' (grid))
+    # # determine grid format
+    # if float(grid) / 100. >= 0.5:
+    #    # grid is defined in 1/1000 degrees; old format
+    #    grid = '{}/{}'.format(float(grid) / 1000.,
+    #                          float(grid) / 1000.)
+    # elif float(grid) / 100. < 0.5:
+    #    # grid is defined in normal degree; new format
+    #    grid = '{}/{}'.format(float(grid), float(grid))
+
+
     # determine grid format
-    if float(grid) / 100. >= 0.5:
-        # grid is defined in 1/1000 degrees; old format
-        grid = '{}/{}'.format(float(grid) / 1000.,
-                              float(grid) / 1000.)
-    elif float(grid) / 100. < 0.5:
-        # grid is defined in normal degree; new format
+    # assumes that nobody wants grid spacings of 20 deg or more
+    if float(grid) >= 20.:
+        # grid is defined in 1/1000 degree; old format
+        grid = '{}/{}'.format(float(grid) / 1000., float(grid) / 1000.)
+    else:
+        # grid is defined in degree; new format
         grid = '{}/{}'.format(float(grid), float(grid))
+
 
     return grid
@@ -290 +302 @@
         List of forecast steps in format e.g. [001, 002, ...]
     '''
+    import numpy as np
 
     if '/' in step:
@@ -466 +479 @@
     '''
     if queue in _config.QUEUES_LIST and \
-        not gateway or not destination or \
-        not ecuid or not ecgid:
+            (not gateway or not destination or
+             not ecuid or not ecgid):
         raise ValueError('\nEnvironment variables GATEWAY, DESTINATION, ECUID '
                          'and ECGID were not set properly! \n '
@@ -689 +702 @@
 
 
-def check_acctime(acctime, marsclass, purefc):
+def check_acctime(acctime, marsclass, purefc, time):
     '''Guarantees that the accumulation forecast times were set.
 
@@ -724 +737 @@
         elif marsclass.upper() == 'OD' and not purefc: # On-demand
             acctime = '00/12'
+        elif marsclass.upper() == 'OD' and purefc: # On-demand
+            acctime = time[0]
         else:
             raise ValueError('ERROR: Accumulation forecast time can not '
@@ -820 +835 @@
     if not job_chunk:
         return job_chunk
+    else:
+        job_chunk = int(job_chunk)
 
     if job_chunk < 0: