Changeset 24540

Timestamp:

01/31/20 14:07:53 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing python dakota

Location:

issm/trunk-jpl/src/m

Files:

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

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

@@ -1 +1 @@
 function md=postqmu(md)
-%INPUT function md=postqmu(md,qmufile,qmudir)
+%INPUT function md=postqmu(md)
 %Deal with dakota output results in files.
 

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

@@ -6 +6 @@
 
 
-def postqmu(md, qmufile, qmudir='qmu' + str(getpid())):
+def postqmu(md):
     '''
     Deal with dakota output results in files.
 
     INPUT function
-    md = postqmu(md, qmufile, qmudir)
+    md = postqmu(md)
 
-    By default: qmudir = 'qmu' + pid (eg. 'qmu2189')
     '''
 
@@ -24 +23 @@
             print(fline)
 
-        raise RuntimeError('Dakota returned error in ' + str(qmuerrfile) + ' file.  ' + str(qmudir) + ' directory retained.')
+        raise RuntimeError('Dakota returned error in ' + str(qmuerrfile) + ' file.')
 
     # parse inputs and results from dakota

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

@@ -6 +6 @@
 %   options come from the solve.m routine. They can include Dakota options:
 %
-%       qmudir:  any directory where to run the qmu analysis
 %       qmufile: input file for Dakota
 %       ivar: selection number for variables input (if several are specified in variables)
@@ -12 +11 @@
 %       imethod: same thing for methods
 %       iparams: same thing for params
-%       overwrite: overwrite qmudir before analysis
 
 disp('preprocessing dakota inputs');
-qmudir    = getfieldvalue(options,'qmudir',['qmu' num2str(feature('GetPid'))]);  % qmudir = ['qmu_' datestr(now,'yyyymmdd_HHMMSS')];
-qmufile   = getfieldvalue(options,'qmufile','qmu');% qmufile cannot be changed unless ????script.sh is also changed
-overwrite = getfieldvalue(options,'overwrite','n');
+qmufile   = getfieldvalue(options,'qmufile','qmu');
 ivar      = getfieldvalue(options,'ivar',1);
 iresp     = getfieldvalue(options,'iresp',1);
@@ -23 +19 @@
 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)
-
 %when running in library mode, the in file needs to be called md.miscellaneous.name.qmu.in
-qmufile=[md.miscellaneous.name ];
+qmufile=[md.miscellaneous.name];
 
 %retrieve variables and resposnes for this particular analysis.

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

@@ -15 +15 @@
    options come from the solve.py routine. They can include Dakota options:
 
-    qmudir:  any directory where to run the qmu analysis
     qmufile: input file for Dakota
 
@@ -23 +22 @@
     imethod: same thing for methods
     iparams: same thing for params
-
-    overwrite: overwrite qmudir before analysis
 '''
 
     print('preprocessing dakota inputs')
-    qmudir = options.getfieldvalue('qmudir', 'qmu' + str(os.getpid()))
-    # qmudir = ['qmu_' datestr(now, 'yyyymmdd_HHMMSS')]
     qmufile = options.getfieldvalue('qmufile', 'qmu')
     # qmufile cannot be changed unless ????script.sh is also changed
-    overwrite = options.getfieldvalue('overwrite', 'n')
     options.addfielddefault('ivar', 0)
     options.addfielddefault('iresp', 0)
     options.addfielddefault('imethod', 0)
     options.addfielddefault('iparams', 0)
-
-    # first create temporary directory in which we will work
-    if strncmpi(overwrite, 'y', 1):
-        os.system('rm -rf ' + qmudir + '/* ')
-    else:
-        # does the directory exist? if so, then error out
-        if os.path.isdir(qmudir):
-            raise RuntimeError('Existing ' + str(options.qmudir) + ' directory, cannot overwrite. Specify "overwrite", "y" option in solve arguments.')
-
-    # os.makedirs() raises error when dir exists, matlab's mkdir() does not
-    if not os.path.isdir(qmudir):
-        os.makedirs(qmudir)
-    os.chdir(qmudir)
 
     # when running in library mode, the in file needs to be called md.miscellaneous.name.qmu.in

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

@@ -58 +58 @@
     #post processes qmu results if necessary
     else:
-        md = postqmu(md, filename)
+        md = postqmu(md)
 
     return md