Changeset 24601

Timestamp:

02/27/20 00:19:59 (5 years ago)

Author:

bdef

Message:

CHG:minor clean up

File:

• issm/trunk-jpl/src/m/classes/clusters/generic.py (modified) (7 diffs)

issm/trunk-jpl/src/m/classes/clusters/generic.py

@@ -1 @@
-import socket
-import os
-import math
-import subprocess
+from socket import gethostname
+from subprocess import call
 from IssmConfig import IssmConfig
 from issmdir import issmdir
@@ -9 +7 @@
 from issmscpin import issmscpin
 from issmscpout import issmscpout
-import MatlabFuncs as m
+from MatlabFuncs import ispc
 try:
     from generic_settings import generic_settings
@@ -43 +41 @@
 
         #get name
-        self.name = socket.gethostname()
+        self.name = gethostname()
 
         #initialize cluster using user settings if provided
@@ -77 +75 @@
     def checkconsistency(self, md, solution, analyses):  # {{{
         if self.np < 1:
-            md = checkmessage(md, 'number of processors should be at least 1')
-        if math.isnan(self.np):
-            md = checkmessage(md, 'number of processors should not be NaN!')
+            md.checkmessage('number of processors should be at least 1')
+        if np.isnan(self.np):
+            md.checkmessage('number of processors should not be NaN!')
 
         return md
@@ -97 +95 @@
 
         # Write queueing script
-        if not m.ispc():
+        if not ispc():
             fid = open(modelname + '.queue', 'w')
             fid.write('#!/bin/sh\n')
@@ -153 +151 @@
     def BuildKrigingQueueScript(self, modelname, solution, io_gather, isvalgrind, isgprof):  # {{{
         #write queuing script
-        if not m.ispc():
+        if not ispc():
             fid = open(modelname + '.queue', 'w')
             fid.write('#!/bin/sh\n')
@@ -196 +194 @@
         if self.interactive:
             compressstring += ' {}.errlog {}.outlog '.format(modelname, modelname)
-        subprocess.call(compressstring, shell=True)
+        call(compressstring, shell=True)
 
         print('uploading input file and queueing script')