New PyWake syntax

Updated docker image with texlive-latex-extra for PyWake report

docker/Dockerfile_simple

@@ -3,6 +3,7 @@
 # ==================================================================
 FROM continuumio/anaconda3:latest
 MAINTAINER Jenni Rinker <rink@dtu.dk>
+ENV PATH="/opt/conda/bin:${PATH}"
 
 
 # get list of update linux files and install lib for matplotlib
@@ -12,7 +13,8 @@ MAINTAINER Jenni Rinker <rink@dtu.dk>
 RUN apt-get update && \
     apt-get install make && \
     apt-get install libgl1-mesa-glx -y && \
-    apt-get install gcc gfortran -y
+    apt-get install gcc gfortran -y && \
+	apt-get install -y texlive-latex-extra
 
 
 # use conda to update itself and install packages not in the

examples/docs/example_4_integrated_optimization_aep_and_irr.py

@@ -27,11 +27,11 @@ def main():
         n_wt = 16
         site = IEA37Site(n_wt)
         windTurbines = IEA37_WindTurbines()
-        wake_model = IEA37SimpleBastankhahGaussian(windTurbines)
+        wake_model = IEA37SimpleBastankhahGaussian(site, windTurbines)
         Drotor_vector = [windTurbines.diameter()] * n_wt 
         power_rated_vector = [float(windTurbines.power(20)/1000)] * n_wt 
         hub_height_vector = [windTurbines.hub_height()] * n_wt 
-        AEPCalc = AEPCalculator(site, windTurbines, wake_model)         
+        AEPCalc = AEPCalculator(wake_model)         
 
         def aep_func(x, y, **kwargs):
             return AEPCalc.calculate_AEP(x_i=x, y_i=y).sum(-1).sum(-1)*10**6

examples/docs/example_6_floris.py

@@ -51,8 +51,8 @@ def main():
                     site = Amalia1Site(f, mean_wsp=wind_speed)
                     site.initial_position = np.array([turbineX, turbineY]).T
                     wt = NREL5MWREF()
-                    wake_model = NOJ(wt)
-                    aep_calculator = AEPCalculator(site, wt, wake_model)
+                    wake_model = NOJ(site, wt)
+                    aep_calculator = AEPCalculator(wake_model)
                     n_wt = len(turbineX)
                     differentiable = differentiable
                     wake_model_options = {'nSamples': 0,

topfarm/cost_models/py_wake_wrapper.py

@@ -47,8 +47,8 @@ def main():
     if __name__ == '__main__':
         site = IEA37Site(16)
         windTurbines = IEA37_WindTurbines()
-        wake_model = IEA37SimpleBastankhahGaussian(windTurbines)
-        aep_calc = PyWakeAEP(site, windTurbines, wake_model)
+        wake_model = IEA37SimpleBastankhahGaussian(site, windTurbines)
+        aep_calc = PyWakeAEP(wake_model)
         tf = TopFarmProblem(
             design_vars=dict(zip('xy', site.initial_position.T)),
             cost_comp=aep_calc.get_TopFarm_cost_component(16),

topfarm/tests/deprecated_tests/test_constraints/test_ConvexBoundaryComp.py

@@ -22,7 +22,7 @@ def test_z_boundary():
 
 
 def test_boundary_component():
-    with pytest.raises(NotImplementedError, message="Boundary type 'missing' is not implemented"):
+    with pytest.raises(NotImplementedError, match="Boundary type 'missing' is not implemented"):
         ConvexBoundaryComp(3, [(0, 0), (0, 1)], xy_boundary_type='missing')
 
 # def test_xyz_boundary():

topfarm/tests/test_constraint/test_constrained_generator.py

@@ -97,3 +97,13 @@ def test_with_convex_boundary_and_constrain(get_tf, driver):
     uta.assertGreaterEqual(y.min(), 0)  # y
     npt.assert_array_less(y, x)
     assert all(np.sqrt(np.diff(x)**2 + np.diff(y)**2) >= 2)
+
+
+if __name__ == '__main__':
+    tf = get_InitialXYZOptimizationProblem(xy_boundary=[(0, 0), (10, 0), (10, 10)], xy_boundary_type='convex_hull',
+                                           min_spacing=2, driver=ConstrainedDiscardGenerator(UniformGenerator(10, 0)))
+    arr = tf.get_DOE_array()
+    x, y = [arr[:, i] for i in range(2)]
+    uta.assertGreaterEqual(x.min(), 0)  # x
+    uta.assertGreaterEqual(y.min(), 0)  # y
+    npt.assert_array_less(y, x)

topfarm/tests/test_topfarm_utils/test_utils.py

@@ -84,9 +84,7 @@ def test_smart_start_aep_map():
     site.default_ws = ws_lst
     site.default_wd = wd_lst
 
-    aep = PyWakeAEP(site=site,
-                    windTurbines=turbines,
-                    wake_model=NOJ(turbines))
+    aep = PyWakeAEP(wake_model=NOJ(site, turbines))
     aep_1wt = aep.calculate_AEP([0], [0]).sum()
 
     tf = TopFarmProblem(
@@ -131,9 +129,7 @@ def test_smart_start_aep_map_large_radius():
     site.default_ws = ws_lst
     site.default_wd = wd_lst
 
-    aep = PyWakeAEP(site=site,
-                    windTurbines=turbines,
-                    wake_model=NOJ(turbines))
+    aep = PyWakeAEP(wake_model=NOJ(site, turbines))
     aep_1wt = aep.calculate_AEP([0], [0]).sum()
     tf = TopFarmProblem(
         design_vars={'x': x, 'y': y},