From 99eac2bacafb047d156e7a037da877faffade509 Mon Sep 17 00:00:00 2001 From: dzalkind Date: Thu, 9 Jul 2020 17:31:12 -0600 Subject: [PATCH] Bug fix: multiple turbines can be tested now --- ROSCO_testing/test_ROSCO.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ROSCO_testing/test_ROSCO.py b/ROSCO_testing/test_ROSCO.py index f1e23118f..9ce80c015 100644 --- a/ROSCO_testing/test_ROSCO.py +++ b/ROSCO_testing/test_ROSCO.py @@ -99,7 +99,7 @@ def ROSCO_Test(fst_vt, runDir, namebase, TMax, turbine_class, turbulence_class, ### Parameter Set up # Run Directory (for all turbines) - baseRunDir = '/Users/dzalkind/Tools/SaveData/ROSCO/PitchSat' + baseRunDir = '/Users/dzalkind/Tools/SaveData/ROSCO/WSE_Params' # Compare results to this Directory: compRunDir = '/Users/dzalkind/Tools/SaveData/ROSCO/Baseline2' @@ -114,7 +114,7 @@ def ROSCO_Test(fst_vt, runDir, namebase, TMax, turbine_class, turbulence_class, reCrunch = False # do you want to re-run pCrunch? # Turbine Setup - testTurbines = ['NREL-5MW'] # current options are: IEA-15MW + testTurbines = ['IEA-15MW'] # current options are: IEA-15MW, NREL-5MW # Loop through test turbines for turbine in testTurbines: @@ -140,7 +140,7 @@ def ROSCO_Test(fst_vt, runDir, namebase, TMax, turbine_class, turbulence_class, fastRead.execute() - runDir = os.path.join(baseRunDir,testTurbines[0]) + runDir = os.path.join(baseRunDir,turbine) namebase = 'ROTest' TMax = 700 turbine_class = 'I' @@ -155,7 +155,7 @@ def ROSCO_Test(fst_vt, runDir, namebase, TMax, turbine_class, turbulence_class, # Set up FAST Sims, move setup up fastBatch = runFAST_pywrapper_batch(FAST_ver='OpenFAST', dev_branch=True) fastBatch.FAST_exe = Openfast_exe # Path to executable - fastBatch.FAST_runDirectory = os.path.join(baseRunDir,testTurbines[0]) + fastBatch.FAST_runDirectory = os.path.join(baseRunDir,turbine) fastBatch.FAST_InputFile = fastRead.FAST_InputFile # FAST input file (ext=.fst) fastBatch.FAST_directory = fastRead.FAST_directory # Path to fst directory files fastBatch.debug_level = 2 @@ -206,7 +206,7 @@ def ROSCO_Test(fst_vt, runDir, namebase, TMax, turbine_class, turbulence_class, # If no comparison exists, just print own stats try: - loadRanksComp = Processing.load_yaml(os.path.join(compRunDir,testTurbines[0],'stats','dataset1_LoadRanking.yaml')) + loadRanksComp = Processing.load_yaml(os.path.join(compRunDir,turbine,'stats','dataset1_LoadRanking.yaml')) print('\t\t{}'.format(turbine)) print('----------------------------------------')