Changeset 24589

Timestamp:

02/26/20 08:08:59 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: use generic_settings if exists

Location:

issm/trunk-jpl/src/m/classes/clusters

Files:

• generic.py (modified) (6 diffs)
• pfe.py (modified) (1 diff)

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

@@ -40 +40 @@
 
         #initialize cluster using user settings if provided
-        if os.path.exists(self.name + '_settings.py'):
-            exec(compile(open(self.name + '_settings.py').read(), self.name + '_settings.py', 'exec'), globals())
+        try:
+            self = generic_settings(self)
+        except NameError:
+            print("generic_settings.py not found, using default settings")
+        else:
+            raise
+
 
         #OK get other fields
         self = options.AssignObjectFields(self)
     # }}}
-
     def __repr__(self):  # {{{
         #  display the object
@@ -61 +65 @@
         return s
     # }}}
-
     def checkconsistency(self, md, solution, analyses):  # {{{
         if self.np < 1:
@@ -135 +138 @@
             fid.close()
     # }}}
-
     def BuildKrigingQueueScript(self, modelname, solution, io_gather, isvalgrind, isgprof):  # {{{
         #write queuing script
@@ -173 +175 @@
             fid.close()
     # }}}
-
     def UploadQueueJob(self, modelname, dirname, filelist):  # {{{
         #compress the files into one zip.
@@ -187 +188 @@
 
     # }}}
-
     def LaunchQueueJob(self, modelname, dirname, filelist, restart, batch):  # {{{
         print('launching solution sequence on remote cluster')
@@ -199 +199 @@
         issmssh(self.name, self.login, self.port, launchcommand)
     # }}}
-
     def Download(self, dirname, filelist):  # {{{
         if m.ispc():

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

@@ -46 +46 @@
         self = pfe_settings(self)
         self.np = self.nprocs()
+
         #OK get other fields
         self = options.AssignObjectFields(self)