Changeset 5961

Timestamp:

09/22/10 14:34:49 (14 years ago)

Author:

Eric.Larour

Message:

removed np, time and exclusive from model

Location:

issm/trunk/src/m

Files:

• classes/@model/model.m (modified) (1 diff)
• classes/@model/setdefaultparameters.m (modified) (2 diffs)
• model/display/displayparallel.m (modified) (1 diff)
• model/ismodelselfconsistent.m (modified) (1 diff)
• model/modeldefault/defaultparams.m (modified) (1 diff)
• utils/Analysis/setcluster.m (modified) (1 diff)

issm/trunk/src/m/classes/@model/model.m

@@ -244 +244 @@
 
         %Parallelisation parameters
-        md.cluster='';
-        md.np=0;
-        md.time=0;
-        md.queue='';
-        md.exclusive=0;
-        md.scheduler_configuration='';
+        md.cluster=none;
         md.outlog='';
         md.errlog='';

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -223 +223 @@
 %Parallelisation parameters
 
-%cluster set as 'none' for serial
-md.cluster='none';
+%cluster set as none for serial
+md.cluster=none;
 
 %this option can be activated to load automatically the results
@@ -232 +232 @@
 md.waitonlock=Inf;
 
-%number of processors to be used (if parallel)
-md.np=8;
-
-%minutes
-md.time=60;
-
-%queue name for cluster
-md.queue='shortc';
-
-%exculsive mode (share no cpus)
-md.exclusive=1;
-
-%?????
-md.scheduler_configuration='local';
-
 %prerun allocation cleanup
 md.alloc_cleanup=1;

issm/trunk/src/m/model/display/displayparallel.m

@@ -10 +10 @@
 
 disp(sprintf('   parallel computation parameters:'));
-
-disp(sprintf('\n      parallelisation:'));
-fielddisplay(md,'cluster','set to ''cluster_name'' to run in cluster, ''none'' to run serially');
-fielddisplay(md,'np','number of CPUS requested on cluster');
-fielddisplay(md,'exclusive','set to 1 if CPUS used are not to be shared with other users, 0 otherwise');
-fielddisplay(md,'time','amount of time requested on cluster');
+md.cluster
 fielddisplay(md,'alloc_cleanup','allocation cleanup before starting a job, default 1');
 fielddisplay(md,'waitonlock','maximum number of minutes to wait for batch results, or return 0');
-fielddisplay(md,'queue','special queue name on cluster? default is '''' ');
-
 disp(sprintf('\n      PETSc solver options:'));
 fielddisplay(md,'solverstring','solver string for Petsc. See solversetto... routines. Default is mumps');

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -104 +104 @@
 fields={'numberofelements','numberofgrids','x','y','z','drag_coefficient','drag_type','drag_p','drag_q',...
         'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','g','lowmem','sparsity','nsteps','maxiter',...
-        'tolx','np','eps_res','max_nonlinear_iterations','exclusive','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
+        'tolx','eps_res','max_nonlinear_iterations','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
 checknan(md,fields);
 %}}}}

issm/trunk/src/m/model/modeldefault/defaultparams.m

@@ -12 +12 @@
 
         %parallelization 
-        md.cluster=oshostname();
-        md.np=8;
-        md.time=60;
+        md.cluster=eval([oshostname() ';']);
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

issm/trunk/src/m/utils/Analysis/setcluster.m

@@ -5 +5 @@
 %      md=setcluster(md,cluster);
 
-md.cluster=cluster.name;
-md.np     =cluster.np;
-md.queue  =cluster.queue;
-md.time   =cluster.time;
+md.cluster=cluster;