From a2ed63bd5ed495274e7447a0df0ff5488e7dbb46 Mon Sep 17 00:00:00 2001 From: Nikhar Abbas Date: Thu, 5 Nov 2020 12:27:53 -0700 Subject: [PATCH] Fix bugs in DISCON testing --- ROSCO_testing/ROSCO_testing.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ROSCO_testing/ROSCO_testing.py b/ROSCO_testing/ROSCO_testing.py index e25dedd1e..3a13c70b1 100644 --- a/ROSCO_testing/ROSCO_testing.py +++ b/ROSCO_testing/ROSCO_testing.py @@ -434,7 +434,7 @@ def ROSCO_Controller_Comp(self, controller_paths, testtype='light', more_case_in self.runDir = run_dir_init self.windDir = wind_dir_init - def ROSCO_DISCON_Comp(self, DISCON_filenames, testtype='light'): + def ROSCO_DISCON_Comp(self, DISCON_filenames, testtype='light', more_case_inputs={}, U=[]): ''' Heavy or light testing for n DISCON.IN files, n = len(DISCON_paths) @@ -455,14 +455,13 @@ def ROSCO_DISCON_Comp(self, DISCON_filenames, testtype='light'): self.windDir = os.path.join(run_dir_init, 'wind') # wind in base runDir # Point to different DISCON.IN files using more_case_inputs - more_case_inputs = {} - more_case_inputs[('ServoDyn', 'DLL_ProcName')] = {'vals': [discon], 'group': 0} + more_case_inputs[('ServoDyn', 'DLL_InFile')] = {'vals': [discon], 'group': 0} self.windDir = os.path.join(run_dir_init, 'wind') # wind in base runDir if testtype.lower() == 'light': - self.ROSCO_Test_lite(more_case_inputs=more_case_inputs) + self.ROSCO_Test_lite(more_case_inputs=more_case_inputs, U=U) elif testtype.lower() == 'heavy': - self.ROSCO_Test_heavy(more_case_inputs=more_case_inputs) + self.ROSCO_Test_heavy(more_case_inputs=more_case_inputs, U=U) else: raise ValueError('{} is an invalid testtype for DISCON comparison'.format(testtype))