[us-commits] r288 - in trunk: . lib

[svn at svn.aucsolutions.com]

Author: gegorbet
Date: 2019-05-10 13:51:46 +0000 (Fri, 10 May 2019)
New Revision: 288

Modified:
   trunk/2DSA-CG_2.php
   trunk/2DSA_2.php
   trunk/GA_3.php
   trunk/PCSA_2.php
   trunk/lib/file_writer.php
   trunk/lib/utility.php
Log:
uslims3 and uslims3_inst mods for Lethbridge server

Modified: trunk/2DSA-CG_2.php
===================================================================
--- trunk/2DSA-CG_2.php	2019-05-05 12:13:59 UTC (rev 287)
+++ trunk/2DSA-CG_2.php	2019-05-10 13:51:46 UTC (rev 288)
@@ -162,6 +162,7 @@
     {
       case 'jetstream-local' :
       case 'taito-local'     :
+      case 'demeler3-local'  :
       case 'us3iab-node0'    :
       case 'us3iab-node1'    :
       case 'us3iab-devel'    :

Modified: trunk/2DSA_2.php
===================================================================
--- trunk/2DSA_2.php	2019-05-05 12:13:59 UTC (rev 287)
+++ trunk/2DSA_2.php	2019-05-10 13:51:46 UTC (rev 288)
@@ -170,7 +170,8 @@
     switch ( $cluster )
     {
        case 'jetstream-local' :
-       case 'taito-local' :
+       case 'taito-local'     :
+       case 'demeler3-local'  :
        case 'us3iab-node0'    :
        case 'us3iab-node1'    :
        case 'us3iab-devel'    :

Modified: trunk/GA_3.php
===================================================================
--- trunk/GA_3.php	2019-05-05 12:13:59 UTC (rev 287)
+++ trunk/GA_3.php	2019-05-10 13:51:46 UTC (rev 288)
@@ -145,6 +145,7 @@
     {
       case 'jetstream-local' :
       case 'taito-local'     :
+      case 'demeler3-local'  :
       case 'us3iab-node0'    :
       case 'us3iab-node1'    :
       case 'us3iab-devel'    :

Modified: trunk/PCSA_2.php
===================================================================
--- trunk/PCSA_2.php	2019-05-05 12:13:59 UTC (rev 287)
+++ trunk/PCSA_2.php	2019-05-10 13:51:46 UTC (rev 288)
@@ -163,6 +163,7 @@
     {
       case 'jetstream-local' :
       case 'taito-local'     :
+      case 'demeler3-local'  :
       case 'us3iab-node0'    :
       case 'us3iab-node1'    :
       case 'us3iab-devel'    :

Modified: trunk/lib/file_writer.php
===================================================================
--- trunk/lib/file_writer.php	2019-05-05 12:13:59 UTC (rev 287)
+++ trunk/lib/file_writer.php	2019-05-10 13:51:46 UTC (rev 288)
@@ -632,6 +632,9 @@
       $xml->startElement( 'tinoise_option' );
         $xml->writeAttribute( 'value', $parameters['tinoise_option'] );
       $xml->endElement(); // tinoise_option
+      $xml->startElement( 'rinoise_option' );
+        $xml->writeAttribute( 'value', $parameters['rinoise_option'] );
+      $xml->endElement(); // rinoise_option
       $xml->startElement( 'fit_mb_select' );
         $xml->writeAttribute( 'value', $parameters['fit_mb_select'] );
       $xml->endElement(); // fit_mb_select
@@ -646,9 +649,6 @@
       $xml->startElement( 'max_iterations' );
         $xml->writeAttribute( 'value', $parameters['max_iterations'] );
       $xml->endElement(); // max_iterations
-      $xml->startElement( 'rinoise_option' );
-        $xml->writeAttribute( 'value', $parameters['rinoise_option'] );
-      $xml->endElement(); // rinoise_option
       $xml->startElement( 'debug_timings' );
         $xml->writeAttribute( 'value', $parameters['debug_timings'] );
       $xml->endElement(); // debug_timings
@@ -698,6 +698,9 @@
       $xml->startElement( 'tinoise_option' );
         $xml->writeAttribute( 'value', $parameters['tinoise_option'] );
       $xml->endElement(); // tinoise_option
+      $xml->startElement( 'rinoise_option' );
+        $xml->writeAttribute( 'value', $parameters['rinoise_option'] );
+      $xml->endElement(); // rinoise_option
       $xml->startElement( 'fit_mb_select' );
         $xml->writeAttribute( 'value', $parameters['fit_mb_select'] );
       $xml->endElement(); // fit_mb_select
@@ -710,9 +713,6 @@
       $xml->startElement( 'max_iterations' );
         $xml->writeAttribute( 'value', $parameters['max_iterations'] );
       $xml->endElement(); // max_iterations
-      $xml->startElement( 'rinoise_option' );
-        $xml->writeAttribute( 'value', $parameters['rinoise_option'] );
-      $xml->endElement(); // rinoise_option
       $xml->startElement( 'debug_timings' );
         $xml->writeAttribute( 'value', $parameters['debug_timings'] );
       $xml->endElement(); // debug_timings

Modified: trunk/lib/utility.php
===================================================================
--- trunk/lib/utility.php	2019-05-05 12:13:59 UTC (rev 287)
+++ trunk/lib/utility.php	2019-05-10 13:51:46 UTC (rev 288)
@@ -78,7 +78,8 @@
   new cluster_info( "js-169-137.jetstream-cloud.org", "jetstream",       "batch" ),
   new cluster_info( "js-169-137.jetstream-cloud.org", "jetstream-local", "batch" ),
   new cluster_info( "taito.csc.fi",             "taito-local",   "serial"  ),
-  new cluster_info( "us3iab-node1.localhost",   "us3iab-node1",  "normal"  )
+  new cluster_info( "us3iab-node1.localhost",   "us3iab-node1",  "normal"  ),
+  new cluster_info( "demeler3.uleth.ca",        "demeler3-local", "batch"  )
   );
 
 global $svcport;