Deprecate many old plugins in the contrib/rovigatti folder

lorenzo-rovigatti · Jun 16, 2024 · 95bd2e0 · 95bd2e0
1 parent 960a8c5
commit 95bd2e0
Show file tree

Hide file tree

Showing 21 changed files with 5 additions and 23 deletions.
diff --git a/contrib/rovigatti/CMakeLists.txt b/contrib/rovigatti/CMakeLists.txt
@@ -1,12 +1,12 @@
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 ADD_CUSTOM_TARGET(rovigatti
- DEPENDS PolymerSwapInteraction TSPInteraction MGAssemblyConf PolymerInteraction 
+ DEPENDS PolymerSwapInteraction MGAssemblyConf 
  DensityPressureProfile PolydisperseLTInteraction ConstructwisePressure 
  MicrogelElasticity MGAnalysis AOInteraction RadialDensityProfile MGInteraction 
- GenericGrByInsertion VoidPercolation Remoteness CPAnalysis Widom LevyDelta 
- LevyInteraction CPMixtureInteraction StarrInteraction mWInteraction 
- GraftedInteraction FSInteraction TSPAnalysis StarrConf ConstructwiseBonds 
+ GenericGrByInsertion VoidPercolation Remoteness CPAnalysis Widom 
+ CPMixtureInteraction StarrInteraction mWInteraction 
+ FSInteraction StarrConf ConstructwiseBonds 
  EmptyVolume FSConf Gyradius PatchySwapInteraction DetailedPatchySwapInteraction 
  PatchyBonds Bonds DetailedPolymerSwapInteraction
 )
@@ -32,9 +32,7 @@ add_library_no_prefix(EmptyVolume src/Observables/EmptyVolume.cpp)
 add_library_no_prefix(FSConf src/Observables/FSConf.cpp src/Interactions/FSInteraction.cpp)
 add_library_no_prefix(Gyradius src/Observables/Gyradius.cpp)
 add_library_no_prefix(StarrConf src/Observables/StarrConf.cpp)
-add_library_no_prefix(TSPAnalysis src/Observables/TSPAnalysis.cpp)
 add_library_no_prefix(Widom src/Observables/Widom.cpp)
-add_library_no_prefix(LevyDelta src/Observables/LevyDelta.cpp src/Interactions/LevyInteraction.cpp)
 add_library_no_prefix(CPAnalysis src/Observables/CPAnalysis.cpp)
 add_library_no_prefix(Remoteness src/Observables/Remoteness.cpp)
 add_library_no_prefix(VoidPercolation src/Observables/VoidPercolation.cpp)
