ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modernize fix instance lookup

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-06-22 20:03:14 -04:00
parent b8cbd1bfc3
commit 5693c8ac33
1 changed files with 126 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

266
unittest/force-styles/test_fix_timestep.cpp
View File

@ -190,33 +190,31 @@ void generate_yaml_file(const char *outfile, const TestConfig &config)
// natoms // natoms
writer.emit("natoms", natoms); writer.emit("natoms", natoms);
int ifix = lmp->modify->find_fix("test"); auto ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
std::cerr << "ERROR: no fix defined with fix ID 'test'\n"; std::cerr << "ERROR: no fix defined with fix ID 'test'\n";
exit(1); exit(1);
} else { } else {
Fix *fix = lmp->modify->fix[ifix];
// run_stress, if enabled // run_stress, if enabled
if (fix->thermo_virial) { if (ifix->thermo_virial) {
auto stress = fix->virial; auto stress = ifix->virial;
block = fmt::format("{:23.16e} {:23.16e} {:23.16e} {:23.16e} {:23.16e} {:23.16e}", block = fmt::format("{:23.16e} {:23.16e} {:23.16e} {:23.16e} {:23.16e} {:23.16e}",
stress[0], stress[1], stress[2], stress[3], stress[4], stress[5]); stress[0], stress[1], stress[2], stress[3], stress[4], stress[5]);
writer.emit_block("run_stress", block); writer.emit_block("run_stress", block);
} }
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
writer.emit("global_scalar", value); writer.emit("global_scalar", value);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
block = std::to_string(num); block = std::to_string(num);
for (int i = 0; i < num; ++i) for (int i = 0; i < num; ++i)
block += fmt::format(" {}", fix->compute_vector(i)); block += fmt::format(" {}", ifix->compute_vector(i));
writer.emit_block("global_vector", block); writer.emit_block("global_vector", block);
} }
} }
@ -283,37 +281,36 @@ TEST(FixTimestep, plain)
EXPECT_POSITIONS("run_pos (normal run, verlet)", lmp->atom, test_config.run_pos, epsilon); 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); EXPECT_VELOCITIES("run_vel (normal run, verlet)", lmp->atom, test_config.run_vel, epsilon);
int ifix = lmp->modify->find_fix("test"); auto ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (normal run, verlet)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (normal run, verlet)", fix->virial, test_config.run_stress,
epsilon); epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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); epsilon);
} }
// check t_target for thermostats // check t_target for thermostats
int dim = -1; int dim = -1;
double *ptr = (double *)fix->extract("t_target", dim); double *ptr = (double *)ifix->extract("t_target", dim);
if ((ptr != nullptr) && (dim == 0)) { if ((ptr != nullptr) && (dim == 0)) {
int ivar = lmp->input->variable->find("t_target"); int ivar = lmp->input->variable->find("t_target");
if (ivar >= 0) { if (ivar >= 0) {
@ -333,31 +330,30 @@ TEST(FixTimestep, plain)
EXPECT_POSITIONS("run_pos (restart, verlet)", lmp->atom, test_config.run_pos, epsilon); 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); EXPECT_VELOCITIES("run_vel (restart, verlet)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (restart, verlet)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (restart, verlet)", fix->virial, test_config.run_stress,
epsilon); epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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); epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -372,31 +368,30 @@ TEST(FixTimestep, plain)
EXPECT_POSITIONS("run_pos (rmass, verlet)", lmp->atom, test_config.run_pos, epsilon); 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); EXPECT_VELOCITIES("run_vel (rmass, verlet)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (rmass, verlet)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (rmass, verlet)", fix->virial, test_config.run_stress,
epsilon); epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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); epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -406,9 +401,9 @@ TEST(FixTimestep, plain)
// rigid fixes need work to test properly with r-RESPA. // rigid fixes need work to test properly with r-RESPA.
// fix nve/limit cannot work with r-RESPA // fix nve/limit cannot work with r-RESPA
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (!utils::strmatch(lmp->modify->fix[ifix]->style, "^rigid") && if (ifix && !utils::strmatch(ifix->style, "^rigid") &&
!utils::strmatch(lmp->modify->fix[ifix]->style, "^nve/limit")) { !utils::strmatch(ifix->style, "^nve/limit")) {
if (!verbose) ::testing::internal::CaptureStdout(); if (!verbose) ::testing::internal::CaptureStdout();
cleanup_lammps(lmp, test_config); cleanup_lammps(lmp, test_config);
if (!verbose) ::testing::internal::GetCapturedStdout(); if (!verbose) ::testing::internal::GetCapturedStdout();
@ -424,31 +419,30 @@ TEST(FixTimestep, plain)
EXPECT_POSITIONS("run_pos (normal run, respa)", lmp->atom, test_config.run_pos, epsilon); EXPECT_POSITIONS("run_pos (normal run, respa)", lmp->atom, test_config.run_pos, epsilon);
EXPECT_VELOCITIES("run_vel (normal run, respa)", lmp->atom, test_config.run_vel, epsilon); EXPECT_VELOCITIES("run_vel (normal run, respa)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (normal run, respa)", ifix->virial,
EXPECT_STRESS("run_stress (normal run, respa)", fix->virial, test_config.run_stress, test_config.run_stress, 1000 * epsilon);
1000 * epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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),
10 * epsilon); 10 * epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -462,31 +456,30 @@ TEST(FixTimestep, plain)
EXPECT_POSITIONS("run_pos (restart, respa)", lmp->atom, test_config.run_pos, epsilon); EXPECT_POSITIONS("run_pos (restart, respa)", lmp->atom, test_config.run_pos, epsilon);
EXPECT_VELOCITIES("run_vel (restart, respa)", lmp->atom, test_config.run_vel, epsilon); EXPECT_VELOCITIES("run_vel (restart, respa)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (restart, respa)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (restart, respa)", fix->virial, test_config.run_stress,
1000 * epsilon); 1000 * epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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),
10 * epsilon); 10 * epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -501,31 +494,30 @@ TEST(FixTimestep, plain)
EXPECT_POSITIONS("run_pos (rmass, respa)", lmp->atom, test_config.run_pos, epsilon); EXPECT_POSITIONS("run_pos (rmass, respa)", lmp->atom, test_config.run_pos, epsilon);
EXPECT_VELOCITIES("run_vel (rmass, respa)", lmp->atom, test_config.run_vel, epsilon); EXPECT_VELOCITIES("run_vel (rmass, respa)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (rmass, respa)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (rmass, respa)", fix->virial, test_config.run_stress,
1000 * epsilon); 1000 * epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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),
10 * epsilon); 10 * epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -584,37 +576,36 @@ TEST(FixTimestep, omp)
EXPECT_POSITIONS("run_pos (normal run, verlet)", lmp->atom, test_config.run_pos, epsilon); 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); EXPECT_VELOCITIES("run_vel (normal run, verlet)", lmp->atom, test_config.run_vel, epsilon);
int ifix = lmp->modify->find_fix("test"); auto ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (normal run, verlet)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (normal run, verlet)", fix->virial, test_config.run_stress,
epsilon); epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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); epsilon);
} }
// check t_target for thermostats // check t_target for thermostats
int dim = -1; int dim = -1;
double *ptr = (double *)fix->extract("t_target", dim); double *ptr = (double *)ifix->extract("t_target", dim);
if ((ptr != nullptr) && (dim == 0)) { if ((ptr != nullptr) && (dim == 0)) {
int ivar = lmp->input->variable->find("t_target"); int ivar = lmp->input->variable->find("t_target");
if (ivar >= 0) { if (ivar >= 0) {
@ -634,31 +625,30 @@ TEST(FixTimestep, omp)
EXPECT_POSITIONS("run_pos (restart, verlet)", lmp->atom, test_config.run_pos, epsilon); 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); EXPECT_VELOCITIES("run_vel (restart, verlet)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (restart, verlet)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (restart, verlet)", fix->virial, test_config.run_stress,
epsilon); epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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); epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -673,31 +663,30 @@ TEST(FixTimestep, omp)
EXPECT_POSITIONS("run_pos (rmass, verlet)", lmp->atom, test_config.run_pos, epsilon); 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); EXPECT_VELOCITIES("run_vel (rmass, verlet)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (rmass, verlet)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (rmass, verlet)", fix->virial, test_config.run_stress,
epsilon); epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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); epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -707,8 +696,8 @@ TEST(FixTimestep, omp)
// rigid fixes need work to test properly with r-RESPA, // rigid fixes need work to test properly with r-RESPA,
// also, torque is not supported by respa/omp // also, torque is not supported by respa/omp
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (!utils::strmatch(lmp->modify->fix[ifix]->style, "^rigid") && !lmp->atom->torque) { if (ifix && !utils::strmatch(ifix->style, "^rigid") && !lmp->atom->torque) {
if (!verbose) ::testing::internal::CaptureStdout(); if (!verbose) ::testing::internal::CaptureStdout();
cleanup_lammps(lmp, test_config); cleanup_lammps(lmp, test_config);
@ -725,31 +714,30 @@ TEST(FixTimestep, omp)
EXPECT_POSITIONS("run_pos (normal run, respa)", lmp->atom, test_config.run_pos, epsilon); EXPECT_POSITIONS("run_pos (normal run, respa)", lmp->atom, test_config.run_pos, epsilon);
EXPECT_VELOCITIES("run_vel (normal run, respa)", lmp->atom, test_config.run_vel, epsilon); EXPECT_VELOCITIES("run_vel (normal run, respa)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (normal run, respa)", ifix->virial,
EXPECT_STRESS("run_stress (normal run, respa)", fix->virial, test_config.run_stress, test_config.run_stress, 1000 * epsilon);
1000 * epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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),
10 * epsilon); 10 * epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -763,31 +751,30 @@ TEST(FixTimestep, omp)
EXPECT_POSITIONS("run_pos (restart, respa)", lmp->atom, test_config.run_pos, epsilon); EXPECT_POSITIONS("run_pos (restart, respa)", lmp->atom, test_config.run_pos, epsilon);
EXPECT_VELOCITIES("run_vel (restart, respa)", lmp->atom, test_config.run_vel, epsilon); EXPECT_VELOCITIES("run_vel (restart, respa)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (restart, respa)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (restart, respa)", fix->virial, test_config.run_stress,
1000 * epsilon); 1000 * epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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),
10 * epsilon); 10 * epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())
@ -802,31 +789,30 @@ TEST(FixTimestep, omp)
EXPECT_POSITIONS("run_pos (rmass, respa)", lmp->atom, test_config.run_pos, epsilon); EXPECT_POSITIONS("run_pos (rmass, respa)", lmp->atom, test_config.run_pos, epsilon);
EXPECT_VELOCITIES("run_vel (rmass, respa)", lmp->atom, test_config.run_vel, epsilon); EXPECT_VELOCITIES("run_vel (rmass, respa)", lmp->atom, test_config.run_vel, epsilon);
ifix = lmp->modify->find_fix("test"); ifix = lmp->modify->get_fix_by_id("test");
if (ifix < 0) { if (!ifix) {
FAIL() << "ERROR: no fix defined with fix ID 'test'\n"; FAIL() << "ERROR: no fix defined with fix ID 'test'\n";
} else { } else {
Fix *fix = lmp->modify->fix[ifix]; if (ifix->thermo_virial) {
if (fix->thermo_virial) { EXPECT_STRESS("run_stress (rmass, respa)", ifix->virial, test_config.run_stress,
EXPECT_STRESS("run_stress (rmass, respa)", fix->virial, test_config.run_stress,
1000 * epsilon); 1000 * epsilon);
} }
stats.reset(); stats.reset();
// global scalar // global scalar
if (fix->scalar_flag) { if (ifix->scalar_flag) {
double value = fix->compute_scalar(); double value = ifix->compute_scalar();
EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon); EXPECT_FP_LE_WITH_EPS(test_config.global_scalar, value, 10 * epsilon);
} }
// global vector // global vector
if (fix->vector_flag) { if (ifix->vector_flag) {
int num = fix->size_vector; int num = ifix->size_vector;
EXPECT_EQ(num, test_config.global_vector.size()); EXPECT_EQ(num, test_config.global_vector.size());
for (int i = 0; i < num; ++i) 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),
10 * epsilon); 10 * epsilon);
} }
if (print_stats && stats.has_data()) if (print_stats && stats.has_data())