Merge branch 'FW_renamed' into 'master'

updated fusedwake import to the new naming convention

See merge request !41

topfarm/cost_models/fused_wake_wrappers.py

@@ -54,7 +54,7 @@ class FusedWakeNOJWakeModel(FusedWakeModel):
 
 def try_me():
     if __name__ == '__main__':
-        from fusedwake import fusedwake
+        import fusedwake
         import os
         import matplotlib.pyplot as plt
         hornsrev_yml = os.path.dirname(fusedwake.__file__) + "/../examples/hornsrev.yml"

topfarm/cost_models/utils/aep_calculator.py

@@ -5,7 +5,6 @@ Created on 19/04/2018
 '''
 import os
 
-from fusedwake import fusedwake
 import numpy as np
 from topfarm.cost_models.fused_wake_wrappers import FusedWakeGCLWakeModel
 from topfarm.cost_models.utils.wind_resource import WindResource