From c26f05a516121a879993b4013866f9ee918069e0 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 25 Apr 2013 01:09:08 -0700
Subject: [PATCH] client: don't use FLOPS info for completion estimates of NCI
 jobs

---
 client/result.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/result.cpp b/client/result.cpp
index 99bee2f744..ff76c8605b 100644
--- a/client/result.cpp
+++ b/client/result.cpp
@@ -544,6 +544,16 @@ double RESULT::estimated_runtime() {
 double RESULT::estimated_runtime_remaining() {
     if (computing_done()) return 0;
     ACTIVE_TASK* atp = gstate.lookup_active_task_by_result(this);
+    if (app->non_cpu_intensive) {
+        if (atp && atp->fraction_done>0) {
+            double est_dur = atp->fraction_done_elapsed_time / atp->fraction_done;
+            double x = est_dur - atp->elapsed_time;
+            if (x <= 0) x = 1;
+            return x;
+        }
+        return 0;
+    }
+
     if (atp) {
 #ifdef SIM
         return sim_flops_left/avp->flops;