Commit a25f3650 authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

.launch uses consistent code name

parent bf509869
...@@ -37,14 +37,14 @@ class FluidConvert(_fluid_particle_base): ...@@ -37,14 +37,14 @@ class FluidConvert(_fluid_particle_base):
""" """
def __init__( def __init__(
self, self,
name = 'FluidConvert', name = 'FluidConvert-v' + bfps.__version__,
work_dir = './', work_dir = './',
simname = 'test', simname = 'test',
fluid_precision = 'single', fluid_precision = 'single',
use_fftw_wisdom = True): use_fftw_wisdom = True):
_fluid_particle_base.__init__( _fluid_particle_base.__init__(
self, self,
name = name, name = name + '-' + fluid_precision,
work_dir = work_dir, work_dir = work_dir,
simname = simname, simname = simname,
dtype = fluid_precision, dtype = fluid_precision,
......
...@@ -38,14 +38,14 @@ class FluidResize(_fluid_particle_base): ...@@ -38,14 +38,14 @@ class FluidResize(_fluid_particle_base):
""" """
def __init__( def __init__(
self, self,
name = 'FluidResize', name = 'FluidResize-v' + bfps.__version__,
work_dir = './', work_dir = './',
simname = 'test', simname = 'test',
dtype = np.float32, dtype = np.float32,
use_fftw_wisdom = False): use_fftw_wisdom = False):
_fluid_particle_base.__init__( _fluid_particle_base.__init__(
self, self,
name = name, name = name + '-' + fluid_precision,
work_dir = work_dir, work_dir = work_dir,
simname = simname, simname = simname,
dtype = dtype, dtype = dtype,
......
...@@ -41,7 +41,7 @@ class NavierStokes(_fluid_particle_base): ...@@ -41,7 +41,7 @@ class NavierStokes(_fluid_particle_base):
""" """
def __init__( def __init__(
self, self,
name = 'NavierStokes', name = 'NavierStokes-v' + bfps.__version__,
work_dir = './', work_dir = './',
simname = 'test', simname = 'test',
fluid_precision = 'single', fluid_precision = 'single',
...@@ -54,7 +54,7 @@ class NavierStokes(_fluid_particle_base): ...@@ -54,7 +54,7 @@ class NavierStokes(_fluid_particle_base):
self.fftw_plan_rigor = fftw_plan_rigor self.fftw_plan_rigor = fftw_plan_rigor
_fluid_particle_base.__init__( _fluid_particle_base.__init__(
self, self,
name = name, name = name + '-' + fluid_precision,
work_dir = work_dir, work_dir = work_dir,
simname = simname, simname = simname,
dtype = fluid_precision, dtype = fluid_precision,
...@@ -62,8 +62,8 @@ class NavierStokes(_fluid_particle_base): ...@@ -62,8 +62,8 @@ class NavierStokes(_fluid_particle_base):
self.parameters['nu'] = 0.1 self.parameters['nu'] = 0.1
self.parameters['fmode'] = 1 self.parameters['fmode'] = 1
self.parameters['famplitude'] = 0.5 self.parameters['famplitude'] = 0.5
self.parameters['fk0'] = 1.5 self.parameters['fk0'] = 2.0
self.parameters['fk1'] = 3.0 self.parameters['fk1'] = 4.0
self.parameters['forcing_type'] = 'linear' self.parameters['forcing_type'] = 'linear'
self.parameters['histogram_bins'] = 256 self.parameters['histogram_bins'] = 256
self.parameters['max_velocity_estimate'] = 1.0 self.parameters['max_velocity_estimate'] = 1.0
...@@ -984,6 +984,11 @@ class NavierStokes(_fluid_particle_base): ...@@ -984,6 +984,11 @@ class NavierStokes(_fluid_particle_base):
self.QR_stats_on = opt.QR_stats self.QR_stats_on = opt.QR_stats
self.parameters['nu'] = (opt.kMeta * 2 / opt.n)**(4./3) self.parameters['nu'] = (opt.kMeta * 2 / opt.n)**(4./3)
self.parameters['dt'] = (opt.dtfactor / opt.n) self.parameters['dt'] = (opt.dtfactor / opt.n)
# custom famplitude for 288 and 576
if opt.n == 288:
self.parameters['famplitude'] = 0.45
elif opt.n == 576:
self.parameters['famplitude'] = 0.47
if ((self.parameters['niter_todo'] % self.parameters['niter_out']) != 0): if ((self.parameters['niter_todo'] % self.parameters['niter_out']) != 0):
self.parameters['niter_out'] = self.parameters['niter_todo'] self.parameters['niter_out'] = self.parameters['niter_todo']
if self.QR_stats_on: if self.QR_stats_on:
...@@ -993,6 +998,7 @@ class NavierStokes(_fluid_particle_base): ...@@ -993,6 +998,7 @@ class NavierStokes(_fluid_particle_base):
meantrS2 = (opt.n//2 / opt.kMeta)**4 * self.parameters['nu']**2 meantrS2 = (opt.n//2 / opt.kMeta)**4 * self.parameters['nu']**2
self.parameters['max_Q_estimate'] = meantrS2 self.parameters['max_Q_estimate'] = meantrS2
self.parameters['max_R_estimate'] = .4*meantrS2**1.5 self.parameters['max_R_estimate'] = .4*meantrS2**1.5
self.name += 'QR',
if len(opt.src_work_dir) == 0: if len(opt.src_work_dir) == 0:
opt.src_work_dir = opt.work_dir opt.src_work_dir = opt.work_dir
......
...@@ -198,7 +198,7 @@ class _code(_base): ...@@ -198,7 +198,7 @@ class _code(_base):
self.write_sge_file( self.write_sge_file(
file_name = os.path.join(self.work_dir, qsub_script_name), file_name = os.path.join(self.work_dir, qsub_script_name),
nprocesses = ncpu, nprocesses = ncpu,
name_of_run = self.name + '_' + suffix, name_of_run = suffix,
command_atoms = command_atoms[3:], command_atoms = command_atoms[3:],
hours = hours, hours = hours,
minutes = minutes, minutes = minutes,
...@@ -210,7 +210,7 @@ class _code(_base): ...@@ -210,7 +210,7 @@ class _code(_base):
qsub_atoms += ['-hold_jid', job_name_list[-1]] qsub_atoms += ['-hold_jid', job_name_list[-1]]
subprocess.call(qsub_atoms + [qsub_script_name]) subprocess.call(qsub_atoms + [qsub_script_name])
os.chdir(current_dir) os.chdir(current_dir)
job_name_list.append(self.name + '_' + suffix) job_name_list.append(suffix)
elif self.host_info['type'] == 'pc': elif self.host_info['type'] == 'pc':
os.chdir(self.work_dir) os.chdir(self.work_dir)
os.environ['LD_LIBRARY_PATH'] += ':{0}'.format(bfps.lib_dir) os.environ['LD_LIBRARY_PATH'] += ':{0}'.format(bfps.lib_dir)
......
...@@ -48,7 +48,7 @@ class _fluid_particle_base(_code): ...@@ -48,7 +48,7 @@ class _fluid_particle_base(_code):
work_dir = work_dir, work_dir = work_dir,
simname = simname) simname = simname)
self.use_fftw_wisdom = use_fftw_wisdom self.use_fftw_wisdom = use_fftw_wisdom
self.name = name + '_' + simname self.name = name
self.particle_species = 0 self.particle_species = 0
if dtype in [np.float32, np.float64]: if dtype in [np.float32, np.float64]:
self.dtype = dtype self.dtype = dtype
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment