Merge debugging changes in make_zip back into develop

utils/prepare_zip_file.py

@@ -5,8 +5,8 @@ import os
 import shutil
 import subprocess
 import sys
-from refutils import (turb_to_hs2, turb_to_step, delete_dlls, clone_repo,
-                      get_repo_info)
+from refutils import (base_to_hs2, base_to_step, base_to_turb, delete_dlls,
+                      clone_repo, get_repo_info)
 
 
 if __name__ == '__main__':
@@ -14,7 +14,7 @@ if __name__ == '__main__':
     ci_ref = sys.argv[1]
     # script inputs
     mod_dir = '../dtu-10mw-rwt/'  # must end with slash
-    zip_name = f'../dtu-10mw-rwt_{ci_ref}'
+    zip_name = f'../dtu-10mw-rwt-{ci_ref}'
     basename = 'DTU_10MW_RWT'
     dll_git_url = 'https://gitlab.windenergy.dtu.dk/OpenLAC/control-binary/control-win32.git'
     dll_branch = 'ref_models'
@@ -26,15 +26,23 @@ if __name__ == '__main__':
 
     # ======= make hawcstab2 and step-wind files =======
     htc_base = mod_dir + f'htc/{basename}.htc'
-    kwargs = {}  # default kwargs in functions are for DTU 10 MW, no need to update
+    kwargs = dict(pitch_f=100, pitch_z=0.7, cut_in=4, cut_out=25, n_wsp=22,
+                  gen_min=299.85, gen_max=479.56567, gbr=50, pitch_min=0, opt_lambda=7.5,
+                  rate_pow=10000, gen_eff=0.94, p1_f=0.05, p1_z=0.7, p2_f=0.06, p2_z=0.7,
+                  gs=2, constant_power=1, dt=40, tstart=100, wsp=24, tint=0.157,
+                  tb_wid=180, tb_ht=180)
+
+    # turbulent file
+    turb_path = mod_dir + f'htc/{basename}_turb.htc'
+    base_to_turb(htc_base, turb_path, **kwargs)
 
     # hawcstab2
     hs2_path = mod_dir + f'{basename}_hs2.htc'
-    turb_to_hs2(htc_base, hs2_path, **kwargs)
+    base_to_hs2(htc_base, hs2_path, **kwargs)
 
     # step wind
     step_path = mod_dir + f'htc/{basename}_step.htc'
-    turb_to_step(htc_base, step_path, **kwargs)
+    base_to_step(htc_base, step_path, **kwargs)
 
     # ======= clone dll repo and copy in the ones we need =======
     control_dir = mod_dir + 'control/'  # must end with slash!
@@ -53,7 +61,7 @@ if __name__ == '__main__':
      for t in dll_list]
 
     # delete control binaries
-    shutil.rmtree('./control-win32/')  # doesn't work on WINDOWS >:(
+    #shutil.rmtree('./control-win32/')  # doesn't work on WINDOWS >:(
     #subprocess.run(['rmdir', '/s', '/q', 'control-win32'], shell=True, check=True)
 
     # write the git branch and commit to file
@@ -67,7 +75,7 @@ if __name__ == '__main__':
     #    f.write(f'Commit: {commit} made on {date}\n')
 
     # ======= make the archive =======
-    shutil.make_archive(mod_dir, 'zip', zip_name)
+    shutil.make_archive(zip_name, 'zip', mod_dir)
 
 
 #%%
\ No newline at end of file