Index: /trunk/cluster_status.php
===================================================================
--- /trunk/cluster_status.php	(revision 14)
+++ /trunk/cluster_status.php	(revision 15)
@@ -165,8 +165,6 @@
    global $data;
 
-//   $clusters = array( "alamo", "jacinto" );
-   $clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "juropa" );
-   //$clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "jureca" );
-//   $clusters = array( "alamo" );
+   //$clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon" );
+   $clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "jureca" );
    foreach ( $clusters as $clname )
    {
@@ -224,5 +222,5 @@
          {
             $host   = "us3@comet.sdsc.edu";
-            $qstat  = `ssh $host '/usr/bin/sinfo -s -p compute -o "%a %F" 2>&1|tail -1'`;
+            $qstat  = `ssh $host '/usr/bin/sinfo -s -p compute -o "%a %F" |tail -1'`;
             $sparts = preg_split( '/\s+/', $qstat );
             $sta    = $sparts[ 0 ];
@@ -231,4 +229,6 @@
             $run    = $sparts[ 0 ];
             $que    = $sparts[ 1 ];
+            if ( $sta == "" )
+               $sta    = "down";
             break;
          }
@@ -247,24 +247,7 @@
             break;
          }
-         case 'juropa':
-         {
-            $host   = "zdv575@juropa.fz-juelich.de";
-            $qstat  = `ssh $host '/usr/bin/qstat -B 2>&1|tail -1'`;
-            $sparts = preg_split( '/\s+/', $qstat );
-            $que    = $sparts[ 3 ];
-            $run    = $sparts[ 4 ];
-            $sta    = $sparts[ 9 ];
-            if ( $sta == "Active" )
-               $sta    = "up";
-            else if ( $sta == "Scheduling" )
-               $sta    = "up";
-            else
-               $sta    = "down";
-            break;
-         }
          case 'jureca':
          {
-            //$host   = "swus1@jureca.fz-juelich.de";
-            $host   = "swus1@juropatest2.fz-juelich.de";
+            $host   = "swus1@jureca.fz-juelich.de";
             $qstat  = `ssh $host '/usr/bin/sinfo -s -p batch -o "%a %F" 2>&1|tail -1'`;
             $sparts = preg_split( '/\s+/', $qstat );
Index: /trunk/gridctl.php
===================================================================
--- /trunk/gridctl.php	(revision 14)
+++ /trunk/gridctl.php	(revision 15)
@@ -659,6 +659,5 @@
    global $cluster;
 
-   if ( preg_match( "/US3-A/i", $gfacID )  &&
-        ! preg_match( "/jur/i", $cluster ) )
+   if ( preg_match( "/US3-A/i", $gfacID ) )
    {
       // Then it's an Airavata/Thrift job
@@ -1087,6 +1086,6 @@
       }
 
+if(preg_match("/US3-A/i",$gfacID))
 //if(preg_match("/US3-ADEV/i",$gfacID))
-if(preg_match("/US3-A/i",$gfacID))
 write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
 //write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
Index: /trunk/runID_info.php
===================================================================
--- /trunk/runID_info.php	(revision 14)
+++ /trunk/runID_info.php	(revision 15)
@@ -730,5 +730,5 @@
   global $uses_airavata;
 
-  if ( $uses_airavata === true && $cluster != 'juropa.fz-juelich.de' )
+  if ( $uses_airavata === true )
   {
     $row['gfacStatus'] = nl2br( getExperimentStatus( $row['gfacID'] ) );