[us-commits] r77 - trunk/class

[svn at svn.aucsolutions.com]

Author: gegorbet
Date: 2019-06-25 20:41:38 +0000 (Tue, 25 Jun 2019)
New Revision: 77

Modified:
   trunk/class/jobsubmit_aira.php
Log:
fix maxwall estimate as a function of total grid points

Modified: trunk/class/jobsubmit_aira.php
===================================================================
--- trunk/class/jobsubmit_aira.php	2019-06-07 16:27:00 UTC (rev 76)
+++ trunk/class/jobsubmit_aira.php	2019-06-25 20:41:38 UTC (rev 77)
@@ -596,12 +596,8 @@
             $gpts_s     = $parameters[ 's_grid_points' ];
             $gpts_k     = $parameters[ 'ff0_grid_points' ];
             $gpts_t     = $gpts_s * $gpts_k;
-            if ( $gpts_t > 200000 )
-               $time      *= 8;
-            else if ( $gpts_t > 100000 )
-               $time      *= 4;
-            else if ( $gpts_t > 50000 )
-               $time      *= 2;
+            $gp_fac     = (int)( ( $gpts_t + 4096 ) / 8192 );
+            $time      *= $gp_fac;
          }
 
          if ( isset( $dsparams[ 'simpoints' ] ) )