From 0643792e2319c1f35cea30a0e8f34c191df0e9d7 Mon Sep 17 00:00:00 2001 From: Nikhar Abbas Date: Tue, 14 Jul 2020 15:58:57 -0600 Subject: [PATCH] properly pass desired output channels --- ROSCO_testing/ROSCO_testing.py | 38 +++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/ROSCO_testing/ROSCO_testing.py b/ROSCO_testing/ROSCO_testing.py index b7927f628..f4daf300f 100644 --- a/ROSCO_testing/ROSCO_testing.py +++ b/ROSCO_testing/ROSCO_testing.py @@ -165,11 +165,21 @@ def ROSCO_Test_lite(self, more_case_inputs=None): case_list, case_name_list = iec.execute(case_inputs=case_inputs) # Ensure proper output channels - channels = ['BldPitch1', 'BldPitch2', 'BldPitch3', 'GenTq', 'GenPwr', 'RotSpeed'] - channels += ["TipDxc1", "TipDyc1", "TipDzc1", "TipDxc2", + var_out = ['BldPitch1', 'BldPitch2', 'BldPitch3', 'GenTq', 'GenPwr', 'RotSpeed'] + var_out += ["TipDxc1", "TipDyc1", "TipDzc1", "TipDxc2", "TipDyc2", "TipDzc2", "TipDxc3", "TipDyc3", "TipDzc3"] - channels += ["RootMxc1", "RootMyc1", "RootMzc1", "RootMxc2", - "RootMyc2", "RootMzc2", "RootMxc3", "RootMyc3", "RootMzc3"] + var_out += ["RootMxc1", "RootMyc1", "RootMzc1", + "RootMxc2", "RootMyc2", "RootMzc2", + "RootMxc3", "RootMyc3", "RootMzc3", + "RootMxb1", "RootMyb1", "RootMzb1", + "RootMxb2", "RootMyb2", "RootMzb2", + "RootMxb3", "RootMyb3", "RootMzb3"] + var_out += ["TwrBsMxt", "TwrBsMyt", "TwrBsMzt", + "TwrBsFxt", "TwrBsFyt", "TwrBsFzt"] + + channels = {} + for var in var_out: + channels[var] = True # Set up FAST Sims fastBatch = runFAST_pywrapper_batch() @@ -183,6 +193,7 @@ def ROSCO_Test_lite(self, more_case_inputs=None): fastBatch.case_list = case_list fastBatch.case_name_list = case_name_list + fastBatch.channels = channels # Check if simulation has been run if self.outfile_fmt == 1: @@ -301,11 +312,21 @@ def ROSCO_Test_heavy(self, more_case_inputs=None): case_list, case_name_list = iec.execute(case_inputs=case_inputs) # Ensure proper output channels - channels = ['BldPitch1', 'BldPitch2', 'BldPitch3', 'GenTq', 'GenPwr', 'RotSpeed'] - channels += ["TipDxc1", "TipDyc1", "TipDzc1", "TipDxc2", + var_out = ['BldPitch1', 'BldPitch2', 'BldPitch3', 'GenTq', 'GenPwr', 'RotSpeed'] + var_out += ["TipDxc1", "TipDyc1", "TipDzc1", "TipDxc2", "TipDyc2", "TipDzc2", "TipDxc3", "TipDyc3", "TipDzc3"] - channels += ["RootMxc1", "RootMyc1", "RootMzc1", "RootMxc2", - "RootMyc2", "RootMzc2", "RootMxc3", "RootMyc3", "RootMzc3"] + var_out += ["RootMxc1", "RootMyc1", "RootMzc1", + "RootMxc2", "RootMyc2", "RootMzc2", + "RootMxc3", "RootMyc3", "RootMzc3", + "RootMxb1", "RootMyb1", "RootMzb1", + "RootMxb2", "RootMyb2", "RootMzb2", + "RootMxb3", "RootMyb3", "RootMzb3"] + var_out += ["TwrBsMxt", "TwrBsMyt", "TwrBsMzt", + "TwrBsFxt", "TwrBsFyt", "TwrBsFzt"] + + channels = {} + for var in var_out: + channels[var] = True # Set up FAST Sims, move setup up fastBatch = runFAST_pywrapper_batch() @@ -319,6 +340,7 @@ def ROSCO_Test_heavy(self, more_case_inputs=None): fastBatch.case_list = case_list fastBatch.case_name_list = case_name_list + fastBatch.channels = channels # Check if simulation has been run if self.outfile_fmt == 1: