Add method for least-squares fitting of DVGeos

.gitignore

@@ -13,3 +13,4 @@ input_files
 .isort.cfg
 *.vscode
 tests/reg_tests/reports/
+tests/reg_tests/test_MPhys*

doc/getting_started.rst

@@ -141,7 +141,7 @@ You can now hopefully appreciate the physical analogy of the control points as p
 
 The code snippet below illustrates a few key methods of the public API.
 
-* :meth:`getValues <.DVGeometry.getValues>` returns the current design variable values as a dictionary where the keys are the DV names.
+* :meth:`getDesignVars <.DVGeometry.getDesignVars>` returns the current design variable values as a dictionary where the keys are the DV names.
 * :meth:`setDesignVars <.DVGeometry.setDesignVars>` sets the design variables to new values using an input dictionary.
 * :meth:`update <.DVGeometry.update>` recalculates the pointset locations given potentially updated design variable values.
 

examples/c172_wing/runFFDExample.py

@@ -34,7 +34,7 @@ def create_fresh_dvgeo():
 DVGeo.addLocalDV("shape", lower=-0.5, upper=0.5, axis="y", scale=1.0)
 
 # Perturb some local variables and observe the effect on the surface
-dvdict = DVGeo.getValues()
+dvdict = DVGeo.getDesignVars()
 dvdict["shape"][DVGeo.getLocalIndex(0)[:, 1, 5]] += 0.15
 dvdict["shape"][DVGeo.getLocalIndex(0)[3, 1, 1]] += 0.15
 DVGeo.setDesignVars(dvdict)
@@ -104,7 +104,7 @@ def create_fresh_dvgeo():
 shapes = [shape_1, shape_2]
 DVGeo.addShapeFunctionDV("shape_func", shapes)
 
-dvdict = DVGeo.getValues()
+dvdict = DVGeo.getDesignVars()
 dvdict["shape_func"] = np.array([0.3, 0.2])
 DVGeo.setDesignVars(dvdict)
 
@@ -176,7 +176,7 @@ def sweep(val, geo):
 
 # rst set DV
 # set a twist distribution from -10 to +20 degrees along the span
-dvdict = DVGeo.getValues()
+dvdict = DVGeo.getDesignVars()
 dvdict["twist"] = np.linspace(-10.0, 20.0, nrefaxpts)
 DVGeo.setDesignVars(dvdict)
 # write out the twisted wing and FFD
@@ -188,7 +188,7 @@ def sweep(val, geo):
 
 # rst set DV 2
 # now add some sweep and change the twist a bit
-dvdict = DVGeo.getValues()
+dvdict = DVGeo.getDesignVars()
 dvdict["sweep"] = 30.0
 dvdict["twist"] = np.linspace(0.0, 20.0, nrefaxpts)
 DVGeo.setDesignVars(dvdict)
@@ -222,7 +222,7 @@ def chord(val, geo):
 DVGeo.addLocalDV("thickness", axis="y", lower=-0.5, upper=0.5)
 
 # change everything and the kitchen sink
-dvdict = DVGeo.getValues()
+dvdict = DVGeo.getDesignVars()
 dvdict["twist"] = np.linspace(0.0, 20.0, nrefaxpts)
 # scale_x should be set to 1 at baseline, unlike the others which perturb about 0
 # the following will produce a longer wing root and shorter wing tip

examples/deform_geometry/runScript.py

@@ -111,7 +111,7 @@ def twist(val, geo):
     DVGeo.addGlobalDV(dvName="twist", value=[0] * nRefAxPts, func=twist, lower=-10, upper=10, scale=1.0)
 
     # Get Design Variables
-    dvDict = DVGeo.getValues()
+    dvDict = DVGeo.getDesignVars()
 
     # Set First Twist Section to 5deg
     dvDict["twist"][0] = 5

examples/esp_airfoil/esp_airfoil.py

@@ -30,7 +30,7 @@
 
 # rst perturb DV start
 # Perturb some local variables and observe the effect on the surface
-dvdict = DVGeo.getValues()
+dvdict = DVGeo.getDesignVars()
 dvdict["camber_dv"] = 0.09
 dvdict["maxloc_dv"] = 0.8
 dvdict["thickness_dv"] = 0.2

examples/ffd_cylinder/runFFDExample.py

@@ -85,7 +85,7 @@
 upper_front_idx = DVGeo.getLocalIndex(0)[:, 1, 0]
 upper_rear_idx = DVGeo.getLocalIndex(0)[:, 1, 1]
 
-currentDV = DVGeo.getValues()["shape"]
+currentDV = DVGeo.getDesignVars()["shape"]
 newDV = currentDV.copy()
 
 # add a constant offset (upward) to the lower points, plus a linear ramp and a trigonometric local change

paper/Global-FFD-DV-Demo.py

@@ -42,7 +42,7 @@ def taper(val, geo):
 # Comment out one or the other
 DVGeo.addLocalDV("local", lower=-0.5, upper=0.5, axis="y", scale=1)
 
-dvDict = DVGeo.getValues()
+dvDict = DVGeo.getDesignVars()
 dvDictCopy = copy.deepcopy(dvDict)
 dvDictCopy["twist"] = np.linspace(0, 50, nRefAxPts)[1:]
 DVGeo.setDesignVars(dvDictCopy)

pygeo/mphys/mphys_dvgeo.py

@@ -578,7 +578,7 @@ def nom_addGeoCompositeDV(
 
         # call the dvgeo object and add this dv
         DVGeo.addCompositeDV(dvName, ptSetName=ptSetName, u=u, scale=scale, prependName=False, **kwargs)
-        val = DVGeo.getValues()
+        val = DVGeo.getDesignVars()
 
         # define the input
         self.add_input(dvName, distributed=False, shape=DVGeo.getNDV(), val=val[dvName][0])
@@ -1089,7 +1089,7 @@ def compute_jacvec_product(self, inputs, d_inputs, d_outputs, mode):
                         # Compute the Jacobian vector product
                         if not global_all_zeros[0]:
                             if doFwd:
-                                d_outputs[ptSetName] += DVGeo.totalSensitivityProd(seeds, ptSetName)
+                                d_outputs[ptSetName] += DVGeo.totalSensitivityProd(seeds, ptSetName).flatten()
                             elif doRev:
                                 # TODO totalSensitivityTransProd is broken. does not work with zero surface nodes on a proc
                                 # xdot = DVGeo.totalSensitivityTransProd(dout, ptSetName)