Merge branch 'master' of nicolopalazzini/whoall into master

whoall

@@ -5,7 +5,7 @@
 # First author: jacopogh - nov 2006
 # Modified and updated by admins & 150 over time
 #
-# Last modified: January 2019 - alessandrodegennaro2
+# Last modified: May 2019 - nicolopalazzini
 
 
 from time import time
@@ -31,8 +31,6 @@ parser.add_argument('-1', '--lcm1', action='store_true', dest='lcm1',
                     help='only display LCM1 hosts ')
 parser.add_argument('-2', '--lcm2', action='store_true', dest='lcm2',
                     help='only display LCM2 hosts ')
-parser.add_argument('-l', '--laur', action='store_true', dest='laur',
-                    help='only display LAUR hosts ')
 parser.add_argument('-c', '--condor', action='store_true', dest='condor',
                     help='only display condor nodes ')
 parser.add_argument('-C', '--cuda', action='store_true', dest='cuda',
@@ -47,7 +45,7 @@ parser.add_argument('-n', action='store_true', dest='n',
 parser.add_argument('-N', action='store_true', dest='N',
                     help='also display number of logs')
 parser.add_argument('-v', '--version', action='version',
-                    version='%(prog)s 2.1', help='print program version')
+                    version='%(prog)s 2.2', help='print program version')
 
 # Parse arguments
 args = parser.parse_args()
@@ -274,10 +272,10 @@ nodes = [
     Node('tron',    'LCM2',     math4=True,     condor=True),
     Node('worf',    'LCM2',     math4=True,     condor=True),
     Node('zombie',  'LCM2',     math4=True,     condor=True),
-    Node('tilde',   'LAUR'),
     Node('jacobi',  'CUDA', cuda=True),
     Node('yukawa',  'CUDA', cuda=True),
     Node('tesla',   'CUDA', cuda=True),
+#	Node('tilde',   'HEAVEN'),
 ]
 
 
@@ -285,13 +283,11 @@ nodes = [
 if args.n:
    splitters = { 'LCM1': '-LCM1----',
                  'LCM2': '-LCM2----',
-                 'CUDA': '-CUDA----',
-                 'LAUR': '-LAUR----' }
+                 'CUDA': '-CUDA----' }
 else:
    splitters = { 'LCM1': '-\033[1;36mLCM1\033[0m----',
                  'LCM2': '-\033[1;32mLCM2\033[0m----',
-                 'CUDA': '-\033[1;35mCUDA\033[0m----',
-                 'LAUR': '-\033[1;33mLAUR\033[0m----' }
+                 'CUDA': '-\033[1;35mCUDA\033[0m----' }
 
 
 ###################################################
@@ -322,8 +318,6 @@ if args.lcm1:
     nodes = [ node for node in nodes if node.location == 'LCM1' ]
 if args.lcm2:
     nodes = [ node for node in nodes if node.location == 'LCM2' ]
-if args.laur:
-    nodes = [ node for node in nodes if node.location == 'LAUR' ]
 if args.cuda:
     nodes = [ node for node in nodes if node.location == 'CUDA' ]
 if args.condor:
@@ -384,7 +378,6 @@ nodes = [ node for node in nodes if node.up
 # Split notes by location
 lcm1nodes = [ node for node in nodes if node.location == 'LCM1' ]
 lcm2nodes = [ node for node in nodes if node.location == 'LCM2' ]
-laurnodes = [ node for node in nodes if node.location == 'LAUR' ]
 cudanodes = [ node for node in nodes if node.location == 'CUDA' ]
 
 # Print out
@@ -396,10 +389,6 @@ if len(lcm2nodes):
     print splitters['LCM2']
     for node in lcm2nodes:
         node.printlist()
-if len(laurnodes):
-    print splitters['LAUR']
-    for node in laurnodes:
-        node.printlist()
 if len(cudanodes):
     print splitters['CUDA']
     for node in cudanodes: