From 3203c24ec5121fbc5424856f30fe65b621b35b61 Mon Sep 17 00:00:00 2001 From: "Paul M. Sutter" Date: Wed, 22 May 2024 15:54:36 -0400 Subject: [PATCH] renamed c_tools to c_src and moved zobov to that directory --- CMakeLists.txt | 4 ++-- {c_tools => c_src}/CMakeLists.txt | 3 +-- {c_tools => c_src}/jozov2/CMakeLists.txt | 0 {c_tools => c_src}/jozov2/findrtop.c | 0 {c_tools => c_src}/jozov2/jozov2.cpp | 0 {c_tools => c_src}/jozov2/jozov2.hpp | 0 {c_tools => c_src}/jozov2/jozov2_io.cpp | 0 {c_tools => c_src}/jozov2/jozov2_watershed.cpp | 0 {c_tools => c_src}/jozov2/jozov2_zones.cpp | 0 {c_tools => c_src}/jozov2/zobov.hpp | 0 {c_tools => c_src}/libzobov/CMakeLists.txt | 0 {c_tools => c_src}/libzobov/contour_pixels.cpp | 0 {c_tools => c_src}/libzobov/contour_pixels.hpp | 0 {c_tools => c_src}/libzobov/gslIntegrate.hpp | 0 {c_tools => c_src}/libzobov/loadZobov.cpp | 0 {c_tools => c_src}/libzobov/loadZobov.hpp | 0 {c_tools => c_src}/libzobov/particleInfo.cpp | 0 {c_tools => c_src}/libzobov/particleInfo.hpp | 0 {c_tools => c_src}/libzobov/voidTree.hpp | 0 {c_tools => c_src}/prep/CMakeLists.txt | 0 {c_tools => c_src}/prep/generateMock.cpp | 0 {c_tools => c_src}/prep/loaders/CMakeLists.txt | 0 {c_tools => c_src}/prep/loaders/basic_loader.cpp | 0 {c_tools => c_src}/prep/loaders/flash_loader.cpp | 0 {c_tools => c_src}/prep/loaders/gadget_loader.cpp | 0 {c_tools => c_src}/prep/loaders/multidark_loader.cpp | 0 {c_tools => c_src}/prep/loaders/ramses_loader.cpp | 0 {c_tools => c_src}/prep/loaders/sdf_loader.cpp | 0 {c_tools => c_src}/prep/loaders/sdfloader_internal.hpp | 0 {c_tools => c_src}/prep/loaders/simulation_loader.cpp | 0 {c_tools => c_src}/prep/loaders/simulation_loader.hpp | 0 {c_tools => c_src}/prep/prepObservation.cpp | 0 {c_tools => c_src}/prep/prepObservation.ggo | 0 {c_tools => c_src}/prep/prepSimulation.cpp | 0 {c_tools => c_src}/prep/prepSimulation.ggo | 0 {c_tools => c_src}/pruning/CMakeLists.txt | 0 {c_tools => c_src}/pruning/pruneVoids.cpp | 0 {c_tools => c_src}/pruning/pruneVoids.ggo | 0 {zobov => c_src/zobov}/CMakeLists.txt | 0 {zobov => c_src/zobov}/findrtop.c | 0 {zobov => c_src/zobov}/jozov.c | 0 {zobov => c_src/zobov}/readfiles.c | 0 {zobov => c_src/zobov}/voz.h | 0 {zobov => c_src/zobov}/voz1b1.c | 0 {zobov => c_src/zobov}/vozinit.c | 0 {zobov => c_src/zobov}/voztie.c | 0 {zobov => c_src/zobov}/vozutil.c | 0 {zobov => c_src/zobov}/zobov_readme.txt | 0 48 files changed, 3 insertions(+), 4 deletions(-) rename {c_tools => c_src}/CMakeLists.txt (97%) rename {c_tools => c_src}/jozov2/CMakeLists.txt (100%) rename {c_tools => c_src}/jozov2/findrtop.c (100%) rename {c_tools => c_src}/jozov2/jozov2.cpp (100%) rename {c_tools => c_src}/jozov2/jozov2.hpp (100%) rename {c_tools => c_src}/jozov2/jozov2_io.cpp (100%) rename {c_tools => c_src}/jozov2/jozov2_watershed.cpp (100%) rename {c_tools => c_src}/jozov2/jozov2_zones.cpp (100%) rename {c_tools => c_src}/jozov2/zobov.hpp (100%) rename {c_tools => c_src}/libzobov/CMakeLists.txt (100%) rename {c_tools => c_src}/libzobov/contour_pixels.cpp (100%) rename {c_tools => c_src}/libzobov/contour_pixels.hpp (100%) rename {c_tools => c_src}/libzobov/gslIntegrate.hpp (100%) rename {c_tools => c_src}/libzobov/loadZobov.cpp (100%) rename {c_tools => c_src}/libzobov/loadZobov.hpp (100%) rename {c_tools => c_src}/libzobov/particleInfo.cpp (100%) rename {c_tools => c_src}/libzobov/particleInfo.hpp (100%) rename {c_tools => c_src}/libzobov/voidTree.hpp (100%) rename {c_tools => c_src}/prep/CMakeLists.txt (100%) rename {c_tools => c_src}/prep/generateMock.cpp (100%) rename {c_tools => c_src}/prep/loaders/CMakeLists.txt (100%) rename {c_tools => c_src}/prep/loaders/basic_loader.cpp (100%) rename {c_tools => c_src}/prep/loaders/flash_loader.cpp (100%) rename {c_tools => c_src}/prep/loaders/gadget_loader.cpp (100%) rename {c_tools => c_src}/prep/loaders/multidark_loader.cpp (100%) rename {c_tools => c_src}/prep/loaders/ramses_loader.cpp (100%) rename {c_tools => c_src}/prep/loaders/sdf_loader.cpp (100%) rename {c_tools => c_src}/prep/loaders/sdfloader_internal.hpp (100%) rename {c_tools => c_src}/prep/loaders/simulation_loader.cpp (100%) rename {c_tools => c_src}/prep/loaders/simulation_loader.hpp (100%) rename {c_tools => c_src}/prep/prepObservation.cpp (100%) rename {c_tools => c_src}/prep/prepObservation.ggo (100%) rename {c_tools => c_src}/prep/prepSimulation.cpp (100%) rename {c_tools => c_src}/prep/prepSimulation.ggo (100%) rename {c_tools => c_src}/pruning/CMakeLists.txt (100%) rename {c_tools => c_src}/pruning/pruneVoids.cpp (100%) rename {c_tools => c_src}/pruning/pruneVoids.ggo (100%) rename {zobov => c_src/zobov}/CMakeLists.txt (100%) rename {zobov => c_src/zobov}/findrtop.c (100%) rename {zobov => c_src/zobov}/jozov.c (100%) rename {zobov => c_src/zobov}/readfiles.c (100%) rename {zobov => c_src/zobov}/voz.h (100%) rename {zobov => c_src/zobov}/voz1b1.c (100%) rename {zobov => c_src/zobov}/vozinit.c (100%) rename {zobov => c_src/zobov}/voztie.c (100%) rename {zobov => c_src/zobov}/vozutil.c (100%) rename {zobov => c_src/zobov}/zobov_readme.txt (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1044ad..874a889 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.2) set(CMAKE_CXX_STANDARD 11) -project(zobovPerso) +project(vide) include(CheckCCompilerFlag) include(ExternalProject) @@ -106,4 +106,4 @@ message(STATUS "Vide binary directory: ${VIDE_BIN}") #) -subdirs(zobov c_tools) +subdirs(c_src) diff --git a/c_tools/CMakeLists.txt b/c_src/CMakeLists.txt similarity index 97% rename from c_tools/CMakeLists.txt rename to c_src/CMakeLists.txt index 2ac81ab..af0a673 100644 --- a/c_tools/CMakeLists.txt +++ b/c_src/CMakeLists.txt @@ -39,10 +39,9 @@ include_directories( SET(ZOB_LIBS zobovTool) - set(computeAverageDistortion_SRCS computeAverageDistortion.cpp) add_genopt(computeAverageDistortion_SRCS computeAverageDistortion.ggo computeAverageDistortion_conf STRUCTNAME Params) #add_executable(computeAverageDistortion ${computeAverageDistortion_SRCS}) #target_link_libraries(computeAverageDistortion ${ZOB_LIBS}) -subdirs(libzobov prep pruning jozov2) +subdirs(libzobov prep pruning jozov2 zobov) diff --git a/c_tools/jozov2/CMakeLists.txt b/c_src/jozov2/CMakeLists.txt similarity index 100% rename from c_tools/jozov2/CMakeLists.txt rename to c_src/jozov2/CMakeLists.txt diff --git a/c_tools/jozov2/findrtop.c b/c_src/jozov2/findrtop.c similarity index 100% rename from c_tools/jozov2/findrtop.c rename to c_src/jozov2/findrtop.c diff --git a/c_tools/jozov2/jozov2.cpp b/c_src/jozov2/jozov2.cpp similarity index 100% rename from c_tools/jozov2/jozov2.cpp rename to c_src/jozov2/jozov2.cpp diff --git a/c_tools/jozov2/jozov2.hpp b/c_src/jozov2/jozov2.hpp similarity index 100% rename from c_tools/jozov2/jozov2.hpp rename to c_src/jozov2/jozov2.hpp diff --git a/c_tools/jozov2/jozov2_io.cpp b/c_src/jozov2/jozov2_io.cpp similarity index 100% rename from c_tools/jozov2/jozov2_io.cpp rename to c_src/jozov2/jozov2_io.cpp diff --git a/c_tools/jozov2/jozov2_watershed.cpp b/c_src/jozov2/jozov2_watershed.cpp similarity index 100% rename from c_tools/jozov2/jozov2_watershed.cpp rename to c_src/jozov2/jozov2_watershed.cpp diff --git a/c_tools/jozov2/jozov2_zones.cpp b/c_src/jozov2/jozov2_zones.cpp similarity index 100% rename from c_tools/jozov2/jozov2_zones.cpp rename to c_src/jozov2/jozov2_zones.cpp diff --git a/c_tools/jozov2/zobov.hpp b/c_src/jozov2/zobov.hpp similarity index 100% rename from c_tools/jozov2/zobov.hpp rename to c_src/jozov2/zobov.hpp diff --git a/c_tools/libzobov/CMakeLists.txt b/c_src/libzobov/CMakeLists.txt similarity index 100% rename from c_tools/libzobov/CMakeLists.txt rename to c_src/libzobov/CMakeLists.txt diff --git a/c_tools/libzobov/contour_pixels.cpp b/c_src/libzobov/contour_pixels.cpp similarity index 100% rename from c_tools/libzobov/contour_pixels.cpp rename to c_src/libzobov/contour_pixels.cpp diff --git a/c_tools/libzobov/contour_pixels.hpp b/c_src/libzobov/contour_pixels.hpp similarity index 100% rename from c_tools/libzobov/contour_pixels.hpp rename to c_src/libzobov/contour_pixels.hpp diff --git a/c_tools/libzobov/gslIntegrate.hpp b/c_src/libzobov/gslIntegrate.hpp similarity index 100% rename from c_tools/libzobov/gslIntegrate.hpp rename to c_src/libzobov/gslIntegrate.hpp diff --git a/c_tools/libzobov/loadZobov.cpp b/c_src/libzobov/loadZobov.cpp similarity index 100% rename from c_tools/libzobov/loadZobov.cpp rename to c_src/libzobov/loadZobov.cpp diff --git a/c_tools/libzobov/loadZobov.hpp b/c_src/libzobov/loadZobov.hpp similarity index 100% rename from c_tools/libzobov/loadZobov.hpp rename to c_src/libzobov/loadZobov.hpp diff --git a/c_tools/libzobov/particleInfo.cpp b/c_src/libzobov/particleInfo.cpp similarity index 100% rename from c_tools/libzobov/particleInfo.cpp rename to c_src/libzobov/particleInfo.cpp diff --git a/c_tools/libzobov/particleInfo.hpp b/c_src/libzobov/particleInfo.hpp similarity index 100% rename from c_tools/libzobov/particleInfo.hpp rename to c_src/libzobov/particleInfo.hpp diff --git a/c_tools/libzobov/voidTree.hpp b/c_src/libzobov/voidTree.hpp similarity index 100% rename from c_tools/libzobov/voidTree.hpp rename to c_src/libzobov/voidTree.hpp diff --git a/c_tools/prep/CMakeLists.txt b/c_src/prep/CMakeLists.txt similarity index 100% rename from c_tools/prep/CMakeLists.txt rename to c_src/prep/CMakeLists.txt diff --git a/c_tools/prep/generateMock.cpp b/c_src/prep/generateMock.cpp similarity index 100% rename from c_tools/prep/generateMock.cpp rename to c_src/prep/generateMock.cpp diff --git a/c_tools/prep/loaders/CMakeLists.txt b/c_src/prep/loaders/CMakeLists.txt similarity index 100% rename from c_tools/prep/loaders/CMakeLists.txt rename to c_src/prep/loaders/CMakeLists.txt diff --git a/c_tools/prep/loaders/basic_loader.cpp b/c_src/prep/loaders/basic_loader.cpp similarity index 100% rename from c_tools/prep/loaders/basic_loader.cpp rename to c_src/prep/loaders/basic_loader.cpp diff --git a/c_tools/prep/loaders/flash_loader.cpp b/c_src/prep/loaders/flash_loader.cpp similarity index 100% rename from c_tools/prep/loaders/flash_loader.cpp rename to c_src/prep/loaders/flash_loader.cpp diff --git a/c_tools/prep/loaders/gadget_loader.cpp b/c_src/prep/loaders/gadget_loader.cpp similarity index 100% rename from c_tools/prep/loaders/gadget_loader.cpp rename to c_src/prep/loaders/gadget_loader.cpp diff --git a/c_tools/prep/loaders/multidark_loader.cpp b/c_src/prep/loaders/multidark_loader.cpp similarity index 100% rename from c_tools/prep/loaders/multidark_loader.cpp rename to c_src/prep/loaders/multidark_loader.cpp diff --git a/c_tools/prep/loaders/ramses_loader.cpp b/c_src/prep/loaders/ramses_loader.cpp similarity index 100% rename from c_tools/prep/loaders/ramses_loader.cpp rename to c_src/prep/loaders/ramses_loader.cpp diff --git a/c_tools/prep/loaders/sdf_loader.cpp b/c_src/prep/loaders/sdf_loader.cpp similarity index 100% rename from c_tools/prep/loaders/sdf_loader.cpp rename to c_src/prep/loaders/sdf_loader.cpp diff --git a/c_tools/prep/loaders/sdfloader_internal.hpp b/c_src/prep/loaders/sdfloader_internal.hpp similarity index 100% rename from c_tools/prep/loaders/sdfloader_internal.hpp rename to c_src/prep/loaders/sdfloader_internal.hpp diff --git a/c_tools/prep/loaders/simulation_loader.cpp b/c_src/prep/loaders/simulation_loader.cpp similarity index 100% rename from c_tools/prep/loaders/simulation_loader.cpp rename to c_src/prep/loaders/simulation_loader.cpp diff --git a/c_tools/prep/loaders/simulation_loader.hpp b/c_src/prep/loaders/simulation_loader.hpp similarity index 100% rename from c_tools/prep/loaders/simulation_loader.hpp rename to c_src/prep/loaders/simulation_loader.hpp diff --git a/c_tools/prep/prepObservation.cpp b/c_src/prep/prepObservation.cpp similarity index 100% rename from c_tools/prep/prepObservation.cpp rename to c_src/prep/prepObservation.cpp diff --git a/c_tools/prep/prepObservation.ggo b/c_src/prep/prepObservation.ggo similarity index 100% rename from c_tools/prep/prepObservation.ggo rename to c_src/prep/prepObservation.ggo diff --git a/c_tools/prep/prepSimulation.cpp b/c_src/prep/prepSimulation.cpp similarity index 100% rename from c_tools/prep/prepSimulation.cpp rename to c_src/prep/prepSimulation.cpp diff --git a/c_tools/prep/prepSimulation.ggo b/c_src/prep/prepSimulation.ggo similarity index 100% rename from c_tools/prep/prepSimulation.ggo rename to c_src/prep/prepSimulation.ggo diff --git a/c_tools/pruning/CMakeLists.txt b/c_src/pruning/CMakeLists.txt similarity index 100% rename from c_tools/pruning/CMakeLists.txt rename to c_src/pruning/CMakeLists.txt diff --git a/c_tools/pruning/pruneVoids.cpp b/c_src/pruning/pruneVoids.cpp similarity index 100% rename from c_tools/pruning/pruneVoids.cpp rename to c_src/pruning/pruneVoids.cpp diff --git a/c_tools/pruning/pruneVoids.ggo b/c_src/pruning/pruneVoids.ggo similarity index 100% rename from c_tools/pruning/pruneVoids.ggo rename to c_src/pruning/pruneVoids.ggo diff --git a/zobov/CMakeLists.txt b/c_src/zobov/CMakeLists.txt similarity index 100% rename from zobov/CMakeLists.txt rename to c_src/zobov/CMakeLists.txt diff --git a/zobov/findrtop.c b/c_src/zobov/findrtop.c similarity index 100% rename from zobov/findrtop.c rename to c_src/zobov/findrtop.c diff --git a/zobov/jozov.c b/c_src/zobov/jozov.c similarity index 100% rename from zobov/jozov.c rename to c_src/zobov/jozov.c diff --git a/zobov/readfiles.c b/c_src/zobov/readfiles.c similarity index 100% rename from zobov/readfiles.c rename to c_src/zobov/readfiles.c diff --git a/zobov/voz.h b/c_src/zobov/voz.h similarity index 100% rename from zobov/voz.h rename to c_src/zobov/voz.h diff --git a/zobov/voz1b1.c b/c_src/zobov/voz1b1.c similarity index 100% rename from zobov/voz1b1.c rename to c_src/zobov/voz1b1.c diff --git a/zobov/vozinit.c b/c_src/zobov/vozinit.c similarity index 100% rename from zobov/vozinit.c rename to c_src/zobov/vozinit.c diff --git a/zobov/voztie.c b/c_src/zobov/voztie.c similarity index 100% rename from zobov/voztie.c rename to c_src/zobov/voztie.c diff --git a/zobov/vozutil.c b/c_src/zobov/vozutil.c similarity index 100% rename from zobov/vozutil.c rename to c_src/zobov/vozutil.c diff --git a/zobov/zobov_readme.txt b/c_src/zobov/zobov_readme.txt similarity index 100% rename from zobov/zobov_readme.txt rename to c_src/zobov/zobov_readme.txt