From 993c0c9102169a01d69bd37e796f14232b3937fe Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Mon, 14 May 2018 10:25:38 +0200
Subject: [PATCH] implemented openmdao methods for PolygonBoundaryComp and
added caching of results
---
.../boundary_component.py | 42 +++++++++++++++++--
topfarm/cost_models/fuga/Colonel | 2 +-
topfarm/plotting.py | 25 +++++++----
3 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/topfarm/constraint_components/boundary_component.py b/topfarm/constraint_components/boundary_component.py
index 7e1292e4..ac977a6c 100644
--- a/topfarm/constraint_components/boundary_component.py
+++ b/topfarm/constraint_components/boundary_component.py
@@ -190,8 +190,26 @@ class PolygonBoundaryComp(BoundaryComp):
self.dEdgeDist_dx = -self.dy / self.length
self.dEdgeDist_dy = self.dx / self.length
+ self._cache_input = None
+ self._cache_output = None
- def calc_distance(self, x, y):
+ def setup(self):
+
+ # Explicitly size input arrays
+ self.add_input('turbineX', np.zeros(self.nTurbines), units='m',
+ desc='x coordinates of turbines in global ref. frame')
+ self.add_input('turbineY', np.zeros(self.nTurbines), units='m',
+ desc='y coordinates of turbines in global ref. frame')
+
+ # Explicitly size output array
+ # (vector with positive elements if turbines outside of hull)
+ self.add_output('boundaryDistances', np.zeros(self.nTurbines),
+ desc="signed perpendicular distance from each turbine to each face CCW; + is inside")
+
+ self.declare_partials('boundaryDistances', ['turbineX', 'turbineY'])
+ #self.declare_partials('boundaryDistances', ['boundaryVertices', 'boundaryNormals'], method='fd')
+
+ def calc_distance_and_gradients(self, x, y):
"""
distance point(x,y) to edge((x1,y1)->(x2,y2))
+/-: inside/outside
@@ -205,7 +223,9 @@ class PolygonBoundaryComp(BoundaryComp):
ddist_dx = sign * 2*x-2*x1 / (2 * distance^.5)
ddist_dy = sign * 2*y-2*y1 / (2 * distance^.5)
"""
-
+ if np.all(np.array([x, y]) == self._cache_input):
+ return self._cache_output
+
X, Y = [np.tile(xy, (len(self.x1), 1)).T for xy in [x, y]] # dim = (ntb, nEdges)
X1, Y1, X2, Y2, ddist_dX, ddist_dY = [np.tile(xy, (len(x), 1))
for xy in [self.x1, self.y1, self.x2, self.y2, self.dEdgeDist_dx, self.dEdgeDist_dy]]
@@ -258,4 +278,20 @@ class PolygonBoundaryComp(BoundaryComp):
closest_edge_index = np.argmin(np.abs(distance), 1)
- return [np.choose(closest_edge_index, v.T) for v in [distance, ddist_dX, ddist_dY]]
+ self._cache_input = np.array([x,y])
+ self._cache_output = [np.choose(closest_edge_index, v.T) for v in [distance, ddist_dX, ddist_dY]]
+ return self._cache_output
+
+ def compute(self, inputs, outputs):
+ turbineX = inputs['turbineX']
+ turbineY = inputs['turbineY']
+
+ outputs['boundaryDistances'] = self.calc_distance_and_gradients(turbineX, turbineY)[0]
+
+ def compute_partials(self, inputs, partials):
+ turbineX = inputs['turbineX']
+ turbineY = inputs['turbineY']
+
+ _, dx, dy = self.calc_distance_and_gradients(turbineX, turbineY)
+ partials['boundaryDistances', 'turbineX'] = np.diagflat(dx)
+ partials['boundaryDistances', 'turbineY'] = np.diagflat(dy)
diff --git a/topfarm/cost_models/fuga/Colonel b/topfarm/cost_models/fuga/Colonel
index b3d528b5..63d550ac 160000
--- a/topfarm/cost_models/fuga/Colonel
+++ b/topfarm/cost_models/fuga/Colonel
@@ -1 +1 @@
-Subproject commit b3d528b5bddb5d62f4a6d9f476d7989f5d0f2ad7
+Subproject commit 63d550ac397e2058fc278ecf1488323440a786fc
diff --git a/topfarm/plotting.py b/topfarm/plotting.py
index a6b67a8f..426b245e 100644
--- a/topfarm/plotting.py
+++ b/topfarm/plotting.py
@@ -21,9 +21,6 @@ def mypause(interval):
class PlotComp(ExplicitComponent):
- """
- Evaluates the equation f(x,y) = (x-3)^2 + xy + (y+4)^2 - 3.
- """
colors = ['b', 'r', 'm', 'c', 'g', 'y', 'orange', 'indigo', 'grey'] * 100
def __init__(self, memory=10, delay=0.001):
@@ -56,11 +53,6 @@ class PlotComp(ExplicitComponent):
plt.ylim(ylim)
def compute(self, inputs, outputs):
- """
- f(x,y) = (x-3)^2 + xy + (y+4)^2 - 3
-
- Optimal solution (minimum): x = 6.6667; y = -7.3333
- """
x = inputs['turbineX']
y = inputs['turbineY']
cost = inputs['cost']
@@ -81,3 +73,20 @@ class PlotComp(ExplicitComponent):
mypause(self.delay)
self.counter += 1
+
+class NoPlot(PlotComp):
+ def __init__(self, *args, **kwargs):
+ ExplicitComponent.__init__(self)
+
+ def show(self):
+ pass
+
+ def setup(self):
+ self.add_input('turbineX', np.zeros(self.n_wt), units='m')
+ self.add_input('turbineY', np.zeros(self.n_wt), units='m')
+ self.add_input('cost', 0.)
+ self.add_input('boundary', np.zeros((self.n_vertices, 2)), units='m')
+
+
+ def compute(self, inputs, outputs):
+ pass
\ No newline at end of file
--
GitLab