Changeset 26330 for issm/trunk-jpl/src/m/classes/clusters/tetralith.m

Timestamp:

06/23/21 13:51:11 (4 years ago)

Author:

jdquinn

Message:

CHG: Bringing pfe.py up to date (will ping Basile about this); clean up

File:

• issm/trunk-jpl/src/m/classes/clusters/tetralith.m (modified) (10 diffs)

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

@@ -1 @@
-%teralith class definition
+%TERALITH cluster class definition
 %
 %   Usage:
@@ -7 +7 @@
 
 classdef tetralith
-        properties (SetAccess=public)  
+        properties (SetAccess=public)
                 % {{{
                 name           = 'tetralith';
@@ -66 +66 @@
                 end
                 %}}}
-                function numprocs=np(self) % {{{
+                function numprocs=nprocs(self) % {{{
                         %compute number of processors
                         numprocs=self.numnodes*self.cpuspernode;
@@ -78 +78 @@
                         %compute number of processors
 %                       cluster.np=cluster.numnodes*cluster.cpuspernode;
-                        np(cluster);%=cluster.numnodes*cluster.cpuspernode;
+                        nprocs(cluster);%=cluster.numnodes*cluster.cpuspernode;
 
                         %write queuing script 
@@ -106 +106 @@
 %                       fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
 %                       fprintf(fid,'mpiexec_mpt -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
-                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+                        fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
 %                       fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
-                         if ~io_gather, %concatenate the output files:
-                                 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
-                         end
-                         fclose(fid);
+                        if ~io_gather, %concatenate the output files:
+                                fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
+                        end
+                        fclose(fid);
                 end
                 %}}}
@@ -132 +132 @@
                         %compute number of processors
 %                       cluster.np=cluster.numnodes*cluster.cpuspernode;
-                        np(cluster);%=cluster.numnodes*cluster.cpuspernode;                     
+                        nprocs(cluster);%=cluster.numnodes*cluster.cpuspernode;
 %                       shortname = substring(modelname,1,min(12,length(modelname)));
 
@@ -160 +160 @@
                         fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
 %                       fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
-                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+                        fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
 %                       fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
 %                       fprintf(fid,'mpiexec_mpt -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
@@ -183 +183 @@
                         end
                 end %}}}
-                function UploadQueueJob(cluster,modelname,dirname,filelist)% {{{
+                function UploadQueueJob(cluster,modelname,dirname,filelist) % {{{
 
                         %compress the files into one zip.
@@ -198 +198 @@
                 end
                 %}}}
-                function LaunchQueueJob(cluster,modelname,dirname,filelist,restart,batch)% {{{
+                function LaunchQueueJob(cluster,modelname,dirname,filelist,restart,batch) % {{{
 
                         disp('launching solution sequence on remote cluster');
@@ -206 +206 @@
                         issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
                 end %}}}
-                function Download(cluster,dirname,filelist)% {{{
+                function Download(cluster,dirname,filelist) % {{{
 
                         %copy files from cluster to current directory