particle_diagnostics and build system upgrades

.gitignore

@@ -4,3 +4,4 @@ external
 .*.swp
 test_include/test_data_filepath.hpp
 **/output
+*.sh

CMake/compile_time_options.cmake

@@ -7,7 +7,7 @@ set( CMAKE_BUILD_TYPE "Release" )
 # preprocessor definitions in source code are defined below:
 set( description "(no description added yet)" )
 set( GITR_USE_CUDA 0 CACHE STRING "${description}" FORCE )
-set( GITR_USE_OPENMP 0 CACHE STRING "${description}" FORCE )
+set( GITR_USE_OPENMP 1 CACHE STRING "${description}" FORCE )
 set( GITR_USE_MPI 0 CACHE STRING "${description}" FORCE )
 set( GITR_USE_DOUBLE 1 CACHE STRING "${description}" FORCE )
 

CMake/crosslink_components.cmake

@@ -76,6 +76,7 @@ target_link_libraries( GITR
                        spectroscopy
                        libconfig_cxx
                        libconfig_c
+                       particle_diagnostics
                        utils
                        boris
                        surface_model
@@ -95,6 +96,9 @@ if( GITR_USE_CUDA )
 
   endforeach()
 
+  target_link_libraries( geometry_check atomic_add_1 )
+  target_link_libraries( spectroscopy atomic_add_1 )
+
 endif()
 
 if( GITR_USE_OPENMP )
@@ -158,15 +162,15 @@ target_link_libraries( coulomb_tests
                        Catch2::Catch2WithMain
                        )
 
-target_link_libraries( file_io_tests
-                       libconfig_cxx
-                       libconfig_c
-                       flags
-                       utils
-                       boris
-                       geometry_check
-                       Catch2::Catch2WithMain
-                       )
+#target_link_libraries( file_io_tests
+#                       libconfig_cxx
+#                       libconfig_c
+#                       flags
+#                       utils
+#                       boris
+#                       geometry_check
+#                       Catch2::Catch2WithMain
+#                       )
 
 target_link_libraries( interpolator_tests Catch2::Catch2WithMain )
 

CMake/cuda.cmake

@@ -29,4 +29,8 @@ endif()
 
 include_directories( ${CUDAToolkit_INCLUDE_DIRS} )
 
-set( CMAKE_CUDA_ARCHITECTURES 70 )
+if( CMAKE_MINOR_VERSION VERSION_LESS 25 )
+set( CMAKE_CUDA_ARCHITECTURES 80 75 70 )
+else()
+set( CMAKE_CUDA_ARCHITECTURES native )
+endif()

CMake/define_source_components.cmake

@@ -31,6 +31,7 @@ set( non_gpu_targets
 
 # conditionally compile as GPU targets
 set( gpu_targets
+     particle_diagnostics
      surface_model
      interp2d
      interpRateCoeff
@@ -39,6 +40,7 @@ set( gpu_targets
      hashGeom
      fields
      spectroscopy
+     atomic_add_1
      geometry_check )
 
 set( gpu_broker_targets 

CMake/define_test_components.cmake

@@ -15,8 +15,8 @@ set( gpu_test_targets
      cross_field_diffusion_tests
      atomic_tests
      coulomb_tests
-     file_io_tests
      )
+     #file_io_tests
 
 foreach( component IN LISTS cpu_test_targets )
 

CMake/enforce_build_order.cmake

@@ -12,7 +12,15 @@ if( dependencies )
 
 endif()
 
+add_dependencies( boris particle_diagnostics )
 # ensure that all source targets are built before GITR
 add_dependencies( GITR ${non_gpu_targets} ${gpu_targets} )
 
 add_dependencies( boris_data_broker boris flags )
+
+if( GITR_USE_CUDA )
+
+  add_dependencies( geometry_check atomic_add_1 )
+  add_dependencies( spectroscopy atomic_add_1 )
+
+endif()