Changeset 19649

Timestamp:

10/19/15 12:49:54 (9 years ago)

Author:

Eric.Larour

Message:

CHG: allow generic cluter to run dakota in parallel for versions >= 6

File:

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

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

@@ -93 +93 @@
 
                         %write queuing script 
+                        %what is the executable being called? 
+                        executable='issm.exe';
+                        version=IssmConfig('_DAKOTA_VERSION_'); version=str2num(version(1:3));
+                        if isdakota & (version>=6),
+                                executable='issm_dakota.exe';
+                        end
+
                         if ~ispc(),
 
@@ -100 +107 @@
                                         if cluster.interactive
                                                 if IssmConfig('_HAVE_MPI_'),
-                                                        fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s \n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
-                                                else
-                                                        fprintf(fid,'%s/issm.exe %s %s %s ',cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                                        fprintf(fid,'mpiexec -np %i %s/%s %s %s %s \n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                                else
+                                                        fprintf(fid,'%s/%s %s %s %s ',cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
                                                 end
                                         else
                                                 if IssmConfig('_HAVE_MPI_'),
-                                                        fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
-                                                else
-                                                        fprintf(fid,'%s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                                        fprintf(fid,'mpiexec -np %i %s/%s %s %s %s 2> %s.errlog >%s.outlog ',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                                else
+                                                        fprintf(fid,'%s/%s %s %s %s 2> %s.errlog >%s.outlog ',cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                                                 end
                                         end