Merge branch 'master' of https://gitlab.windenergy.dtu.dk/toolbox/WindEnergyToolbox

docs/howto-make-dlcs.md

@@ -167,7 +167,7 @@ description [here]
 (https://gitlab.windenergy.dtu.dk/toolbox/WindEnergyToolbox/blob/master/docs/configure-wine.md).
 
 All your HAWC2 executables and DLL's are now located
-at ```/home/$USER/.wine32/drive_c/bin```.
+at ```/home/$USER/wine_exe/win32```.
 
 Notice that the HAWC2 executable names are ```hawc2-latest.exe```,
 ```hawc2-118.exe```, etc. By default the latest version will be used and the user
@@ -177,7 +177,7 @@ executable.
 
 Alternatively you can also include all the DLL's and executables in the root of
 your HAWC2 model folder. Executables and DLL's placed in the root folder take
-precedence over the ones placed in ```/home/$USER/.wine32/drive_c/bin```.
+precedence over the ones placed in ```/home/$USER/wine_exe/win32```.
 
 Log out and in again from the cluster (close and restart PuTTY).
 
@@ -195,7 +195,7 @@ When there is a new version of HAWC2, or when a new license manager is released,
 you can update your local wine directory as follows:
 
 ```
-g-000 $ cp /home/MET/hawc2exe/* /home/$USER/.wine32/drive_c/bin/
+g-000 $ cp /home/MET/hawc2exe/* /home/$USER/wine_exe/win32/
 ```
 
 The file ```hawc2-latest.exe``` will always be the latest HAWC2

wetb/prepost/dlcdefs.py

@@ -361,6 +361,8 @@ def excel_stabcon(proot, fext='xlsx', pignore=None, pinclude=None, sheet=0,
                 tags_dict['[case_id]'] = tags_dict['[Case id.]']
             if '[time stop]' in tags_dict.keys():
                 tags_dict['[time_stop]'] = tags_dict['[time stop]']
+            else:
+                tags_dict['[time stop]'] = tags_dict['[time_stop]']
             try:
                 tags_dict['[turb_base_name]'] = tags_dict['[Turb base name]']
             except KeyError:

wetb/prepost/dlctemplate.py

@@ -162,7 +162,10 @@ def variable_tag_func(master, case_id_short=False):
     mt['[log_dir]'] = 'logfiles/%s/' % dlc_case
     mt['[htc_dir]'] = 'htc/%s/' % dlc_case
     mt['[case_id]'] = mt['[Case id.]']
-    mt['[time_stop]'] = mt['[time stop]']
+    try:
+        mt['[time_stop]'] = mt['[time stop]']
+    except KeyError:
+        mt['[time stop]'] = mt['[time_stop]']
     mt['[turb_base_name]'] = mt['[Turb base name]']
     mt['[DLC]'] = mt['[Case id.]'].split('_')[0][3:]
     mt['[pbs_out_dir]'] = 'pbs_out/%s/' % dlc_case