@@ -47,14 +45,10 @@ add_library_no_prefix(DensityPressureProfile src/Observables/DensityPressureProf
 add_library_no_prefix(MGAssemblyConf src/Observables/MGAssemblyConf.cpp src/Interactions/FSInteraction.cpp)
 
 # Interactions
-add_library_no_prefix(TSPInteraction src/Interactions/TSPInteraction.cpp)
-add_library_no_prefix(PolymerInteraction src/Interactions/PolymerInteraction.cpp src/Interactions/TSPInteraction.cpp)
 add_library_no_prefix(FSInteraction src/Interactions/FSInteraction.cpp)
-add_library_no_prefix(GraftedInteraction src/Interactions/GraftedInteraction.cpp src/Interactions/TSPInteraction.cpp)
 add_library_no_prefix(mWInteraction src/Interactions/mWInteraction.cpp)
 add_library_no_prefix(StarrInteraction src/Interactions/StarrInteraction.cpp)
 add_library_no_prefix(CPMixtureInteraction src/Interactions/CPMixtureInteraction.cpp)
-add_library_no_prefix(LevyInteraction src/Interactions/LevyInteraction.cpp)
 add_library_no_prefix(MGInteraction src/Interactions/MGInteraction.cpp)
 add_library_no_prefix(AOInteraction src/Interactions/AOInteraction.cpp)
 add_library_no_prefix(PolydisperseLTInteraction src/Interactions/PolydisperseLTInteraction.cpp)
@@ -63,15 +57,6 @@ add_library_no_prefix(PatchySwapInteraction src/Interactions/PatchySwapInteracti
 add_library_no_prefix(DetailedPatchySwapInteraction src/Interactions/DetailedPatchySwapInteraction.cpp)
 add_library_no_prefix(DetailedPolymerSwapInteraction src/Interactions/DetailedPolymerSwapInteraction.cpp)
 
-FIND_PACKAGE(PkgConfig)
-IF(PkgConfig_FOUND)
- PKG_CHECK_MODULES(GSL gsl)
- IF(GSL_FOUND)
- add_library_no_prefix(NathanNeighs src/Observables/NathanNeighs.cpp)
- target_link_libraries(NathanNeighs ${GSL_LIBRARIES})
- ENDIF(GSL_FOUND)
-ENDIF(PkgConfig_FOUND)
-
 IF(CUDA)
  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -rdynamic")
  find_package("CUDA")
@@ -88,14 +73,11 @@ IF(CUDA)
  cuda_add_library_no_prefix(CUDAFSInteraction src/Interactions/CUDAFSInteraction.cu src/Interactions/FSInteraction.cpp)
  cuda_add_library_no_prefix(CUDAmWInteraction src/Interactions/CUDAmWInteraction.cu src/Interactions/mWInteraction.cpp)
  cuda_add_library_no_prefix(CUDAStarrInteraction src/Interactions/CUDAStarrInteraction.cu src/Interactions/StarrInteraction.cpp)
- cuda_add_library_no_prefix(CUDALevyInteraction src/Interactions/CUDALevyInteraction.cu src/Interactions/LevyInteraction.cpp)
  cuda_add_library_no_prefix(CUDACPMixtureInteraction src/Interactions/CUDACPMixtureInteraction.cu src/Interactions/CPMixtureInteraction.cpp)
  cuda_add_library_no_prefix(CUDAMGInteraction src/Interactions/CUDAMGInteraction.cu src/Interactions/MGInteraction.cpp)
  cuda_add_library_no_prefix(CUDAAOInteraction src/Interactions/CUDAAOInteraction.cu src/Interactions/AOInteraction.cpp)
- cuda_add_library_no_prefix(CUDAPolymerInteraction src/Interactions/CUDAPolymerInteraction.cu src/Interactions/PolymerInteraction.cpp)
  cuda_add_library_no_prefix(CUDAPolymerSwapInteraction src/Interactions/CUDAPolymerSwapInteraction.cu src/Interactions/PolymerSwapInteraction.cpp)
  cuda_add_library_no_prefix(CUDADetailedPolymerSwapInteraction src/Interactions/CUDADetailedPolymerSwapInteraction.cu src/Interactions/DetailedPolymerSwapInteraction.cpp)
- cuda_add_library_no_prefix(CUDATSPInteraction src/Interactions/CUDATSPInteraction.cu src/Interactions/TSPInteraction.cpp)
 
- ADD_DEPENDENCIES(rovigatti CUDADetailedPolymerSwapInteraction CUDADetailedPatchySwapInteraction CUDAPatchySwapInteraction CUDAPolymerInteraction CUDAAOInteraction CUDAMGInteraction CUDACPMixtureInteraction CUDAFSInteraction CUDAmWInteraction CUDAStarrInteraction CUDALevyInteraction CUDAPolymerSwapInteraction CUDATSPInteraction)
+ ADD_DEPENDENCIES(rovigatti CUDADetailedPolymerSwapInteraction CUDADetailedPatchySwapInteraction CUDAPatchySwapInteraction CUDAAOInteraction CUDAMGInteraction CUDACPMixtureInteraction CUDAFSInteraction CUDAmWInteraction CUDAStarrInteraction CUDAPolymerSwapInteraction)
 ENDIF(CUDA)
diff --git a/...i/src/Interactions/CUDALevyInteraction.cu → ...c/Interactions/old/CUDALevyInteraction.cu b/...i/src/Interactions/CUDALevyInteraction.cu → ...c/Interactions/old/CUDALevyInteraction.cu
diff --git a/...ti/src/Interactions/CUDALevyInteraction.h → ...rc/Interactions/old/CUDALevyInteraction.h b/...ti/src/Interactions/CUDALevyInteraction.h → ...rc/Interactions/old/CUDALevyInteraction.h
diff --git a/...rc/Interactions/CUDAPolymerInteraction.cu → ...nteractions/old/CUDAPolymerInteraction.cu b/...rc/Interactions/CUDAPolymerInteraction.cu → ...nteractions/old/CUDAPolymerInteraction.cu
diff --git a/...src/Interactions/CUDAPolymerInteraction.h → ...Interactions/old/CUDAPolymerInteraction.h b/...src/Interactions/CUDAPolymerInteraction.h → ...Interactions/old/CUDAPolymerInteraction.h
diff --git a/...ti/src/Interactions/CUDATSPInteraction.cu → ...rc/Interactions/old/CUDATSPInteraction.cu b/...ti/src/Interactions/CUDATSPInteraction.cu → ...rc/Interactions/old/CUDATSPInteraction.cu
diff --git a/...tti/src/Interactions/CUDATSPInteraction.h → ...src/Interactions/old/CUDATSPInteraction.h b/...tti/src/Interactions/CUDATSPInteraction.h → ...src/Interactions/old/CUDATSPInteraction.h
diff --git a/...i/src/Interactions/GraftedInteraction.cpp → ...c/Interactions/old/GraftedInteraction.cpp b/...i/src/Interactions/GraftedInteraction.cpp → ...c/Interactions/old/GraftedInteraction.cpp
diff --git a/...tti/src/Interactions/GraftedInteraction.h → ...src/Interactions/old/GraftedInteraction.h b/...tti/src/Interactions/GraftedInteraction.h → ...src/Interactions/old/GraftedInteraction.h
diff --git a/...atti/src/Interactions/LevyInteraction.cpp → .../src/Interactions/old/LevyInteraction.cpp b/...atti/src/Interactions/LevyInteraction.cpp → .../src/Interactions/old/LevyInteraction.cpp
diff --git a/...igatti/src/Interactions/LevyInteraction.h → ...ti/src/Interactions/old/LevyInteraction.h b/...igatti/src/Interactions/LevyInteraction.h → ...ti/src/Interactions/old/LevyInteraction.h
diff --git a/...i/src/Interactions/PolymerInteraction.cpp → ...c/Interactions/old/PolymerInteraction.cpp b/...i/src/Interactions/PolymerInteraction.cpp → ...c/Interactions/old/PolymerInteraction.cpp
diff --git a/...tti/src/Interactions/PolymerInteraction.h → ...src/Interactions/old/PolymerInteraction.h b/...tti/src/Interactions/PolymerInteraction.h → ...src/Interactions/old/PolymerInteraction.h
diff --git a/...gatti/src/Interactions/TSPInteraction.cpp → ...i/src/Interactions/old/TSPInteraction.cpp b/...gatti/src/Interactions/TSPInteraction.cpp → ...i/src/Interactions/old/TSPInteraction.cpp
diff --git a/...vigatti/src/Interactions/TSPInteraction.h → ...tti/src/Interactions/old/TSPInteraction.h b/...vigatti/src/Interactions/TSPInteraction.h → ...tti/src/Interactions/old/TSPInteraction.h
diff --git a/...b/rovigatti/src/Observables/LevyDelta.cpp → ...vigatti/src/Observables/old/LevyDelta.cpp b/...b/rovigatti/src/Observables/LevyDelta.cpp → ...vigatti/src/Observables/old/LevyDelta.cpp
diff --git a/...rib/rovigatti/src/Observables/LevyDelta.h → ...rovigatti/src/Observables/old/LevyDelta.h b/...rib/rovigatti/src/Observables/LevyDelta.h → ...rovigatti/src/Observables/old/LevyDelta.h
diff --git a/...ovigatti/src/Observables/NathanNeighs.cpp → ...atti/src/Observables/old/NathanNeighs.cpp b/...ovigatti/src/Observables/NathanNeighs.cpp → ...atti/src/Observables/old/NathanNeighs.cpp
diff --git a/.../rovigatti/src/Observables/NathanNeighs.h → ...igatti/src/Observables/old/NathanNeighs.h b/.../rovigatti/src/Observables/NathanNeighs.h → ...igatti/src/Observables/old/NathanNeighs.h
diff --git a/...rovigatti/src/Observables/TSPAnalysis.cpp → ...gatti/src/Observables/old/TSPAnalysis.cpp b/...rovigatti/src/Observables/TSPAnalysis.cpp → ...gatti/src/Observables/old/TSPAnalysis.cpp
diff --git a/...b/rovigatti/src/Observables/TSPAnalysis.h → ...vigatti/src/Observables/old/TSPAnalysis.h b/...b/rovigatti/src/Observables/TSPAnalysis.h → ...vigatti/src/Observables/old/TSPAnalysis.h