Changeset 5029

Timestamp:

08/06/10 14:46:52 (15 years ago)

Author:

Eric.Larour

Message:

Append PID number of qmu directory, for nightly runs.

Location:

issm/trunk/src/m

Files:

• classes/public/process_solve_options.m (modified) (1 diff)
• qmu/preqmu.m (modified) (1 diff)

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

@@ -36 +36 @@
 
 %  process qmu arguments
-outoptions.qmudir=getfieldvalue(options,'qmudir','qmu');  % qmudir =['qmu_' datestr(now,'yyyymmdd_HHMMSS')];
+outoptions.qmudir=getfieldvalue(options,'qmudir',['qmu' num2str(GetPid)]);  % qmudir =['qmu_' datestr(now,'yyyymmdd_HHMMSS')];
 outoptions.qmufile=getfieldvalue(options,'qmufile','qmu');% qmufile cannot be changed unless ????script.sh is also changed
+outoptions.overwrite=getfieldvalue(options,'overwrite','n');
 outoptions.ivar=getfieldvalue(options,'ivar',1);
 outoptions.iresp=getfieldvalue(options,'iresp',1);

issm/trunk/src/m/qmu/preqmu.m

@@ -23 +23 @@
 
 %first create temporary directory in which we will work
-if exist(options.qmudir,'dir')
-    if ~isfield(options,'overwrite')
-                %if exist(options.qmudir)==7,
-                %       options.overwrite=input(['Overwrite existing ''' options.qmudir ''' directory? Y/N [N]: '], 's');
-                %else
-                        options.overwrite='y';
-                %end
-
-    end
-    if strncmpi(options.overwrite,'y',1)
-        system(['rm -rf ' options.qmudir '/*']); 
-%    else
-%        error('Existing ''%s'' directory not overwritten.',qmudir);
-    end
+if strncmpi(options.overwrite,'y',1)
+        system(['rm -rf ' options.qmudir '/*']); 
+else
+        %does the directory exist? if so, then error out
+        if exist(options.qmudir)==7,
+                error('Existing ''%s'' directory, cannot overwrite. Specify ''overwrite'',''y'' option in solve arguments.',options.qmudir);
+        end
 end
 mkdir(options.qmudir)