Rename cp_ct data file to be clearer. Update fields in all turine models; may remove from iea10mw, nrel5mw subsequently.

misi9170 · misi9170 · commit 0f8887b28690 · 2024-11-18T15:24:40.000-07:00
diff --git a/floris/core/turbine/tum_operation_model.py b/floris/core/turbine/tum_operation_model.py
@@ -29,7 +29,7 @@ class TUMLossTurbine(BaseOperationModel):
 
     The method requires C_P, C_T look-up tables as functions of tip speed ratio and blade pitch
     angle, available here:
-    "../floris/turbine_library/LUT_iea15MW.npz" for the IEA 3.4 MW (Bortolotti et al., 2019)
+    "floris/turbine_library/iea_15MW_cp_ct_surface.npz" for the IEA 15MW reference turbine.
     As with all turbine submodules, implements only static power() and thrust_coefficient() methods,
     which are called by power() and thrust_coefficient() on turbine.py, respectively.
     There are also two new functions, i.e. compute_local_vertical_shear() and control_trajectory().
diff --git a/floris/turbine_library/iea_10MW.yaml b/floris/turbine_library/iea_10MW.yaml
@@ -31,7 +31,7 @@ power_thrust_table:
   beta: -3.8233819218614817
   cd:  0.004612981322772105
   cl_alfa: 4.602140680380394
-  cp_ct_data_file: "LUT_iea15MW.npz"
+  cp_ct_data_file: "iea_15MW_cp_ct_surface.npz"
 
   # Power and thrust curves
   power:
diff --git a/floris/turbine_library/iea_15MW.yaml b/floris/turbine_library/iea_15MW.yaml
@@ -33,7 +33,7 @@ power_thrust_table:
   beta: -3.098605491003358
   cd:  0.004426686198054057
   cl_alfa: 4.546410770937916
-  cp_ct_data_file: "LUT_iea15MW.npz"
+  cp_ct_data_file: "iea_15MW_cp_ct_surface.npz"
 
   # Power and thrust curves
   power:
diff --git a/floris/turbine_library/iea_15MW_cp_ct_surface.npz b/floris/turbine_library/iea_15MW_cp_ct_surface.npz
diff --git a/floris/turbine_library/nrel_5MW.yaml b/floris/turbine_library/nrel_5MW.yaml
@@ -65,7 +65,7 @@ power_thrust_table:
   beta: -0.45891
   cd:  0.0040638
   cl_alfa: 4.275049
-  cp_ct_data_file: "LUT_iea15MW.npz"
+  cp_ct_data_file: "iea_15MW_cp_ct_surface.npz"
 
   ### Power thrust table data
   # wind speeds for look-up tables of power and thrust_coefficient
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -401,7 +401,7 @@ def __init__(self):
             "beta": -0.45891,
             "cd": 0.0040638,
             "cl_alfa": 4.275049,
-            "cp_ct_data_file": "LUT_iea15MW.npz"
+            "cp_ct_data_file": "iea_15MW_cp_ct_surface.npz"
         }
 
         self.turbine_floating = copy.deepcopy(self.turbine)

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ def __init__(self):`
`401`	`401`	`"beta": -0.45891,`
`402`	`402`	`"cd": 0.0040638,`
`403`	`403`	`"cl_alfa": 4.275049,`
`404`		`- "cp_ct_data_file": "LUT_iea15MW.npz"`
	`404`	`+ "cp_ct_data_file": "iea_15MW_cp_ct_surface.npz"`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`self.turbine_floating = copy.deepcopy(self.turbine)`