Changeset 25632

Timestamp:

10/06/20 09:44:24 (4 years ago)

Author:

jdquinn

Message:

BUG: Temp fix for Dakota test suite; needed to add issm_post to bin_PROGRAMS; clean up

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• m/classes/qmu.py (modified) (2 diffs)
• m/classes/qmustatistics.m (modified) (4 diffs)
• m/classes/sealevelmodel.py (modified) (1 diff)
• m/qmu/postqmu.py (modified) (2 diffs)
• m/qmu/preqmu.py (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -803 +803 @@
 issm_dakota_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS)
 issm_dakota_LDADD= $(LDADD)
+bin_PROGRAMS += issm_post
 issm_post_SOURCES = main/issm_post.cpp
 issm_post_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)

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

@@ -25 +25 @@
         self.method = OrderedDict()
         self.params = OrderedStruct()
+        self.statistics = OrderedStruct() # TODO: Replace this with 'qmustatistics()' once class is translated
         self.results = OrderedDict()
         self.numberofresponses = 0
@@ -217 +218 @@
             flag = False
         WriteData(fid, prefix, 'data', flag, 'name', 'md.qmu.mass_flux_segments_present', 'format', 'Boolean')
+        # TODO: Uncomment this and remove the following line once qmustatistics class is translated
+        #self.statistics.marshall
+        WriteData(fid,prefix,'name','md.qmu.statistics','data',0,'format','Boolean');
     # }}}

issm/trunk-jpl/src/m/classes/qmustatistics.m

@@ -9 +9 @@
                 %generic information: 
                 nfiles_per_directory = 5;  %number of files per output directory.
-                ndirectories         = 50; %number of output directories.  %ndirectories should be < numcpus
+                ndirectories         = 50; %number of output directories; should be < numcpus
         
                 method = struct('name',{'None'},'fields',{[]},'steps',{[]},'nbins',{NaN},'indices',{[]});
@@ -55 +55 @@
                         md = checkfield(md,'fieldname','qmu.statistics.nfiles_per_directory','>=',1);
                         if self.ndirectories>md.cluster.np, 
-                                error('qmustatistics consistency check: number of cluster cpus should be > to number of output directories');
+                                error('qmustatistics consistency check: number of cluster CPUs should be > number of output directories');
                         end
                         if (self.ndirectories*self.nfiles_per_directory)~=md.qmu.method.params.samples,
@@ -86 +86 @@
                 function disp(self) % {{{
 
-                        disp(sprintf('qmustatistics:  post-dakota run processing of QMU statistics:'));
+                        disp(sprintf('qmustatistics: post-Dakota run processing of QMU statistics:'));
                                 
                         if strcmpi(self.method(1).name,'None'),  return; end;
@@ -92 +92 @@
                         %generic information:
                         fielddisplay(self,'nfiles_per_directory','number of files per output directory');
-                        fielddisplay(self,'ndirectories','number of output directories.  %ndirectories should be < numcpus');
+                        fielddisplay(self,'ndirectories','number of output directories; should be < numcpus');
 
                         for i=1:length(self.method),

issm/trunk-jpl/src/m/classes/sealevelmodel.py

@@ -70 +70 @@
         s += '{}\n'.format(fielddisplay(self, 'cluster', 'cluster parameters (number of cpus...'))
         s += '{}\n'.format(fielddisplay(self, 'miscellaneous', 'miscellaneous fields'))
+
+        return s
     #}}}
 

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

@@ -9 +9 @@
 
 def postqmu(md):
-    '''
-    POSTQMU - Deal with Dakota output results in files
+    """POSTQMU - Deal with Dakota output results in files
     
-        Usage:
-            md = postqmu(md)
+    Usage:
+        md = postqmu(md)
 
-        TODO:
-        - Run Dakota test to check that updates from 6/26 are working
-        - Add checks to Popen
-    '''
+    TODO:
+    - Run Dakota test to check that updates from 6/26 are working
+    - Add checks to Popen
+    """
 
     # check to see if dakota returned errors in the err file
@@ -56 +55 @@
                 dakotaresults.modelresults.append(md2.results)
 
-    if md.qmu.statistics.method[0].name != 'None':
-        md.qmu.isdakota = 0
-        md = loadresultsfromdisk(md, [md.miscellaneous.name,'.stats'])
-        md.qmu.isdakota = 1
+    # TODO: Uncomment the following once qmustatistics class is translated
+    # if md.qmu.statistics.method[0].name != 'None':
+    #     md.qmu.isdakota = 0
+    #     md = loadresultsfromdisk(md, [md.miscellaneous.name,'.stats'])
+    #     md.qmu.isdakota = 1
 
     # put dakotaresults in their right location.

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

@@ -11 +11 @@
 
 def preqmu(md, options):
-    '''
-    QMU - apply Quantification of Margins and Uncertainties techniques
+    """QMU - apply Quantification of Margins and Uncertainties techniques
     to a solution sequence (like stressbalance.py, progonstic.py, etc ...),
     using the Dakota software from Sandia.
 
-    options come from the solve.py routine. They can include Dakota options:
+    Options come from the solve.py routine. They can include Dakota options:
 
-    qmufile: input file for Dakota
-
-    (ivap, iresp, imethod, and iparams are currently unimplemented)
-    ivar: selection number for variables input (if several are specified in variables)
-    iresp: same thing for response functions
-    imethod: same thing for methods
-    iparams: same thing for params
-    '''
+        qmufile : input file for Dakota
+        ivap    : <currently unimplemented>
+        iresp   : <currently unimplemented>
+        imethod : <currently unimplemented>
+        iparams : <currently unimplemented>
+        ivar    : selection number for variables input (if several are specified in variables)
+        iresp   : same thing for response functions
+        imethod : same thing for methods
+        iparams : same thing for params
+    """
 
     print('preprocessing dakota inputs')