[BUGFIX] Add demo_cp_ct_surface location to data files.

.github/workflows/check-working-examples.yaml

@@ -21,7 +21,7 @@ jobs:
     - name: Install project
       run: |
         python -m pip install --upgrade pip
-        pip install -e .
+        pip install .
         pip install nbconvert  # For converting Jupyter notebook to python script in the next step
     - name: Run examples
       # Run all examples and test that they finish successfully. Do not evaluate the results.
@@ -30,7 +30,7 @@ jobs:
       run: |
 
         mkdir -p temp1/temp2/temp3
-        cp -r examples/ temp1/temp2/temp3/.
+        cp -rL examples temp1/temp2/temp3/.
         cd temp1/temp2/temp3/examples/
 
         error_found=0  # 0 is false

.github/workflows/continuous-integration-workflow.yaml

@@ -23,11 +23,15 @@ jobs:
     - name: Install project
       run: |
         python -m pip install --upgrade pip
-        pip install -e ".[develop]"
+        pip install ".[develop]"
     - uses: pre-commit/[email protected]
     - name: Run tests
       if: success() || failure()  # Run this step even if the linting step fails
       run: |
+        mkdir -p temp1/temp2/temp3
+        cp -rL tests temp1/temp2/temp3/.
+        cd temp1/temp2/temp3/
+
         # -rA displays the captured output for all tests after they're run
         # See the docs: https://doc.pytest.org/en/latest/reference/reference.html#command-line-flags
         pytest -rA tests/ --ignore tests/timing.py --ignore tests/profiling.py

.github/workflows/quality-metrics-workflow.yaml

@@ -21,7 +21,7 @@ jobs:
     - name: Install project
       run: |
         python -m pip install --upgrade pip
-        pip install -e ".[develop]"
+        pip install ".[develop]"
     - name: Run the code quality script
       run: |
         cd profiling

pyproject.toml

@@ -65,6 +65,8 @@ include = ["floris*"]
 [tool.setuptools.package-data]
 floris = [
     "turbine_library/*.yaml",
+    "turbine_library/*.csv",
+    "turbine_library/demo_cp_ct_surfaces/*.npz",
     "core/wake_velocity/turbopark_lookup_table.mat",
     "default_inputs.yaml"
 ]

tests/conftest.py

@@ -2,10 +2,12 @@
 from __future__ import annotations
 
 import copy
+from pathlib import Path
 
 import numpy as np
 import pytest
 
+import floris
 from floris.core import (
     Core,
     FlowField,
@@ -138,6 +140,10 @@ def print_test_values(
 ROTOR_DIAMETER = 126.0
 TURBINE_GRID_RESOLUTION = 2
 
+DEMO_CP_CT_5MW_FILE = (
+    Path(floris.__file__).resolve().parent /
+    "turbine_library/demo_cp_ct_surfaces/nrel_5MW_demo_cp_ct_surface.npz"
+)
 
 ## Unit test fixtures
 
@@ -401,7 +407,7 @@ def __init__(self):
             "beta": -0.45891,
             "cd": 0.0040638,
             "cl_alfa": 4.275049,
-            "cp_ct_data_file": "demo_cp_ct_surfaces/nrel_5MW_demo_cp_ct_surface.npz"
+            "cp_ct_data_file": DEMO_CP_CT_5MW_FILE
         }
 
         self.turbine_floating = copy.deepcopy(self.turbine)

tests/convert_v3_to_v4_test.py

@@ -1,11 +1,12 @@
 import os
 from pathlib import Path
 
+import floris
 from floris import FlorisModel
 
 
 CONVERT_FOLDER = Path(__file__).resolve().parent / "v3_to_v4_convert_test"
-FLORIS_FOLDER = Path(__file__).resolve().parent / ".." / "floris"
+FLORIS_FOLDER = Path(floris.__file__).resolve().parent
 
 
 def test_v3_to_v4_convert():

tests/data/wrg_test.wrg

@@ -0,0 +1,7 @@
+2 3 0.0 0.0 1000.0
+                   0         0       0   90  9.5  2.25              0 12 116 106  273  86  93  228  61  76  220  54  74  220  66  79  220 121  98  244 177 107  279  84  89  232  43  70  195  36  75  188  53 100  201  98 111  267
+                   0      1000       0   90  9.6  2.31              0 12 116 107  341  86  93  228  61  76  220  54  74  220  66  79  220 121  98  244 177 107  279  84  89  232  43  70  195  36  75  188  53 100  201  98 111  267
+                   0      2000       0   90  9.7  2.36              0 12 116 106  409  86  93  228  61  76  220  54  74  220  66  79  220 121  98  244 177 107  279  84  89  232  43  70  195  36  75  188  53 100  201  98 111  267
+                1000         0       0   90  9.6  2.34              0 12 116 106  273  86  93  228  61  76  220  54  82  407  66  79  220 121  98  244 177 107  279  84  89  232  43  70  195  36  75  188  53 100  201  98 111  267
+                1000      1000       0   90  9.6  2.40              0 12 116 107  341  86  93  228  61  76  220  54  82  407  66  79  220 121  98  244 177 107  279  84  89  232  43  70  195  36  75  188  53 100  201  98 111  267
+                1000      2000       0   90  9.7  2.46              0 12 116 106  409  86  93  228  61  76  220  54  82  407  66  79  220 121  98  244 177 107  279  84  89  232  43  70  195  36  75  188  53 100  201  98 111  267

tests/wind_rose_wrg_test.py

@@ -4,20 +4,19 @@
 import numpy as np
 import pytest
 
+import floris
 from floris import (
     FlorisModel,
     UncertainFlorisModel,
     WindRoseWRG,
 )
 
 
-WRG_FILE_FILE = (
-    Path(__file__).resolve().parent / "../examples/examples_wind_resource_grid/wrg_example.wrg"
-)
-
 TEST_DATA = Path(__file__).resolve().parent / "data"
 YAML_INPUT = TEST_DATA / "input_full.yaml"
 
+WRG_FILE_FILE = TEST_DATA / "wrg_test.wrg"
+
 def test_load_wrg():
     WindRoseWRG(WRG_FILE_FILE)