Skip to content

Commit

Permalink
wtc -> ROSCO
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhar-abbas committed Feb 17, 2020
1 parent 08ebd90 commit b753794
Show file tree
Hide file tree
Showing 16 changed files with 64 additions and 64 deletions.
14 changes: 7 additions & 7 deletions Examples/Example_07.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
import matplotlib.pyplot as plt
import yaml
# ROSCO toolbox modules
from ROSCO_toolbox import controller as wtc_controller
from ROSCO_toolbox import turbine as wtc_turbine
from ROSCO_toolbox import sim as wtc_sim
from ROSCO_toolbox import utilities as wtc_utilities
from ROSCO_toolbox import controller as ROSCO_controller
from ROSCO_toolbox import turbine as ROSCO_turbine
from ROSCO_toolbox import sim as ROSCO_sim
from ROSCO_toolbox import utilities as ROSCO_utilities

# Load yaml file
parameter_filename = 'NREL5MW_example.yaml'
Expand All @@ -30,9 +30,9 @@
controller_params['PS_Mode'] = 3

# Instantiate turbine, controller, and file processing classes
turbine = wtc_turbine.Turbine(turbine_params)
controller = wtc_controller.Controller(controller_params)
file_processing = wtc_utilities.FileProcessing()
turbine = ROSCO_turbine.Turbine(turbine_params)
controller = ROSCO_controller.Controller(controller_params)
file_processing = ROSCO_utilities.FileProcessing()

# Load turbine data from OpenFAST and rotor performance text file
turbine.load_from_fast(path_params['FAST_InputFile'],path_params['FAST_directory'],dev_branch=True,rot_source='txt',txt_filename=path_params['rotor_performance_filename'])
Expand Down
2 changes: 1 addition & 1 deletion Examples/NREL5MW_example.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- # ---------------------NREL Generic controller tuning input file -------------------
# Written for use with WTC_Toolbox tuning procedures
# Written for use with ROSCO_Toolbox tuning procedures
# Turbine: NREL 5MW Reference Wind Turbine
# ------------------------------ OpenFAST PATH DEFINITIONS ------------------------------
path_params:
Expand Down
30 changes: 15 additions & 15 deletions Examples/ROSCO_walkthrough.ipynb

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Examples/example_01.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Python Modules
import yaml
# ROSCO Modules
from ROSCO_toolbox import turbine as wtc_turbine
from ROSCO_toolbox import turbine as ROSCO_turbine

# Load yaml file
parameter_filename = 'NREL5MW_example.yaml'
Expand All @@ -22,7 +22,7 @@
turbine_params = inps['turbine_params']

# Load turbine data from openfast model
turbine = wtc_turbine.Turbine(turbine_params)
turbine = ROSCO_turbine.Turbine(turbine_params)
turbine.load_from_fast(path_params['FAST_InputFile'],path_params['FAST_directory'],dev_branch=True,rot_source='txt',txt_filename=path_params['rotor_performance_filename'])

# Print some basic turbine info
Expand Down
4 changes: 2 additions & 2 deletions Examples/example_02.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
# Python modules
import matplotlib.pyplot as plt
# ROSCO toolbox modules
from ROSCO_toolbox import turbine as wtc_turbine
from ROSCO_toolbox import turbine as ROSCO_turbine


# Initialize a turbine class -- Don't need to instantiate!
turbine = wtc_turbine.Turbine
turbine = ROSCO_turbine.Turbine

# Load quick from python pickle
turbine = turbine.load('NREL5MW_saved.p')
Expand Down
8 changes: 4 additions & 4 deletions Examples/example_03.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
# Python modules
import yaml
# ROSCO toolbox modules
from ROSCO_toolbox import turbine as wtc_turbine
from ROSCO_toolbox import utilities as wtc_utilities
from ROSCO_toolbox import turbine as ROSCO_turbine
from ROSCO_toolbox import utilities as ROSCO_utilities
# Initialize parameter dictionaries
turbine_params = {}
control_params = {}
Expand All @@ -25,10 +25,10 @@
controller_params = inps['controller_params']

