Changeset 26538

Timestamp:

11/04/21 11:59:06 (3 years ago)

Author:

jdquinn

Message:

CHG: Patch to get unrelated Python tests passing again

Location:

issm/trunk-jpl/src/m/classes

Files:

• model.py (modified) (5 diffs)
• stochasticforcing.py (added)

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

@@ -69 +69 @@
 from DepthAverage import DepthAverage
 from sampling import sampling
+from stochasticforcing import stochasticforcing
 #}}}
 
@@ -127 +128 @@
         self.miscellaneous = None
         self.private = None
+        self.stochasticforcing = None
 
         if len(args) == 0:
@@ -183 +185 @@
         s = "%s\n%s" % (s, "%19s: %-22s -- %s" % ("radaroverlay", "[%s %s]" % ("1x1", obj.radaroverlay.__class__.__name__), "radar image for plot overlay"))
         s = "%s\n%s" % (s, "%19s: %-22s -- %s" % ("miscellaneous", "[%s %s]" % ("1x1", obj.miscellaneous.__class__.__name__), "miscellaneous fields"))
+        s = "%s\n%s" % (s, "%19s: %-22s -- %s" % ("stochasticforcing", "[%s %s]" % ("1x1", obj.stochasticforcing.__class__.__name__), "stochasticity applied to model forcings"))
         return s
     #}}}
@@ -188 +191 @@
     def properties(self): #{{{
         # ordered list of properties since vars(self) is random
-        return ['mesh',
-                'mask',
-                'geometry',
-                'constants',
-                'smb',
-                'basalforcings',
-                'materials',
-                'damage',
-                'friction',
-                'flowequation',
-                'timestepping',
-                'initialization',
-                'rifts',
-                'dsl',
-                'solidearth',
-                'debug',
-                'verbose',
-                'settings',
-                'toolkits',
-                'cluster',
-                'balancethickness',
-                'stressbalance',
-                'groundingline',
-                'hydrology',
-                'masstransport',
-                'thermal',
-                'steadystate',
-                'transient',
-                'levelset',
-                'calving',
-                'frontalforcings',
-                'love',
-                'esa',
-                'sampling',
-                'autodiff',
-                'inversion',
-                'qmu',
-                'amr',
-                'results',
-                'outputdefinition',
-                'radaroverlay',
-                'miscellaneous',
-                'private']
+        return [
+            'mesh',
+            'mask',
+            'geometry',
+            'constants',
+            'smb',
+            'basalforcings',
+            'materials',
+            'damage',
+            'friction',
+            'flowequation',
+            'timestepping',
+            'initialization',
+            'rifts',
+            'dsl',
+            'solidearth',
+            'debug',
+            'verbose',
+            'settings',
+            'toolkits',
+            'cluster',
+            'balancethickness',
+            'stressbalance',
+            'groundingline',
+            'hydrology',
+            'masstransport',
+            'thermal',
+            'steadystate',
+            'transient',
+            'levelset',
+            'calving',
+            'frontalforcings',
+            'love',
+            'esa',
+            'sampling',
+            'autodiff',
+            'inversion',
+            'qmu',
+            'amr',
+            'results',
+            'outputdefinition',
+            'radaroverlay',
+            'miscellaneous',
+            'private',
+            'stochasticforcing'
+        ]
     #}}}
 
@@ -277 +283 @@
         self.miscellaneous = miscellaneous()
         self.private = private()
+        self.stochasticforcing = stochasticforcing()
     #}}}