diff --git a/CMakeLists.txt b/CMakeLists.txt index 0702932..378e45d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # --------------------------------------------------------------------------- # # Author: Joey Dumont # # Author: Denis Gagnon # -# Date: 2015-02-26 # +# Date: 2015-06-01 # # Description: CMake compilation instructions. # # ----------------------------------------------------------------------------# @@ -31,7 +31,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall -march=native -std=c++11") # -- Compilation Instructions -- # # ----------------------------------------------------------------- # # -- Included files -include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include INC_LIST) +include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include) # -- Source files aux_source_directory (${CMAKE_CURRENT_SOURCE_DIR}/src SRC_LIST) diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 2099840..0000000 --- a/INSTALL +++ /dev/null @@ -1,370 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell command `./configure && make && make install' -should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 7cb72c6..0000000 --- a/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -# Autoconf flags -ACLOCAL_AMFLAGS = -I m4 - -# Name of library -lib_LTLIBRARIES = libcomplex_bessel.la - -# List of needed source files -libcomplex_bessel_la_SOURCES = src/machine.for src/zbesh.for src/amos_iso_c_fortran_wrapper.f90 -libcomplex_bessel_la_LDFLAGS = -release 0.4.0 - -# List of needed headers -library_includedir=$(includedir)/complex_bessel -library_include_HEADERS = src/fortranLinkage.h src/utilities.h src/besselFunctions.h - -library2_includedir=$(includedir) -library2_include_HEADERS = complex_bessel.h diff --git a/TODO b/TODO index 894d7ed..6abc6a3 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,7 @@ -July 2014 - [] Add support for real orders by carefully coding the reflection formulae. - [] Add support for real arguments via a static cast +June 2015 + [✓] Add support for real orders by carefully coding the reflection formulae. + [ ] Add support for real arguments via a static cast from double to complex. + [ ] Add support for spherical Bessel functions. + [ ] Test for more values of order and argument. + [ ] Add support for derivatives of spherical Bessel functions. diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 7fc6550..0000000 --- a/configure.ac +++ /dev/null @@ -1,33 +0,0 @@ -# Process this file with autoconf to produce a configure script. -AC_INIT(complex_bessel, 0.4.0, gagnon88@gmail.com) -AM_INIT_AUTOMAKE([1.10 -Wall no-define subdir-objects]) - -# Required autoconf version -AC_PREREQ([2.59]) - -# Configuration header to generate -AC_CONFIG_HEADERS([config.h]) - -# Required programs -AC_PROG_CXX -AC_PROG_CC - -# Check installation of Fortran 77 (gfortran is preferable) -AC_PROG_F77([gfortran f95 fl32 f77 fort77 xlf g77 f90 xlf90]) -AC_PROG_FC - -# Enable shared library -AC_PROG_INSTALL -AC_ENABLE_SHARED -AC_DISABLE_STATIC - -# Check for archiver -AM_PROG_AR - -# Check for libtool -LT_INIT - -# Configuration files -AC_CONFIG_FILES([Makefile]) -AC_CONFIG_MACRO_DIR([m4]) -AC_OUTPUT diff --git a/include/complex_bessel.h b/include/complex_bessel.h index c288482..615d7bc 100644 --- a/include/complex_bessel.h +++ b/include/complex_bessel.h @@ -1,5 +1,5 @@ -#ifndef CBESSEL_ -#define CBESSEL_ +#ifndef COMPLEX_BESSEL +#define COMPLEX_BESSEL /*! \file complex_bessel.h * @@ -23,5 +23,6 @@ #include "complex_bessel_bits/fortranLinkage.h" #include "complex_bessel_bits/utilities.h" #include "complex_bessel_bits/besselFunctions.h" +#include "complex_bessel_bits/sph_besselFunctions.h" -#endif +#endif // COMPLEX_BESSEL diff --git a/include/complex_bessel_bits/besselFunctions.h b/include/complex_bessel_bits/besselFunctions.h index f707860..cb42585 100644 --- a/include/complex_bessel_bits/besselFunctions.h +++ b/include/complex_bessel_bits/besselFunctions.h @@ -24,8 +24,11 @@ namespace sp_bessel { /*! @name Evaluation of Bessel functions. * We implement Amos' Fortran subroutines in C++. - * \todo Provide error detection and signaling. */ + * \todo Provide error detection and signaling. + */ + ///@{ + /*! Using a function as a template parameter, we define a function that * computes the derivative of the Bessel functions \f$J,\,Y,\,H^{(1,2)},\,I,\,K\f$ * using the recurrence relations \cite ABR65 (Sects. 9.1.27/9.6.26). */ @@ -34,7 +37,7 @@ inline std::complex diffBessel(double order, std::complex z, int { // For J, Y, H1 and H2, phase = -1. // For I, e^(order*pi*i)K, phase = 1. - // First term of the serie. + // First term of the series. double p = 1.0; std::complex s = T(order-n, z); @@ -225,17 +228,17 @@ inline std::complex besselK(double order, std::complex z) zbesk_wrap(zr,zi,nu,kode,N,&cyr,&cyi,&nz,&ierr); // Call Fortran subroutine. // In passing from C++ to FORTRAN, the exact zero becomes the numerical zero (10^(-14)). - // The limiting form of K_nu(z) for high order, Gamma(nu)/2*(z/2)^(-nu), - // leads to product of the form zero*infinity for the imaginary part, which destroys numerical precision. We hence - // manually set the imaginary part of the answer to zero is the imaginary part of the input - // is zero. - if (zi == 0.0 && zr >= 0.0) cyi = 0.0; - std::complex answer(cyr,cyi); + // The limiting form of K_nu(z) for high order, Gamma(nu)/2*(z/2)^(-nu), + // leads to product of the form zero*infinity for the imaginary part, which destroys numerical precision. We hence + // manually set the imaginary part of the answer to zero is the imaginary part of the input + // is zero. + if (zi == 0.0 && zr >= 0.0) cyi = 0.0; + std::complex answer(cyr,cyi); - // In case of error, we print the error code. - if (ierr!=0) std::cout << "besselK: Error code " << ierr << "." << std::endl; + // In case of error, we print the error code. + if (ierr!=0) std::cout << "besselK: Error code " << ierr << "." << std::endl; - return answer; + return answer; } inline std::complex expBesselK(double order, std::complex z) @@ -369,6 +372,6 @@ inline std::complex biryp(std::complex z) ///@} -} +} // namespace sp_bessel #endif // BESSELFUNCTIONS_H diff --git a/include/complex_bessel_bits/fortranLinkage.h b/include/complex_bessel_bits/fortranLinkage.h index 0569414..a179d45 100644 --- a/include/complex_bessel_bits/fortranLinkage.h +++ b/include/complex_bessel_bits/fortranLinkage.h @@ -62,6 +62,6 @@ extern void zbiry_wrap(double,double,int,int,double*,double*,int*,int*); } ///@} -} +} // namespace sp_bessel #endif // FORTRANLINKAGE_H diff --git a/include/complex_bessel_bits/sph_besselFunctions.h b/include/complex_bessel_bits/sph_besselFunctions.h new file mode 100644 index 0000000..4edf12b --- /dev/null +++ b/include/complex_bessel_bits/sph_besselFunctions.h @@ -0,0 +1,60 @@ +/*! \file sph_besselFunctions.h + * + * \author Joey Dumont + * \author Denis Gagnon + * + * \brief Functions computing the spherical Bessel functions. + * + * We compute the spherical Bessel functions by evaluating the + * Bessel functions with half-integer order with D.E. Amos' FORTRAN + * implementation. + * + * \copyright LGPL + */ + +#ifndef SPH_BESSELFUNCTIONS_H +#define SPH_BESSELFUNCTIONS_H + +#include +#include + +#include "besselFunctions.h" +#include "utilities.h" + +namespace sp_bessel { + +/// Near \f$z\rightarrow0\f$, the floating point division necessary would +/// destroy precision. We thus use an ascending series to compute sph_besselJ. +/// See \cite ABR65 Sec. 10.1.2. +inline std::complex sph_besselJ_asc_series(double order, std::complex z) +{ + return 0; +} + +/// We compute the spherical Bessel function of the first kind. +inline std::complex sph_besselJ(double order, std::complex z) +{ + return std::sqrt(constants::pi/(2.0*z))*besselJ(order+0.5, z); +} + +/// We compute the spherical Bessel function of the second kind. +inline std::complex sph_besselY(double order, std::complex z) +{ + return std::sqrt(constants::pi/(2.0*z))*besselY(order+0.5,z); +} + +/// We compute the spherical Hankel function of the first kind. +inline std::complex sph_hankelH1(double order, std::complex z) +{ + return std::sqrt(constants::pi/(2.0*z))*hankelH1(order+0.5,z); +} + +/// We compute the spherical Hankel function of the second kind. +inline std::complex sph_hankelH2(double order, std::complex z) +{ + return std::sqrt(constants::pi/(2.0*z))*hankelH2(order+0.5,z); +} + +} // namespace sp_bessel + +#endif // SPH_BESSELFUNCTIONS_H \ No newline at end of file diff --git a/include/complex_bessel_bits/utilities.h b/include/complex_bessel_bits/utilities.h index 46cbe7d..7573448 100644 --- a/include/complex_bessel_bits/utilities.h +++ b/include/complex_bessel_bits/utilities.h @@ -51,6 +51,6 @@ inline double sin_pi(double nu) return std::sin(constants::pi*nu); } -} +} // namespace sp_bessel #endif // UTILITIES_H diff --git a/tests/simpleTest.cpp b/tests/simpleTest.cpp index 6ea342a..ab8f29b 100644 --- a/tests/simpleTest.cpp +++ b/tests/simpleTest.cpp @@ -1,4 +1,5 @@ #include +//#include #include using namespace sp_bessel; @@ -6,6 +7,7 @@ using namespace sp_bessel; int main(int argc, char* argv[]) { std::complex z(1.0,0.0); + std::complex nearOrigin(1.0e-10,0); std::cout << besselJ(2,z) << std::endl; std::cout << besselJp(2,z) << std::endl; std::cout << besselJp(2,z,2) << std::endl; @@ -16,5 +18,9 @@ int main(int argc, char* argv[]) std::cout << besselKp(2,z,2) << std::endl; std::cout << hankelH1(2,z) << std::endl; std::cout << hankelH1p(2,z) << std::endl; + std::cout << sph_besselJ(-constants::pi,nearOrigin) << std::endl; + std::cout << sph_besselY(-constants::pi,nearOrigin) << std::endl; + std::cout << sph_hankelH1(-constants::pi,nearOrigin) << std::endl; + std::cout << sph_hankelH2(-constants::pi,nearOrigin) << std::endl; return 0; }