Changeset 21934

Timestamp:

08/10/17 11:45:56 (8 years ago)

Author:

schlegel

Message:

CHG: allow valgrind on mac for issm_dakota

File:

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

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

@@ -112 +112 @@
                                         if ismac, 
                                                 if IssmConfig('_HAVE_MPI_'),
-                                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --dsymutil=yes --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
-                                                        cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname);
+                                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --dsymutil=yes --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
+                                                        cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname);
                                                 else
-                                                        fprintf(fid,'%s --leak-check=full --dsymutil=yes --error-limit=no --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
-                                                        cluster.valgrind,cluster.valgrindsup,cluster.codepath,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname);
+                                                        fprintf(fid,'%s --leak-check=full --dsymutil=yes --error-limit=no --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
+                                                        cluster.valgrind,cluster.valgrindsup,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname);
                                                 end
                                         else
@@ -144 +144 @@
 
                                 if cluster.np>1,
-                                        fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/issm.exe" %s ./ %s ',cluster.np,cluster.codepath,solution,modelname);
-                                else
-                                        fprintf(fid,'"%s/issm.exe" %s ./ %s ',cluster.codepath,solution,modelname);
+                                        fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/%s" %s ./ %s ',cluster.np,cluster.codepath,executable,solution,modelname);
+                                else
+                                        fprintf(fid,'"%s/%s" %s ./ %s ',cluster.codepath,executable,solution,modelname);
                                 end
                                 fclose(fid);