Changeset 12952

Timestamp:

08/09/12 10:47:27 (13 years ago)

Author:

jschierm

Message:

CHG: Take advantage of MatlabFuncs.

File:

• issm/trunk-jpl/test/NightlyRun/runme.py (modified) (8 diffs)

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -42 +42 @@
         from parallelrange import parallelrange
         from IdToName import IdToName
+        from MatlabFuncs import *
 
         #Get ISSM_DIR variable
@@ -49 +50 @@
         #Process options
         #GET benchmark {{{1
-        if not benchmark.lower() in ['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing']:
+        if not ismember(benchmark,['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing']):
                 print "runme warning: benchmark '%s' not supported, defaulting to test 'nightly'." % benchmark
                 benchmark='nightly'
         # }}}
         #GET procedure {{{1
-        if not procedure.lower() in ['check','update']:
+        if not ismember(procedure,['check','update']):
                 print "runme warning: procedure '%s' not supported, defaulting to test 'check'." % procedure
                 procedure='check'
         # }}}
         #GET output {{{1
-        if not output.lower() in ['nightly','daily','none']:
+        if not ismember(output,['nightly','daily','none']):
                 print "runme warning: output '%s' not supported, defaulting to test 'none'." % output
                 output='none'
@@ -107 +108 @@
 
         #Process Ids according to benchmarks {{{1
-        if   benchmark.lower() == 'nightly':
+        if   strcmpi(benchmark,'nightly'):
                 test_ids=test_ids.intersection(set(range(1,1000)))
-        elif benchmark.lower() == 'ismip':
+        elif strcmpi(benchmark,'ismip'):
                 test_ids=test_ids.intersection(set(range(1101,1200)))
-        elif benchmark.lower() == 'eismint':
+        elif strcmpi(benchmark,'eismint'):
                 test_ids=test_ids.intersection(set(range(1201,1300)))
-        elif benchmark.lower() == 'thermal':
+        elif strcmpi(benchmark,'thermal'):
                 test_ids=test_ids.intersection(set(range(1301,1400)))
-        elif benchmark.lower() == 'mesh':
+        elif strcmpi(benchmark,'mesh'):
                 test_ids=test_ids.intersection(set(range(1401,1500)))
-        elif benchmark.lower() == 'validation':
+        elif strcmpi(benchmark,'validation'):
                 test_ids=test_ids.intersection(set(range(1001,2000)))
-        elif benchmark.lower() == 'tranforcing':
+        elif strcmpi(benchmark,'tranforcing'):
                 test_ids=test_ids.intersection(set(range(1501,1503)))
 #       print 'test_ids after benchmark =',test_ids
@@ -139 +140 @@
                         #UPDATE ARCHIVE?
                         archive_name='Archive'+str(id)
-                        if procedure.lower() == 'update':
-
-                                if not socket.gethostname().lower().split('.')[0] == 'larsen':
+                        if strcmpi(procedure,'update'):
+
+                                if not strcmp(socket.gethostname().lower().split('.')[0],'larsen'):
 #                                       raise RuntimeError("Nightly run archives must be saved on 'larsen' (hostname is '"+socket.gethostname()+"').")
                                         print "Nightly run archives must be saved on 'larsen' (hostname is '"+socket.gethostname()+"')."
@@ -200 +201 @@
                                                 directory=os.getcwd().split('/')    #  not used?
                                                 message=me2
-                                                if   output.lower() == 'nightly':
+                                                if   strcmpi(output,'nightly'):
                                                         fid=open(os.path.join(ISSM_DIR,'nightlylog','matlaberror.log'), 'a')
                                                         fid.write('%s' % message)
@@ -206 +207 @@
                                                         fid.close()
                                                         print 'FAILURE difference: N/A test id: %i test name: %s field: %s' % (id,id_string,fieldname)
-                                                elif output.lower() == 'daily':
+                                                elif strcmpi(output,'daily'):
                                                         fid=open(os.path.join(ISSM_DIR,'dailylog','matlaberror.log'), 'a')
                                                         fid.write('%s' % message)
@@ -223 +224 @@
                         directory=os.getcwd().split('/')    #  not used?
                         message=me
-                        if   output.lower() == 'nightly':
+                        if   strcmpi(output,'nightly'):
                                 fid=open(os.path.join(ISSM_DIR+'nightlylog','matlaberror.log'), 'a')
                                 fid.write('%s' % message)
@@ -229 +230 @@
                                 fid.close()
                                 print 'FAILURE difference: N/A test id: %i test name: %s field: %s' % (id,id_string,'N/A')
-                        elif output.lower() == 'daily':
+                        elif strcmpi(output,'daily'):
                                 fid=open(os.path.join(ISSM_DIR+'dailylog','matlaberror.log'), 'a')
                                 fid.write('%s' % message)