rda-python-dsarch 1.0.19__tar.gz → 1.0.20__tar.gz

{rda_python_dsarch-1.0.19 → rda_python_dsarch-1.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 1.0.19
+Version: 1.0.20
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch

{rda_python_dsarch-1.0.19 → rda_python_dsarch-1.0.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dsarch"
-version = "1.0.19"
+version = "1.0.20"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_dsarch-1.0.19 → rda_python_dsarch-1.0.20}/src/rda_python_dsarch/PgArch.py

@@ -693,6 +693,7 @@ def check_enough_options(cact, acts):
       if 'EM' not in PgOPT.params: PgLOG.PGLOG['LOGMASK'] &= ~PgLOG.EMLALL   # turn off email if not yet
       PgOPT.PGOPT['emerol'] |= PgLOG.EXITLG
       # set command line Batch options
+      set_qsub_walltime()
       PgCMD.set_batch_options(PgOPT.params, 1)
       PgCMD.init_dscheck(0, '', "dsarch", PgOPT.params['DS'], cact, PgLOG.PGLOG['CURDIR'], PgOPT.params['LN'],
                          PgOPT.params['BP'], PgOPT.PGOPT['emerol'])
@@ -700,6 +701,30 @@ def check_enough_options(cact, acts):
 
    PgSIG.start_none_daemon('dsarch', PgOPT.PGOPT['CACT'], PgOPT.params['LN'], 1, PgOPT.params['WI'], 1, PgOPT.params['AL'])
 
+#
+# set qsub walltime if needed
+#
+def set_qsub_walltime():
+
+   fcnt = 0
+   if 'LF' in PgOPT.params:
+      fcnt = len(PgOPT.params['LF'])
+   elif 'WF' in PgOPT.params:
+      fcnt = len(PgOPT.params['WF'])
+   else:
+      return
+
+   if 'GX' in PgOPT.params: fcnt *= 30
+   hr = int(fcnt/30000)
+   if hr == 6: return
+
+   if hr < 2:
+      hr = 2
+   elif hr > 24:
+      hr = 24
+   PgCMD.set_one_boption('qoptions', '-l walltime={}:00:00'.format(hr), 1)
+   return
+
 #
 # build local file list for given local directory and reset file sizes
 #

{rda_python_dsarch-1.0.19 → rda_python_dsarch-1.0.20}/src/rda_python_dsarch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 1.0.19
+Version: 1.0.20
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch