diff --git a/docs/howto-make-dlcs.md b/docs/howto-make-dlcs.md
index 144eed6ed3af387e2813cef951add8b35e474433..87c418a7f145eef48635a99d06a1fdee9afd8222 100644
--- a/docs/howto-make-dlcs.md
+++ b/docs/howto-make-dlcs.md
@@ -41,7 +41,7 @@ result and log files with lower case file names, regardless of the user input.
Hence, in order to avoid possible ambiguities at all times, make sure that there
are no upper case symbols defined in the value of the following tags (as defined
in the Excel spreadsheets): ```[Case folder]```, ```[Case id.]```, and
-```[Turb base name]```.
+```[turb_base_name]```.
The system will always force the values of the tags to be lower case anyway, and
when working on Windows, this might cause some confusing and unexpected behavior.
@@ -406,12 +406,12 @@ Required, and used for the PBS output and post-processing
Optional
* ```[turb_db_dir] = '../turb/'```
-* ```[wake_dir] = False```
-* ```[wake_db_dir] = False```
-* ```[wake_base_name] = 'turb_'```
+* ```[micro_dir] = False```
+* ```[micro_db_dir] = False```
+* ```[micro_base_name] = 'turb_'```
* ```[meander_dir] = False```
-* ```[meand_db_dir] = False```
-* ```[meand_base_name] = 'turb_'```
+* ```[meander_db_dir] = False```
+* ```[meander_base_name] = 'turb_'```
* ```[mooring_dir] = False```, all files and sub-folders copied to node
* ```[hydro_dir] = False```, all files and sub-folders copied to node
@@ -464,19 +464,48 @@ turbulence boxes using the 64-bit version of the stand alone Mann turbulence
box generator. The appropriate input parameters are taken from the following
tags:
-* ```[tu_model]```
-* ```[Turb base name]```
-* ```[MannAlfaEpsilon]```
-* ```[MannL]```
-* ```[MannGamma]```
-* ```[seed]```
-* ```[turb_nr_u]``` : number of grid points in the u direction
-* ```[turb_nr_v]``` : number of grid points in the v direction
-* ```[turb_nr_w]``` : number of grid points in the w direction
-* ```[turb_dx]``` : grid spacing in meters in the u direction
-* ```[turb_dy]``` : grid spacing in meters in the v direction
-* ```[turb_dz]``` : grid spacing in meters in the w direction
-* ```[high_freq_comp]```
+* Atmospheric turbulence:
+ * ```[tu_model] = 1```
+ * ```[turb_base_name]```
+ * ```[MannAlfaEpsilon]```
+ * ```[MannL]```
+ * ```[MannGamma]```
+ * ```[seed]```
+ * ```[turb_nr_u]``` : number of grid points in the u direction
+ * ```[turb_nr_v]``` : number of grid points in the v direction
+ * ```[turb_nr_w]``` : number of grid points in the w direction
+ * ```[turb_dx]``` : grid spacing in meters in the u direction
+ * ```[turb_dy]``` : grid spacing in meters in the v direction
+ * ```[turb_dz]``` : grid spacing in meters in the w direction
+ * ```[high_freq_comp]```
+
+* Micro turbulence for DWM:
+ * ```[micro_base_name]```
+ * ```[MannAlfaEpsilon_micro]```
+ * ```[MannL_micro]```
+ * ```[MannGamma_micro]```
+ * ```[seed_micro]```
+ * ```[turb_nr_u_micro]``` : number of grid points in the u direction
+ * ```[turb_nr_v_micro]``` : number of grid points in the v direction
+ * ```[turb_nr_w_micro]``` : number of grid points in the w direction
+ * ```[turb_dx_micro]``` : grid spacing in meters in the u direction
+ * ```[turb_dy_micro]``` : grid spacing in meters in the v direction
+ * ```[turb_dz_micro]``` : grid spacing in meters in the w direction
+ * ```[high_freq_comp_micro]```
+
+* Meander turbulence for DWM
+ * ```[meander_base_name]```
+ * ```[MannAlfaEpsilon_meander]```
+ * ```[MannL_meander]```
+ * ```[MannGamma_meander]```
+ * ```[seed_meander]```
+ * ```[turb_nr_u_meander]``` : number of grid points in the u direction
+ * ```[turb_nr_v_meander]``` : number of grid points in the v direction
+ * ```[turb_nr_w_meander]``` : number of grid points in the w direction
+ * ```[turb_dx_meander]``` : grid spacing in meters in the u direction
+ * ```[turb_dy_meander]``` : grid spacing in meters in the v direction
+ * ```[turb_dz_meander]``` : grid spacing in meters in the w direction
+ * ```[high_freq_comp_meander]```
### Tags required for hydro file generation
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index 24f7accc051725c921f05362866606f814811062..eac23b85cf3fa07372372958719d92a3e41e122d 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -58,9 +58,9 @@ from wetb.prepost.GenerateHydro import hydro_input
from wetb.utils.envelope import compute_envelope
from os.path import join as os_path_join
-def join_path(*args):
- return os_path_join(*args).replace("\\","/")
-os.path.join = join_path
+#def join_path(*args):
+# return os_path_join(*args).replace("\\","/")
+#os.path.join = join_path
@@ -470,7 +470,7 @@ def run_local(cases, silent=False, check_log=True):
# create the required directories
dirkeys = ['[data_dir]', '[htc_dir]', '[res_dir]', '[log_dir]',
'[eigenfreq_dir]', '[animation_dir]', '[turb_dir]',
- '[wake_dir]', '[meander_dir]', '[opt_dir]', '[control_dir]',
+ '[micro_dir]', '[meander_dir]', '[opt_dir]', '[control_dir]',
'[mooring_dir]', '[hydro_dir]', '[externalforce]']
for dirkey in dirkeys:
if tags[dirkey]:
@@ -1181,24 +1181,22 @@ class HtcMaster(object):
self.tags['[iter_dir]'] = 'iter/'
self.tags['[log_dir]'] = 'logfiles/'
self.tags['[turb_dir]'] = 'turb/'
- self.tags['[wake_dir]'] = None
- self.tags['[meand_dir]'] = None
+ self.tags['[micro_dir]'] = None
+ self.tags['[meander_dir]'] = None
self.tags['[turb_db_dir]'] = None
- self.tags['[wake_db_dir]'] = None
- self.tags['[meand_db_dir]'] = None
+ self.tags['[micro_db_dir]'] = None
+ self.tags['[meander_db_dir]'] = None
self.tags['[control_dir]'] = 'control/'
self.tags['[externalforce]'] = 'externalforce/'
self.tags['[animation_dir]'] = 'animation/'
self.tags['[eigenfreq_dir]'] = 'eigenfreq/'
- self.tags['[wake_dir]'] = 'wake/'
- self.tags['[meander_dir]'] = 'meander/'
self.tags['[htc_dir]'] = 'htc/'
self.tags['[mooring_dir]'] = 'mooring/'
self.tags['[hydro_dir]'] = 'htc_hydro/'
self.tags['[pbs_out_dir]'] = 'pbs_out/'
self.tags['[turb_base_name]'] = None
- self.tags['[wake_base_name]'] = None
- self.tags['[meand_base_name]'] = None
+ self.tags['[micro_base_name]'] = None
+ self.tags['[meander_base_name]'] = None
self.tags['[zip_root_files]'] = []
self.tags['[fname_source]'] = []
@@ -1215,8 +1213,8 @@ class HtcMaster(object):
# self.queue = Queue.Queue()
self.output_dirs = ['[res_dir]', '[log_dir]', '[turb_dir]',
- '[case_id]', '[wake_dir]', '[animation_dir]',
- '[meand_dir]', '[eigenfreq_dir]']
+ '[case_id]', '[micro_dir]', '[animation_dir]',
+ '[meander_dir]', '[eigenfreq_dir]']
def create_run_dir(self):
"""
@@ -1225,13 +1223,15 @@ class HtcMaster(object):
dirkeys = ['[data_dir]', '[htc_dir]', '[res_dir]', '[log_dir]',
'[eigenfreq_dir]', '[animation_dir]', '[turb_dir]',
- '[wake_dir]', '[meander_dir]', '[opt_dir]', '[control_dir]',
+ '[micro_dir]', '[meander_dir]', '[opt_dir]', '[control_dir]',
'[mooring_dir]', '[hydro_dir]', '[externalforce]']
# create all the necessary directories
for dirkey in dirkeys:
if isinstance(self.tags[dirkey], str):
path = os.path.join(self.tags['[run_dir]'], self.tags[dirkey])
+ if self.tags[dirkey].lower() == 'none':
+ continue
if not os.path.exists(path):
os.makedirs(path)
@@ -1356,7 +1356,7 @@ class HtcMaster(object):
htcmaster_dir = self.tags['[master_htc_dir]']
data_dir = self.tags['[data_dir]']
turb_dir = self.tags['[turb_dir]']
- wake_dir = self.tags['[wake_dir]']
+ wake_dir = self.tags['[micro_dir]']
meander_dir = self.tags['[meander_dir]']
mooring_dir = self.tags['[mooring_dir]']
hydro_dir = self.tags['[hydro_dir]']
@@ -1383,7 +1383,7 @@ class HtcMaster(object):
# the master file
src = os.path.join(htcmaster_dir, htcmaster)
- dst = os.path.join('htc', '_master', htcmaster)
+ dst = os.path.join('htc', '_master', os.path.basename(htcmaster))
zf.write(src, dst, zipfile.ZIP_DEFLATED)
# manually add all that resides in control, mooring and hydro
@@ -1934,9 +1934,9 @@ class PBS(object):
self.animation_dir = tag_dict['[animation_dir]']
self.TurbDirName = tag_dict['[turb_dir]']
self.TurbDb = tag_dict['[turb_db_dir]']
- self.wakeDb = tag_dict['[wake_db_dir]']
- self.meandDb = tag_dict['[meand_db_dir]']
- self.WakeDirName = tag_dict['[wake_dir]']
+ self.wakeDb = tag_dict['[micro_db_dir]']
+ self.meandDb = tag_dict['[meander_db_dir]']
+ self.WakeDirName = tag_dict['[micro_dir]']
self.MeanderDirName = tag_dict['[meander_dir]']
self.ModelZipFile = tag_dict['[model_zip]']
self.htc_dir = tag_dict['[htc_dir]']
@@ -1944,8 +1944,8 @@ class PBS(object):
self.mooring_dir = tag_dict['[mooring_dir]']
self.model_path = tag_dict['[run_dir]']
self.turb_base_name = tag_dict['[turb_base_name]']
- self.wake_base_name = tag_dict['[wake_base_name]']
- self.meand_base_name = tag_dict['[meand_base_name]']
+ self.wake_base_name = tag_dict['[micro_base_name]']
+ self.meand_base_name = tag_dict['[meander_base_name]']
self.pbs_queue_command = tag_dict['[pbs_queue_command]']
self.walltime = tag_dict['[walltime]']
self.dyn_walltime = tag_dict['[auto_walltime]']
@@ -2059,12 +2059,17 @@ class PBS(object):
self.pbs += " mkdir -p " + self.htc_dir + '\n'
self.pbs += " mkdir -p " + self.results_dir + '\n'
self.pbs += " mkdir -p " + self.logs_dir + '\n'
- if self.TurbDirName is not None or self.TurbDirName != 'None':
+ if self.TurbDirName is not None or self.TurbDirName.lower()!='none':
self.pbs += " mkdir -p " + self.TurbDirName + '\n'
+
if self.WakeDirName and self.WakeDirName != self.TurbDirName:
- self.pbs += " mkdir -p " + self.WakeDirName + '\n'
+ if str(self.WakeDirName).lower() != 'none':
+ self.pbs += " mkdir -p " + self.WakeDirName + '\n'
+
if self.MeanderDirName and self.MeanderDirName != self.TurbDirName:
- self.pbs += " mkdir -p " + self.MeanderDirName + '\n'
+ if str(self.MeanderDirName).lower() != 'none':
+ self.pbs += " mkdir -p " + self.MeanderDirName + '\n'
+
if self.hydro_dir:
self.pbs += " mkdir -p " + self.hydro_dir + '\n'
# create the eigen analysis dir just in case that is necessary
@@ -2200,7 +2205,7 @@ class PBS(object):
fname_pbs_out=fname_pbs_out,
winenumactl=self.winenumactl)
self.pbs += ' echo "execute HAWC2, do not fork and wait"\n'
- self.pbs += " %s \n" % execstr
+ self.pbs += " %s\n" % execstr
# param = (self.winenumactl, hawc2_exe, self.htc_dir+case,
# self.wine_appendix)
@@ -5155,6 +5160,63 @@ class MannTurb64(prepost.PBSScript):
self.silent = silent
self.pbs_in_dir = 'pbs_in_turb/'
+ def create_turb(self, base_name, out_base, turb_dir, turb_db_dir, param):
+ """
+
+ Parameters
+ ----------
+
+ base_name
+
+ out_base
+
+ turb_dir
+
+ turb_db_dir
+
+ param : dictionary
+ Should contain the following keys: [MannAlfaEpsilon], [MannL]
+ [MannGamma], [seed], [turb_nr_u], [turb_nr_u], [turb_nr_w],
+ [turb_dx], [turb_dy], [turb_dz], [high_freq_comp]
+ """
+
+ self.path_pbs_e = os.path.join(out_base, turb_dir, base_name + '.err')
+ self.path_pbs_o = os.path.join(out_base, turb_dir, base_name + '.out')
+ self.path_pbs_i = os.path.join(self.pbs_in_dir, turb_dir, base_name + '.p')
+
+ # apply winefix
+ self.prelude = self.winefix
+ # browse to scratch dir
+ self.prelude += 'cd {}\n'.format(self.scratchdir)
+
+ self.coda = '# COPY BACK FROM SCRATCH AND RENAME, remove _ at end\n'
+ # copy back to turb dir at the end
+ if turb_db_dir is not None:
+ dst = os.path.join('$PBS_O_WORKDIR', turb_db_dir, base_name)
+ else:
+ dst = os.path.join('$PBS_O_WORKDIR', turb_dir, base_name)
+ # FIXME: Mann64 turb exe creator adds an underscore to output
+ for comp in list('uvw'):
+ src = '{}_{}.bin'.format(base_name, comp)
+ dst2 = '{}{}.bin'.format(dst, comp)
+ self.coda += 'cp {} {}\n'.format(src, dst2)
+
+ # alfaeps, L, gamma, seed, nr_u, nr_v, nr_w, du, dv, dw high_freq_comp
+ rpl = (float(param['[MannAlfaEpsilon]']),
+ float(param['[MannL]']),
+ float(param['[MannGamma]']),
+ int(float(param['[seed]'])),
+ int(float(param['[turb_nr_u]'])),
+ int(float(param['[turb_nr_v]'])),
+ int(float(param['[turb_nr_w]'])),
+ float(param['[turb_dx]']),
+ float(param['[turb_dy]']),
+ float(param['[turb_dz]']),
+ int(float(param['[high_freq_comp]'])))
+ params = '%1.6f %1.6f %1.6f %i %i %i %i %1.4f %1.4f %1.4f %i' % rpl
+ self.execution = '%s %s %s' % (self.exe, base_name, params)
+ self.create(check_dirs=True)
+
def gen_pbs(self, cases):
"""
Parameters
@@ -5169,57 +5231,51 @@ class MannTurb64(prepost.PBSScript):
self.pbsworkdir = os.path.join(case0['[run_dir]'], '')
if not self.silent:
print('\nStart creating PBS files for turbulence with Mann64...')
- for cname, case in cases.items():
- # only relevant for cases with turbulence
- if '[tu_model]' in case and int(case['[tu_model]']) == 0:
- continue
- if '[turb_base_name]' not in case:
- continue
+ mann_turb = ['[MannAlfaEpsilon]', '[MannL]', '[MannGamma]',
+ '[turb_nr_u]', '[turb_nr_v]', '[turb_nr_w]', '[seed]',
+ '[turb_dx]', '[turb_dy]', '[turb_dz]',
+ '[high_freq_comp]']
+ mann_micro = {k:k.replace(']', '_micro]') for k in mann_turb}
+ mann_meander = {k:k.replace(']', '_meander]') for k in mann_turb}
+
+ for cname, case in cases.items():
- base_name = case['[turb_base_name]']
- # pbs_in/out dir can contain subdirs, only take the inner directory
+ # pbs_in/out dir can contain subdirs, only take the base directory
out_base = misc.path_split_dirs(case['[pbs_out_dir]'])[0]
- turb = case['[turb_dir]']
-
- self.path_pbs_e = os.path.join(out_base, turb, base_name + '.err')
- self.path_pbs_o = os.path.join(out_base, turb, base_name + '.out')
- self.path_pbs_i = os.path.join(self.pbs_in_dir, base_name + '.p')
-
- # apply winefix
- self.prelude = self.winefix
- # browse to scratch dir
- self.prelude += 'cd {}\n'.format(self.scratchdir)
-
- self.coda = '# COPY BACK FROM SCRATCH AND RENAME, remove _ at end\n'
- # copy back to turb dir at the end
- if case['[turb_db_dir]'] is not None:
- dst = os.path.join('$PBS_O_WORKDIR', case['[turb_db_dir]'],
- base_name)
- else:
- dst = os.path.join('$PBS_O_WORKDIR', case['[turb_dir]'],
- base_name)
- # FIXME: Mann64 turb exe creator adds an underscore to output
- for comp in list('uvw'):
- src = '{}_{}.bin'.format(base_name, comp)
- dst2 = '{}{}.bin'.format(dst, comp)
- self.coda += 'cp {} {}\n'.format(src, dst2)
-
- # alfaeps, L, gamma, seed, nr_u, nr_v, nr_w, du, dv, dw high_freq_comp
- rpl = (float(case['[MannAlfaEpsilon]']),
- float(case['[MannL]']),
- float(case['[MannGamma]']),
- int(case['[seed]']),
- int(case['[turb_nr_u]']),
- int(case['[turb_nr_v]']),
- int(case['[turb_nr_w]']),
- float(case['[turb_dx]']),
- float(case['[turb_dy]']),
- float(case['[turb_dz]']),
- int(case['[high_freq_comp]']))
- params = '%1.6f %1.6f %1.6f %i %i %i %i %1.4f %1.4f %1.4f %i' % rpl
- self.execution = '%s %s %s' % (self.exe, base_name, params)
- self.create(check_dirs=True)
+
+ # NORMAL ATMOSPHERIC TURBULENCE
+ # only relevant for cases with turbulence
+ req = '[tu_model]' in case and '[turb_base_name]' in case
+ if req and int(case['[tu_model]'])==1:
+ base = case['[turb_base_name]']
+ # pbs_in/out dir can contain subdirs, only take the base directory
+ turb_dir = case['[turb_dir]']
+ turb_db_dir = case['[turb_db_dir]']
+ # more fail safe switches in case user did not change defaults
+ if turb_dir and base and base.lower()!='none' and base!='':
+ self.create_turb(base, out_base, turb_dir, turb_db_dir,
+ {key:case[key] for key in mann_turb})
+
+ # MICRO TURBULENCE
+ if ('[micro_dir]' in case) and ('[micro_base_name]' in case):
+ base = case['[micro_base_name]']
+ turb_dir = case['[micro_dir]']
+ turb_db_dir = case['[micro_db_dir]']
+ # more fail safe switches in case user did not change defaults
+ if turb_dir and base and base.lower()!='none' and base!='':
+ p = {key:case[mann_micro[key]] for key in mann_turb}
+ self.create_turb(base, out_base, turb_dir, turb_db_dir, p)
+
+ # MEANDER TURBULENCE
+ if ('[meander_dir]' in case) and ('[meander_base_name]' in case):
+ base = case['[meander_base_name]']
+ turb_dir = case['[meander_dir]']
+ turb_db_dir = case['[meander_db_dir]']
+ # more fail safe switches in case user did not change defaults
+ if turb_dir and base and base.lower()!='none' and base!='':
+ p = {key:case[mann_meander[key]] for key in mann_turb}
+ self.create_turb(base, out_base, turb_dir, turb_db_dir, p)
def eigenbody(cases, debug=False):
diff --git a/wetb/prepost/dlcdefs.py b/wetb/prepost/dlcdefs.py
index 69ef0a15b21f6312e24ae8e719d6dad1b934729e..1f4e754df00522503865343de486cba8a045966f 100644
--- a/wetb/prepost/dlcdefs.py
+++ b/wetb/prepost/dlcdefs.py
@@ -296,7 +296,7 @@ def tags_defaults(master):
master.tags['[iter_dir]'] = 'iter/'
master.tags['[turb_dir]'] = 'turb/'
master.tags['[turb_db_dir]'] = '../turb/'
- master.tags['[wake_dir]'] = False
+ master.tags['[micro_dir]'] = False
master.tags['[hydro_dir]'] = False
master.tags['[mooring_dir]'] = False
master.tags['[externalforce]'] = False
@@ -416,7 +416,7 @@ def excel_stabcon(proot, fext='xlsx', pignore=None, pinclude=None, sheet=0,
tags_dict[str(key)] = str(value)
else:
tags_dict[str(key)] = value
- # convert ; and empty to False/True
+ # convert ; and empty to False/True, "none" to None
if isinstance(tags_dict[str(key)], str):
if tags_dict[str(key)] == ';':
tags_dict[str(key)] = False
@@ -424,6 +424,8 @@ def excel_stabcon(proot, fext='xlsx', pignore=None, pinclude=None, sheet=0,
tags_dict[str(key)] = True
elif tags_dict[str(key)].lower() == 'nan':
tags_dict[str(key)] = True
+ elif tags_dict[str(key)].lower() == 'none':
+ tags_dict[str(key)] = None
# FIXME: this horrible mess requires a nice and clearly defined
# tag spec/naming convention, and with special tag prefix
@@ -443,6 +445,14 @@ def excel_stabcon(proot, fext='xlsx', pignore=None, pinclude=None, sheet=0,
else:
raise KeyError('[seed] should be used as tag for turb. seed')
+ # for backwards compatibility
+ if '[wake_dir]' in tags_dict and not '[micro_dir]':
+ tags_dict['[micro_dir]'] = tags_dict['[wake_dir]']
+ if '[wake_db_dir]' in tags_dict and not '[micro_db_dir]':
+ tags_dict['[micro_db_dir]'] = tags_dict['[wake_db_dir]']
+ if '[wake_base_name]' in tags_dict and not '[micro_base_name]':
+ tags_dict['[micro_base_name]'] = tags_dict['[wake_base_name]']
+
tags_dict['[Case folder]'] = tags_dict['[Case folder]'].lower()
tags_dict['[Case id.]'] = tags_dict['[Case id.]'].lower()
dlc_case = tags_dict['[Case folder]']
@@ -460,11 +470,17 @@ def excel_stabcon(proot, fext='xlsx', pignore=None, pinclude=None, sheet=0,
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:
+
+ if '[Turb base name]' in tags_dict:
+ if not '[turb_base_name]' in tags_dict:
+ tags_dict['[turb_base_name]'] = tags_dict['[Turb base name]']
+ elif not '[turb_base_name]' in tags_dict:
tags_dict['[turb_base_name]'] = None
tags_dict['[Turb base name]'] = None
+ # for backwards compatibility: user has only defined [Turb base name]
+ elif not '[Turb base name]' in tags_dict:
+ tags_dict['[Turb base name]'] = tags_dict['[turb_base_name]']
+
tags_dict['[DLC]'] = tags_dict['[Case id.]'].split('_')[0][3:]
if '[pbs_out_dir]' not in tags_dict:
tags_dict['[pbs_out_dir]'] = 'pbs_out/%s/' % dlc_case
diff --git a/wetb/prepost/dlctemplate.py b/wetb/prepost/dlctemplate.py
index c1c58cb6550faa1cccb211f5042c3090ccd511e0..56cb207fa10801dcc93d6a370a656c2269ce0e4f 100644
--- a/wetb/prepost/dlctemplate.py
+++ b/wetb/prepost/dlctemplate.py
@@ -277,10 +277,24 @@ def launch_dlcs_excel(sim_id, silent=False, verbose=False, pbs_turb=False,
iter_dict['[empty]'] = [False]
if postpro_node or postpro_node_zipchunks:
+# pyenv = 'py36-wetb'
pyenv = 'wetb_py3'
else:
pyenv = None
+ # if linux:
+ # pyenv = 'wetb_py3'
+ # pyenv_cmd = 'source /home/python/miniconda3/bin/activate'
+ # exesingle = "{hawc2_exe:} {fname_htc:}"
+ # exechunks = "({winenumactl:} {hawc2_exe:} {fname_htc:}) "
+ # exechunks += "2>&1 | tee {fname_pbs_out:}"
+ # else:
+ # pyenv = ''
+ # pyenv_cmd = 'source /home/ozgo/bin/activate_hawc2cfd.sh'
+ # exesingle = "time {hawc2_exe:} {fname_htc:}"
+ # exechunks = "(time numactl --physcpubind=$CPU_NR {hawc2_exe:} {fname_htc:}) "
+ # exechunks += "2>&1 | tee {fname_pbs_out:}"
+
# see if a htc/DLCs dir exists
# Load all DLC definitions and make some assumptions on tags that are not
# defined
@@ -507,8 +521,19 @@ def postpro_node_merge(tqdm=False, zipchunks=False, m=[3,4,6,8,9,10,12]):
# a line for the header
mdf.txt2txt(fcsv, path_pattern, tarmode='r:xz', header=None,
header_fjoined=lf._header(), recursive=True)
+
+ # FIXME: this is due to bug in log file analysis. What is going on here??
+ # fix that some cases do not have enough columns
+ with open(fcsv.replace('.csv', '2.csv'), 'w') as f1:
+ with open(fcsv) as f2:
+ for line in f2.readlines():
+ if len(line.split(';'))==96:
+ line = line.replace(';0.00000000000;nan;-0.0000;',
+ '0.00000000000;nan;-0.0000;')
+ f1.write(line)
+
# convert from CSV to DataFrame
- df = lf.csv2df(fcsv)
+ df = lf.csv2df(fcsv.replace('.csv', '2.csv'))
df.to_hdf(fcsv.replace('.csv', '.h5'), 'table')
# -------------------------------------------------------------------------
path_pattern = os.path.join(P_RUN, 'res', '*', '*.csv')
diff --git a/wetb/prepost/simchunks.py b/wetb/prepost/simchunks.py
index 45acab2f2c817592130e28aa45cb57686e347ca0..47c27d5f21af511e4305b7e1ea934c12a4f83301 100644
--- a/wetb/prepost/simchunks.py
+++ b/wetb/prepost/simchunks.py
@@ -68,11 +68,12 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
fname_model = os.path.join(run_dir, model_zip)
with zipfile.ZipFile(fname_model, 'r') as zf_model:
for n in zf_model.namelist():
+ # FIXME: might be duplicates when creating dirs from dirtags
zf.writestr(n, zf_model.open(n).read())
# create all necessary directories in the zip file
dirtags = ['[htc_dir]', '[res_dir]','[log_dir]','[animation_dir]',
- '[pbs_in_dir]', '[eigenfreq_dir]','[turb_dir]','[wake_dir]',
+ '[pbs_in_dir]', '[eigenfreq_dir]','[turb_dir]','[micro_dir]',
'[meander_dir]','[hydro_dir]', '[mooring_dir]',
'[pbs_in_dir]', '[pbs_out_dir]']
dirnames = []
@@ -82,6 +83,7 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
dirnames.append(dirname)
for dirname in set(dirnames):
if dirname != 0:
+ # FIXME: might have duplicates from the base model zip file
zf.write('.', os.path.join(dirname, '.'))
# and the post-processing data
@@ -274,7 +276,7 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
pbs += "echo 'current working directory:'\n"
pbs += 'pwd\n'
pbs += 'echo "create turb_db directories"\n'
- turb_db_tags = ['[turb_db_dir]', '[meand_db_dir]', '[wake_db_dir]']
+ turb_db_tags = ['[turb_db_dir]', '[meander_db_dir]', '[micro_db_dir]']
turb_db_dirs = []
for tag in turb_db_tags:
for dirname in set(df[tag].unique().tolist()):
@@ -283,7 +285,7 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
turb_db_dirs.append(dirname)
turb_db_dirs = set(turb_db_dirs)
# create all turb dirs
- for dirname in turb_db_dirs:
+ for dirname in sorted(turb_db_dirs):
pbs += 'mkdir -p %s\n' % os.path.join(dirname, '')
# =====================================================================
@@ -294,25 +296,36 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
pbs += 'cd $PBS_O_WORKDIR\n'
pbs += "echo 'current working directory:'\n"
pbs += 'pwd\n'
- base_name_tags = ['[turb_base_name]', '[meand_base_name]',
- '[wake_base_name]']
+ base_name_tags = ['[turb_base_name]', '[meander_base_name]',
+ '[micro_base_name]']
for db, base_name in zip(turb_db_tags, base_name_tags):
turb_db_dirs = df[db] + df[base_name]
# When set to None, the DataFrame will have text as None
# FIXME: CI runner has and old pandas version (v0.14.1)
try:
- turb_db_src = turb_db_dirs[turb_db_dirs.str.find('None')==-1]
+ p1 = turb_db_dirs.str.find('None')==-1
+ p2 = turb_db_dirs.str.find('none')==-1
+ p3 = turb_db_dirs.str.find('false')==-1
+ p4 = turb_db_dirs.str.find('False')==-1
+# p4 = turb_db_dirs.str.find('0')==-1
+ turb_db_src = turb_db_dirs[p1 & p2 & p3 & p4]
except AttributeError:
# and findall returns list with the search str occuring as
# many times as found in the str...
# sel should be True if str does NOT occur in turb_db_dirs
# meaning if findall returns empty list
- findall = turb_db_dirs.str.findall('None').tolist()
- sel = [True if len(k)==0 else False for k in findall]
+ sel = [True]*len(turb_db_dirs)
+ for val in ['false', 'none', 'None', 'False']:
+ findall = turb_db_dirs.str.findall(val).tolist()
+ # len==0 if nothing has been found
+ sel_ = [True if len(k)==0 else False for k in findall]
+ # merge with other search results, none of the elements
+ # should occur
+ sel = [True if k and kk else False for k, kk in zip(sel, sel_)]
turb_db_src = turb_db_dirs[sel]
pbs += '\n'
pbs += '# copy to scratch db directory for %s, %s\n' % (db, base_name)
- for k in turb_db_src.unique():
+ for k in sorted(turb_db_src.unique()):
dst = os.path.dirname(os.path.join(pbase, sim_id, k))
pbs += 'cp %s* %s\n' % (k, os.path.join(dst, '.'))
@@ -323,14 +336,14 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
pbs += "echo 'current working directory:'\n"
pbs += 'pwd\n'
pbs += 'echo "create turb directories in CPU dirs"\n'
- turb_dir_tags = ['[turb_dir]', '[meand_dir]', '[wake_dir]']
+ turb_dir_tags = ['[turb_dir]', '[meander_dir]', '[micro_dir]']
turb_dirs = []
for tag in turb_dir_tags:
for dirname in set(df[tag].unique().tolist()):
dirname_s = str(dirname).replace('.', '').replace('/', '')
if dirname_s.lower() not in ['false', 'none', '0']:
turb_dirs.append(dirname)
- turb_dirs = set(turb_dirs)
+ turb_dirs = sorted(set(turb_dirs))
for k in list(range(ppn)):
for dirname in turb_dirs:
pbs += 'mkdir -p %s\n' % os.path.join(str(k), dirname, '')
@@ -504,7 +517,24 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
if not os.path.exists(fpath):
os.makedirs(fpath)
- df_iter = chunker(df, nr_procs_series*ppn)
+ # remove all cases that start with test_ and move them into a separate
+ # chunk
+ # FIXME: CI runner has and old pandas version (v0.14.1)
+ try:
+ sel_notest = df['[Case folder]'].str.find('test_')<0
+ sel_test = ~sel_notest
+ except AttributeError:
+ # and findall returns list with the search str occuring as
+ # many times as found in the str...
+ findall = df['[Case folder]'].str.findall('test_').tolist()
+ # len==0 if nothing has been found
+ sel_notest = [True if len(k)==0 else False for k in findall]
+ sel_test = [not k for k in sel_notest]
+ df_dlc = df[sel_notest]
+ df_test = df[sel_test]
+
+ # DLC CHUNKS
+ df_dlc_iter = chunker(df_dlc, nr_procs_series*ppn)
sim_id = df['[sim_id]'].iloc[0]
run_dir = df['[run_dir]'].iloc[0]
model_zip = df['[model_zip]'].iloc[0]
@@ -512,19 +542,34 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
nodes = 1
df_ind = pd.DataFrame(columns=['chnk_nr'], dtype=np.int32)
df_ind.index.name = '[case_id]'
- for ii, dfi in enumerate(df_iter):
+ for ii, dfi in enumerate(df_dlc_iter):
fname, ind = make_zip_chunks(dfi, i0+ii, sim_id, run_dir, model_zip)
make_pbs_chunks(dfi, i0+ii, sim_id, run_dir, model_zip,
wine_arch=wine_arch, wine_prefix=wine_prefix,
compress=compress)
df_ind = df_ind.append(ind)
print(fname)
-
fname = os.path.join(post_dir, 'case_id-chunk-index')
df_ind['chnk_nr'] = df_ind['chnk_nr'].astype(np.int32)
df_ind.to_hdf(fname+'.h5', 'table', compression=9, complib='zlib')
df_ind.to_csv(fname+'.csv')
+ # TEST CHUNKS
+ df_test_iter = chunker(df_test, nr_procs_series*ppn)
+ df_ind = pd.DataFrame(columns=['chnk_nr'], dtype=np.int32)
+ df_ind.index.name = '[case_id]'
+ for ii, dfi in enumerate(df_test_iter):
+ fname, ind = make_zip_chunks(dfi, 90000+ii, sim_id, run_dir, model_zip)
+ make_pbs_chunks(dfi, 90000+ii, sim_id, run_dir, model_zip,
+ wine_arch=wine_arch, wine_prefix=wine_prefix,
+ compress=compress)
+ df_ind = df_ind.append(ind)
+ print(fname)
+ fname = os.path.join(post_dir, 'case_id-chunk-test-index')
+ df_ind['chnk_nr'] = df_ind['chnk_nr'].astype(np.int32)
+ df_ind.to_hdf(fname+'.h5', 'table', compression=9, complib='zlib')
+ df_ind.to_csv(fname+'.csv')
+
def regroup_tarfiles(cc):
"""Re-group all chunks again per [Case folder] compressed file. First all
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/demo_dlc_remote.zip b/wetb/prepost/tests/data/demo_dlc/ref/demo_dlc_remote.zip
index 3c02a1d7a11acaeff10fdae72416c4856fcbc4bc..45726903558776c88e95bdc40e69a9fa7c125369 100644
Binary files a/wetb/prepost/tests/data/demo_dlc/ref/demo_dlc_remote.zip and b/wetb/prepost/tests/data/demo_dlc/ref/demo_dlc_remote.zip differ
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/htc/DLCs/dlc01_demos.xlsx b/wetb/prepost/tests/data/demo_dlc/ref/htc/DLCs/dlc01_demos.xlsx
index 6b4bb2d9fe4f7b5b2e347ecb8da55e2cd3695669..7bfe0aa04b9a638480e5c6de023b196c3e048a0a 100755
Binary files a/wetb/prepost/tests/data/demo_dlc/ref/htc/DLCs/dlc01_demos.xlsx and b/wetb/prepost/tests/data/demo_dlc/ref/htc/DLCs/dlc01_demos.xlsx differ
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp11_s101.htc b/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp11_s101.htc
index 1e90311901dfa186b63e07af76f945146c173448..ab2178550615f59d3518b5bd5ee92fb48aa92f5a 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp11_s101.htc
+++ b/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp11_s101.htc
@@ -382,7 +382,7 @@ begin wind ;
filename_u ./turb/turb_s101_11msu.bin ;
filename_v ./turb/turb_s101_11msv.bin ;
filename_w ./turb/turb_s101_11msw.bin ;
- box_dim_u 512 0.85938 ;
+ box_dim_u 512 0.859375 ;
box_dim_v 32 7.5;
box_dim_w 32 7.5;
std_scaling 1.0 0.7 0.5 ;
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc b/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc
index 930ccc95e059f661c4a159c245f002d1646ebf7d..a9f9db89b5e9f5917bc386cb69469287cc4343e5 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc
+++ b/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc
@@ -379,10 +379,10 @@ begin wind ;
;
begin mann ;
create_turb_parameters 29.4 1.0 3.9 0 1.0 ; L, alfaeps, gamma, seed, highfrq compensation
- filename_u ./turb/noneu.bin ;
- filename_v ./turb/nonev.bin ;
- filename_w ./turb/nonew.bin ;
- box_dim_u 512 0.03906 ;
+ filename_u ./turb/Noneu.bin ;
+ filename_v ./turb/Nonev.bin ;
+ filename_w ./turb/Nonew.bin ;
+ box_dim_u 512 0.0390625 ;
box_dim_v 32 7.5;
box_dim_w 32 7.5;
std_scaling 1.0 0.7 0.5 ;
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc b/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc
index cab1eb201e061768cda344d6623715d4de3b043e..a25168ae89c08bd5edcca23f4ac16c7284569d4b 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc
+++ b/wetb/prepost/tests/data/demo_dlc/ref/htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc
@@ -379,10 +379,10 @@ begin wind ;
;
begin mann ;
create_turb_parameters 29.4 1.0 3.9 0 1.0 ; L, alfaeps, gamma, seed, highfrq compensation
- filename_u ./turb/noneu.bin ;
- filename_v ./turb/nonev.bin ;
- filename_w ./turb/nonew.bin ;
- box_dim_u 512 0.04395 ;
+ filename_u ./turb/Noneu.bin ;
+ filename_v ./turb/Nonev.bin ;
+ filename_w ./turb/Nonew.bin ;
+ box_dim_u 512 0.0439453 ;
box_dim_v 32 7.5;
box_dim_w 32 7.5;
std_scaling 1.0 0.7 0.5 ;
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 a2f204a876a4d00b188b8f126d16933e67940b6d..34da49132a67a517b8fbdb0f4ef72311c9965410 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
@@ -68,7 +68,7 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
# find+xargs mode: 1 PBS job, multiple cases
else
echo "execute HAWC2, do not fork and wait"
- (time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp10_s100.htc) 2>&1 | tee pbs_out/dlc01_demos/dlc01_steady_wsp10_s100.err.out
+ (time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp10_s100.htc) 2>&1 | tee pbs_out/dlc01_demos/dlc01_steady_wsp10_s100.err.out
fi
# ------------------------------------------------------------------------------
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 33f02992f48ef4ab61fd1218e8dc49b174c1262e..058929a0a67691e810230e8916adf8b768374d36 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
@@ -38,8 +38,12 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
mkdir -p res/dlc01_demos/
mkdir -p logfiles/dlc01_demos/
mkdir -p turb/
+ mkdir -p turb_micro/
+ mkdir -p turb_meander/
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/
+ cp -R $PBS_O_WORKDIR/turb_micro/micro_s101_11ms*.bin turb_micro/
+ cp -R $PBS_O_WORKDIR/turb_meander/meander_s101_11ms*.bin turb_meander/
_HOSTNAME_=`hostname`
if [[ ${_HOSTNAME_:0:1} == "j" ]] ; then
WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
@@ -68,7 +72,7 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
# find+xargs mode: 1 PBS job, multiple cases
else
echo "execute HAWC2, do not fork and wait"
- (time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp11_s101.htc) 2>&1 | tee pbs_out/dlc01_demos/dlc01_steady_wsp11_s101.err.out
+ (time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp11_s101.htc) 2>&1 | tee pbs_out/dlc01_demos/dlc01_steady_wsp11_s101.err.out
fi
# ------------------------------------------------------------------------------
@@ -87,6 +91,8 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
mkdir -p $PBS_O_WORKDIR/logfiles/dlc01_demos/
mkdir -p $PBS_O_WORKDIR/animation/
mkdir -p $PBS_O_WORKDIR/../turb/
+ mkdir -p $PBS_O_WORKDIR/turb_micro/
+ mkdir -p $PBS_O_WORKDIR/turb_meander/
cp -R res/dlc01_demos/. $PBS_O_WORKDIR/res/dlc01_demos/.
cp -R logfiles/dlc01_demos/. $PBS_O_WORKDIR/logfiles/dlc01_demos/.
cp -R animation/. $PBS_O_WORKDIR/animation/.
@@ -96,6 +102,12 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
cd turb/
for i in `ls *.bin`; do if [ -e $PBS_O_WORKDIR/../turb/$i ]; then echo "$i exists no copyback"; else echo "$i copyback"; cp $i $PBS_O_WORKDIR/../turb/; fi; done
cd /scratch/$USER/$PBS_JOBID/1/
+ cd turb_micro/
+ for i in `ls *.bin`; do if [ -e $PBS_O_WORKDIR/turb_micro/$i ]; then echo "$i exists no copyback"; else echo "$i copyback"; cp $i $PBS_O_WORKDIR/turb_micro/; fi; done
+ cd /scratch/$USER/$PBS_JOBID/1/
+ cd turb_meander/
+ for i in `ls *.bin`; do if [ -e $PBS_O_WORKDIR/turb_meander/$i ]; then echo "$i exists no copyback"; else echo "$i copyback"; cp $i $PBS_O_WORKDIR/turb_meander/; fi; done
+ cd /scratch/$USER/$PBS_JOBID/1/
echo "END COPY BACK TURB"
echo ""
@@ -120,6 +132,12 @@ else
cd turb/
for i in `ls *.bin`; do if [ -e $PBS_O_WORKDIR/../turb/$i ]; then echo "$i exists no copyback"; else echo "$i copyback"; cp $i $PBS_O_WORKDIR/../turb/; fi; done
cd /scratch/$USER/$PBS_JOBID/$CPU_NR/
+ cd turb_micro/
+ for i in `ls *.bin`; do if [ -e ../remote/turb_micro/$i ]; then echo "$i exists no copyback"; else echo "$i copyback"; cp $i ../remote/turb_micro/; fi; done
+ cd /scratch/$USER/$PBS_JOBID/$CPU_NR/
+ cd turb_meander/
+ for i in `ls *.bin`; do if [ -e ../remote/turb_meander/$i ]; then echo "$i exists no copyback"; else echo "$i copyback"; cp $i ../remote/turb_meander/; fi; done
+ cd /scratch/$USER/$PBS_JOBID/$CPU_NR/
echo "END COPY BACK TURB"
echo ""
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 909462333ad296912dbc7b564d73b3c87466c929..1e9d652ee49f1352eca4107cc85415b2d34d9c16 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
@@ -39,7 +39,6 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
mkdir -p logfiles/dlc01_demos/
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/
_HOSTNAME_=`hostname`
if [[ ${_HOSTNAME_:0:1} == "j" ]] ; then
WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
@@ -68,7 +67,7 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
# find+xargs mode: 1 PBS job, multiple cases
else
echo "execute HAWC2, do not fork and wait"
- (time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc) 2>&1 | tee pbs_out/dlc01_demos/dlc01_steady_wsp8_noturb.err.out
+ (time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp8_noturb.htc) 2>&1 | tee pbs_out/dlc01_demos/dlc01_steady_wsp8_noturb.err.out
fi
# ------------------------------------------------------------------------------
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 c4a0ee11250ba1e6143a0ba15da29a663ea645ac..91b4f5bc48b44231480da78734b517e435538a47 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
@@ -39,7 +39,6 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
mkdir -p logfiles/dlc01_demos/
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/
_HOSTNAME_=`hostname`
if [[ ${_HOSTNAME_:0:1} == "j" ]] ; then
WINEARCH=win32 WINEPREFIX=~/.wine32 winefix
@@ -68,7 +67,7 @@ if [ -z ${LAUNCH_PBS_MODE+x} ] ; then
# find+xargs mode: 1 PBS job, multiple cases
else
echo "execute HAWC2, do not fork and wait"
- (time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc) 2>&1 | tee pbs_out/dlc01_demos/dlc01_steady_wsp9_noturb.err.out
+ (time WINEARCH=win32 WINEPREFIX=~/.wine32 numactl --physcpubind=$CPU_NR wine hawc2-latest ./htc/dlc01_demos/dlc01_steady_wsp9_noturb.htc) 2>&1 | tee pbs_out/dlc01_demos/dlc01_steady_wsp9_noturb.err.out
fi
# ------------------------------------------------------------------------------
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s100_10ms.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb/turb_s100_10ms.p
similarity index 100%
rename from wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s100_10ms.p
rename to wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb/turb_s100_10ms.p
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s101_11ms.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb/turb_s101_11ms.p
similarity index 100%
rename from wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s101_11ms.p
rename to wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb/turb_s101_11ms.p
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_meander/meander_s101_11ms.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_meander/meander_s101_11ms.p
new file mode 100644
index 0000000000000000000000000000000000000000..90db7996f989e7b399c46cacc7bd0d9a45cafc1c
--- /dev/null
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_meander/meander_s101_11ms.p
@@ -0,0 +1,55 @@
+
+### Standard Output
+#PBS -N no_name_job
+#PBS -o ./pbs_out/turb_meander/meander_s101_11ms.out
+### Standard Error
+#PBS -e ./pbs_out/turb_meander/meander_s101_11ms.err
+#PBS -W umask=0003
+### Maximum wallclock time format HOURS:MINUTES:SECONDS
+#PBS -l walltime=00:59:59
+#PBS -lnodes=1:ppn=1
+### Queue name
+#PBS -q workq
+
+### #PBS -a [start_time]
+### #PBS -W depend=afterany:[job_id]
+
+### Browse to current working dir
+echo ""
+cd $PBS_O_WORKDIR
+echo "current working dir:"
+pwd
+echo ""
+
+### ===========================================================================
+echo "------------------------------------------------------------------------"
+echo "PRELUDE"
+echo "------------------------------------------------------------------------"
+
+winefix
+cd /scratch/$USER/$PBS_JOBID/
+
+
+echo ""
+echo "------------------------------------------------------------------------"
+echo "EXECUTION"
+echo "------------------------------------------------------------------------"
+
+time WINEARCH=win64 WINEPREFIX=~/.wine wine mann_turb_x64.exe meander_s101_11ms 11.000000 12.000000 13.000000 101 9 9 50 0.9990 0.9990 1.3300 1
+### wait for jobs to finish
+wait
+
+echo ""
+echo "------------------------------------------------------------------------"
+echo "CODA"
+echo "------------------------------------------------------------------------"
+
+# COPY BACK FROM SCRATCH AND RENAME, remove _ at end
+cp meander_s101_11ms_u.bin $PBS_O_WORKDIR/turb_meander/meander_s101_11msu.bin
+cp meander_s101_11ms_v.bin $PBS_O_WORKDIR/turb_meander/meander_s101_11msv.bin
+cp meander_s101_11ms_w.bin $PBS_O_WORKDIR/turb_meander/meander_s101_11msw.bin
+
+
+echo ""
+### ===========================================================================
+exit
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_micro/micro_s101_11ms.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_micro/micro_s101_11ms.p
new file mode 100644
index 0000000000000000000000000000000000000000..e4cd256dfb2a0b1052fc14f81e0e67c65cf15c5f
--- /dev/null
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_micro/micro_s101_11ms.p
@@ -0,0 +1,55 @@
+
+### Standard Output
+#PBS -N no_name_job
+#PBS -o ./pbs_out/turb_micro/micro_s101_11ms.out
+### Standard Error
+#PBS -e ./pbs_out/turb_micro/micro_s101_11ms.err
+#PBS -W umask=0003
+### Maximum wallclock time format HOURS:MINUTES:SECONDS
+#PBS -l walltime=00:59:59
+#PBS -lnodes=1:ppn=1
+### Queue name
+#PBS -q workq
+
+### #PBS -a [start_time]
+### #PBS -W depend=afterany:[job_id]
+
+### Browse to current working dir
+echo ""
+cd $PBS_O_WORKDIR
+echo "current working dir:"
+pwd
+echo ""
+
+### ===========================================================================
+echo "------------------------------------------------------------------------"
+echo "PRELUDE"
+echo "------------------------------------------------------------------------"
+
+winefix
+cd /scratch/$USER/$PBS_JOBID/
+
+
+echo ""
+echo "------------------------------------------------------------------------"
+echo "EXECUTION"
+echo "------------------------------------------------------------------------"
+
+time WINEARCH=win64 WINEPREFIX=~/.wine wine mann_turb_x64.exe micro_s101_11ms 21.000000 22.000000 23.000000 101 19 19 60 10.9990 10.9990 11.3300 1
+### wait for jobs to finish
+wait
+
+echo ""
+echo "------------------------------------------------------------------------"
+echo "CODA"
+echo "------------------------------------------------------------------------"
+
+# COPY BACK FROM SCRATCH AND RENAME, remove _ at end
+cp micro_s101_11ms_u.bin $PBS_O_WORKDIR/turb_micro/micro_s101_11msu.bin
+cp micro_s101_11ms_v.bin $PBS_O_WORKDIR/turb_micro/micro_s101_11msv.bin
+cp micro_s101_11ms_w.bin $PBS_O_WORKDIR/turb_micro/micro_s101_11msw.bin
+
+
+echo ""
+### ===========================================================================
+exit
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/prepost/remote_tags.txt b/wetb/prepost/tests/data/demo_dlc/ref/prepost/remote_tags.txt
index 2ff04e02808125e7d806675f513384775d1cf215..b8bdb8f8419e41a6cbf2fb3cad2ba421cc00f6c5 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/prepost/remote_tags.txt
+++ b/wetb/prepost/tests/data/demo_dlc/ref/prepost/remote_tags.txt
@@ -25,6 +25,12 @@
[G_t0] : True
[Grid loss time] : 5000
[Induction] : 1
+ [MannAlfaEpsilon_meander] : True
+ [MannAlfaEpsilon_micro] : True
+ [MannGamma_meander] : True
+ [MannGamma_micro] : True
+ [MannL_meander] : True
+ [MannL_micro] : True
[Pitch 1 DLC22b] : 0
[Pitvel 1] : 3
[Pitvel 2] : 4
@@ -34,7 +40,7 @@
[TI] : 0.232
[Time pitch runaway] : 5000
[Time stuck DLC22b] : -1
- [Turb base name] : none
+ [Turb base name] : None
[Windspeed] : 8
[case_id] : dlc01_steady_wsp8_noturb
[data_dir] : data/
@@ -42,15 +48,23 @@
[duration] : 20.0
[gust] : False
[gust_type] : True
+ [high_freq_comp_meander] : True
+ [high_freq_comp_micro] : True
[htc_dir] : htc/dlc01_demos/
[init_wr] : 0.5
[iter_dir] : iter/dlc01_demos/
[log_dir] : logfiles/dlc01_demos/
+ [meander_base_name] : None
+ [meander_dir] : None
+ [micro_base_name] : None
+ [micro_dir] : None
[out_format] : hawc_binary
[pbs_in_dir] : pbs_in/dlc01_demos/
[pbs_out_dir] : pbs_out/dlc01_demos/
[res_dir] : res/dlc01_demos/
[seed] : 0
+ [seed_meander] : True
+ [seed_micro] : True
[shear_exp] : 0
[staircase] : False
[t flap on] : -1
@@ -59,8 +73,21 @@
[time_stop] : 40
[tu_model] : 0
[tu_seed] : 0
- [turb_base_name] : none
- [turb_dx] : 0.03906
+ [turb_base_name] : None
+ [turb_dir] : turb/
+ [turb_dx] : 0.0390625
+ [turb_dx_meander] : True
+ [turb_dx_micro] : True
+ [turb_dy_meander] : True
+ [turb_dy_micro] : True
+ [turb_dz_meander] : True
+ [turb_dz_micro] : True
+ [turb_nr_u_meander] : True
+ [turb_nr_u_micro] : True
+ [turb_nr_v_meander] : True
+ [turb_nr_v_micro] : True
+ [turb_nr_w_meander] : True
+ [turb_nr_w_micro] : True
[wdir] : 0
[windramp] : False
[wsp factor] : 1.0
@@ -83,6 +110,12 @@
[G_t0] : True
[Grid loss time] : 5000
[Induction] : 1
+ [MannAlfaEpsilon_meander] : True
+ [MannAlfaEpsilon_micro] : True
+ [MannGamma_meander] : True
+ [MannGamma_micro] : True
+ [MannL_meander] : True
+ [MannL_micro] : True
[Pitch 1 DLC22b] : 0
[Pitvel 1] : 3
[Pitvel 2] : 4
@@ -92,7 +125,7 @@
[TI] : 0.2196
[Time pitch runaway] : 5000
[Time stuck DLC22b] : -1
- [Turb base name] : none
+ [Turb base name] : None
[Windspeed] : 9
[case_id] : dlc01_steady_wsp9_noturb
[data_dir] : data/
@@ -100,15 +133,23 @@
[duration] : 20.0
[gust] : False
[gust_type] : True
+ [high_freq_comp_meander] : True
+ [high_freq_comp_micro] : True
[htc_dir] : htc/dlc01_demos/
[init_wr] : 0.5
[iter_dir] : iter/dlc01_demos/
[log_dir] : logfiles/dlc01_demos/
+ [meander_base_name] : None
+ [meander_dir] : None
+ [micro_base_name] : None
+ [micro_dir] : None
[out_format] : hawc_binary
[pbs_in_dir] : pbs_in/dlc01_demos/
[pbs_out_dir] : pbs_out/dlc01_demos/
[res_dir] : res/dlc01_demos/
[seed] : 0
+ [seed_meander] : True
+ [seed_micro] : True
[shear_exp] : 0
[staircase] : False
[t flap on] : -1
@@ -117,8 +158,21 @@
[time_stop] : 40
[tu_model] : 0
[tu_seed] : 0
- [turb_base_name] : none
- [turb_dx] : 0.04395
+ [turb_base_name] : None
+ [turb_dir] : turb/
+ [turb_dx] : 0.0439453
+ [turb_dx_meander] : True
+ [turb_dx_micro] : True
+ [turb_dy_meander] : True
+ [turb_dy_micro] : True
+ [turb_dz_meander] : True
+ [turb_dz_micro] : True
+ [turb_nr_u_meander] : True
+ [turb_nr_u_micro] : True
+ [turb_nr_v_meander] : True
+ [turb_nr_v_micro] : True
+ [turb_nr_w_meander] : True
+ [turb_nr_w_micro] : True
[wdir] : 0
[windramp] : False
[wsp factor] : 0.8889
@@ -141,6 +195,12 @@
[G_t0] : True
[Grid loss time] : 5000
[Induction] : 1
+ [MannAlfaEpsilon_meander] : True
+ [MannAlfaEpsilon_micro] : True
+ [MannGamma_meander] : True
+ [MannGamma_micro] : True
+ [MannL_meander] : True
+ [MannL_micro] : True
[Pitch 1 DLC22b] : 0
[Pitvel 1] : 3
[Pitvel 2] : 4
@@ -158,15 +218,23 @@
[duration] : 20.0
[gust] : False
[gust_type] : True
+ [high_freq_comp_meander] : True
+ [high_freq_comp_micro] : True
[htc_dir] : htc/dlc01_demos/
[init_wr] : 0.5
[iter_dir] : iter/dlc01_demos/
[log_dir] : logfiles/dlc01_demos/
+ [meander_base_name] : None
+ [meander_dir] : None
+ [micro_base_name] : None
+ [micro_dir] : None
[out_format] : hawc_binary
[pbs_in_dir] : pbs_in/dlc01_demos/
[pbs_out_dir] : pbs_out/dlc01_demos/
[res_dir] : res/dlc01_demos/
[seed] : 100
+ [seed_meander] : True
+ [seed_micro] : True
[shear_exp] : 0
[staircase] : False
[t flap on] : -1
@@ -176,7 +244,20 @@
[tu_model] : 1
[tu_seed] : 100
[turb_base_name] : turb_s100_10ms
+ [turb_dir] : turb/
[turb_dx] : 0.78125
+ [turb_dx_meander] : True
+ [turb_dx_micro] : True
+ [turb_dy_meander] : True
+ [turb_dy_micro] : True
+ [turb_dz_meander] : True
+ [turb_dz_micro] : True
+ [turb_nr_u_meander] : True
+ [turb_nr_u_micro] : True
+ [turb_nr_v_meander] : True
+ [turb_nr_v_micro] : True
+ [turb_nr_w_meander] : True
+ [turb_nr_w_micro] : True
[wdir] : 0
[windramp] : False
[wsp factor] : 0.8
@@ -199,6 +280,12 @@
[G_t0] : True
[Grid loss time] : 5000
[Induction] : 1
+ [MannAlfaEpsilon_meander] : 11.0
+ [MannAlfaEpsilon_micro] : 21.0
+ [MannGamma_meander] : 13.0
+ [MannGamma_micro] : 23.0
+ [MannL_meander] : 12.0
+ [MannL_micro] : 22.0
[Pitch 1 DLC22b] : 0
[Pitvel 1] : 3
[Pitvel 2] : 4
@@ -216,15 +303,23 @@
[duration] : 20.0
[gust] : False
[gust_type] : True
+ [high_freq_comp_meander] : 1.0
+ [high_freq_comp_micro] : True
[htc_dir] : htc/dlc01_demos/
[init_wr] : 0.5
[iter_dir] : iter/dlc01_demos/
[log_dir] : logfiles/dlc01_demos/
+ [meander_base_name] : meander_s101_11ms
+ [meander_dir] : turb_meander/
+ [micro_base_name] : micro_s101_11ms
+ [micro_dir] : turb_micro/
[out_format] : hawc_binary
[pbs_in_dir] : pbs_in/dlc01_demos/
[pbs_out_dir] : pbs_out/dlc01_demos/
[res_dir] : res/dlc01_demos/
[seed] : 100
+ [seed_meander] : 101.0
+ [seed_micro] : 101.0
[shear_exp] : 0
[staircase] : False
[t flap on] : -1
@@ -234,7 +329,20 @@
[tu_model] : 1
[tu_seed] : 100
[turb_base_name] : turb_s101_11ms
- [turb_dx] : 0.85938
+ [turb_dir] : turb/
+ [turb_dx] : 0.859375
+ [turb_dx_meander] : 0.999
+ [turb_dx_micro] : 10.999
+ [turb_dy_meander] : 0.999
+ [turb_dy_micro] : 10.999
+ [turb_dz_meander] : 1.33
+ [turb_dz_micro] : 11.33
+ [turb_nr_u_meander] : 9.0
+ [turb_nr_u_micro] : 19.0
+ [turb_nr_v_meander] : 9.0
+ [turb_nr_v_micro] : 19.0
+ [turb_nr_w_meander] : 50.0
+ [turb_nr_w_micro] : 60.0
[wdir] : 0
[windramp] : False
[wsp factor] : 0.7273
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p
index 7683139f922f07df5ce82a1cf262cdf5c4c17e95..1e59d48fba61584dbe2b0011b166955a980e07ab 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p
@@ -81,13 +81,12 @@ echo 'current working directory:'
pwd
# copy to scratch db directory for [turb_db_dir], [turb_base_name]
-cp ../turb/none* /scratch/$USER/$PBS_JOBID/remote/../turb/.
cp ../turb/turb_s100_10ms* /scratch/$USER/$PBS_JOBID/remote/../turb/.
cp ../turb/turb_s101_11ms* /scratch/$USER/$PBS_JOBID/remote/../turb/.
-# copy to scratch db directory for [meand_db_dir], [meand_base_name]
+# copy to scratch db directory for [meander_db_dir], [meander_base_name]
-# copy to scratch db directory for [wake_db_dir], [wake_base_name]
+# copy to scratch db directory for [micro_db_dir], [micro_base_name]
echo "----------------------------------------------------------------------"
cd /scratch/$USER/$PBS_JOBID/
@@ -95,17 +94,41 @@ echo 'current working directory:'
pwd
echo "create turb directories in CPU dirs"
mkdir -p 0/turb/
+mkdir -p 0/turb_meander/
+mkdir -p 0/turb_micro/
mkdir -p 1/turb/
+mkdir -p 1/turb_meander/
+mkdir -p 1/turb_micro/
mkdir -p 2/turb/
+mkdir -p 2/turb_meander/
+mkdir -p 2/turb_micro/
mkdir -p 3/turb/
+mkdir -p 3/turb_meander/
+mkdir -p 3/turb_micro/
mkdir -p 4/turb/
+mkdir -p 4/turb_meander/
+mkdir -p 4/turb_micro/
mkdir -p 5/turb/
+mkdir -p 5/turb_meander/
+mkdir -p 5/turb_micro/
mkdir -p 6/turb/
+mkdir -p 6/turb_meander/
+mkdir -p 6/turb_micro/
mkdir -p 7/turb/
+mkdir -p 7/turb_meander/
+mkdir -p 7/turb_micro/
mkdir -p 8/turb/
+mkdir -p 8/turb_meander/
+mkdir -p 8/turb_micro/
mkdir -p 9/turb/
+mkdir -p 9/turb_meander/
+mkdir -p 9/turb_micro/
mkdir -p 10/turb/
+mkdir -p 10/turb_meander/
+mkdir -p 10/turb_micro/
mkdir -p 11/turb/
+mkdir -p 11/turb_meander/
+mkdir -p 11/turb_micro/
echo "----------------------------------------------------------------------"
cd /scratch/$USER/$PBS_JOBID/remote/
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.zip b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.zip
index 286bbcb3df1c3701910dbc45b42117a01559344a..b2c89af8c5e72e4214fbbd03741389525650e5ac 100644
Binary files a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.zip and b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.zip differ
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p
index 330c907689b3344dbc4d538ad13c939fc23b50ad..9625f4dd41e86717231735e676c989a9bec46b04 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p
@@ -97,13 +97,12 @@ echo 'current working directory:'
pwd
# copy to scratch db directory for [turb_db_dir], [turb_base_name]
-cp ../turb/none* /scratch/$USER/$PBS_JOBID/remote/../turb/.
cp ../turb/turb_s100_10ms* /scratch/$USER/$PBS_JOBID/remote/../turb/.
cp ../turb/turb_s101_11ms* /scratch/$USER/$PBS_JOBID/remote/../turb/.
-# copy to scratch db directory for [meand_db_dir], [meand_base_name]
+# copy to scratch db directory for [meander_db_dir], [meander_base_name]
-# copy to scratch db directory for [wake_db_dir], [wake_base_name]
+# copy to scratch db directory for [micro_db_dir], [micro_base_name]
echo "----------------------------------------------------------------------"
cd /scratch/$USER/$PBS_JOBID/
@@ -111,25 +110,65 @@ echo 'current working directory:'
pwd
echo "create turb directories in CPU dirs"
mkdir -p 0/turb/
+mkdir -p 0/turb_meander/
+mkdir -p 0/turb_micro/
mkdir -p 1/turb/
+mkdir -p 1/turb_meander/
+mkdir -p 1/turb_micro/
mkdir -p 2/turb/
+mkdir -p 2/turb_meander/
+mkdir -p 2/turb_micro/
mkdir -p 3/turb/
+mkdir -p 3/turb_meander/
+mkdir -p 3/turb_micro/
mkdir -p 4/turb/
+mkdir -p 4/turb_meander/
+mkdir -p 4/turb_micro/
mkdir -p 5/turb/
+mkdir -p 5/turb_meander/
+mkdir -p 5/turb_micro/
mkdir -p 6/turb/
+mkdir -p 6/turb_meander/
+mkdir -p 6/turb_micro/
mkdir -p 7/turb/
+mkdir -p 7/turb_meander/
+mkdir -p 7/turb_micro/
mkdir -p 8/turb/
+mkdir -p 8/turb_meander/
+mkdir -p 8/turb_micro/
mkdir -p 9/turb/
+mkdir -p 9/turb_meander/
+mkdir -p 9/turb_micro/
mkdir -p 10/turb/
+mkdir -p 10/turb_meander/
+mkdir -p 10/turb_micro/
mkdir -p 11/turb/
+mkdir -p 11/turb_meander/
+mkdir -p 11/turb_micro/
mkdir -p 12/turb/
+mkdir -p 12/turb_meander/
+mkdir -p 12/turb_micro/
mkdir -p 13/turb/
+mkdir -p 13/turb_meander/
+mkdir -p 13/turb_micro/
mkdir -p 14/turb/
+mkdir -p 14/turb_meander/
+mkdir -p 14/turb_micro/
mkdir -p 15/turb/
+mkdir -p 15/turb_meander/
+mkdir -p 15/turb_micro/
mkdir -p 16/turb/
+mkdir -p 16/turb_meander/
+mkdir -p 16/turb_micro/
mkdir -p 17/turb/
+mkdir -p 17/turb_meander/
+mkdir -p 17/turb_micro/
mkdir -p 18/turb/
+mkdir -p 18/turb_meander/
+mkdir -p 18/turb_micro/
mkdir -p 19/turb/
+mkdir -p 19/turb_meander/
+mkdir -p 19/turb_micro/
echo "----------------------------------------------------------------------"
cd /scratch/$USER/$PBS_JOBID/remote/
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.zip b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.zip
index 286bbcb3df1c3701910dbc45b42117a01559344a..b2c89af8c5e72e4214fbbd03741389525650e5ac 100644
Binary files a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.zip and b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.zip differ
diff --git a/wetb/prepost/tests/data/demo_dlc/source/htc/DLCs/dlc01_demos.xlsx b/wetb/prepost/tests/data/demo_dlc/source/htc/DLCs/dlc01_demos.xlsx
index e2b99c94f3fa9b74fcbc6d0602a4849b7713c369..cd350b43a56ac2c01f006899c06bc2515a09c465 100755
Binary files a/wetb/prepost/tests/data/demo_dlc/source/htc/DLCs/dlc01_demos.xlsx and b/wetb/prepost/tests/data/demo_dlc/source/htc/DLCs/dlc01_demos.xlsx differ
diff --git a/wetb/prepost/tests/test_Simulations.py b/wetb/prepost/tests/test_Simulations.py
index 4f18d65ccc4d3a2263610fade66b1fa395ab2570..baa5f317af979946bfef5db376cf8ca2e2e3cb36 100644
--- a/wetb/prepost/tests/test_Simulations.py
+++ b/wetb/prepost/tests/test_Simulations.py
@@ -98,12 +98,11 @@ class TestGenerateInputs(Template):
print()
raise
-
# we can not git check-in empty dirs so we can not compare the complete
# directory structure withouth manually creating the empty dirs here
for subdir in ['control', 'data', 'htc', 'pbs_in', 'pbs_in_turb',
'htc/_master', 'htc/dlc01_demos', 'pbs_in/dlc01_demos',
- 'zip-chunks-gorm', 'zip-chunks-jess']:
+ 'zip-chunks-jess', 'zip-chunks-gorm']:
remote = os.path.join(p_root, tmpl.PROJECT, 'remote', subdir)
ref = os.path.join(p_root, tmpl.PROJECT, 'ref', subdir)
# the zipfiles are taken care of separately