From 0f0d46d4954f9cb0b83b3983f89036baa2da61e9 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 29 May 2015 17:00:33 +0200 Subject: [PATCH 1/3] forcing icicle to use local libcloudph++ --- tests/paper_GMD_2015/src/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/paper_GMD_2015/src/CMakeLists.txt b/tests/paper_GMD_2015/src/CMakeLists.txt index 76d21e1bf..c2149f25d 100644 --- a/tests/paper_GMD_2015/src/CMakeLists.txt +++ b/tests/paper_GMD_2015/src/CMakeLists.txt @@ -28,7 +28,10 @@ target_include_directories(icicle PUBLIC ${libmpdataxx_INCLUDE_DIRS}) find_package(Boost COMPONENTS thread iostreams system timer program_options filesystem REQUIRED) target_link_libraries(icicle ${Boost_LIBRARIES}) -#TODO: check if it's there -target_link_libraries(icicle cloudphxx_lgrngn) +find_library(libcloudphxx_LIBRARIES cloudphxx_lgrngn ${CMAKE_SOURCE_DIR}/../../build/src) +if (NOT libmpdataxx_LIBRARIES) + message(FATAL_ERROR "libclouphxx++ not found") +endif() +target_link_libraries(icicle ${libcloudphxx_LIBRARIES}) install(TARGETS icicle DESTINATION bin) From 866a6d08e87ff09b65aa4873db805ff8aa8f49b9 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 29 May 2015 17:17:31 +0200 Subject: [PATCH 2/3] temporarily adding git revision [skip ci] --- include/libcloudph++/git_revision.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 include/libcloudph++/git_revision.h diff --git a/include/libcloudph++/git_revision.h b/include/libcloudph++/git_revision.h new file mode 100644 index 000000000..10141e5e9 --- /dev/null +++ b/include/libcloudph++/git_revision.h @@ -0,0 +1 @@ +#define GIT_REVISION "0f0d46d4954f9cb0b83b3983f89036baa2da61e9" From a852ce7031a73303dd2bee6b06921cf6ba9a61ea Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 29 May 2015 17:28:28 +0200 Subject: [PATCH 3/3] adding CREDITS file --- CREDITS | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 CREDITS diff --git a/CREDITS b/CREDITS new file mode 100644 index 000000000..2bf5a92cb --- /dev/null +++ b/CREDITS @@ -0,0 +1,31 @@ +Development of libcloudph++ has been carried out at the +Faculty of Physics [1], University of Warsaw [2], Poland. +The University of Warsaw holds the copyright to libcloudph++. + +The development was funded mainly by the Poland's National +Science Centre (NCN, [3]). + +The development team consists of (in alphabetic order): + + Sylwester Arabas + (library design, core code in lagrangian scheme, + GPU/CPU option, Python bindings, documentation [4]) + Piotr Dziekan + (validation and extensions of the coalescence scheme) + Dorota Jarecka + (Python bindings) + Anna Jaruga + (bulk schemes, aqueous chemistry in lagrangian scheme, + documentation [4]) + Hanna Pawłowska + (team management, documentation [4]) + Wojciech Grabowski + (consultancy, documentation [4]) + Maciej Waruszewski + (misc help) + +[1]: http://www.fuw.edu.pl/ +[2]: http://en.uw.edu.pl/ +[3]: http://www.ncn.gov.pl/ +[4]: http://arxiv.org/abs/1407.1309 + http://www.geosci-model-dev-discuss.net/7/8275/2014/