Changeset 22111

Timestamp:

09/19/17 15:58:37 (8 years ago)

Author:

Eric.Larour

Message:

CHG: generic and pfe now valgrind on issm_slr.

Location:

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/clusters

Files:

• generic.m (modified) (3 diffs)
• pfe.m (modified) (1 diff)

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/clusters/generic.m ¶

@@ -158 +158 @@
                 end
                 %}}}
-                function BuildQueueScriptMultipleModels(cluster,dirname,modelname,solution,dirnames,modelnames,nps) % {{{
+                function BuildQueueScriptMultipleModels(cluster,dirname,modelname,solution,isvalgrind,dirnames,modelnames,nps) % {{{
                 
                         %some checks: 
@@ -172 +172 @@
                         
                         fprintf(fid,'#!%s\n',cluster.shell);
+                        
+                        mpistring='';
+                                
+                        %preload libraries
+                        if isvalgrind,
+                                mpistring=[mpistring sprintf('LD_PRELOAD=%s \n',cluster.valgrindlib)];
+                        end
 
                         %number of cpus: 
-                        mpistring=sprintf('mpiexec -np %i ',cluster.np);
-
+                        mpistring=[mpistring sprintf('mpiexec -np %i ',cluster.np)];
+
+                        if isvalgrind,
+                                mpistring=[mpistring sprintf(' %s --leak-check=full --error-limit=no --dsymutil=yes --suppressions=%s ',cluster.valgrind,cluster.valgrindsup)];
+                        end
+        
                         %executable: 
                         mpistring=[mpistring sprintf('%s/%s ',cluster.codepath,executable)];
-                        
+        
                         %solution name: 
                         mpistring=[mpistring sprintf('%s ',solution)];
@@ -195 +206 @@
                         %log files: 
                         if ~cluster.interactive,
-                                mpistring=[mpistring sprintf('2> %s.errlog> %s.outlog',modelname,modelname)];
+                                mpistring=[mpistring sprintf(' 2> %s.errlog> %s.outlog',modelname,modelname)];
                         end
 

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/clusters/pfe.m ¶

@@ -203 +203 @@
                          end
                  end %}}}
-                 function BuildQueueScriptMultipleModels(cluster,dirname,modelname,solution,dirnames,modelnames,nps) % {{{
+                 function BuildQueueScriptMultipleModels(cluster,dirname,modelname,solution,valgrind,dirnames,modelnames,nps) % {{{
 
                          %some checks: