Changeset 19673

Timestamp:

10/21/15 16:42:47 (9 years ago)

Author:

schlegel

Message:

CHG: add function for np calculation

Location:

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

Files:

• discover.m (modified) (3 diffs)
• greenplanet.m (modified) (4 diffs)
• hpc.m (modified) (4 diffs)
• lonestar.m (modified) (1 diff)
• pfe.m (modified) (1 diff)

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

@@ -24 +24 @@
                  hyperthreading=0;
          end
-         properties (SetAccess=private) 
-                 np=20*8;
-                 % }}}
-         end
+         %}}}
          methods
                  function cluster=discover(varargin) % {{{
@@ -56 +53 @@
                  end
                  %}}}
+                 function numprocs=np(cluster) % {{{
+                         %compute number of processors
+                         numprocs=cluster.numnodes*cluster.cpuspernode;
+                 end
+                 %}}}
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
@@ -87 +89 @@
 
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
-
-                         %compute number of processors
-                         cluster.np=cluster.numnodes*cluster.cpuspernode;
 
                          %write queuing script 

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

@@ -21 +21 @@
                  memory        = 2;
          end
-         properties (SetAccess=private) 
-                 np=20*8;
-                 % }}}
-         end
+         %}}}
          methods
                  function cluster=greenplanet(varargin) % {{{
@@ -52 +49 @@
                  end
                  %}}}
+                 function numprocs=np(cluster) % {{{
+                         %compute number of processors
+                         numprocs=cluster.numnodes*cluster.cpuspernode;
+                 end
+                 %}}}
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
@@ -71 +73 @@
                          if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
-
-                         %compute number of processors
-                         cluster.np=cluster.numnodes*cluster.cpuspernode;
 
                          %write queuing script 
@@ -101 +100 @@
                          if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
-
-                         %compute number of processors
-                         cluster.np=cluster.numnodes*cluster.cpuspernode;
 
                          %write queuing script 

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

@@ -19 +19 @@
                  interactive=0;
          end
-         properties (SetAccess=private) 
-                 np=20*8;
-                 % }}}
-         end
+         %}}}
          methods
                  function cluster=hpc(varargin) % {{{
@@ -48 +45 @@
                  end
                  %}}}
+                 function numprocs=np(cluster) % {{{
+                         %compute number of processors
+                         numprocs=cluster.numnodes*cluster.cpuspernode;
+                 end
+                 %}}}
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
@@ -67 +69 @@
                          if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
-
-                         %compute number of processors
-                         cluster.np=cluster.numnodes*cluster.cpuspernode;
 
                          %write queuing script 
@@ -95 +94 @@
                          if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
-
-                         %compute number of processors
-                         cluster.np=cluster.numnodes*cluster.cpuspernode;
 
                          %write queuing script 

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

@@ -21 +21 @@
                  time          = 24*60*60;
          end
+         %}}}
          methods
                  function cluster=lonestar(varargin) % {{{

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

@@ -26 +26 @@
                  hyperthreading = 0;
          end
+         %}}}
          methods
                  function cluster=pfe(varargin) % {{{