Changeset 24538

Timestamp:

01/31/20 13:53:16 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: no more qmu directory when running dakota

Location:

issm/trunk-jpl/src/m

Files:

• qmu/preqmu.m (modified) (5 diffs)
• qmu/process_qmu_options.m (modified) (1 diff)
• solve/loadresultsfromcluster.m (modified) (2 diffs)
• solve/loadresultsfromcluster.py (modified) (1 diff)
• solve/loadresultsfromdisk.m (modified) (1 diff)
• solve/solve.m (modified) (1 diff)
• solve/solve.py (modified) (1 diff)
• solve/solveiceocean.m (modified) (1 diff)

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

@@ -24 +24 @@
 
 %first create temporary directory in which we will work
-if strncmpi(overwrite,'y',1)
-        system(['rm -rf ' qmudir '/*']); 
-else
-        %does the directory exist? if so, then error out
-        if exist(qmudir)==7,
-                error('Existing ''%s'' directory, cannot overwrite. Specify ''overwrite'',''y'' option in solve arguments.',options.qmudir);
-        end
-end
-mkdir(qmudir)
-cd(qmudir)
+%if strncmpi(overwrite,'y',1)
+%       system(['rm -rf ' qmudir '/*']); 
+%else
+%       %does the directory exist? if so, then error out
+%       if exist(qmudir)==7,
+%               error('Existing ''%s'' directory, cannot overwrite. Specify ''overwrite'',''y'' option in solve arguments.',options.qmudir);
+%       end
+%end
+%mkdir(qmudir)
+%cd(qmudir)
 
 %when running in library mode, the in file needs to be called md.miscellaneous.name.qmu.in
@@ -46 +46 @@
 responses=expandresponses(md,responses);
 
-%go through variables and responses, and check they don't have more than md.qmu.numberofpartitions values. Also determine numvariables and numresponses{{{
+%go through variables and responses, and check they don't have more than md.qmu.numberofpartitions values. Also determine numvariables and numresponses
 numvariables=0;
 variable_fieldnames=fieldnames(variables);
@@ -72 +72 @@
         numresponses=numresponses+numel(responses.(field_name));
 end
-%}}}}
 
 %create in file for dakota
@@ -78 +77 @@
 system(['rm -rf ' md.miscellaneous.name '.m']);
 
-%build a list of variables and responses descriptors. the list is not expanded. {{{
+%build a list of variables and responses descriptors. the list is not expanded.
 variabledescriptors={};
 variable_fieldnames=fieldnames(md.qmu.variables(ivar));
@@ -98 +97 @@
         end
 end
-%}}}
 
 %register the fields that will be needed by the Qmu model.

issm/trunk-jpl/src/m/qmu/process_qmu_options.m

@@ -74 +74 @@
         case 'overwrite'
                 outoptions.overwrite=options{i,2};
-        case 'keep'
-                outoptions.keep=options{i,2};
         case 'outfiles'
                 outoptions.outfiles=options{i,2};

issm/trunk-jpl/src/m/solve/loadresultsfromcluster.m

@@ -46 +46 @@
 
 %erase the log and output files
-if md.qmu.isdakota,
-        delete([['qmu' num2str(feature('GetPid')) '/'] md.miscellaneous.name '.outlog']);
-        delete([['qmu' num2str(feature('GetPid')) '/']  md.miscellaneous.name '.errlog']);
-else
-        if ~nolog,
-                delete([md.miscellaneous.name '.outlog']);
-                delete([md.miscellaneous.name '.errlog']);
-        end
+if ~nolog,
+        delete([md.miscellaneous.name '.outlog']);
+        delete([md.miscellaneous.name '.errlog']);
+end
+if exist([md.private.runtimename '.outbin'])
         delete([md.miscellaneous.name '.outbin']);
-        if exist([md.private.runtimename '.tar.gz']) & ~ispc(),
-                delete([md.private.runtimename '.tar.gz']);
-        end
+end
+if exist([md.private.runtimename '.tar.gz']) & ~ispc(),
+        delete([md.private.runtimename '.tar.gz']);
 end
 
@@ -63 +60 @@
 hostname=oshostname();
 if strcmpi(hostname,cluster.name),
-        if md.qmu.isdakota,
-                delete([['qmu' num2str(feature('GetPid')) '/'] md.miscellaneous.name '.bin']);
-                delete([['qmu' num2str(feature('GetPid')) '/'] md.miscellaneous.name '.queue']);
+        delete([md.miscellaneous.name '.bin']);
+        delete([md.miscellaneous.name '.toolkits']);
+        if ~ispc(),
+                delete([md.miscellaneous.name '.queue']);
         else
-                delete([md.miscellaneous.name '.bin']);
-                delete([md.miscellaneous.name '.toolkits']);
-                if ~ispc(),
-                        delete([md.miscellaneous.name '.queue']);
-                else
-                        delete([md.miscellaneous.name '.bat']);
-                end
+                delete([md.miscellaneous.name '.bat']);
         end
 end

issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py

@@ -77 +77 @@
         TryRem('.bin', filename)
 
-    #cwd = os.getcwd().split('/')[-1]
-    if md.qmu.isdakota:
-        os.chdir('..')
-    #TryRem('', cwd)
-
     return md
-
 
 def TryRem(extension, filename):

issm/trunk-jpl/src/m/solve/loadresultsfromdisk.m

@@ -60 +60 @@
 else
         md=postqmu(md);
-        cd ..
 end

issm/trunk-jpl/src/m/solve/solve.m

@@ -172 +172 @@
          disp('Model results must be loaded manually with md=loadresultsfromcluster(md);');
 end
-
-%post processes qmu results if necessary
-if md.qmu.isdakota,
-        if ~strncmpi(getfieldvalue(options,'keep','y'),'y',1)
-                system(['rm -rf qmu' num2str(feature('GetPid'))]);
-        end
-end

issm/trunk-jpl/src/m/solve/solve.py

@@ -153 +153 @@
             md = loadresultsfromcluster(md)
 
-    #post processes qmu results if necessary
-    if md.qmu.isdakota:
-        if not strncmpi(options.getfieldvalue('keep', 'y'), 'y', 1):
-            shutil.rmtree('qmu' + str(os.getpid()))
-
     return md

issm/trunk-jpl/src/m/solve/solveiceocean.m

@@ -135 +135 @@
          disp('Model results must be loaded manually with md=loadresultsfromcluster(md);');
 end
-
-%post processes qmu results if necessary
-if md.qmu.isdakota,
-        if ~strncmpi(getfieldvalue(options,'keep','y'),'y',1)
-                system(['rm -rf qmu' num2str(feature('GetPid'))]);
-        end
-end