Changeset 2912

Timestamp:

01/26/10 12:31:23 (15 years ago)

Author:

Eric.Larour

Message:

Created modellist class, with its own methods, made out of lists of models
that need to be solved for on a cluster.

Location:

issm/trunk/src/m

Files:

• classes/@modellist (added)
• classes/@modellist/display.m (added)
• classes/@modellist/get.m (added)
• classes/@modellist/modellist.m (added)
• classes/@modellist/setdefaultparameters.m (added)
• classes/@modellist/solve.m (added)
• classes/@modellist/subsasgn.m (added)
• classes/@modellist/subsref.m (added)
• classes/public/process_solve_options.m (modified) (1 diff)
• classes/public/queue/BuildMultipleQueueingScriptgemini.m (modified) (1 diff)
• classes/public/queue/LaunchMultipleQueueJobgemini.m (modified) (1 diff)
• classes/public/solveparallel.m (modified) (2 diffs)
• utils/Model/loadmodellist.m (added)
• utils/Plot/basinzoom.m (modified) (4 diffs)

issm/trunk/src/m/classes/public/process_solve_options.m

@@ -15 +15 @@
 %batch mode for launching jobs.
 outoptions.batch=getfieldvalue(options,'batch','no');
+
+%directory 
+outoptions.directory=getfieldvalue(options,'directory','');
 
 %check solution type is supported

issm/trunk/src/m/classes/public/queue/BuildMultipleQueueingScriptgemini.m

@@ -14 +14 @@
 fprintf(fid,'#!/bin/sh\n');
 fprintf(fid,'cd %s\n',executionpath);
-fprintf(fid,'rm -rf %s_*vs*\n',name);
+fprintf(fid,'mkdir %s\n',name);
+fprintf(fid,'cd %s\n',name);
+fprintf(fid,'mv ../ModelList.tar.gz ./\n');
 fprintf(fid,'tar -zxvf ModelList.tar.gz\n');
-fprintf(fid,'foreach i (%s_*vs*.queue)\n',name);
+fprintf(fid,'foreach i (%s-*vs*.queue)\n',name);
 fprintf(fid,'qsub $i\n');
 fprintf(fid,'end\n');

issm/trunk/src/m/classes/public/queue/LaunchMultipleQueueJobgemini.m

@@ -17 +17 @@
 %upload both files to cluster
 disp('uploading input file,  queueing script and variables script');
-system(['scp ModelList.tar.gz ' name '.queue '  cluster ':' executionpath]);
+eval(['!scp ModelList.tar.gz ' name '.queue '  cluster ':' executionpath]);
 
 disp('launching solution sequence on remote cluster');

issm/trunk/src/m/classes/public/solveparallel.m

@@ -5 +5 @@
 %      md=solveparallel(md);
 
+
 %Get cluster.rc location
 cluster_rc_location=which('cluster.rc');
@@ -10 +11 @@
 %Figure out parameters for this particular cluster
 [codepath,executionpath]=ClusterParameters(md.cluster,cluster_rc_location);
+
+%Append name of directory if specified in options: 
+executionpath=[executionpath '/' options.directory];
 
 %Marshall model data into a binary file.

issm/trunk/src/m/utils/Plot/basinzoom.m

@@ -1 @@
-function varargout=basinzoom(region,unitmultiplier)
+function varargout=basinzoom(region,varargin)
 %ANTZOOM - zoom on a basin in Antarctica or Greenland.
 %
@@ -11 +11 @@
 %Initialize regions
 available_regions=InitializeRegionInfo();
+
+%recover unitmultiplier if available
+if nargin==2,
+        unitmultiplier=varargin{1};
+else
+        unitmultiplier=NaN;
+end
+
 
 %Check arguments
@@ -119 +127 @@
         regions=AddAvailableRegion(regions,'icestreams',-1.2274*10^6,-.137*10^6,-1.1172*10^6,-.138*10^6);
         regions=AddAvailableRegion(regions,'icestreamE',2.2*10^6,2.7*10^6,0,5*10^5);
-        regions=AddAvailableRegion(regions,'jakobshavn',-4.6*10^5,-3*10^5,-2.3*10^6,-2.2*10^6);
+        regions=AddAvailableRegion(regions,'jks',-2.4*10^5,-.8*10^5,-2.3*10^6,-2.2*10^6);
+        regions=AddAvailableRegion(regions,'jakobshavn',-2.4*10^5,-.8*10^5,-2.3*10^6,-2.2*10^6);
         regions=AddAvailableRegion(regions,'larseniceshelf',-2.3855*10^6,-1.9649*10^6,0.9498*10^6,1.2996*10^6);
         regions=AddAvailableRegion(regions,'mcmurdo',1.3750*10^5,4.8255*10^5,-1.4569*10^6,-1.1119*10^6);
@@ -126 +135 @@
         regions=AddAvailableRegion(regions,'peninsula',-2.7617*10^6,-1.2831*10^6,.4492*10^6,1.6940*10^6);
         regions=AddAvailableRegion(regions,'pennelcoast',3*10^5,6*10^5,-2.1*10^6,-1.85*10^6); 
+        regions=AddAvailableRegion(regions,'petermann',-3.8*10^5,-.9*10^5,-1.1*10^6,-.88*10^6); 
+        regions=AddAvailableRegion(regions,'pet',-3.8*10^5,-.9*10^5,-1.1*10^6,-.88*10^6); 
         regions=AddAvailableRegion(regions,'pig',-1.72*10^6,-1.45*10^6,-3.5*10^5,.5*10^5);
         regions=AddAvailableRegion(regions,'ronneiceshelf',-1.5*10^6,-.7*10^6,1*10^5,9.3*10^5);