From b813a22734f4f478f2922ce98f0a3001b8845260 Mon Sep 17 00:00:00 2001 From: dzalkind Date: Wed, 10 Mar 2021 10:37:42 -0700 Subject: [PATCH] Clean up testing scripts --- ROSCO_testing/ROSCO_testing.py | 1 - ROSCO_testing/run_Testing.py | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ROSCO_testing/ROSCO_testing.py b/ROSCO_testing/ROSCO_testing.py index dca415682..4aa7675e0 100644 --- a/ROSCO_testing/ROSCO_testing.py +++ b/ROSCO_testing/ROSCO_testing.py @@ -476,7 +476,6 @@ def ROSCO_DISCON_Comp(self, DISCON_filenames, testtype='light', more_case_inputs self.windDir = wind_dir_init def print_results(self,outfiles): - print(outfiles) op = output_processing.output_processing() FAST_Output = op.load_fast_out(outfiles, tmin=0) diff --git a/ROSCO_testing/run_Testing.py b/ROSCO_testing/run_Testing.py index d6ff98e03..9434c933c 100644 --- a/ROSCO_testing/run_Testing.py +++ b/ROSCO_testing/run_Testing.py @@ -84,7 +84,7 @@ def run_testing(turbine2test, testtype, rosco_binaries=[], discon_files=[], **kw # Setup ROSCO testing parameters rt_kwargs = {} rt_kwargs['runDir'] = os.path.join(this_dir,'results/IEA-15MW') # directory for FAST simulations - rt_kwargs['namebase'] = 'heavy_test' # Base name for FAST files + rt_kwargs['namebase'] = 'lite_test' # Base name for FAST files rt_kwargs['FAST_exe'] = 'openfast' # OpenFAST executable path rt_kwargs['Turbsim_exe']= 'turbsim' # Turbsim executable path rt_kwargs['FAST_ver'] = 'OpenFAST' # FAST version @@ -98,13 +98,11 @@ def run_testing(turbine2test, testtype, rosco_binaries=[], discon_files=[], **kw # ---- Define test type ---- turbine2test = 'IEA-15MW' # IEA-15MW or NREL-5MW - testtype = 'heavy' # lite, heavy, binary-comp, discon-comp + testtype = 'lite' # lite, heavy, binary-comp, discon-comp # Only fill one of these if comparing controllers rosco_binaries = [glob.glob(os.path.join(this_dir,'../ROSCO/build/libdiscon.*'))[0]] # Differently named libdiscons to compare discon_files = [] # Differently named DISCON.IN files to compare - print(rosco_binaries) - print(this_dir) # Run testing run_testing(turbine2test, testtype, rosco_binaries=rosco_binaries, discon_files=discon_files, **rt_kwargs)