# Load turbine data from openfast model
turbine = wtc_turbine.Turbine(turbine_params)
turbine = ROSCO_turbine.Turbine(turbine_params)
turbine.load_from_fast(path_params['FAST_InputFile'],path_params['FAST_directory'],dev_branch=True,rot_source=None,txt_filename=None)

# Write rotor performance text file
txt_filename = 'Cp_Ct_Cq.Ex03.txt'
file_processing = wtc_utilities.FileProcessing()
file_processing = ROSCO_utilities.FileProcessing()
file_processing.write_rotor_performance(turbine,txt_filename=txt_filename)
14 changes: 7 additions & 7 deletions Examples/example_04.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
import matplotlib.pyplot as plt
import yaml
# ROSCO toolbox modules
from ROSCO_toolbox import controller as wtc_controller
from ROSCO_toolbox import turbine as wtc_turbine
from ROSCO_toolbox import sim as wtc_sim
from ROSCO_toolbox import utilities as wtc_utilities
from ROSCO_toolbox import controller as ROSCO_controller
from ROSCO_toolbox import turbine as ROSCO_turbine
from ROSCO_toolbox import sim as ROSCO_sim
from ROSCO_toolbox import utilities as ROSCO_utilities

# Load yaml file
parameter_filename = 'NREL5MW_example.yaml'
Expand All @@ -26,9 +26,9 @@
controller_params = inps['controller_params']

# Instantiate turbine, controller, and file processing classes
turbine = wtc_turbine.Turbine(turbine_params)
controller = wtc_controller.Controller(controller_params)
file_processing = wtc_utilities.FileProcessing()
turbine = ROSCO_turbine.Turbine(turbine_params)
controller = ROSCO_controller.Controller(controller_params)
file_processing = ROSCO_utilities.FileProcessing()

# Load turbine data from OpenFAST and rotor performance text file
turbine.load_from_fast(path_params['FAST_InputFile'],path_params['FAST_directory'],dev_branch=True,rot_source='txt',txt_filename=path_params['rotor_performance_filename'])
Expand Down
16 changes: 8 additions & 8 deletions Examples/example_05.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
import numpy as np
import yaml
# ROSCO toolbox modules
from ROSCO_toolbox import controller as wtc_controller
from ROSCO_toolbox import turbine as wtc_turbine
from ROSCO_toolbox import sim as wtc_sim
from ROSCO_toolbox import utilities as wtc_utilities
from ROSCO_toolbox import control_interface as wtc_ci
from ROSCO_toolbox import controller as ROSCO_controller
from ROSCO_toolbox import turbine as ROSCO_turbine
from ROSCO_toolbox import sim as ROSCO_sim
from ROSCO_toolbox import utilities as ROSCO_utilities
from ROSCO_toolbox import control_interface as ROSCO_ci

# Specify controller dynamic library path and name
lib_name = ('../ROSCO/build/libdiscon.dylib')

# Load turbine model from saved pickle
turbine = wtc_turbine.Turbine
turbine = ROSCO_turbine.Turbine
turbine = turbine.load('NREL5MW_saved.p')

# Load controller library
controller_int = wtc_ci.ControllerInterface(lib_name)
controller_int = ROSCO_ci.ControllerInterface(lib_name)

# Load the simulator
sim = wtc_sim.Sim(turbine,controller_int)
sim = ROSCO_sim.Sim(turbine,controller_int)

# Define a wind speed history
dt = 0.1
Expand Down
16 changes: 8 additions & 8 deletions Examples/example_06.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# Python Modules
import yaml
# ROSCO toolbox modules
from ROSCO_toolbox import controller as wtc_controller
from ROSCO_toolbox import turbine as wtc_turbine
from ROSCO_toolbox import sim as wtc_sim
from ROSCO_toolbox import utilities as wtc_utilities
from ROSCO_toolbox import controller as ROSCO_controller
from ROSCO_toolbox import turbine as ROSCO_turbine
from ROSCO_toolbox import sim as ROSCO_sim
from ROSCO_toolbox import utilities as ROSCO_utilities

