Changeset 25044

Timestamp:

06/17/20 12:13:40 (5 years ago)

Author:

jdquinn

Message:

BUG: Majority of fixes for Dakota Python tests; still need to fix test418.m

Location:

issm/trunk-jpl

Files:

• src/m/classes/qmu/normal_uncertain.m (modified) (2 diffs)
• src/m/classes/qmu/normal_uncertain.py (modified) (1 diff)
• src/m/qmu/preqmu.py (modified) (1 diff)
• test/NightlyRun/test218.m (modified) (1 diff)
• test/NightlyRun/test218.py (modified) (2 diffs)
• test/NightlyRun/test235.py (modified) (1 diff)
• test/NightlyRun/test244.py (modified) (1 diff)
• test/NightlyRun/test250.py (modified) (1 diff)
• test/NightlyRun/test251.py (modified) (1 diff)
• test/NightlyRun/test412.py (modified) (1 diff)
• test/NightlyRun/test413.py (modified) (1 diff)
• test/NightlyRun/test414.py (modified) (1 diff)
• test/NightlyRun/test417.py (modified) (1 diff)

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

@@ -29 +29 @@
                         self.descriptor=getfieldvalue(options,'descriptor');
                         self.mean=getfieldvalue(options,'mean');
+                        disp(self.mean)
                         self.stddev=getfieldvalue(options,'stddev');
 
@@ -38 +39 @@
                                 self.nsteps=getfieldvalue(options,'nsteps',1);
                                 npart=qmupart2npart(self.partition);
+                                fprintf('nsteps=%d\n',self.nsteps);
+                                fprintf('npart=%d\n',npart);
                                 if npart~=size(self.mean,1),
                                         error(['normal_uncertain constructor: for the scaled variable ' self.descriptor ' the row size of the mean field should be identical to the number of partitions']);

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

@@ -13 +13 @@
     NORMAL_UNCERTAIN class definition
 
