diff --git a/docs/configure-wine.md b/docs/configure-wine.md
index e2c891bceff0694989144b9cfbc17dda6884e8f2..31b2a222b173aee5c9aca65e1a98df12be5e67a2 100644
--- a/docs/configure-wine.md
+++ b/docs/configure-wine.md
@@ -1,5 +1,5 @@
-Configure Wine for Gorm
-------------------------
+Background Information Regarding Wine
+-------------------------------------
> Note that the steps described here are executed automatically by the
configuration script [```config-wine-hawc2.sh```]
@@ -7,6 +7,9 @@ configuration script [```config-wine-hawc2.sh```]
in ```pbsutils```.
+Configure Wine for Gorm
+------------------------
+
You will also need to configure wine and place the HAWC2 executables in a
directory that wine knows about. First, activate the correct wine environment by
typing in a shell in the Gorm's home directory (it can be activated with
@@ -24,23 +27,24 @@ command). In the ```.bashrc``` file in your home directory
alias wine32='WINEARCH=win32 WINEPREFIX=~/.wine32 wine'
```
-Add a folder called ```bin``` to your wine system's PATH so we can copy all
-the HAWC2 executables in here:
+Add a folder called ```~/wine_exe/win32``` to your wine system's PATH so we can
+copy all the HAWC2 executables in here:
```
-WINEDIRNAME=".wine32"
-printf 'REGEDIT4\n[HKEY_CURRENT_USER\\Environment]\n"PATH"="c:\\bin"' >> ./tmp.reg
-WINEARCH=win32 WINEPREFIX=~/$WINEDIRNAME wine regedit ./tmp.reg
+$EXE_DIR_WINE="z:/home/$USER/wine_exe/win32/"
+printf 'REGEDIT4\n[HKEY_CURRENT_USER\\Environment]\n"PATH"="'"$EXE_DIR_WINE"'"\n' >> ./tmp.reg
+WINEARCH=win32 WINEPREFIX=~/.wine32 wine regedit ./tmp.reg
rm ./tmp.reg
```
And now copy all the HAWC2 executables, DLL's (including the license manager)
to your wine directory. You can copy all the required executables, dll's and
the license manager are located at ```/home/MET/hawc2exe```. The following
-command will do this copying:
+command will update your local directory with any new executables that have
+been placed in ```/home/MET/hawc2exe/win32/```:
```
-g-000 $ cp /home/MET/hawc2exe/* /home/$USER/.wine32/drive_c/bin/
+g-000 $ rsync -a /home/MET/hawc2exe/win32/* /home/$USER/wine_exe/win32/
```
Notice that the HAWC2 executable names are ```hawc2-latest.exe```,
@@ -55,7 +59,19 @@ simply copy all the files from there again to update.
Configure Wine for Jess
------------------------
+Same principles apply to Jess, and [```config-wine-hawc2.sh```]
+(https://gitlab.windenergy.dtu.dk/toolbox/pbsutils/blob/master/config-wine-hawc2.sh)
+can be used to initialize and configure your wine environment.
+
+Note that due to a bug in the specific version of wine that is installed on
+Jess, ```config-wine-hawc2.sh``` will apply the following command to fix this.
+It is important to note that this fix will have to be executed on each node at
+the beginning of each new session:
+
```
-g-000 $ WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
-g-000 $ WINEARCH=win32 WINEPREFIX=~/.wine32 wine test.exe
+j-000 $ WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
```
+
+```winefix``` is automatically included in the ```pbs_in``` scripts genetrated
+by the toolbox.
+
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index e12a6aa069fdcab864570269b677e166c740ed86..a60e9b286b71e729a4e24443853342d5834034f9 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -1942,7 +1942,12 @@ class PBS(object):
self.wine = 'time WINEARCH=win32 WINEPREFIX=~/.wine32 wine'
else:
raise UserWarning('server support only for jess or gorm')
- self.winefix = 'WINEARCH=win32 WINEPREFIX=~/.wine32 winefix\n'
+
+ # determine at runtime if winefix has to be ran
+ self.winefix = ' _HOSTNAME_=`hostname`\n'
+ self.winefix += ' if [[ ${_HOSTNAME_:0:1} == "j" ]] ; then \n'
+ self.winefix += ' WINEARCH=win32 WINEPREFIX=~/.wine32 winefix\n'
+ self.winefix += ' fi\n'
# the output channels comes with a price tag. Each time step
# will have a penelty depending on the number of output channels
@@ -2228,7 +2233,7 @@ class PBS(object):
self.pbs += " cp -R $PBS_O_WORKDIR/%s ./%s \n" % (fname, fgen)
# only apply the wine fix in PBS mode
- self.pbs += ' ' + self.winefix
+ self.pbs += self.winefix
# TODO: activate python env, calculate post-processing
# self.pbs += 'echo `python -c "import wetb; print(wetb.__version__)"`\n'
diff --git a/wetb/prepost/dlctemplate.py b/wetb/prepost/dlctemplate.py
old mode 100755
new mode 100644
index fdc21f63a0b024f5abc6ef294c35683eccef59e1..22a1899a14fc17d8c0be6debd2e77c702b787b2e
--- a/wetb/prepost/dlctemplate.py
+++ b/wetb/prepost/dlctemplate.py
@@ -443,7 +443,7 @@ if __name__ == '__main__':
force_dir=P_RUN, saveinterval=2000, csv=opt.csv,
statistics=opt.stats, years=opt.years, neq=opt.neq,
fatigue=opt.fatigue, A=opt.rotarea, AEP=opt.AEP,
- no_bins=opt.no_bins, nn_blr=opt.nn_blr, nn_twt=opt.nn_twt,
+ no_bins=opt.no_bins,
save_new_sigs=opt.save_new_sigs, save_iter=False,
envelopeturbine=opt.envelopeturbine,
envelopeblade=opt.envelopeblade)
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp10_s100.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp10_s100.p
index ad37d08eda8af66d8d9039f92b23411e9adafae0..27dde9c45eef7778dddad7e0b162ccc32fc2d0f4 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp10_s100.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp10_s100.p
@@ -37,7 +37,10 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
mkdir -p turb/
cp -R $PBS_O_WORKDIR/htc/dlc01_demos/dlc01_steady_wsp10_s100.htc ./htc/dlc01_demos/
cp -R $PBS_O_WORKDIR/../turb/turb_s100_10ms*.bin turb/
- WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
+ _HOSTNAME_=`hostname`
+ if [[ ${_HOSTNAME_:0:1} == "j" ]] ; then
+ WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
+ fi
# ------------------------------------------------------------
else
# with find+xargs we first browse to CPU folder
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp11_s101.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp11_s101.p
index d4675f07d0ad5d8011fac3c5c19201705054ac8e..4d0df37617d5bf8093c7572c7ace7102da7b125c 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp11_s101.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp11_s101.p
@@ -37,7 +37,10 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
mkdir -p turb/
cp -R $PBS_O_WORKDIR/htc/dlc01_demos/dlc01_steady_wsp11_s101.htc ./htc/dlc01_demos/
cp -R $PBS_O_WORKDIR/../turb/turb_s101_11ms*.bin turb/
- WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
+ _HOSTNAME_=`hostname`
+ if [[ ${_HOSTNAME_:0:1} == "j" ]] ; then
+ WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
+ fi
# ------------------------------------------------------------
else
# with find+xargs we first browse to CPU folder
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp8_noturb.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp8_noturb.p
index 8570f9cb95946522ea0f34bdfe4d445b701202e7..fdb203d5a0361e9da54c23ee3cddc1acaca6bd52 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp8_noturb.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp8_noturb.p
@@ -37,7 +37,10 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
mkdir -p turb/
cp -R $PBS_O_WORKDIR/htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc ./htc/dlc01_demos/
cp -R $PBS_O_WORKDIR/../turb/none*.bin turb/
- WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
+ _HOSTNAME_=`hostname`
+ if [[ ${_HOSTNAME_:0:1} == "j" ]] ; then
+ WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
+ fi
# ------------------------------------------------------------
else
# with find+xargs we first browse to CPU folder
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp9_noturb.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp9_noturb.p
index 8b7dc11bda27c4205e9eb084657ab876200fb122..84d71cd6d5066ef8a8f131e6c0e5a33f7120b6c5 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp9_noturb.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in/dlc01_demos/dlc01_steady_wsp9_noturb.p
@@ -37,7 +37,10 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
mkdir -p turb/
cp -R $PBS_O_WORKDIR/htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc ./htc/dlc01_demos/
cp -R $PBS_O_WORKDIR/../turb/none*.bin turb/
- WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
+ _HOSTNAME_=`hostname`
+ if [[ ${_HOSTNAME_:0:1} == "j" ]] ; then
+ WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
+ fi
# ------------------------------------------------------------
else
# with find+xargs we first browse to CPU folder