Changeset 26870

Timestamp:

02/10/22 00:46:28 (3 years ago)

Author:

bdef

Message:

CHG: catching the case where a single costfunction is given as integer and not list

Location:

issm/trunk-jpl/src/m

Files:

• classes/inversion.py (modified) (1 diff)
• inversions/marshallcostfunctions.py (modified) (1 diff)

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

@@ -131 +131 @@
         md = checkfield(md, 'fieldname', 'inversion.step_threshold', 'size', [md.inversion.nsteps])
         md = checkfield(md, 'fieldname', 'inversion.cost_functions', 'size', [num_costfunc], 'values', supportedcostfunctions())
-        md = checkfield(md, 'fieldname', 'inversion.cost_functions_coefficients', 'size', [md.mesh.numberofvertices, num_costfunc], '>=', 0)
-        md = checkfield(md, 'fieldname', 'inversion.gradient_scaling', 'size', [md.inversion.nsteps, num_controls])
-        md = checkfield(md, 'fieldname', 'inversion.min_parameters', 'size', [md.mesh.numberofvertices, num_controls])
-        md = checkfield(md, 'fieldname', 'inversion.max_parameters', 'size', [md.mesh.numberofvertices, num_controls])
+        if num_costfunc == 1:
+            md.inversion.cost_functions_coefficients = np.squeeze(md.inversion.cost_functions_coefficients)
+            md = checkfield(md, 'fieldname', 'inversion.cost_functions_coefficients', 'size', [md.mesh.numberofvertices], '>=', 0)
+        else:
+            md = checkfield(md, 'fieldname', 'inversion.cost_functions_coefficients', 'size', [md.mesh.numberofvertices, num_costfunc], '>=', 0)
+
+        if num_controls == 1:
+            md.inversion.gradient_scaling = np.squeeze(md.inversion.gradient_scaling)
+            md.inversion.min_parameters = np.squeeze(md.inversion.min_parameters)
+            md.inversion.max_parameters = np.squeeze(md.inversion.max_parameters)
+            md = checkfield(md, 'fieldname', 'inversion.gradient_scaling', 'size', [md.inversion.nsteps])
+            md = checkfield(md, 'fieldname', 'inversion.min_parameters', 'size', [md.mesh.numberofvertices])
+            md = checkfield(md, 'fieldname', 'inversion.max_parameters', 'size', [md.mesh.numberofvertices])
+        else:
+            md = checkfield(md, 'fieldname', 'inversion.gradient_scaling', 'size', [md.inversion.nsteps, num_controls])
+            md = checkfield(md, 'fieldname', 'inversion.min_parameters', 'size', [md.mesh.numberofvertices, num_controls])
+            md = checkfield(md, 'fieldname', 'inversion.max_parameters', 'size', [md.mesh.numberofvertices, num_controls])
 
         # Only SSA, HO and FS are supported right now

issm/trunk-jpl/src/m/inversions/marshallcostfunctions.py

@@ -14 +14 @@
               505: 'ThicknessAcrossGradient'}
 
-    data = [cfDict[cf] for cf in cost_functions]
+    if type(cost_functions == int):
+        data = [cfDict[cost_functions]]
+    else:
+        data = [cfDict[cf] for cf in cost_functions]
     #  #copy list first
     # data = copy.deepcopy(cost_functions)