Changeset 25649

Timestamp:

10/07/20 00:44:24 (5 years ago)

Author:

jdquinn

Message:

CHG: Initial commit; clean up

Location:

issm/trunk-jpl/src/m/classes

Files:

• qmu.py (modified) (4 diffs)
• qmustatistics.m (modified) (1 diff)
• qmustatistics.py (added)

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

@@ -1 +1 @@
 import numpy as np
+
 from collections import OrderedDict
 from dakota_method import *
@@ -6 +7 @@
 from IssmConfig import *
 from MatlabFuncs import *
+from qmustatistics import qmustatistics
 from WriteData import WriteData
 
@@ -25 +27 @@
         self.method = OrderedDict()
         self.params = OrderedStruct()
-        self.statistics = OrderedStruct() # TODO: Replace this with 'qmustatistics()' once class is translated
+        self.statistics = qmustatistics()
         self.results = OrderedDict()
         self.numberofresponses = 0
@@ -218 +220 @@
             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');
+        self.statistics.marshall(prefix, md, fid)
     # }}}

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

@@ -72 +72 @@
                                 for s=1:length(m.steps),
                                         if m.steps(s)<=0,
-                                                error(sprintf('qmustatistics consistency check error: qmu.statistics.method(%i).steps(%i) should be >0!',i,s));
+                                                error(sprintf('qmustatistics consistency check error: qmu.statistics.method(%i).steps(%i) should be > 0!',i,s));
                                         end
                                         if m.steps(s)> md.mesh.numberofvertices