From 2980a482567e013de17efa319c1f5598096da7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Tue, 10 Sep 2024 14:29:33 +0200 Subject: [PATCH] Revert unnecessary changes --- .github/workflows/CI.yml | 1 - .gitignore | 1 - src/CMakeLists.txt | 3 --- src/inputFile.h | 4 ++-- src/inputFile_impl.h | 38 -------------------------------------- 5 files changed, 2 insertions(+), 45 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ed6f5fe6..3d8c352a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -117,7 +117,6 @@ jobs: -DMPIEXEC_MAX_NUMPROCS=2 -DMPIEXEC_PREFLAGS="--oversubscribe" \ -DCMAKE_PREFIX_PATH="$HOME/kokkos;$HOME/arborx;$HOME/ALL" \ -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} \ - -DCabana_DISABLE_CAJITA_DEPRECATION_WARNINGS=ON \ -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} cmake --build build --parallel 2 cmake --install build diff --git a/.gitignore b/.gitignore index c429bde9..40e1f1ae 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ build .cproject .project -*.swp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e2cdaf11..48050394 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -89,9 +89,6 @@ target_include_directories(CabanaMD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/system_types $ $) -if(CabanaMD_ENBALE_ALL) - target_link_libraries(CabanaMD ALL::ALL) -endif() #------------------------------------------------------------ diff --git a/src/inputFile.h b/src/inputFile.h index 25b5d793..d70cd546 100644 --- a/src/inputFile.h +++ b/src/inputFile.h @@ -179,8 +179,8 @@ class InputFile int binning_type = BINNING_LINKEDCELL; - int comm_type; - int comm_exchange_rate; + int comm_type = COMM_MPI; + int comm_exchange_rate = 20; double comm_ghost_cutoff; int force_type = FORCE_LJ; diff --git a/src/inputFile_impl.h b/src/inputFile_impl.h index b4172607..9213a716 100644 --- a/src/inputFile_impl.h +++ b/src/inputFile_impl.h @@ -79,46 +79,8 @@ InputFile::InputFile( InputCL commandline_, t_System *system_ ) output_file = commandline.output_file; error_file = commandline.error_file; - // set defaults (matches ExaMiniMD LJ example) - - nsteps = 0; - - thermo_rate = 0; - dumpbinary_rate = 0; - correctness_rate = 0; - vtk_rate = 0; - dumpbinaryflag = false; - correctnessflag = false; - timestepflag = false; - - lattice_offset_x = 0.0; - lattice_offset_y = 0.0; - lattice_offset_z = 0.0; - box[0] = 0; - box[2] = 0; - box[4] = 0; - box[1] = 40; - box[3] = 40; - box[5] = 40; - - units_style = UNITS_LJ; - lattice_style = LATTICE_FCC; - lattice_constant = 0.8442; - - temperature_target = 1.4; - temperature_seed = 87287; - - nsteps = 100; - thermo_rate = 10; - - neighbor_skin = 0.3; - neighbor_skin = 0.0; // for metal and real units - max_neigh_guess = 50; - comm_exchange_rate = 20; comm_ghost_cutoff = std::pow( ( 4.0 / lattice_constant ), ( 1.0 / 3.0 ) ) * 20.0; // 20 lattice constants - - force_cutoff = 2.5; } template