From b89dbe0987a6bb48fc4549dbf1a3563e37d675a7 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Thu, 22 May 2014 09:27:53 +0200 Subject: [PATCH 1/5] Finished packaging omptl --- CMakeLists.txt | 4 +++- src/CMakeLists.txt | 2 ++ src/mykdtree.tcc | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 880f616..135b5ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,12 +50,14 @@ if (ENABLE_SHARP) SET(SHARP_INCLUDE_PATH ${DEP_BUILD}/include) endif (ENABLE_SHARP) +SET(OMPTL_BUILD_DIR ${CMAKE_BINARY_DIR}/omptl-prefix/src/omptl) ExternalProject_Add(omptl URL ${CMAKE_SOURCE_DIR}/external/omptl-20120422.tar.bz2 CONFIGURE_COMMAND echo "No configure" BUILD_COMMAND echo "No build" - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/omptl-prefix/src/omptl ${CMAKE_BINARY_DIR}/external/stage/include/omptl + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${OMPTL_BUILD_DIR} ${CMAKE_BINARY_DIR}/external/stage/include/omptl ) +include_directories(${OMPTL_BUILD_DIR}/..) set(HDF5_FIND_COMPONENTS HL CXX) if(HDF5_ROOTDIR) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 611deaa..ea15ca3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -89,5 +89,7 @@ endif (BUILD_SHARED_LIBS) install(DIRECTORY . DESTINATION include/CosmoTool FILES_MATCHING PATTERN "*.hpp") +install(DIRECTORY ${OMPTL_BUILD_DIR} + DESTINATION include/CosmoTool/omptl) install(DIRECTORY . DESTINATION include/CosmoTool FILES_MATCHING PATTERN "*.tcc") diff --git a/src/mykdtree.tcc b/src/mykdtree.tcc index e276cad..3d66564 100644 --- a/src/mykdtree.tcc +++ b/src/mykdtree.tcc @@ -1,5 +1,6 @@ #include "replicateGenerator.hpp" #include +#include "omptl/omptl_algorithm" #include #include #include From 29c9536ff142dfdf9dfc88ee03313c601dc93469 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Thu, 22 May 2014 09:33:52 +0200 Subject: [PATCH 2/5] White space fix --- src/fourier/details/euclidian_transform.hpp | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/fourier/details/euclidian_transform.hpp b/src/fourier/details/euclidian_transform.hpp index e5ef34a..b11985f 100644 --- a/src/fourier/details/euclidian_transform.hpp +++ b/src/fourier/details/euclidian_transform.hpp @@ -83,30 +83,30 @@ namespace CosmoTool Nc = 1; volume = 1; for (int i = 0; i < dims.size(); i++) - { - N *= dims[i]; + { + N *= dims[i]; Nc *= m_dims_hc[i]; - volume *= L[i]; - dk[i] = 2*M_PI/L[i]; + volume *= L[i]; + dk[i] = 2*M_PI/L[i]; swapped_dims[dims.size()-1-i] = dims[i]; - } + } realMap = new EuclidianFourierMapReal( - boost::shared_ptr(calls::alloc_real(N), - std::ptr_fun(calls::free)), - m_dims); + boost::shared_ptr(calls::alloc_real(N), + std::ptr_fun(calls::free)), + m_dims); fourierMap = new EuclidianFourierMapComplex( - boost::shared_ptr >((std::complex*)calls::alloc_complex(Nc), - std::ptr_fun(calls::free)), - dims[0], m_dims_hc, dk); - { - m_analysis = calls::plan_dft_r2c(dims.size(), &swapped_dims[0], - realMap->data(), (typename calls::complex_type *)fourierMap->data(), - FFTW_DESTROY_INPUT|FFTW_MEASURE); - m_synthesis = calls::plan_dft_c2r(dims.size(), &swapped_dims[0], - (typename calls::complex_type *)fourierMap->data(), realMap->data(), - FFTW_DESTROY_INPUT|FFTW_MEASURE); - } + boost::shared_ptr >((std::complex*)calls::alloc_complex(Nc), + std::ptr_fun(calls::free)), + dims[0], m_dims_hc, dk); + { + m_analysis = calls::plan_dft_r2c(dims.size(), &swapped_dims[0], + realMap->data(), (typename calls::complex_type *)fourierMap->data(), + FFTW_DESTROY_INPUT|FFTW_MEASURE); + m_synthesis = calls::plan_dft_c2r(dims.size(), &swapped_dims[0], + (typename calls::complex_type *)fourierMap->data(), realMap->data(), + FFTW_DESTROY_INPUT|FFTW_MEASURE); + } } virtual ~EuclidianFourierTransform() From 285eeb8edeafae3098e32307600ddc1a8e53426f Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Thu, 22 May 2014 09:35:54 +0200 Subject: [PATCH 3/5] Fixed gather_sources --- build_tools/gather_sources.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build_tools/gather_sources.py b/build_tools/gather_sources.py index ca8c3d1..509f1a4 100644 --- a/build_tools/gather_sources.py +++ b/build_tools/gather_sources.py @@ -131,13 +131,14 @@ The fact that you are presently reading this means that you have had knowledge of the CeCILL license and that you accept its terms. +*/ """ - relimit = r'^(?s)/\*\+.*\+\*/' + relimit = r'^(?s)/\*\+.*\+\*/\n' print("C++ file: %s" % filename) apply_license(license, relimit, filename) def analyze_tree(prefix, t): - for ename,entry in t.items(): + for entry in t.items(): + ename = entry.name if ename == 'external' or ename == 'zobov': continue if type(entry) == Tree: From 61c6f1b3eaced875fa70b3916ce5584531a6114c Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Thu, 22 May 2014 09:37:20 +0200 Subject: [PATCH 4/5] Fixed gather_sources --- build_tools/gather_sources.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools/gather_sources.py b/build_tools/gather_sources.py index 509f1a4..a2b0ff2 100644 --- a/build_tools/gather_sources.py +++ b/build_tools/gather_sources.py @@ -55,7 +55,7 @@ def apply_license(license, relimit, filename): def apply_python_license(filename): license="""#+ -# This is CosmoTool (@FILENAME@) -- Copyright (C) Guilhem Lavaux (2007-2013) +# This is CosmoTool (@FILENAME@) -- Copyright (C) Guilhem Lavaux (2007-2014) # # guilhem.lavaux@gmail.com # @@ -97,7 +97,7 @@ def apply_python_license(filename): def apply_cpp_license(filename): license="""/*+ -This is CosmoTool (@FILENAME@) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (@FILENAME@) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com @@ -137,7 +137,7 @@ knowledge of the CeCILL license and that you accept its terms. def analyze_tree(prefix, t): - for entry in t.items(): + for entry in t: ename = entry.name if ename == 'external' or ename == 'zobov': continue From 7f27897b831a59d7ce58fc84efed50e027efa963 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Thu, 22 May 2014 09:38:59 +0200 Subject: [PATCH 5/5] Updated copyright headers --- build_tools/gather_sources.py | 2 +- sample/gadgetToArray.cpp | 34 ++++++++++++++++++ sample/gadgetToDensity.cpp | 34 ++++++++++++++++++ sample/simple3DFilter.cpp | 34 ++++++++++++++++++ sample/testAlgo.cpp | 2 +- sample/testBQueue.cpp | 2 +- sample/testBSP.cpp | 2 +- sample/testDelaunay.cpp | 2 +- sample/testEskow.cpp | 2 +- sample/testHDF5.cpp | 34 ++++++++++++++++++ sample/testInterpolate.cpp | 2 +- sample/testNewton.cpp | 2 +- sample/testPool.cpp | 2 +- sample/testReadFlash.cpp | 2 +- sample/testSmooth.cpp | 2 +- sample/test_cosmopower.cpp | 2 +- sample/test_fft_calls.cpp | 2 +- sample/test_healpix_calls.cpp | 2 +- sample/testkd.cpp | 2 +- sample/testkd2.cpp | 2 +- sample/testkd3.cpp | 2 +- src/algo.hpp | 2 +- src/bqueue.hpp | 2 +- src/bsp_simple.hpp | 2 +- src/cic.cpp | 2 +- src/cic.hpp | 2 +- src/config.hpp | 2 +- src/cosmopower.cpp | 2 +- src/cosmopower.hpp | 2 +- src/dinterpolate.hpp | 2 +- src/eskow.hpp | 2 +- src/field.hpp | 2 +- src/fixArray.hpp | 2 +- src/fortran.cpp | 2 +- src/fortran.hpp | 2 +- src/fourier/base_types.hpp | 2 +- src/fourier/details/euclidian_maps.hpp | 2 +- src/fourier/details/euclidian_spectrum_1d.hpp | 2 +- .../details/euclidian_spectrum_1d_bin.hpp | 2 +- src/fourier/details/euclidian_transform.hpp | 2 +- src/fourier/details/healpix_alms.hpp | 2 +- src/fourier/details/healpix_map.hpp | 2 +- src/fourier/details/healpix_spectrum.hpp | 2 +- src/fourier/details/healpix_transform.hpp | 2 +- src/fourier/details/healpix_utility.hpp | 2 +- src/fourier/euclidian.hpp | 2 +- src/fourier/fft/fftw_calls.hpp | 2 +- src/fourier/healpix.hpp | 2 +- src/growthFactor.cpp | 2 +- src/growthFactor.hpp | 2 +- src/h5_readFlash.cpp | 36 ++++++++++++++++++- src/h5_readFlash.hpp | 36 ++++++++++++++++++- src/hdf5_array.hpp | 34 ++++++++++++++++++ src/hdf5_flash.h | 33 +++++++++++++++-- src/interpolate.cpp | 2 +- src/interpolate.hpp | 2 +- src/interpolate3d.hpp | 2 +- src/kdtree_leaf.hpp | 2 +- src/kdtree_splitters.hpp | 2 +- src/loadFlash.cpp | 2 +- src/loadFlash.hpp | 2 +- src/loadFlash_dummy.cpp | 2 +- src/loadGadget.cpp | 2 +- src/loadGadget.hpp | 2 +- src/loadRamses.cpp | 2 +- src/loadRamses.hpp | 2 +- src/loadSimu.hpp | 2 +- src/load_data.cpp | 2 +- src/load_data.hpp | 2 +- src/mach.hpp | 2 +- src/miniargs.cpp | 2 +- src/miniargs.hpp | 2 +- src/mykdtree.hpp | 2 +- src/newton.hpp | 2 +- src/octTree.cpp | 2 +- src/octTree.hpp | 2 +- src/pool.hpp | 2 +- src/powerSpectrum.cpp | 2 +- src/powerSpectrum.hpp | 2 +- src/replicateGenerator.hpp | 2 +- src/sparseGrid.hpp | 2 +- src/sphSmooth.hpp | 2 +- src/yorick.hpp | 2 +- src/yorick_nc3.cpp | 2 +- src/yorick_nc4.cpp | 2 +- 85 files changed, 347 insertions(+), 82 deletions(-) diff --git a/build_tools/gather_sources.py b/build_tools/gather_sources.py index a2b0ff2..85d7d43 100644 --- a/build_tools/gather_sources.py +++ b/build_tools/gather_sources.py @@ -1,5 +1,5 @@ #+ -# This is CosmoTool (./build_tools/gather_sources.py) -- Copyright (C) Guilhem Lavaux (2007-2013) +# This is CosmoTool (./build_tools/gather_sources.py) -- Copyright (C) Guilhem Lavaux (2007-2014) # # guilhem.lavaux@gmail.com # diff --git a/sample/gadgetToArray.cpp b/sample/gadgetToArray.cpp index 7d4669c..6f646c6 100644 --- a/sample/gadgetToArray.cpp +++ b/sample/gadgetToArray.cpp @@ -1,3 +1,37 @@ +/*+ +This is CosmoTool (./sample/gadgetToArray.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) + +guilhem.lavaux@gmail.com + +This software is a computer program whose purpose is to provide a toolbox for cosmological +data analysis (e.g. filters, generalized Fourier transforms, power spectra, ...) + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +As a counterpart to the access to the source code and rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors have only limited +liability. + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. ++*/ #include #include #include diff --git a/sample/gadgetToDensity.cpp b/sample/gadgetToDensity.cpp index d17f263..2f7d5de 100644 --- a/sample/gadgetToDensity.cpp +++ b/sample/gadgetToDensity.cpp @@ -1,3 +1,37 @@ +/*+ +This is CosmoTool (./sample/gadgetToDensity.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) + +guilhem.lavaux@gmail.com + +This software is a computer program whose purpose is to provide a toolbox for cosmological +data analysis (e.g. filters, generalized Fourier transforms, power spectra, ...) + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +As a counterpart to the access to the source code and rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors have only limited +liability. + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. ++*/ #include #include #include diff --git a/sample/simple3DFilter.cpp b/sample/simple3DFilter.cpp index 1932e97..357af83 100644 --- a/sample/simple3DFilter.cpp +++ b/sample/simple3DFilter.cpp @@ -1,3 +1,37 @@ +/*+ +This is CosmoTool (./sample/simple3DFilter.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) + +guilhem.lavaux@gmail.com + +This software is a computer program whose purpose is to provide a toolbox for cosmological +data analysis (e.g. filters, generalized Fourier transforms, power spectra, ...) + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +As a counterpart to the access to the source code and rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors have only limited +liability. + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. ++*/ #include #include "yorick.hpp" #include "sphSmooth.hpp" diff --git a/sample/testAlgo.cpp b/sample/testAlgo.cpp index cdf7971..3f081e0 100644 --- a/sample/testAlgo.cpp +++ b/sample/testAlgo.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testAlgo.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testAlgo.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testBQueue.cpp b/sample/testBQueue.cpp index 08beb6d..eebb195 100644 --- a/sample/testBQueue.cpp +++ b/sample/testBQueue.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testBQueue.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testBQueue.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testBSP.cpp b/sample/testBSP.cpp index def0717..0c79445 100644 --- a/sample/testBSP.cpp +++ b/sample/testBSP.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testBSP.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testBSP.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testDelaunay.cpp b/sample/testDelaunay.cpp index 8d2d9d4..e7ce6d8 100644 --- a/sample/testDelaunay.cpp +++ b/sample/testDelaunay.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testDelaunay.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testDelaunay.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testEskow.cpp b/sample/testEskow.cpp index aa48d2b..8093e5d 100644 --- a/sample/testEskow.cpp +++ b/sample/testEskow.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testEskow.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testEskow.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testHDF5.cpp b/sample/testHDF5.cpp index 82c3230..d38eb01 100644 --- a/sample/testHDF5.cpp +++ b/sample/testHDF5.cpp @@ -1,3 +1,37 @@ +/*+ +This is CosmoTool (./sample/testHDF5.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) + +guilhem.lavaux@gmail.com + +This software is a computer program whose purpose is to provide a toolbox for cosmological +data analysis (e.g. filters, generalized Fourier transforms, power spectra, ...) + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +As a counterpart to the access to the source code and rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors have only limited +liability. + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. ++*/ #include #include #include "hdf5_array.hpp" diff --git a/sample/testInterpolate.cpp b/sample/testInterpolate.cpp index b863170..3e71744 100644 --- a/sample/testInterpolate.cpp +++ b/sample/testInterpolate.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testInterpolate.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testInterpolate.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testNewton.cpp b/sample/testNewton.cpp index 5677bbc..b592224 100644 --- a/sample/testNewton.cpp +++ b/sample/testNewton.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testNewton.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testNewton.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testPool.cpp b/sample/testPool.cpp index e4ff8c1..a6b8d87 100644 --- a/sample/testPool.cpp +++ b/sample/testPool.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testPool.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testPool.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testReadFlash.cpp b/sample/testReadFlash.cpp index 93a5b64..52e64bd 100644 --- a/sample/testReadFlash.cpp +++ b/sample/testReadFlash.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testReadFlash.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testReadFlash.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testSmooth.cpp b/sample/testSmooth.cpp index ddb8c3e..14cd779 100644 --- a/sample/testSmooth.cpp +++ b/sample/testSmooth.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testSmooth.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testSmooth.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/test_cosmopower.cpp b/sample/test_cosmopower.cpp index 1bf1ec8..635b9e0 100644 --- a/sample/test_cosmopower.cpp +++ b/sample/test_cosmopower.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/test_cosmopower.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/test_cosmopower.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/test_fft_calls.cpp b/sample/test_fft_calls.cpp index e49ad82..e35f768 100644 --- a/sample/test_fft_calls.cpp +++ b/sample/test_fft_calls.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/test_fft_calls.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/test_fft_calls.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/test_healpix_calls.cpp b/sample/test_healpix_calls.cpp index 75473d8..6b1e8f8 100644 --- a/sample/test_healpix_calls.cpp +++ b/sample/test_healpix_calls.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/test_healpix_calls.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/test_healpix_calls.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testkd.cpp b/sample/testkd.cpp index f810571..699947f 100644 --- a/sample/testkd.cpp +++ b/sample/testkd.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testkd.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testkd.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testkd2.cpp b/sample/testkd2.cpp index 7c29b1e..c4d4298 100644 --- a/sample/testkd2.cpp +++ b/sample/testkd2.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testkd2.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testkd2.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/sample/testkd3.cpp b/sample/testkd3.cpp index 50eba07..d238c5d 100644 --- a/sample/testkd3.cpp +++ b/sample/testkd3.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./sample/testkd3.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./sample/testkd3.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/algo.hpp b/src/algo.hpp index 2dce3eb..be03a77 100644 --- a/src/algo.hpp +++ b/src/algo.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/algo.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/algo.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/bqueue.hpp b/src/bqueue.hpp index 872830e..87b3a1c 100644 --- a/src/bqueue.hpp +++ b/src/bqueue.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/bqueue.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/bqueue.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/bsp_simple.hpp b/src/bsp_simple.hpp index 298256e..f9d2681 100644 --- a/src/bsp_simple.hpp +++ b/src/bsp_simple.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/bsp_simple.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/bsp_simple.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/cic.cpp b/src/cic.cpp index 8a24597..ba6bac5 100644 --- a/src/cic.cpp +++ b/src/cic.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/cic.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/cic.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/cic.hpp b/src/cic.hpp index 560ba2f..f76ec81 100644 --- a/src/cic.hpp +++ b/src/cic.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/cic.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/cic.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/config.hpp b/src/config.hpp index 8fd7b2d..5bf23a4 100644 --- a/src/config.hpp +++ b/src/config.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/config.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/config.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/cosmopower.cpp b/src/cosmopower.cpp index 20026a2..ba92a15 100644 --- a/src/cosmopower.cpp +++ b/src/cosmopower.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/cosmopower.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/cosmopower.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/cosmopower.hpp b/src/cosmopower.hpp index dd86cf1..01649c7 100644 --- a/src/cosmopower.hpp +++ b/src/cosmopower.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/cosmopower.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/cosmopower.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/dinterpolate.hpp b/src/dinterpolate.hpp index 1bf3322..980d0d0 100644 --- a/src/dinterpolate.hpp +++ b/src/dinterpolate.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/dinterpolate.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/dinterpolate.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/eskow.hpp b/src/eskow.hpp index 987cb88..3e09767 100644 --- a/src/eskow.hpp +++ b/src/eskow.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/eskow.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/eskow.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/field.hpp b/src/field.hpp index 45f6eac..d0b9377 100644 --- a/src/field.hpp +++ b/src/field.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/field.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/field.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fixArray.hpp b/src/fixArray.hpp index 0d2e26d..556cc78 100644 --- a/src/fixArray.hpp +++ b/src/fixArray.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fixArray.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fixArray.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fortran.cpp b/src/fortran.cpp index 79641ac..f0b9c86 100644 --- a/src/fortran.cpp +++ b/src/fortran.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fortran.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fortran.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fortran.hpp b/src/fortran.hpp index d63e8d3..85e7618 100644 --- a/src/fortran.hpp +++ b/src/fortran.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fortran.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fortran.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/base_types.hpp b/src/fourier/base_types.hpp index 42b579a..c5cf4e9 100644 --- a/src/fourier/base_types.hpp +++ b/src/fourier/base_types.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/base_types.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/base_types.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/euclidian_maps.hpp b/src/fourier/details/euclidian_maps.hpp index 4cbf6a3..5b808b2 100644 --- a/src/fourier/details/euclidian_maps.hpp +++ b/src/fourier/details/euclidian_maps.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/euclidian_maps.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/euclidian_maps.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/euclidian_spectrum_1d.hpp b/src/fourier/details/euclidian_spectrum_1d.hpp index 01a7dac..8d8b021 100644 --- a/src/fourier/details/euclidian_spectrum_1d.hpp +++ b/src/fourier/details/euclidian_spectrum_1d.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/euclidian_spectrum_1d.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/euclidian_spectrum_1d.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/euclidian_spectrum_1d_bin.hpp b/src/fourier/details/euclidian_spectrum_1d_bin.hpp index ee6cd0b..eb50209 100644 --- a/src/fourier/details/euclidian_spectrum_1d_bin.hpp +++ b/src/fourier/details/euclidian_spectrum_1d_bin.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/euclidian_spectrum_1d_bin.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/euclidian_spectrum_1d_bin.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/euclidian_transform.hpp b/src/fourier/details/euclidian_transform.hpp index b11985f..ac16fa9 100644 --- a/src/fourier/details/euclidian_transform.hpp +++ b/src/fourier/details/euclidian_transform.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/euclidian_transform.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/euclidian_transform.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/healpix_alms.hpp b/src/fourier/details/healpix_alms.hpp index fb438a8..3cfe43c 100644 --- a/src/fourier/details/healpix_alms.hpp +++ b/src/fourier/details/healpix_alms.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/healpix_alms.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/healpix_alms.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/healpix_map.hpp b/src/fourier/details/healpix_map.hpp index a2a3f18..ee6f031 100644 --- a/src/fourier/details/healpix_map.hpp +++ b/src/fourier/details/healpix_map.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/healpix_map.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/healpix_map.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/healpix_spectrum.hpp b/src/fourier/details/healpix_spectrum.hpp index 92f7085..349b88c 100644 --- a/src/fourier/details/healpix_spectrum.hpp +++ b/src/fourier/details/healpix_spectrum.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/healpix_spectrum.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/healpix_spectrum.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/healpix_transform.hpp b/src/fourier/details/healpix_transform.hpp index 37e79e8..73bb180 100644 --- a/src/fourier/details/healpix_transform.hpp +++ b/src/fourier/details/healpix_transform.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/healpix_transform.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/healpix_transform.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/details/healpix_utility.hpp b/src/fourier/details/healpix_utility.hpp index 11219d6..06f22ab 100644 --- a/src/fourier/details/healpix_utility.hpp +++ b/src/fourier/details/healpix_utility.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/details/healpix_utility.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/details/healpix_utility.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/euclidian.hpp b/src/fourier/euclidian.hpp index efc76e7..2ab4b5e 100644 --- a/src/fourier/euclidian.hpp +++ b/src/fourier/euclidian.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/euclidian.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/euclidian.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/fft/fftw_calls.hpp b/src/fourier/fft/fftw_calls.hpp index c811728..7d1138f 100644 --- a/src/fourier/fft/fftw_calls.hpp +++ b/src/fourier/fft/fftw_calls.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/fft/fftw_calls.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/fft/fftw_calls.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/fourier/healpix.hpp b/src/fourier/healpix.hpp index e8b8b2d..1e2cd54 100644 --- a/src/fourier/healpix.hpp +++ b/src/fourier/healpix.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/fourier/healpix.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/fourier/healpix.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/growthFactor.cpp b/src/growthFactor.cpp index b718d4e..f185e90 100644 --- a/src/growthFactor.cpp +++ b/src/growthFactor.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/growthFactor.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/growthFactor.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/growthFactor.hpp b/src/growthFactor.hpp index 1a455df..30c2155 100644 --- a/src/growthFactor.hpp +++ b/src/growthFactor.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/growthFactor.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/growthFactor.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/h5_readFlash.cpp b/src/h5_readFlash.cpp index e460bdb..2ace735 100644 --- a/src/h5_readFlash.cpp +++ b/src/h5_readFlash.cpp @@ -1,11 +1,45 @@ /*+ +This is CosmoTool (./src/h5_readFlash.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) + +guilhem.lavaux@gmail.com + +This software is a computer program whose purpose is to provide a toolbox for cosmological +data analysis (e.g. filters, generalized Fourier transforms, power spectra, ...) + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +As a counterpart to the access to the source code and rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors have only limited +liability. + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. ++*/ +/*+ !! This file has been developped by P. M. Sutter !! -+*/ +*/ /* This file contains the functions that read the data from the HDF5 file * The functions accept the PARAMESH data through arguments. */ diff --git a/src/h5_readFlash.hpp b/src/h5_readFlash.hpp index abcf9aa..3c6982d 100644 --- a/src/h5_readFlash.hpp +++ b/src/h5_readFlash.hpp @@ -1,4 +1,38 @@ /*+ +This is CosmoTool (./src/h5_readFlash.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) + +guilhem.lavaux@gmail.com + +This software is a computer program whose purpose is to provide a toolbox for cosmological +data analysis (e.g. filters, generalized Fourier transforms, power spectra, ...) + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +As a counterpart to the access to the source code and rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors have only limited +liability. + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. ++*/ +/*+ !!! NOTE !!! @@ -6,7 +40,7 @@ This file has been developped by P. M. Sutter. !!!! -+*/ +*/ /* This file contains the functions that read the data from the HDF5 file * The functions accept the PARAMESH data through arguments. */ diff --git a/src/hdf5_array.hpp b/src/hdf5_array.hpp index 46673ba..455d4b7 100644 --- a/src/hdf5_array.hpp +++ b/src/hdf5_array.hpp @@ -1,3 +1,37 @@ +/*+ +This is CosmoTool (./src/hdf5_array.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) + +guilhem.lavaux@gmail.com + +This software is a computer program whose purpose is to provide a toolbox for cosmological +data analysis (e.g. filters, generalized Fourier transforms, power spectra, ...) + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +As a counterpart to the access to the source code and rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors have only limited +liability. + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. ++*/ #ifndef __COSMO_HDF5_ARRAY_HPP #define __COSMO_HDF5_ARRAY_HPP diff --git a/src/hdf5_flash.h b/src/hdf5_flash.h index bf53f36..8963802 100644 --- a/src/hdf5_flash.h +++ b/src/hdf5_flash.h @@ -1,9 +1,36 @@ /*+ -!! +This is CosmoTool (./src/hdf5_flash.h) -- Copyright (C) Guilhem Lavaux (2007-2014) -This particular file has been developped by P. M. Sutter +guilhem.lavaux@gmail.com -!! +This software is a computer program whose purpose is to provide a toolbox for cosmological +data analysis (e.g. filters, generalized Fourier transforms, power spectra, ...) + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +As a counterpart to the access to the source code and rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors have only limited +liability. + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. +*/ /* general header file for the HDF 5 IO in FLASH */ diff --git a/src/interpolate.cpp b/src/interpolate.cpp index ec6575c..7ce0efd 100644 --- a/src/interpolate.cpp +++ b/src/interpolate.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/interpolate.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/interpolate.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/interpolate.hpp b/src/interpolate.hpp index 2e30e29..53acd46 100644 --- a/src/interpolate.hpp +++ b/src/interpolate.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/interpolate.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/interpolate.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/interpolate3d.hpp b/src/interpolate3d.hpp index 0f66d02..8d66a40 100644 --- a/src/interpolate3d.hpp +++ b/src/interpolate3d.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/interpolate3d.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/interpolate3d.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/kdtree_leaf.hpp b/src/kdtree_leaf.hpp index 0481889..0aa91b3 100644 --- a/src/kdtree_leaf.hpp +++ b/src/kdtree_leaf.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/kdtree_leaf.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/kdtree_leaf.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/kdtree_splitters.hpp b/src/kdtree_splitters.hpp index c0364a6..8f0e22e 100644 --- a/src/kdtree_splitters.hpp +++ b/src/kdtree_splitters.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/kdtree_splitters.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/kdtree_splitters.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/loadFlash.cpp b/src/loadFlash.cpp index d437f25..5f54f3d 100644 --- a/src/loadFlash.cpp +++ b/src/loadFlash.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/loadFlash.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/loadFlash.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/loadFlash.hpp b/src/loadFlash.hpp index 62f511b..b11498f 100644 --- a/src/loadFlash.hpp +++ b/src/loadFlash.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/loadFlash.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/loadFlash.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/loadFlash_dummy.cpp b/src/loadFlash_dummy.cpp index 2c6a86c..cc70346 100644 --- a/src/loadFlash_dummy.cpp +++ b/src/loadFlash_dummy.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/loadFlash_dummy.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/loadFlash_dummy.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/loadGadget.cpp b/src/loadGadget.cpp index f9f1072..11929f4 100644 --- a/src/loadGadget.cpp +++ b/src/loadGadget.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/loadGadget.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/loadGadget.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/loadGadget.hpp b/src/loadGadget.hpp index e05a187..adbc818 100644 --- a/src/loadGadget.hpp +++ b/src/loadGadget.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/loadGadget.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/loadGadget.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/loadRamses.cpp b/src/loadRamses.cpp index 5154921..ecf340b 100644 --- a/src/loadRamses.cpp +++ b/src/loadRamses.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/loadRamses.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/loadRamses.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/loadRamses.hpp b/src/loadRamses.hpp index 5282a3c..5834c29 100644 --- a/src/loadRamses.hpp +++ b/src/loadRamses.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/loadRamses.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/loadRamses.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/loadSimu.hpp b/src/loadSimu.hpp index 1c360a4..ed9a1f8 100644 --- a/src/loadSimu.hpp +++ b/src/loadSimu.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/loadSimu.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/loadSimu.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/load_data.cpp b/src/load_data.cpp index f23f909..9fd2552 100644 --- a/src/load_data.cpp +++ b/src/load_data.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/load_data.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/load_data.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/load_data.hpp b/src/load_data.hpp index 6be3bbb..6643eaa 100644 --- a/src/load_data.hpp +++ b/src/load_data.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/load_data.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/load_data.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/mach.hpp b/src/mach.hpp index 6bea525..9ef1942 100644 --- a/src/mach.hpp +++ b/src/mach.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/mach.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/mach.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/miniargs.cpp b/src/miniargs.cpp index 7c23230..c994e7e 100644 --- a/src/miniargs.cpp +++ b/src/miniargs.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/miniargs.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/miniargs.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/miniargs.hpp b/src/miniargs.hpp index 9f04b58..1157783 100644 --- a/src/miniargs.hpp +++ b/src/miniargs.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/miniargs.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/miniargs.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/mykdtree.hpp b/src/mykdtree.hpp index bf1eaa0..1f50bca 100644 --- a/src/mykdtree.hpp +++ b/src/mykdtree.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/mykdtree.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/mykdtree.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/newton.hpp b/src/newton.hpp index d3975fe..3cb82ae 100644 --- a/src/newton.hpp +++ b/src/newton.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/newton.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/newton.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/octTree.cpp b/src/octTree.cpp index 2c76609..9f1d5f7 100644 --- a/src/octTree.cpp +++ b/src/octTree.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/octTree.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/octTree.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/octTree.hpp b/src/octTree.hpp index 425d8fd..877017a 100644 --- a/src/octTree.hpp +++ b/src/octTree.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/octTree.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/octTree.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/pool.hpp b/src/pool.hpp index b3e2637..d536275 100644 --- a/src/pool.hpp +++ b/src/pool.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/pool.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/pool.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/powerSpectrum.cpp b/src/powerSpectrum.cpp index b2a34be..777654c 100644 --- a/src/powerSpectrum.cpp +++ b/src/powerSpectrum.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/powerSpectrum.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/powerSpectrum.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/powerSpectrum.hpp b/src/powerSpectrum.hpp index d4c6761..efed489 100644 --- a/src/powerSpectrum.hpp +++ b/src/powerSpectrum.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/powerSpectrum.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/powerSpectrum.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/replicateGenerator.hpp b/src/replicateGenerator.hpp index 4d89050..44d5953 100644 --- a/src/replicateGenerator.hpp +++ b/src/replicateGenerator.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/replicateGenerator.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/replicateGenerator.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/sparseGrid.hpp b/src/sparseGrid.hpp index 516be9d..1b665d0 100644 --- a/src/sparseGrid.hpp +++ b/src/sparseGrid.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/sparseGrid.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/sparseGrid.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/sphSmooth.hpp b/src/sphSmooth.hpp index b347178..d116dd4 100644 --- a/src/sphSmooth.hpp +++ b/src/sphSmooth.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/sphSmooth.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/sphSmooth.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/yorick.hpp b/src/yorick.hpp index 59d4656..f38200e 100644 --- a/src/yorick.hpp +++ b/src/yorick.hpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/yorick.hpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/yorick.hpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/yorick_nc3.cpp b/src/yorick_nc3.cpp index 8a69d9b..30a8173 100644 --- a/src/yorick_nc3.cpp +++ b/src/yorick_nc3.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/yorick_nc3.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/yorick_nc3.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com diff --git a/src/yorick_nc4.cpp b/src/yorick_nc4.cpp index 49ae5b5..a0234df 100644 --- a/src/yorick_nc4.cpp +++ b/src/yorick_nc4.cpp @@ -1,5 +1,5 @@ /*+ -This is CosmoTool (./src/yorick_nc4.cpp) -- Copyright (C) Guilhem Lavaux (2007-2013) +This is CosmoTool (./src/yorick_nc4.cpp) -- Copyright (C) Guilhem Lavaux (2007-2014) guilhem.lavaux@gmail.com