diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ffc1005707e773cbc3306557bce3500f96e8e6e..94ac82b7f38ae90c2346762a92422a039bc3713a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,10 +3,10 @@ make_32bit_zip: script: - pip install git+https://gitlab.windenergy.dtu.dk/hawc-reference-models/reference-utilities.git - cd utils - - python3 prepare_zip_file.py + - python3 prepare_zip_file.py $CI_COMMIT_REF_NAME artifacts: paths: - - dtu-10mw-rwt.zip + - dtu-10mw-rwt-$CI_COMMIT_REF_NAME.zip tags: # - CPAV_old - python @@ -15,6 +15,8 @@ make_32bit_zip: - release* - make_zip +# see deepwind repo for configuring report/zip compilation + # (later) make the report # - git clone git@gitlab.windenergy.dtu.dk:HAWC2/hawc2-binary/hawc2-win32.git # - hawc2-win32/HAWC2MB.exe htc\DTU_10MW_RWT.htc diff --git a/utils/prepare_zip_file.py b/utils/prepare_zip_file.py index 1840ff5583549b1fa17dc1c09ead263c5f4dbf2f..63e062366782e4dfc4bcb8ae441f925677e78b03 100644 --- a/utils/prepare_zip_file.py +++ b/utils/prepare_zip_file.py @@ -4,14 +4,18 @@ import os import shutil import subprocess -from refutils import (turb_to_hs2, turb_to_step, delete_dlls, clone_repo, - get_repo_info) +import sys +from refutils import (base_to_hs2, base_to_step, base_to_turb, delete_dlls, + clone_repo, get_repo_info) if __name__ == '__main__': + # get ref name + ci_ref = sys.argv[1] + print(f'Preparing zip file for {ci_ref}...') # script inputs mod_dir = '../dtu-10mw-rwt/' # must end with slash - zip_name = '../dtu-10mw-rwt' + 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' @@ -23,15 +27,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! @@ -50,21 +62,21 @@ 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 - url, branch, commit, date = get_repo_info() - with open(mod_dir + 'git_version.txt', 'w') as f: - f.write(f'Git info for {basename} zip file\n') - f.write('------------------------------------\n') - f.write('Automatically generated using CI on following repo.\n\n') - f.write(f'Repo url: {url}\n') - f.write(f'Branch: {branch}\n') - f.write(f'Commit: {commit} made on {date}\n') + #url, branch, commit, date = get_repo_info() + #with open(mod_dir + 'git_version.txt', 'w') as f: + # f.write(f'Git info for {basename} zip file\n') + # f.write('------------------------------------\n') + # f.write('Automatically generated using CI on following repo.\n\n') + # f.write(f'Repo url: {url}\n') + # f.write(f'Branch: {branch}\n') + # 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