Merge pull request #275 from trontrytel/new_names

New names

Author: pdziekan

.travis_scripts/icicle.sh

@@ -34,7 +34,7 @@ cd ../../..
 
 ## icicle
 if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo $apt_get_install libboost-program-options-dev; fi
-cd libcloudphxx/tests/paper_GMD_2015
+cd libcloudphxx/tests/2D_cloud
 mkdir -p build 
 cd build
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DBOOST_ROOT=/usr/local; fi

tests/paper_GMD_2015/CMakeLists.txt tests/2D_cloud/CMakeLists.txttests/paper_GMD_2015/CMakeLists.txt renamed to tests/2D_cloud/CMakeLists.txt

@@ -20,4 +20,5 @@ if (NOT libcloudphxx_LIBRARIES)
 endif()
 
 add_subdirectory(src) 
-add_subdirectory(tests)
+add_subdirectory(paper_GMD_2015)
+add_subdirectory(thesis_2017)

tests/paper_GMD_2015/tests/CMakeLists.txt …s/2D_cloud/paper_GMD_2015/CMakeLists.txttests/paper_GMD_2015/tests/CMakeLists.txt renamed to tests/2D_cloud/paper_GMD_2015/CMakeLists.txt tests/paper_GMD_2015/tests/CMakeLists.txt renamed to tests/2D_cloud/paper_GMD_2015/CMakeLists.txt

@@ -2,4 +2,3 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 add_subdirectory(fig_a)
 add_subdirectory(fig_b)
 add_subdirectory(fig_c)
-add_subdirectory(chem_sandbox)

tests/paper_GMD_2015/tests/common.hpp tests/2D_cloud/paper_GMD_2015/common.hpptests/paper_GMD_2015/tests/common.hpp renamed to tests/2D_cloud/paper_GMD_2015/common.hpp

@@ -8,7 +8,7 @@ int main(int ac, char** av)
   if (ac != 2) error_macro("expecting 1 argument: CMAKE_BINARY_DIR")
 
   std::string 
-    dir = string(av[1]) + "/tests/fig_a/",
+    dir = string(av[1]) + "/paper_GMD_2015/fig_a/",
     h5  = dir + "out_blk_1m";
 
   auto n = h5n(h5);