source: issm/oecreview/Archive/24307-24683/ISSM-24537-24538.diff@ 24684

Index: ../trunk-jpl/src/m/qmu/preqmu.m
===================================================================
--- ../trunk-jpl/src/m/qmu/preqmu.m     (revision 24537)
+++ ../trunk-jpl/src/m/qmu/preqmu.m     (revision 24538)
@@ -23,16 +23,16 @@
 iparams   = getfieldvalue(options,'iparams',1);
 
 %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
 qmufile=[md.miscellaneous.name ];
@@ -45,7 +45,7 @@
 variables=expandvariables(md,variables);
 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);
 for i=1:length(variable_fieldnames),
@@ -71,13 +71,12 @@
        end
        numresponses=numresponses+numel(responses.(field_name));
 end
-%}}}}
 
 %create in file for dakota
 dakota_in_data(md.qmu.method(imethod),variables,responses,md.qmu.params(iparams),qmufile);
 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));
 for i=1:length(variable_fieldnames),
@@ -97,7 +96,6 @@
                responsedescriptors{end+1}=fieldresponses(j).descriptor;
        end
 end
-%}}}
 
 %register the fields that will be needed by the Qmu model.
 md.qmu.numberofresponses=numresponses;
Index: ../trunk-jpl/src/m/qmu/process_qmu_options.m
===================================================================
--- ../trunk-jpl/src/m/qmu/process_qmu_options.m        (revision 24537)
+++ ../trunk-jpl/src/m/qmu/process_qmu_options.m        (revision 24538)
@@ -73,8 +73,6 @@
                iparams=options{i,2};
        case 'overwrite'
                outoptions.overwrite=options{i,2};
-       case 'keep'
-               outoptions.keep=options{i,2};
        case 'outfiles'
                outoptions.outfiles=options{i,2};
        case 'rstfile'
Index: ../trunk-jpl/src/m/solve/solveiceocean.m
===================================================================
--- ../trunk-jpl/src/m/solve/solveiceocean.m    (revision 24537)
+++ ../trunk-jpl/src/m/solve/solveiceocean.m    (revision 24538)
@@ -134,10 +134,3 @@
 elseif md.settings.waitonlock==0,
         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
Index: ../trunk-jpl/src/m/solve/loadresultsfromcluster.py
===================================================================
--- ../trunk-jpl/src/m/solve/loadresultsfromcluster.py  (revision 24537)
+++ ../trunk-jpl/src/m/solve/loadresultsfromcluster.py  (revision 24538)
@@ -76,14 +76,8 @@
     # remove this for bin file debugging
         TryRem('.bin', filename)
 
-    #cwd = os.getcwd().split('/')[-1]
-    if md.qmu.isdakota:
-        os.chdir('..')
-    #TryRem('', cwd)
-
     return md
 
-
 def TryRem(extension, filename):
     try:
         os.remove(filename + extension)
Index: ../trunk-jpl/src/m/solve/solve.py
===================================================================
--- ../trunk-jpl/src/m/solve/solve.py   (revision 24537)
+++ ../trunk-jpl/src/m/solve/solve.py   (revision 24538)
@@ -152,9 +152,4 @@
                 print('loading results from cluster')
             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
Index: ../trunk-jpl/src/m/solve/loadresultsfromcluster.m
===================================================================
--- ../trunk-jpl/src/m/solve/loadresultsfromcluster.m   (revision 24537)
+++ ../trunk-jpl/src/m/solve/loadresultsfromcluster.m   (revision 24538)
@@ -45,33 +45,25 @@
 md=loadresultsfromdisk(md,[md.miscellaneous.name '.outbin']);
 
 %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
 
 %erase input file if run was carried out on same platform.
 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
Index: ../trunk-jpl/src/m/solve/solve.m
===================================================================
--- ../trunk-jpl/src/m/solve/solve.m    (revision 24537)
+++ ../trunk-jpl/src/m/solve/solve.m    (revision 24538)
@@ -171,10 +171,3 @@
 elseif md.settings.waitonlock==0,
         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
Index: ../trunk-jpl/src/m/solve/loadresultsfromdisk.m
===================================================================
--- ../trunk-jpl/src/m/solve/loadresultsfromdisk.m      (revision 24537)
+++ ../trunk-jpl/src/m/solve/loadresultsfromdisk.m      (revision 24538)
@@ -59,5 +59,4 @@
 %post processes qmu results if necessary
 else
        md=postqmu(md);
-       cd ..
 end