Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

time-delay-potential #157

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

time-delay-potential #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d7e0717
Cleaned some things up.
rbmetcalf Dec 19, 2019
2bd6dad
Fixed some output for critical curves.
rbmetcalf Dec 22, 2019
2cab07b
Removed CCfits from the documentation.
rbmetcalf Dec 23, 2019
18a29f1
Updated INSTALL.md
rbmetcalf Dec 23, 2019
fec61a7
Upate INSTALL.md
rbmetcalf Dec 23, 2019
24d27d0
Comments.
rbmetcalf Jan 23, 2020
1c56ced
Merge branch 'master' into rbm/time-delay-potential
rbmetcalf Feb 6, 2020
52658a2
Fixed problem with path to cfitsio include directory.
rbmetcalf Feb 6, 2020
26dec49
Merge branch 'rbm/time-delay-potential' of https://github.com/glenco/…
rbmetcalf Feb 6, 2020
5f0e224
resolved a warning
rbmetcalf Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ add_subdirectory(Miscellaneous)
####

if(ENABLE_FITS)
include_directories(${CCFITS_INCLUDE_DIRS})
include_directories(${CFITSIO_INCLUDE_DIRS})
endif()

if(ENABLE_FFTW)
Expand Down
9 changes: 4 additions & 5 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ The *GLAMER* library requires some libraries by default and others are optional.
Library | Required by || Description
----------|---------------||-----------------------------------------------------
[CFITSIO] | `ENABLE_FITS` |required| Library for reading and writing files in the FITS format.
[CCfits]¹ | `ENABLE_FITS` |required| C++ wrapper for *CFITSIO*.
[FFTW] | `ENABLE_FFTW` |required| Library for Fast Fourier Transform algorithms.
[GSL] | `ENABLE_GSL` |optional| Library for scientific computation
[GSL] | `ENABLE_GSL` |optional| Library for scientific computation
[HDF5 C++] | `ENABLE_HDF5` |optional| I/O in hdf5 format
[HealPix] | ENABLE_HEALPIX |optional| C++ Healpix interface

Expand Down Expand Up @@ -232,6 +231,6 @@ Building the project will not build the GLAMER libraries automatically!
[ccfitsdoc]: https://heasarc.gsfc.nasa.gov/fitsio/CCfits/html/index.html "CCfits documentation"
[fftw]: http://www.fftw.org "FFTW Home Page"
[gsl]: http://www.gnu.org/software/gsl/ "GNU Scientific Library"
[HDF5 C++]: https://support.hdfgroup.org/HDF5/doc/cpplus_RM/index.html"
[HealPix]:https://healpix.jpl.nasa.gov/html/Healpix_cxx/index.html"
[conda]:https://docs.conda.io/projects/conda/en/latest/"
[HDF5 C++]: https://support.hdfgroup.org/HDF5/doc/cpplus_RM/ "HDF5 C++"
[HealPix]: https://healpix.jpl.nasa.gov/html/Healpix_cxx/ "HealPix"
[conda]: https://docs.conda.io/projects/conda/en/latest/ "conda"
1 change: 1 addition & 0 deletions MultiPlane/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ add_sources(
profile.cpp
particle_lens.cpp
multimap.cpp
lensmap.cpp
)
Loading