Changeset 24541

Timestamp:

01/31/20 14:42:10 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing a few things

Location:

issm/trunk-jpl/src/m

Files:

• qmu/postqmu.m (modified) (1 diff)
• qmu/postqmu.py (modified) (1 diff)
• qmu/preqmu.m (modified) (1 diff)
• qmu/preqmu.py (modified) (1 diff)
• solve/loadresultsfromcluster.m (modified) (2 diffs)
• solve/solve.m (modified) (1 diff)

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

@@ -22 +22 @@
 qmuinfile=[md.miscellaneous.name '.qmu.in'];
 qmuoutfile=[md.miscellaneous.name '.qmu.out'];
-
-%[method,dvar,dresp_in]=dakota_in_parse(qmuinfile);
-%dakotaresults.method   =method;
-%dakotaresults.dvar     =dvar;
-%dakotaresults.dresp_in =dresp_in;
-
 [method,dresp_out,scm,pcm,srcm,prcm]=dakota_out_parse(qmuoutfile);
 dakotaresults.dresp_out=dresp_out;

issm/trunk-jpl/src/m/qmu/postqmu.py

@@ -28 +28 @@
     qmuinfile = str(md.miscellaneous.name) + '.qmu.in'
     qmuoutfile = str(md.miscellaneous.name) + '.qmu.out'
-
-    # unused and unimplemented
-    #[method, dvar, dresp_in] = dakota_in_parse(qmuinfile)
-    #dakotaresults.method   =method
-    #dakotaresults.dvar     =dvar
-    #dakotaresults.dresp_in =dresp_in
-
     [method, dresp_out, scm, pcm, srcm, prcm] = dakota_out_parse(qmuoutfile)
     dakotaresults = struct()

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

@@ -59 +59 @@
 %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.

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

@@ -79 +79 @@
     dakota_in_data(md.qmu.method, variables, responses, md.qmu.params, qmufile)
 
-    #====================================================================================  #
-    #REMOVED FOR DEBUGGING ONLY:
-    #os.system('rm -rf ' + str(md.miscellaneous.name) + '.py')
-    #====================================================================================  #
-
     # build a list of variables and responses descriptors. the list is not expanded.
     #{{{

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

@@ -46 +46 @@
 
 %erase the log and output files
-if ~nolog,
-        delete([md.miscellaneous.name '.outlog']);
-        delete([md.miscellaneous.name '.errlog']);
-end
-if exist([md.private.runtimename '.outbin'])
-        delete([md.miscellaneous.name '.outbin']);
+for i=1:numel(filelist)
+        filename = filelist{i};
+        if exist(filename)
+                delete(filename)
+        end
 end
 if exist([md.private.runtimename '.tar.gz']) & ~ispc(),
@@ -62 +61 @@
         delete([md.miscellaneous.name '.bin']);
         delete([md.miscellaneous.name '.toolkits']);
+        if md.qmu.isdakota
+                delete([md.miscellaneous.name '.qmu.in']);
+        end
         if ~ispc(),
                 delete([md.miscellaneous.name '.queue']);

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

@@ -107 +107 @@
 end
 
-%if running qmu analysis, some preprocessing of dakota files using models
-%fields needs to be carried out. 
+%if running qmu analysis, some preprocessing of dakota files using models fields needs to be carried out. 
 if md.qmu.isdakota,
         md=preqmu(md,options);