Changeset 19625

Timestamp:

10/08/15 11:14:36 (9 years ago)

Author:

seroussi

Message:

fixed interactive mitgcm/issm coupling on pleiades

File:

• issm/trunk-jpl/src/m/classes/clusters/pfe.m (modified) (5 diffs)

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

@@ -151 +151 @@
                          if cluster.interactive,
                                  fid=fopen([modelname '.run'],'w');
-                                 if ~isvalgrind,
-                                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/Interactive' num2str(cluster.interactive)],modelname);
-                                 else
-                                         fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/Interactive' num2str(cluster.interactive)],modelname);
+                                 if cluster.interactive==10,
+                                                 fprintf(fid,'module unload mpi-mvapich2/1.4.1/gcc\n');
+                                                 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[pwd() '/run'],modelname);
+                                 else
+                                         if ~isvalgrind,
+                                                 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/Interactive' num2str(cluster.interactive)],modelname);
+                                         else
+                                                 fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/Interactive' num2str(cluster.interactive)],modelname);
+                                         end
                                  end
                                  if ~io_gather, %concatenate the output files:
@@ -247 +252 @@
                          if cluster.interactive,
                                  fid=fopen([modelname '.run'],'w');
-                                 fprintf(fid,['mpiexec -np %i ./mitgcmuv && touch ' modelname '.lock %s\n'],np);
+                                 fprintf(fid,'module load mpi-mvapich2/1.4.1/gcc\n');
+                                 fprintf(fid,['mpiexec -np %i ./mitgcmuv \n'],np);
+                                 fprintf(fid,['touch ' modelname '.lock %s\n']);
                                  fclose(fid);
                                  fid=fopen([modelname '.errlog'],'w');
@@ -269 +276 @@
 
                          disp('uploading input file and queueing script');
-                         if cluster.interactive,
+                         if cluster.interactive==10,
+                                 directory=[pwd() '/run/'];
+                         elseif cluster.interactive,
                                  directory=[cluster.executionpath '/Interactive' num2str(cluster.interactive)];
                          else 
@@ -297 +306 @@
                                          launchcommand=['cd ' cluster.executionpath '/Interactive' num2str(cluster.interactive)];
                                  else
-                                         launchcommand=['cd ' cluster.executionpath '/Interactive' num2str(cluster.interactive) ' && tar -zxf ' dirname '.tar.gz'];
+                                         if cluster.interactive==10,
+                                                 launchcommand=['cd ' pwd() '/run && tar -zxf ' dirname '.tar.gz'];
+                                         else
+                                                 launchcommand=['cd ' cluster.executionpath '/Interactive' num2str(cluster.interactive) ' && tar -zxf ' dirname '.tar.gz'];
+                                         end
                                  end
                          end
@@ -308 +321 @@
 
                          %copy files from cluster to current directory
-                         if ~cluster.interactive,
+                         if cluster.interactive==10,
+                                 directory=[pwd() '/run/'];
+                         elseif ~cluster.interactive,
                                  directory=[cluster.executionpath '/' dirname '/'];
                          else