Changeset 25031

Timestamp:

06/12/20 09:53:07 (5 years ago)

Author:

jdquinn

Message:

CHG: Better variable naming so as not to confuse with indices; cleanup

Location:

issm/trunk-jpl/src/m/qmu

Files:

• expandresponses.py (modified) (2 diffs)
• expandvariables.py (modified) (2 diffs)
• setupdesign/QmuSetupVariables.py (modified) (1 diff)

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

@@ +1 @@
+from helpers import *
 from QmuSetupResponses import *
-from helpers import *
 
 
 def expandresponses(md, responses):
-    #EXPANDRESPONSES - expand responses
-
+    
     fnames = fieldnames(responses)
 
@@ -11 +10 @@
     dresp = OrderedStruct()
 
-    for k in fnames:
-        v = getattr(responses, k)
-        exec('dresp.{} = type(v)()'.format(k))
-        for j in range(len(v)):
+    for key in fnames:
+        value = getattr(responses, key)
+        exec('dresp.{} = type(value)()'.format(key))
+        for j in range(len(value)):
             #call setupdesign
-            exec('dresp.{}=QmuSetupResponses(md, dresp.{}, v[j])'.format(k, k))
+            exec('dresp.{}=QmuSetupResponses(md, dresp.{}, value[j])'.format(key, key))
 
     return dresp

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

@@ -1 @@
-from QmuSetupVariables import *
 from helpers import *
 from qmu_classes import *
+from QmuSetupVariables import *
 
 
@@ -11 +11 @@
     dvar = OrderedStruct()
 
-    for k in fnames:
-        v = getattr(variables, k)
+    for key in fnames:
+        value = getattr(variables, key)
 
     #  for linear constraints, just copy
-        if isinstance(v, linear_inequality_constraint) or isinstance(v, linear_equality_constraint):
-            exec('dvar.{} = v'.format(k))
+        if isinstance(value, linear_inequality_constraint) or isinstance(value, linear_equality_constraint):
+            exec('dvar.{} = value'.format(key))
 
     #  for variables, call the setup function
         else:
-            exec('dvar.{} = type(v)()'.format(k))
-            for j in range(len(v)):
+            exec('dvar.{} = type(value)()'.format(key))
+            for j in range(len(value)):
                 #call setupdesign
-                exec('dvar.{}=QmuSetupVariables(md, v[j])'.format(k, k))
+                exec('dvar.{}=QmuSetupVariables(md, value[j])'.format(key, key))
     return dvar

issm/trunk-jpl/src/m/qmu/setupdesign/QmuSetupVariables.py

@@ -32 +32 @@
             nlower = variables.lower.shape[1]
             nupper = variables.upper.shape[1]
-            if nlower != npart or nupper != npart:
+            if nlower != nt or nupper != nt:
                 raise RuntimeError('QmuSetupVariables error message: upper and lower fields should have the same number of cols as the number of time steps')
         elif isinstance(variables, normal_uncertain):