# Load yaml file
parameter_filename = 'NREL5MW_example.yaml'
Expand All @@ -25,10 +25,10 @@
controller_params = inps['controller_params']

# Instantiate turbine, controller, and file processing classes
turbine = wtc_turbine.Turbine(turbine_params)
controller = wtc_controller.Controller(controller_params)
file_processing = wtc_utilities.FileProcessing()
fast_io = wtc_utilities.FAST_IO()
turbine = ROSCO_turbine.Turbine(turbine_params)
controller = ROSCO_controller.Controller(controller_params)
file_processing = ROSCO_utilities.FileProcessing()
fast_io = ROSCO_utilities.FAST_IO()

# Load turbine data from OpenFAST and rotor performance text file
turbine.load_from_fast(path_params['FAST_InputFile'],path_params['FAST_directory'],dev_branch=True,rot_source='txt',txt_filename=path_params['rotor_performance_filename'])
Expand Down
4 changes: 2 additions & 2 deletions Examples/example_08.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import numpy as np
import matplotlib.pyplot as plt
# ROSCO toolbox modules
from ROSCO_toolbox import utilities as wtc_utilities
from ROSCO_toolbox import utilities as ROSCO_utilities

# Instantiate fast_IO
fast_io = wtc_utilities.FAST_IO()
fast_io = ROSCO_utilities.FAST_IO()

# Define openfast output filenames
# filenames = ["../Test_Cases/5MW_Land/5MW_Land.outb"]
Expand Down
4 changes: 2 additions & 2 deletions Examples/example_09.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import numpy as np
import matplotlib.pyplot as plt
# ROSCO toolbox modules
from ROSCO_toolbox import utilities as wtc_utilities
from ROSCO_toolbox import utilities as ROSCO_utilities

# Instantiate fast_IO
fast_io = wtc_utilities.FAST_IO()
fast_io = ROSCO_utilities.FAST_IO()

# Define openfast output filenames
wind_directory = '../Test_Cases/Wind/'
Expand Down
2 changes: 1 addition & 1 deletion Matlab_Toolbox/Post_TestCases.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% Post_TestCases.m
% Script to load and plot data from test cases in the WTC_Toolbox
% Script to load and plot data from test cases in the ROSCO_Toolbox

%% Define and load test cases

Expand Down
2 changes: 1 addition & 1 deletion ROSCO_toolbox/sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# specific language governing permissions and limitations under the License.

import numpy as np
from ROSCO_toolbox import turbine as wtc_turbine
from ROSCO_toolbox import turbine as ROSCO_turbine
from ROSCO_toolbox import control_interface as ci
import matplotlib.pyplot as plt
import sys
Expand Down
4 changes: 2 additions & 2 deletions Test_Cases/Run_TestCases.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# Import and define modules and classes
import os
import matplotlib.pyplot as plt
from ROSCO_toolbox import utilities as wtc_Utilities
fast_io = wtc_Utilities.FAST_IO()
from ROSCO_toolbox import utilities as ROSCO_Utilities
fast_io = ROSCO_Utilities.FAST_IO()

# Define call for OpenFAST
fastcall = 'openfast_dev'
Expand Down
2 changes: 1 addition & 1 deletion Tune_Cases/NREL5MW.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- # ---------------------NREL Generic controller tuning input file -------------------
# Written for use with WTC_Toolbox tuning procedures
# Written for use with ROSCO_Toolbox tuning procedures
# Turbine: NREL 5MW Reference Wind Turbine
# ------------------------------ OpenFAST PATH DEFINITIONS ------------------------------
path_params:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Requirements list for WTC_toolbox (can add late)
# Requirements list for ROSCO_toolbox (can add late)

0 comments on commit b753794

Please sign in to comment.