-        Usage:
-            nuv = normal_uncertain('descriptor',descriptor,'mean',mean,'stddev',stddev,'partition',partition)
-            where nuv is the normal_uncertain object returned by the constructor, mean and stddev are self
-            explanatory.  partition is the partition vector for distributed variables. Can be a partition
-            vector over elements or vertices.
-
-        Example:
-            md.qmu.variables.rheology=normal_uncertain(
-                'descriptor','RheologyBBar',
-                'mean',1,
-                'stddev',.05
-                )
-            md.qmu.variables.rheology=normal_uncertain(
-                'descriptor','scaled_RheologyBBar',
-                'mean',1,
-                'stddev',.05,
-                'partition',vpartition
-                )
+    Usage:
+        nuv = normal_uncertain('descriptor',descriptor,'mean',mean,'stddev',stddev,'partition',partition)
+        where nuv is the normal_uncertain object returned by the constructor, mean and stddev are self
+        explanatory.  partition is the partition vector for distributed variables. Can be a partition
+        vector over elements or vertices.
+
+    Example:
+        md.qmu.variables.rheology=normal_uncertain(
+            'descriptor','RheologyBBar',
+            'mean',1,
+            'stddev',.05
+            )
+        md.qmu.variables.rheology=normal_uncertain(
+            'descriptor','scaled_RheologyBBar',
+            'mean',1,
+            'stddev',.05,
+            'partition',vpartition
+            )
     '''
     def __init__(self):

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

@@ -127 +127 @@
                     variablepartitions.append(fieldvariable[j].partition)
                     variablepartitions_npart.append(qmupart2npart(fieldvariable[j].partition))
-                    variablepartitions_nt.append(fieldvariable.nsteps)
+                    variablepartitions_nt.append(fieldvariable[j].nsteps)
                 else:
                     variablepartitions.append([])

issm/trunk-jpl/test/NightlyRun/test218.m

@@ -84 +84 @@
 
 %imperative! 
-md.stressbalance.reltol=10^-10; %tighten for qmu analysese
+md.stressbalance.reltol=10^-10; %tighten for qmu analyses
 md.qmu.isdakota=1;
 

issm/trunk-jpl/test/NightlyRun/test218.py

@@ -85 +85 @@
 md.qmu.variables.rheology_B = normal_uncertain.normal_uncertain(
         'descriptor', 'scaled_MaterialsRheologyB',
-        'mean', np.ones(md.mesh.numberofvertices),
-        'stddev', .05 * np.ones(md.mesh.numberofvertices),
+        'mean', np.ones((npart, 1)),
+        'stddev', .05 * np.ones((npart, 1)),
         'partition', partition
         )
@@ -110 +110 @@
 
 #imperative!
-md.stressbalance.reltol = 10**-10  #tighten for qmu analysis
+md.stressbalance.reltol = 10**-10  #tighten for qmu analyses
 md.qmu.isdakota = 1
 

issm/trunk-jpl/test/NightlyRun/test235.py

@@ -44 +44 @@
 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_SmbMassBalance',
-    'mean', np.ones(npart),
-    'stddev', 100 * np.ones(npart),
+    'mean', np.ones((npart, 1)),
+    'stddev', 100 * np.ones((npart, 1)),
     'partition', partition
     )

issm/trunk-jpl/test/NightlyRun/test244.py

@@ -74 +74 @@
 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_SmbC',
-    'mean', np.ones(md.mesh.numberofelements),
-    'stddev', .5 * np.ones(md.mesh.numberofelements),
+    'mean', np.ones((npart, 1)),
+    'stddev', .5 * np.ones((npart, 1)),
     'partition', partition
     )

issm/trunk-jpl/test/NightlyRun/test250.py

@@ -42 +42 @@
 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_SmbMassBalance',
-    'mean', np.ones(md.mesh.numberofvertices),
-    'stddev', .1 * np.ones(md.mesh.numberofvertices),
+    'mean', np.ones((npart, 1)),
+    'stddev', .1 * np.ones((npart, 1)),
     'partition', partition
     )

issm/trunk-jpl/test/NightlyRun/test251.py

@@ -43 +43 @@
 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_SmbMassBalance',
-    'mean', np.ones(md.mesh.numberofvertices),
-    'stddev', 100 * np.ones(md.mesh.numberofvertices),
+    'mean', np.ones((npart, 1)),
+    'stddev', 100 * np.ones((npart, 1)),
     'partition', partition
     )

issm/trunk-jpl/test/NightlyRun/test412.py

@@ -37 +37 @@
 md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_FrictionCoefficient',
-    'mean', np.ones(npart),
-    'stddev', .01 * np.ones(npart),
+    'mean', np.ones((npart, 1)),
+    'stddev', .01 * np.ones((npart, 1)),
     'partition', partition
     )

issm/trunk-jpl/test/NightlyRun/test413.py

@@ -34 +34 @@
 md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_FrictionCoefficient',
-    'mean', np.ones(npart),
-    'stddev', .01 * np.ones(npart),
+    'mean', np.ones((npart, 1)),
+    'stddev', .01 * np.ones((npart, 1)),
     'partition', partition
     )

issm/trunk-jpl/test/NightlyRun/test414.py

@@ -38 +38 @@
 md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_FrictionCoefficient',
-    'mean', np.ones(npart),
-    'stddev', .01 * np.ones(npart),
+    'mean', np.ones((npart, 1)),
+    'stddev', .01 * np.ones((npart, 1)),
     'partition', partition
     )

issm/trunk-jpl/test/NightlyRun/test417.py

@@ -39 +39 @@
 md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_FrictionCoefficient',
-    'mean', np.ones(npart),
-    'stddev', .01 * np.ones(npart),
+    'mean', np.ones((npart, 1)),
+    'stddev', .01 * np.ones((npart, 1)),
     'partition', partition
     )