From eceb6e56b6d701f72ee3de654d3e1098be2ca302 Mon Sep 17 00:00:00 2001 From: pibo Date: Tue, 16 Nov 2021 11:25:26 -0700 Subject: [PATCH 1/2] fix bug with Re number and make all paths relative --- weis/aeroelasticse/FAST_reader.py | 2 +- weis/aeroelasticse/FAST_writer.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/weis/aeroelasticse/FAST_reader.py b/weis/aeroelasticse/FAST_reader.py index c1ecaf263..07edea941 100644 --- a/weis/aeroelasticse/FAST_reader.py +++ b/weis/aeroelasticse/FAST_reader.py @@ -888,7 +888,7 @@ def read_AeroDyn15Polar(self): self.fst_vt['AeroDyn15']['af_data'][afi] = [None]*polar['NumTabs'] for tab in range(polar['NumTabs']): # For multiple tables - polar['Re'] = float_read(readline_filterComments(f).split()[0]) + polar['Re'] = float_read(readline_filterComments(f).split()[0]) * 1.e+6 polar['Ctrl'] = int_read(readline_filterComments(f).split()[0]) polar['InclUAdata'] = bool_read(readline_filterComments(f).split()[0]) diff --git a/weis/aeroelasticse/FAST_writer.py b/weis/aeroelasticse/FAST_writer.py index b1bff39eb..565326842 100644 --- a/weis/aeroelasticse/FAST_writer.py +++ b/weis/aeroelasticse/FAST_writer.py @@ -587,8 +587,8 @@ def write_BeamDyn(self): def write_BeamDynBlade(self): # bd_blade_file = self.fst_vt['BeamDyn']['BldFile'] - bd_blade_file = os.path.abspath(os.path.join(self.FAST_runDirectory, self.FAST_namingOut + '_BeamDyn_Blade.dat')) - self.fst_vt['BeamDyn']['BldFile'] = bd_blade_file + self.fst_vt['BeamDyn']['BldFile'] = self.FAST_namingOut + '_BeamDyn_Blade.dat' + bd_blade_file = os.path.abspath(os.path.join(self.FAST_runDirectory, self.fst_vt['BeamDyn']['BldFile'])) f = open(bd_blade_file, 'w') f.write('------- BEAMDYN V1.00.* INDIVIDUAL BLADE INPUT FILE --------------------------\n') @@ -1384,7 +1384,7 @@ def write_DISCON_in(self): # Write DISCON input files ROSCO_utilities.write_rotor_performance(turbine, txt_filename=txt_filename) - ROSCO_utilities.write_DISCON(turbine,controller,param_file=discon_in_file, txt_filename=txt_filename) + ROSCO_utilities.write_DISCON(turbine,controller,param_file=discon_in_file, txt_filename=self.fst_vt['DISCON_in']['PerfFileName']) def write_HydroDyn(self): From 5c4d4ea30836ec1e0a111714a0d949556e23ed3e Mon Sep 17 00:00:00 2001 From: pibo Date: Thu, 18 Nov 2021 19:06:03 -0700 Subject: [PATCH 2/2] bring back abs path to cp table file --- weis/aeroelasticse/FAST_writer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weis/aeroelasticse/FAST_writer.py b/weis/aeroelasticse/FAST_writer.py index 565326842..bcfa1a3ee 100644 --- a/weis/aeroelasticse/FAST_writer.py +++ b/weis/aeroelasticse/FAST_writer.py @@ -1384,7 +1384,7 @@ def write_DISCON_in(self): # Write DISCON input files ROSCO_utilities.write_rotor_performance(turbine, txt_filename=txt_filename) - ROSCO_utilities.write_DISCON(turbine,controller,param_file=discon_in_file, txt_filename=self.fst_vt['DISCON_in']['PerfFileName']) + ROSCO_utilities.write_DISCON(turbine,controller,param_file=discon_in_file, txt_filename=txt_filename) def write_HydroDyn(self):