diff --git a/riemann/__init__.py b/riemann/__init__.py index 921754f..f40e1e0 100755 --- a/riemann/__init__.py +++ b/riemann/__init__.py @@ -50,6 +50,7 @@ from . import euler_3D_constants from . import burgers_3D_constants from . import vc_advection_3D_constants +from . import euler_mapgrid_3D try: @@ -99,6 +100,7 @@ from . import euler_3D from . import burgers_3D from . import vc_advection_3D + from . import euler_mapgrid_3D except ImportError as e: import traceback print("********************************************************************") diff --git a/riemann/meson.build b/riemann/meson.build index 1272983..559040e 100644 --- a/riemann/meson.build +++ b/riemann/meson.build @@ -111,6 +111,7 @@ riemann_2D = [ riemann_3D = [ 'vc_acoustics', 'euler', + 'euler_mapgrid', 'burgers', 'vc_advection', ] @@ -226,3 +227,24 @@ foreach name, sources: special_extensions install : true ) endforeach + +ext_name = 'mappedGrid' +ext_srcs = [ + srcdir / 'euler3d_mappedGrid.f90', +] +f2py_srcs = custom_target( + 'f2py_mappedGrid', + command: [f2py, ext_name], + input: ext_srcs, + output: [ext_name + 'module.c', ext_name + '-f2pywrappers2.f90'], + build_by_default: true, +) + +py.extension_module( + ext_name, [ext_srcs, f2py_srcs], + incdir_f2py / 'fortranobject.c', + include_directories: inc_np, + dependencies : py_dep, + subdir: pkg_dir, + install : true +)