Changeset 26332 for issm/trunk-jpl/src/m/classes/clusters/maui.m

Timestamp:

06/28/21 14:12:20 (4 years ago)

Author:

jdquinn

Message:

CHG: Translation of discover.m -> py; additional MATLAB builtin function translations; cleanup

File:

• issm/trunk-jpl/src/m/classes/clusters/maui.m (modified) (4 diffs)

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

@@ -38 +38 @@
                         disp(sprintf('    name: %s',cluster.name));
                         disp(sprintf('    login: %s',cluster.login));
-                        disp(sprintf('    port: %i',cluster.port));
                         disp(sprintf('    numnodes: %i',cluster.numnodes));
                         disp(sprintf('    cpuspernode: %i',cluster.cpuspernode));
-                        disp(sprintf('    np: %i',cluster.cpuspernode*cluster.numnodes));
+                        disp(sprintf('    np: %i',cluster.nprocs()));
+                        disp(sprintf('    port: %i',cluster.port));
                         disp(sprintf('    projectaccount: %s',cluster.projectaccount));
                         disp(sprintf('    partition: %s',cluster.partition));
@@ -62 +62 @@
                         partition_requirements_np=[80];
 
-                        QueueRequirements(available_partitions,partition_requirements_time,partition_requirements_np,cluster.partition,cluster.np,1)
+                        QueueRequirements(available_partitions,partition_requirements_time,partition_requirements_np,cluster.partition,cluster.nprocs(),1)
 
-                        %Miscelaneous
+                        %Miscellaneous
                         if isempty(cluster.login), md = checkmessage(md,'login empty'); end
                         if isempty(cluster.codepath), md = checkmessage(md,'codepath empty'); end
@@ -95 +95 @@
                         fprintf(fid,'module swap PrgEnv-cray PrgEnv-intel\n');
                         fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
-                        fprintf(fid,'srun -n %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+                        fprintf(fid,'srun -n %i %s/issm.exe %s %s %s\n',cluster.nprocs(),cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                         if ~io_gather, %concatenate the output files:
                                 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -104 +104 @@
                         if cluster.interactive,
                                 fid=fopen([modelname '.run'],'w');
-                                fprintf(fid,'mpiexec -n %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+                                fprintf(fid,'mpiexec -n %i %s/issm.exe %s %s %s\n',cluster.nprocs(),cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                                 if ~io_gather, %concatenate the output files:
                                         fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);