Changeset 13101 for issm/branches/trunk-jpl-damage/src/m/classes/clusters/generic.m

Timestamp:

08/20/12 17:39:30 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl through revision 13099 into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• src/m/classes/clusters/generic.m (modified) (1 diff)

issm/branches/trunk-jpl-damage

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/branches/trunk-jpl-damage/src/m/classes/clusters/generic.m

@@ -77 +77 @@
                                         %Add --gen-suppressions=all to get suppression lines
                                         fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib);
-                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
+                                        if ismac, 
+                                                fprintf(fid,'mpiexec -np %i %s --leak-check=full --dsymutil=yes --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
                                                 cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname);
+                                        else
+                                                fprintf(fid,'mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
+                                                cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname);
+                                        end
                                 end
                                 if ~io_gather, %concatenate the output files:

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4