Changeset 27228

Timestamp:

08/25/22 16:22:30 (3 years ago)

Author:

Eric.Larour

Message:

CHG: new pfeuq class and some disp modifications.

Location:

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

Files:

• pfe.m (modified) (2 diffs)
• pfeuq.m (modified) (2 diffs)

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

@@ -49 +49 @@
                         disp(sprintf('    np: %i',cluster.nprocs()));
                         disp(sprintf('    port: %i',cluster.port));
-                        disp(sprintf('    queue: %i',cluster.queue));
+                        disp(sprintf('    queue: %s',cluster.queue));
                         disp(sprintf('    time: %i',cluster.time));
-                        disp(sprintf('    processor: %i',cluster.processor));
+                        disp(sprintf('    processor: %sn',cluster.processor));
                         disp(sprintf('    srcpath: %s',cluster.srcpath));
                         disp(sprintf('    extpkgpath: %s',cluster.extpkgpath));
@@ -181 +181 @@
                         fprintf(fid,'cd %s/%s/\n\n',cluster.executionpath,dirname);
                         if ~isvalgrind,
-                                fprintf(fid,'/u/scicon/tools/bin/toss3/several_tries mpiexec -np %i /u/scicon/tools/bin/mbind.x -cs -n%i %s/%s %s %s/%s %s\n',cluster.nprocs(),cluster.cpuspernode,cluster.codepath,executable,solution,cluster.executionpath,dirname,modelname);
+                                fprintf(fid,'mpiexec -np %i /u/scicon/tools/bin/mbind.x -cs -n%i %s/%s %s %s/%s %s\n',cluster.nprocs(),cluster.cpuspernode,cluster.codepath,executable,solution,cluster.executionpath,dirname,modelname);
                         else
                                 fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.nprocs(),cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);

issm/branches/trunk-larour-SLPS2022/src/m/classes/clusters/pfeuq.m

@@ -165 +165 @@
                         fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
                         fprintf(fid,'cd %s/%s/\n\n',cluster.executionpath,dirname);
-                        fprintf(fid,'/u/scicon/tools/bin/several_tries mpiexec -np %i /u/scicon/tools/bin/mbind.x -v  %s/%s %s %s/%s %s\n',cluster.concurrent_evaluations*cluster.numnodes_per_evaluation*cluster.cpuspernode+1,...
+                        fprintf(fid,'mpiexec -np %i /u/scicon/tools/bin/mbind.x -v  %s/%s %s %s/%s %s\n',cluster.concurrent_evaluations*cluster.numnodes_per_evaluation*cluster.cpuspernode+1,...
                                                                                                                                                                                                                                                                          cluster.codepath,executable,solution,cluster.executionpath,dirname,modelname);
                         if ~io_gather, %concatenate the output files:
@@ -177 +177 @@
                                 if cluster.interactive==10,
                                                 fprintf(fid,'module unload mpi-mvapich2/1.4.1/gcc\n');
-                                                fprintf(fid,'/u/scicon/tools/bin/several_tries mpiexec -np %i /u/scicon/tools/bin/mbind.x -v  %s/%s %s %s/Interactive%i %s\n',cluster.concurrent_evaluations*cluster.numnodes_per_evaluation*cluster.cpuspernode+1,...
+                                                fprintf(fid,'mpiexec -np %i /u/scicon/tools/bin/mbind.x -v  %s/%s %s %s/Interactive%i %s\n',cluster.concurrent_evaluations*cluster.numnodes_per_evaluation*cluster.cpuspernode+1,...
                                                                                                                                                                                                                                                                          cluster.codepath,executable,solution,cluster.executionpath,cluster.interactive,modelname);
                                 else