From 0e9a419593a11d1efe2b47574624c958cad0a04d Mon Sep 17 00:00:00 2001 From: alphataubio Date: Sun, 4 Aug 2024 01:53:08 -0400 Subject: [PATCH] updated find_fix to get_fix_by_id for kokkos_omp test --- unittest/force-styles/test_fix_timestep.cpp | 61 ++++++++++----------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/unittest/force-styles/test_fix_timestep.cpp b/unittest/force-styles/test_fix_timestep.cpp index 579b91d215..4295cd902a 100644 --- a/unittest/force-styles/test_fix_timestep.cpp +++ b/unittest/force-styles/test_fix_timestep.cpp @@ -875,37 +875,38 @@ TEST(FixTimestep, kokkos_omp) EXPECT_POSITIONS("run_pos (normal run, verlet)", lmp->atom, test_config.run_pos, epsilon); EXPECT_VELOCITIES("run_vel (normal run, verlet)", lmp->atom, test_config.run_vel, epsilon); - int ifix = lmp->modify->find_fix("test"); - if (ifix < 0) { + auto *ifix = lmp->modify->get_fix_by_id("test"); + + if (!ifix) { FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; } else { - Fix *fix = lmp->modify->fix[ifix]; - if (fix->thermo_virial) { - EXPECT_STRESS("run_stress (normal run, verlet)", fix->virial, test_config.run_stress, + + if (ifix->thermo_virial) { + EXPECT_STRESS("run_stress (normal run, verlet)", ifix->virial, test_config.run_stress, epsilon); } stats.reset(); // global scalar - if (fix->scalar_flag) { - double value = fix->compute_scalar(); + if (ifix->scalar_flag) { + double value = ifix->compute_scalar(); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); } // global vector - if (fix->vector_flag) { - int num = fix->size_vector; + if (ifix->vector_flag) { + int num = ifix->size_vector; EXPECT_EQ(num, test_config.global_vector.size()); for (int i = 0; i < num; ++i) - EXPECT_FP_LE_WITH_EPS(test_config.global_vector[i], fix->compute_vector(i), + EXPECT_FP_LE_WITH_EPS(test_config.global_vector[i], ifix->compute_vector(i), epsilon); } // check t_target for thermostats int dim = -1; - double *ptr = (double *)fix->extract("t_target", dim); + double *ptr = (double *)ifix->extract("t_target", dim); if ((ptr != nullptr) && (dim == 0)) { int ivar = lmp->input->variable->find("t_target"); if (ivar >= 0) { @@ -925,31 +926,30 @@ TEST(FixTimestep, kokkos_omp) EXPECT_POSITIONS("run_pos (restart, verlet)", lmp->atom, test_config.run_pos, epsilon); EXPECT_VELOCITIES("run_vel (restart, verlet)", lmp->atom, test_config.run_vel, epsilon); - ifix = lmp->modify->find_fix("test"); - if (ifix < 0) { + ifix = lmp->modify->get_fix_by_id("test"); + if (!ifix) { FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; } else { - Fix *fix = lmp->modify->fix[ifix]; - if (fix->thermo_virial) { - EXPECT_STRESS("run_stress (restart, verlet)", fix->virial, test_config.run_stress, + if (ifix->thermo_virial) { + EXPECT_STRESS("run_stress (restart, verlet)", ifix->virial, test_config.run_stress, epsilon); } stats.reset(); // global scalar - if (fix->scalar_flag) { - double value = fix->compute_scalar(); + if (ifix->scalar_flag) { + double value = ifix->compute_scalar(); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); } // global vector - if (fix->vector_flag) { - int num = fix->size_vector; + if (ifix->vector_flag) { + int num = ifix->size_vector; EXPECT_EQ(num, test_config.global_vector.size()); for (int i = 0; i < num; ++i) - EXPECT_FP_LE_WITH_EPS(test_config.global_vector[i], fix->compute_vector(i), + EXPECT_FP_LE_WITH_EPS(test_config.global_vector[i], ifix->compute_vector(i), epsilon); } if (print_stats && stats.has_data()) @@ -964,31 +964,30 @@ TEST(FixTimestep, kokkos_omp) EXPECT_POSITIONS("run_pos (rmass, verlet)", lmp->atom, test_config.run_pos, epsilon); EXPECT_VELOCITIES("run_vel (rmass, verlet)", lmp->atom, test_config.run_vel, epsilon); - ifix = lmp->modify->find_fix("test"); - if (ifix < 0) { + ifix = lmp->modify->get_fix_by_id("test"); + if (!ifix) { FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; } else { - Fix *fix = lmp->modify->fix[ifix]; - if (fix->thermo_virial) { - EXPECT_STRESS("run_stress (rmass, verlet)", fix->virial, test_config.run_stress, + if (ifix->thermo_virial) { + EXPECT_STRESS("run_stress (rmass, verlet)", ifix->virial, test_config.run_stress, epsilon); } stats.reset(); // global scalar - if (fix->scalar_flag) { - double value = fix->compute_scalar(); + if (ifix->scalar_flag) { + double value = ifix->compute_scalar(); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); } // global vector - if (fix->vector_flag) { - int num = fix->size_vector; + if (ifix->vector_flag) { + int num = ifix->size_vector; EXPECT_EQ(num, test_config.global_vector.size()); for (int i = 0; i < num; ++i) - EXPECT_FP_LE_WITH_EPS(test_config.global_vector[i], fix->compute_vector(i), + EXPECT_FP_LE_WITH_EPS(test_config.global_vector[i], ifix->compute_vector(i), epsilon); } if (print_stats && stats.has_data())