From cd5967ed37aeee040e4380d01af03424a2c2c503 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Thu, 6 Jun 2019 19:08:20 +0200
Subject: [PATCH] fixed example utils
---
examples/example_utils.py | 16 ++++++++++------
.../device/codegen/base/struct_codegen.py | 3 ++-
.../backend/device/codegen/base/union_codegen.py | 3 ++-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/examples/example_utils.py b/examples/example_utils.py
index 3e6393056..8ba5de6c8 100644
--- a/examples/example_utils.py
+++ b/examples/example_utils.py
@@ -147,10 +147,14 @@ class HysopArgParser(argparse.ArgumentParser):
self._add_file_io_args(default_dump_dir)
self._add_term_io_args()
self._add_misc_args()
-
+
+ def pre_process_args(self, args):
+ pass
+
def run(self, program, **kwds):
args = self.parse_args()
args.__class__ = HysopNamespace
+ self.pre_process_args(args)
# SETUP I/O
from mpi4py import MPI
@@ -570,13 +574,13 @@ class HysopArgParser(argparse.ArgumentParser):
default=2,
dest='strang_order',
help='Set the default directional splitting order.')
- method.add_argument('-sdm', '--scalar-diffusion-mode', type=str,
- default='spectral', dest='scalar_diffusion_mode',
+ method.add_argument('-sdm', '--scalars-diffusion-mode', type=str,
+ default='spectral', dest='scalars_diffusion_mode',
help='Enforce either spectral or directional diffusion with finite differences for scalars. Vorticity diffusion mode may not be enforced by this parameter, see --vorticity-diffusion-mode. The default value is spectral diffusion mode.')
method.add_argument('-vdm', '--vorticity-diffusion-mode', type=str,
default='spectral', dest='vorticity_diffusion_mode',
help='Enforce either spectral or directional diffusion with finite differences for vorticity. Vorticity is a special case for diffusion because vorticity diffusion can be computed at the same time as the Poisson operator which recovers the velocity. Spectral diffusion of vorticity when divergence-free field projection is enabled is virtually free. The default value is spectral diffusion mode.')
- method.add_argument('-edst', '--enable-diffusion-substepping',
+ method.add_argument('--enable-diffusion-substepping',
dest='enable_diffusion_substepping', action='store_true',
help='Do not restrict timestep because of finite difference directional diffusion CFL but enforce substepping inside the operator depending on current timestep.')
@@ -588,7 +592,7 @@ class HysopArgParser(argparse.ArgumentParser):
'reprojection_frequency'), int, allow_none=False)
self._check_default(args, ('time_integrator', 'remesh_kernel', 'interpolation_filter',
'restriction_filter', 'stretching_formulation', 'polynomial_interpolator',
- 'vorticity_diffusion_mode', 'scalar_diffusion_mode'),
+ 'vorticity_diffusion_mode', 'scalars_diffusion_mode'),
str, allow_none=False)
self._check_positive(args, 'compute_granularity', strict=False, allow_none=False)
self._check_positive(args, 'fd_order', strict=True, allow_none=False)
@@ -614,7 +618,7 @@ class HysopArgParser(argparse.ArgumentParser):
args.advection_interpolator = \
self._convert_advection_interpolation('advection_interpolator', args.advection_interpolator)
self._check_and_set_diffusion_mode('vorticity_diffusion_mode', args)
- self._check_and_set_diffusion_mode('scalar_diffusion_mode', args)
+ self._check_and_set_diffusion_mode('scalars_diffusion_mode', args)
def _add_threading_args(self):
threading = self.add_argument_group('threading parameters')
diff --git a/hysop/backend/device/codegen/base/struct_codegen.py b/hysop/backend/device/codegen/base/struct_codegen.py
index b6ff919fc..f858f28f4 100644
--- a/hysop/backend/device/codegen/base/struct_codegen.py
+++ b/hysop/backend/device/codegen/base/struct_codegen.py
@@ -34,8 +34,9 @@ class StructCodeGenerator(OpenClCodeGenerator):
return self.dtype.fields
def c_decl(self):
+ assert (self.context is not None)
dtype,cdecl = cl.tools.match_dtype_to_c_struct( \
- self.device,self.ctype.replace('struct',''),self.dtype,self.context)
+ self.device,self.ctype.replace('struct',''),self.dtype,context=self.context)
return cdecl
def gencode(self, comments, ctype_overrides):
diff --git a/hysop/backend/device/codegen/base/union_codegen.py b/hysop/backend/device/codegen/base/union_codegen.py
index 98fb708ec..c574b2c5e 100644
--- a/hysop/backend/device/codegen/base/union_codegen.py
+++ b/hysop/backend/device/codegen/base/union_codegen.py
@@ -28,8 +28,9 @@ class UnionCodeGenerator(OpenClCodeGenerator):
self.gencode(comments, ctype_overrides)
def c_decl(self):
+ assert (self.context is not None)
dtype,cdecl = cl.tools.match_dtype_to_c_struct( \
- self.device,self.ctype.replace('union',''),self.dtype,self.context)
+ self.device,self.ctype.replace('union',''),self.dtype,context=self.context)
return cdecl
def fields(self):
--
GitLab