Now really add function to add turbulence

WISDEM · Jan 16, 2025 · 2ea4b17 · 2ea4b17
1 parent 504bf98
commit 2ea4b17
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/weis/aeroelasticse/IEC_CoeherentGusts.py b/weis/aeroelasticse/IEC_CoeherentGusts.py
@@ -300,7 +300,6 @@ def write_wnd(self, fname, data, hd):
             fid.write('  '+''.join([('%.6f' % val).center(12) for val in row]) + '\n')
 
         fid.close()
-<<<<<<< HEAD
 
     def add_turbulence(filename, u, v = None, w = None, time = None, ref_height = None, new_filename = None):
         """
@@ -366,5 +365,3 @@ def add_turbulence(filename, u, v = None, w = None, time = None, ref_height = No
             ts_new.write(new_filename)
         else: 
             return ts_new
-=======
->>>>>>> 7d095caec5db66217229c1996dfe2498965a15ed