From c1e299ff488411bde613c4561c5d75030d6d5d60 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Fri, 19 Jul 2019 16:24:42 -0500 Subject: [PATCH 1/3] Wrap l3dterms and h3dterms --- fmmlib3d | 2 +- wrappers.pyf.mako | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/fmmlib3d b/fmmlib3d index 339e93b..ff30e39 160000 --- a/fmmlib3d +++ b/fmmlib3d @@ -1 +1 @@ -Subproject commit 339e93bbc6025c4d93b805d92c1485fadbc770ff +Subproject commit ff30e39b21029974815b43a33c8c7c9e0576e86a diff --git a/wrappers.pyf.mako b/wrappers.pyf.mako index 87efd65..8f0de34 100644 --- a/wrappers.pyf.mako +++ b/wrappers.pyf.mako @@ -242,7 +242,7 @@ python module _internal integer, intent(out) :: nterms integer, intent(out) :: ier end subroutine l2dterms - + subroutine h2dterms(size,zk,eps,nterms,ier) ! implicit real *8 (a-h,o-z) real*8, intent(in) :: size @@ -252,6 +252,21 @@ python module _internal integer, intent(out) :: ier end subroutine h2dterms + subroutine l3dterms(eps,nterms,ier) + real*8, intent(in) :: eps + integer, intent(out) :: nterms + integer, intent(out) :: ier + end subroutine l3dterms + + subroutine h3dterms(size_bn,zk,eps,nterms,ier) + ! implicit real *8 (a-h,o-z) + real*8, intent(in) :: size_bn + complex*16, intent(in) :: zk + real*8, intent(in) :: eps + integer, intent(out) :: nterms + integer, intent(out) :: ier + end subroutine h3dterms + ! }}} ! {{{ rotation matrix construction @@ -264,7 +279,7 @@ python module _internal end subroutine rotviarecur3p_init ! }}} - + ! {{{ generated vectorized wrappers ${gen_vector_wrappers()} -- GitLab From d49df7b5cfb6df2037738a1742a78acdd3aeb936 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Fri, 19 Jul 2019 16:24:59 -0500 Subject: [PATCH 2/3] Bump version --- pyfmmlib/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfmmlib/version.py b/pyfmmlib/version.py index c288436..48e5f89 100644 --- a/pyfmmlib/version.py +++ b/pyfmmlib/version.py @@ -1,3 +1,3 @@ -VERSION = (2019, 1, 1) +VERSION = (2019, 1, 2) VERSION_STATUS = "" VERSION_TEXT = ".".join(str(x) for x in VERSION) + VERSION_STATUS -- GitLab From f69a4d39eb63ec4ff06b8a97b010f7982b35c058 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Fri, 19 Jul 2019 16:49:26 -0500 Subject: [PATCH 3/3] Reset fmmlib3d --- fmmlib3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fmmlib3d b/fmmlib3d index ff30e39..339e93b 160000 --- a/fmmlib3d +++ b/fmmlib3d @@ -1 +1 @@ -Subproject commit ff30e39b21029974815b43a33c8c7c9e0576e86a +Subproject commit 339e93bbc6025c4d93b805d92c1485fadbc770ff -- GitLab