Changeset 24569

Timestamp:

02/20/20 06:05:48 (5 years ago)

Author:

bdef

Message:

NEW: migrating Hydro tests to 900 (SquareNoDyn geometry) and minor changes

Location:

issm/trunk-jpl

Files:

• src/m/classes/clusters/generic.py (modified) (3 diffs)
• src/m/plot/plot_unit.py (modified) (2 diffs)
• test/Archives/Archive330.arch (modified) ( previous)
• test/Archives/Archive900.arch (added)
• test/Archives/Archive901.arch (added)
• test/Archives/Archive902.arch (added)
• test/Archives/Archive903.arch (added)
• test/Archives/Archive904.arch (added)
• test/Archives/Archive905.arch (added)
• test/NightlyRun/GetIds.py (modified) (1 diff)
• test/NightlyRun/test900.m (added)
• test/NightlyRun/test900.py (added)
• test/NightlyRun/test901.m (added)
• test/NightlyRun/test901.py (added)
• test/NightlyRun/test902.m (added)
• test/NightlyRun/test902.py (added)
• test/NightlyRun/test903.m (added)
• test/NightlyRun/test903.py (added)
• test/NightlyRun/test904.m (added)
• test/NightlyRun/test904.py (added)
• test/NightlyRun/test905.m (added)
• test/NightlyRun/test905.py (added)
• test/Par/SquareNoDyn.par (added)
• test/Par/SquareNoDyn.py (added)

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

@@ -30 +30 @@
         self.executionpath = issmdir() + '/execution'
         self.valgrind = issmdir() + '/externalpackages/valgrind/install/bin/valgrind'
-        self.valgrindlib = issmdir() + '/externalpackages/valgrind/install/lib/libmpidebug.so'
-        self.valgrindsup = issmdir() + '/externalpackages/valgrind/issm.supp'
+        self.valgrindlib = '/usr/lib/x86_64-linux-gnu/openmpi/lib/libmpi.so.20.10.1'
+        self.valgrindsup = [issmdir() + '/externalpackages/valgrind/issm.supp']  # add any .supp in list form as needed
 
         #use provided options to change fields
@@ -103 +103 @@
                 #Add --gen -suppressions = all to get suppression lines
                 #fid.write('LD_PRELOAD={} \\\n'.format(self.valgrindlib)) it could be deleted
+                supstring = ''
+                for supfile in self.valgrindsup:
+                    supstring += ' --suppressions=' + supfile
+
                 if IssmConfig('_HAVE_MPI_')[0]:
-                    fid.write('mpiexec -np {} {} --leak-check=full --suppressions={} {}/{} {} {}/{} {} 2>{}.errlog>{}.outlog '.
-                              format(self.np, self.valgrind, self.valgrindsup, self.codepath, executable, solution, self.executionpath, dirname, modelname, modelname, modelname))
+                    fid.write('mpiexec -np {} {} --leak-check=full {} {}/{} {} {}/{} {} 2>{}.errlog>{}.outlog '.
+                              format(self.np, self.valgrind, supstring, self.codepath, executable, solution, self.executionpath, dirname, modelname, modelname, modelname))
                 else:
-                    fid.write('{} --leak-check=full --suppressions={} {}/{} {} {}/{} {} 2>{}.errlog>{}.outlog '.
-                              format(self.valgrind, self.valgrindsup, self.codepath, executable, solution, self.executionpath, dirname, modelname, modelname, modelname))
+                    fid.write('{} --leak-check=full {} {}/{} {} {}/{} {} 2>{}.errlog>{}.outlog '.
+                              format(self.valgrind, supstring, self.codepath, executable, solution, self.executionpath, dirname, modelname, modelname, modelname))
 
             if not io_gather:  #concatenate the output files:
@@ -147 +151 @@
                 #Add - -    gen - suppressions = all to get suppression lines
                 #fid.write('LD_PRELOAD={} \\\n'.format(self.valgrindlib))
-                fid.write('mpiexec -np {} {} --leak -check=full --suppressions={} {}/kriging.exe {}/{} {} 2 > {}.errlog > {}.outlog ' .format
-                          (self.np, self.valgrind, self.valgrindsup, self.codepath, self.executionpath, modelname, modelname, modelname, modelname))
+                fid.write('mpiexec -np {} {} --leak -check=full --suppressions={} {}/kriging.exe {}/{} {} 2 > {}.errlog > {}.outlog ' .format(self.np, self.valgrind, self.valgrindsup, self.codepath, self.executionpath, modelname, modelname, modelname, modelname))
             if not io_gather:    #concatenate the output files:
                 fid.write('\ncat {}.outbin. *>{}.outbin'.format(modelname, modelname))

issm/trunk-jpl/src/m/plot/plot_unit.py

@@ -73 +73 @@
     else:
         limextent = 0.
+
     if options.exist('clim'):
         lims = options.getfieldvalue('clim', [np.nanmin(data), np.nanmax(data)])
@@ -78 +79 @@
         lims = options.getfieldvalue('caxis', [np.nanmin(data), np.nanmax(data)])
     else:
-        if np.nanmin(data) == np.nanmax(data):
-            lims = [np.nanmin(data) * 0.9, np.nanmax(data) * 1.1]
+        if limextent == 0.:
+            delta = abs(0.1 * np.nanmin(data))
+            lims = [np.nanmin(data) - delta, np.nanmax(data) + delta]
         elif limextent < 1.0e-12:
             lims = [np.nanmin(data) - 2 * dataspread, np.nanmax(data) + 2 * dataspread]

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

@@ -44 +44 @@
         if np.array([type(i) == int for i in ids_names]).all():
             ids = ids_names
+        if np.array([type(i) == np.int64 for i in ids_names]).all():
+            ids = ids_names
         elif np.array([type(i) == str for i in ids_names]).all():
             ids = np.concatenate([IdFromString(i) for i in ids_names])