Split k* parameters for y, z in Bastankhah 2016

rafmudaf · Mar 25, 2024 · 251f948 · 251f948
1 parent b3bc8bb
commit 251f948
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/examples/cases_torque2024/four_turbine/bastankhah2016/wind_energy_system.yaml b/examples/cases_torque2024/four_turbine/bastankhah2016/wind_energy_system.yaml
@@ -14,7 +14,8 @@ attributes:
         parameters:
           alpha: 0.58
           beta: 0.077
-          k: 0.022
+          ka: 0.3837
+          kb: 0.003678
       deflection:
         name:
         parameters: 
diff --git a/examples/cases_torque2024/four_turbine/bastankhah2016_deflection/wind_energy_system.yaml b/examples/cases_torque2024/four_turbine/bastankhah2016_deflection/wind_energy_system.yaml
@@ -14,10 +14,12 @@ attributes:
         parameters:
           alpha: 0.58
           beta: 0.077
-          k: 0.022
+          ka: 0.3837
+          kb: 0.003678
       deflection:
         name: bastankhah2016_deflection
         parameters:
           alpha: 0.58
           beta: 0.077
-          k: 0.022
+          ka: 0.3837
+          kb: 0.003678
diff --git a/examples/cases_torque2024/one_turbine/bastankhah2016/wind_energy_system.yaml b/examples/cases_torque2024/one_turbine/bastankhah2016/wind_energy_system.yaml
@@ -11,7 +11,8 @@ attributes:
         parameters:
           alpha: 0.58
           beta: 0.077
-          k: 0.022
+          ka: 0.3837
+          kb: 0.003678
       deflection:
         name:
         parameters: 
diff --git a/examples/cases_torque2024/one_turbine/bastankhah2016_deflection/wind_energy_system.yaml b/examples/cases_torque2024/one_turbine/bastankhah2016_deflection/wind_energy_system.yaml
@@ -11,10 +11,12 @@ attributes:
         parameters:
           alpha: 0.58
           beta: 0.077
-          k: 0.022
+          ka: 0.3837
+          kb: 0.003678
       deflection:
         name: bastankhah2016_deflection
         parameters:
           alpha: 0.58
           beta: 0.077
-          k: 0.022
+          ka: 0.3837
+          kb: 0.003678
diff --git a/wcomp/floris_interface.py b/wcomp/floris_interface.py
@@ -38,8 +38,8 @@
         "parameters": {
             "alpha": "alpha",
             "beta": "beta",
-            "ka": "k",
-            "kb": "k",
+            "ka": "ka",
+            "kb": "kb",
         }
     },
     "turbopark": {
@@ -61,8 +61,8 @@
         "parameters": {
             "alpha": "alpha",
             "beta": "beta",
-            "ka": "k",
-            "kb": "k",
+            "ka": "ka",
+            "kb": "kb",
         }
     },
 }

diff --git a/wcomp/foxes_interface.py b/wcomp/foxes_interface.py
@@ -56,8 +56,8 @@
         "parameters": {
             "alpha": "alpha",
             "beta": "beta",
-            "kTI": "k",
-            "kb": "k",
+            "kTI": "ka",
+            "kb": "kb",
         }
     },
     "turbopark": {
@@ -81,8 +81,8 @@
         "parameters": {
             "alpha": "alpha",
             "beta": "beta",
-            "kTI": "k",
-            "kb": "k",
+            "kTI": "ka",
+            "kb": "kb",
         }
     },
 }