Changeset 24600

Timestamp:

02/27/20 00:06:56 (5 years ago)

Author:

bdef

Message:

CHG:change in the handling of settings

File:

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

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

@@ -10 +10 @@
 from issmscpout import issmscpout
 import MatlabFuncs as m
+try:
+    from generic_settings import generic_settings
+except ImportError:
+    print('Warning generic_settings.py not found, default will be used')
 
 
@@ -30 +34 @@
         self.executionpath = issmdir() + '/execution'
         self.valgrind = issmdir() + '/externalpackages/valgrind/install/bin/valgrind'
-        self.valgrindlib = '/usr/lib/x86_64-linux-gnu/openmpi/lib/libmpi.so.20.10.1'
+        self.valgrindlib = issmdir() + '/externalpackages/valgrind/install/lib/libmpidebug.so'
         self.valgrindsup = [issmdir() + '/externalpackages/valgrind/issm.supp']  # add any .supp in list form as needed
         self.verbose = 1
@@ -42 +46 @@
 
         #initialize cluster using user settings if provided
+
         try:
             self = generic_settings(self)
         except NameError:
             print("generic_settings.py not found, using default settings")
-        else:
-            raise
-
+        # else:
+        #     raise
 
         #OK get other fields
         self = options.AssignObjectFields(self)
     # }}}
+
     def __repr__(self):  # {{{
         #  display the object
@@ -69 +74 @@
         return s
     # }}}
+
     def checkconsistency(self, md, solution, analyses):  # {{{
         if self.np < 1:
@@ -77 +83 @@
         return md
     # }}}
+
     def BuildQueueScript(self, dirname, modelname, solution, io_gather, isvalgrind, isgprof, isdakota, isoceancoupling):  # {{{
         # Which executable are we calling?
-        executable = 'issm.exe' # default
+        executable = 'issm.exe'  # default
 
         if isdakota:
@@ -143 +150 @@
             fid.close()
     # }}}
+
     def BuildKrigingQueueScript(self, modelname, solution, io_gather, isvalgrind, isgprof):  # {{{
         #write queuing script
@@ -180 +188 @@
             fid.close()
     # }}}
+
     def UploadQueueJob(self, modelname, dirname, filelist):  # {{{
         #compress the files into one zip.
@@ -193 +202 @@
 
     # }}}
+
     def LaunchQueueJob(self, modelname, dirname, filelist, restart, batch):  # {{{
         print('launching solution sequence on remote cluster')
@@ -204 +214 @@
         issmssh(self.name, self.login, self.port, launchcommand)
     # }}}
+
     def Download(self, dirname, filelist):  # {{{
         if m.ispc():