diff --git a/source/source_cell/dom_force.cpp b/source/source_cell/dom_force.cpp index b035247892d..34654aaeaa9 100644 --- a/source/source_cell/dom_force.cpp +++ b/source/source_cell/dom_force.cpp @@ -75,7 +75,7 @@ void DomainDecomposition::accumulate_ghost_forces(MDCell& cell) { throw std::runtime_error("Ghost force owner is outside the ghost communication stencil."); } - send_buffers[static_cast(peer - peer_ranks.begin())].push_back(record); + send_buffers[peer - peer_ranks.begin()].push_back(record); } atom.force.set(0.0, 0.0, 0.0); } diff --git a/source/source_cell/dom_ghost.cpp b/source/source_cell/dom_ghost.cpp index 92430a41f7b..e2981cdcf02 100644 --- a/source/source_cell/dom_ghost.cpp +++ b/source/source_cell/dom_ghost.cpp @@ -65,7 +65,7 @@ void DomainDecomposition::exchange_ghost_atoms(MDCell& cell) const int index = (offset[0] + nlayer[0]) * span_y * span_z + (offset[1] + nlayer[1]) * span_z + (offset[2] + nlayer[2]); - slot_lookup[static_cast(index)] = static_cast(islot); + slot_lookup[index] = static_cast(islot); } const auto collect_offsets = [&](const LocalAtom& atom, const int dim, std::vector& offsets) { @@ -124,11 +124,11 @@ void DomainDecomposition::exchange_ghost_atoms(MDCell& cell) const int lookup_index = (dx + nlayer[0]) * span_y * span_z + (dy + nlayer[1]) * span_z + (dz + nlayer[2]); - const int slot_index = slot_lookup[static_cast(lookup_index)]; + const int slot_index = slot_lookup[lookup_index]; assert(slot_index >= 0); - const GhostExchangeSlot& slot = slots[static_cast(slot_index)]; - send_buffers[static_cast(slot_index)].push_back(pack_atom(atom, slot.image_shift)); - slots[static_cast(slot_index)].send_atom_indices.push_back(static_cast(iat)); + const GhostExchangeSlot& slot = slots[slot_index]; + send_buffers[slot_index].push_back(pack_atom(atom, slot.image_shift)); + slots[slot_index].send_atom_indices.push_back(static_cast(iat)); } } } @@ -144,7 +144,7 @@ void DomainDecomposition::exchange_ghost_atoms(MDCell& cell) slot.dynamic_image_shifts.reserve(slot.send_atom_indices.size()); for (const int index : slot.send_atom_indices) { - const LocalAtom& atom = owned_atoms[static_cast(index)]; + const LocalAtom& atom = owned_atoms[index]; slot.previous_fracs.push_back({{atom.frac.x, atom.frac.y, atom.frac.z}}); slot.dynamic_image_shifts.push_back(slot.image_shift); } @@ -280,7 +280,7 @@ void DomainDecomposition::update_ghost_atom_positions(MDCell& cell) std::vector send_frac(6 * slot.send_atom_indices.size(), 0.0); for (std::size_t i = 0; i < slot.send_atom_indices.size(); ++i) { - const LocalAtom& atom = owned_atoms[static_cast(slot.send_atom_indices[i])]; + const LocalAtom& atom = owned_atoms[slot.send_atom_indices[i]]; const std::array image_shift = image_shift_for_update( atom, slot.previous_fracs[i], slot.dynamic_image_shifts[i], slot); slot.previous_fracs[i] = {{atom.frac.x, atom.frac.y, atom.frac.z}}; diff --git a/source/source_cell/kernels/cuda/gpu_neighlist_device.cu b/source/source_cell/kernels/cuda/gpu_neighlist_device.cu index 1d4a45b2408..d83693d3bd3 100644 --- a/source/source_cell/kernels/cuda/gpu_neighlist_device.cu +++ b/source/source_cell/kernels/cuda/gpu_neighlist_device.cu @@ -106,8 +106,8 @@ int build_device_impl(int nall, if (status != 0) goto cleanup; for (int bin = 0; bin < total_bins; ++bin) { - bin_offsets[static_cast(bin + 1)] - = bin_offsets[static_cast(bin)] + bin_counts[static_cast(bin)]; + bin_offsets[bin + 1] + = bin_offsets[bin] + bin_counts[bin]; } status = check_cuda(cudaMemcpy(d_bin_offsets, bin_offsets.data(), sizeof(int) * (total_bins + 1), cudaMemcpyHostToDevice), diff --git a/source/source_cell/kernels/cuda/gpu_neighlist_host.cu b/source/source_cell/kernels/cuda/gpu_neighlist_host.cu index c03cd522d54..19e3db0e67d 100644 --- a/source/source_cell/kernels/cuda/gpu_neighlist_host.cu +++ b/source/source_cell/kernels/cuda/gpu_neighlist_host.cu @@ -100,8 +100,8 @@ int build_impl(int nall, if (status != 0) goto cleanup; for (int bin = 0; bin < total_bins; ++bin) { - bin_offsets[static_cast(bin + 1)] - = bin_offsets[static_cast(bin)] + bin_counts[static_cast(bin)]; + bin_offsets[bin + 1] + = bin_offsets[bin] + bin_counts[bin]; } status = check_cuda(cudaMemcpy(d_bin_offsets, bin_offsets.data(), sizeof(int) * (total_bins + 1), cudaMemcpyHostToDevice), diff --git a/source/source_cell/module_neighlist/bin_manager.cpp b/source/source_cell/module_neighlist/bin_manager.cpp index 32ab4bbe8eb..8c1fb54d9e2 100644 --- a/source/source_cell/module_neighlist/bin_manager.cpp +++ b/source/source_cell/module_neighlist/bin_manager.cpp @@ -230,7 +230,7 @@ void BinManager::build_atom_neighbors( for (const ModuleNeighList::LocalAtomIndex binned_atom_index : bins_[nidx].get_atom_indices()) { - const NeighborAtom& natom = binned_atoms[static_cast(binned_atom_index)]; + const NeighborAtom& natom = binned_atoms[binned_atom_index]; double dx = atom.position_x - natom.position_x; double dy = atom.position_y - natom.position_y; double dz = atom.position_z - natom.position_z; diff --git a/source/source_cell/module_neighlist/neighbor_list.h b/source/source_cell/module_neighlist/neighbor_list.h index c460deb11c3..cfc5ad4d1b6 100644 --- a/source/source_cell/module_neighlist/neighbor_list.h +++ b/source/source_cell/module_neighlist/neighbor_list.h @@ -41,7 +41,7 @@ class NeighborList firstneigh_[i] = allocator_.allocate(numneigh_[i]); for (int j = 0; j < numneigh_[i]; ++j) { - firstneigh_[i][j] = neighbors[static_cast(j)]; + firstneigh_[i][j] = neighbors[j]; } } diff --git a/source/source_cell/module_neighlist/neighbor_search.cpp b/source/source_cell/module_neighlist/neighbor_search.cpp index 68cc53d5e6f..8ff1ef013cc 100644 --- a/source/source_cell/module_neighlist/neighbor_search.cpp +++ b/source/source_cell/module_neighlist/neighbor_search.cpp @@ -205,11 +205,11 @@ void NeighborSearch::filter_candidate_neighbors_(double cutoff, double lat0) for (int i = 0; i < candidate_neighbor_list_.get_ncentral_atoms(); ++i) { active.clear(); - const NeighborAtom& center = all_atoms_[static_cast(i)]; + const NeighborAtom& center = all_atoms_[i]; for (int j = 0; j < candidate_neighbor_list_.get_numneigh(i); ++j) { const int index = candidate_neighbor_list_.get_firstneigh(i)[j]; - const NeighborAtom& neighbor = all_atoms_[static_cast(index)]; + const NeighborAtom& neighbor = all_atoms_[index]; const double dx = (center.position_x - neighbor.position_x) * lat0; const double dy = (center.position_y - neighbor.position_y) * lat0; const double dz = (center.position_z - neighbor.position_z) * lat0; diff --git a/source/source_cell/module_neighlist/unittests/test_domain_decomposition.cpp b/source/source_cell/module_neighlist/unittests/test_domain_decomposition.cpp index 8b3d9aa23ee..fd03bfa152b 100644 --- a/source/source_cell/module_neighlist/unittests/test_domain_decomposition.cpp +++ b/source/source_cell/module_neighlist/unittests/test_domain_decomposition.cpp @@ -118,7 +118,7 @@ TEST_F(DomainDecompositionTest, GhostExchangePlanMatchesGhostLayout) ASSERT_GE(owner, 0); ASSERT_LT(owner, static_cast(cell.owned_atoms().size())); EXPECT_EQ(cell.ghost_atoms()[iat].type_index, - cell.owned_atoms()[static_cast(owner)].type_index); + cell.owned_atoms()[owner].type_index); } } else @@ -160,7 +160,7 @@ TEST_F(DomainDecompositionTest, GhostExchangePlanMatchesGhostLayout) + iatom; ASSERT_LT(ghost_index, cell.ghost_atoms().size()); EXPECT_EQ(cell.ghost_atoms()[ghost_index].type_index, - cell.owned_atoms()[static_cast(owned_index)].type_index); + cell.owned_atoms()[owned_index].type_index); } } } diff --git a/source/source_cell/module_neighlist/unittests/test_mdcell_migrate_mpi.cpp b/source/source_cell/module_neighlist/unittests/test_mdcell_migrate_mpi.cpp index 4a857136695..ba7fb71c81e 100644 --- a/source/source_cell/module_neighlist/unittests/test_mdcell_migrate_mpi.cpp +++ b/source/source_cell/module_neighlist/unittests/test_mdcell_migrate_mpi.cpp @@ -103,7 +103,7 @@ TEST(MdCellMigrateMpiTest, AtomCrossingDomainMigratesToNewOwner) for (int i = 0; i < mdcell.owned_atoms().size(); ++i) { - EXPECT_EQ(mdcell.owned_atoms()[static_cast(i)].owner_rank, rank); + EXPECT_EQ(mdcell.owned_atoms()[i].owner_rank, rank); } } } diff --git a/source/source_cell/module_neighlist/unittests/test_neighbor_search.cpp b/source/source_cell/module_neighlist/unittests/test_neighbor_search.cpp index 6798def4f8e..4b3e561deee 100644 --- a/source/source_cell/module_neighlist/unittests/test_neighbor_search.cpp +++ b/source/source_cell/module_neighlist/unittests/test_neighbor_search.cpp @@ -28,11 +28,11 @@ void initialize_test_ucell(UnitCell& ucell, for (int it = 0; it < ntype; ++it) { ucell.atoms[it].type = it; - ucell.atoms[it].na = na[static_cast(it)]; + ucell.atoms[it].na = na[it]; ucell.atoms[it].tau.resize(static_cast(ucell.atoms[it].na)); for (int ia = 0; ia < ucell.atoms[it].na; ++ia) { - ucell.atoms[it].tau[static_cast(ia)] = tau[iat++]; + ucell.atoms[it].tau[ia] = tau[iat++]; } ucell.nat += ucell.atoms[it].na; } diff --git a/source/source_cell/print_cell.cpp b/source/source_cell/print_cell.cpp index 258102860db..250895d3fbc 100644 --- a/source/source_cell/print_cell.cpp +++ b/source/source_cell/print_cell.cpp @@ -362,7 +362,7 @@ StruMeta make_stru_meta(const UnitCell& ucell) metadata.species.resize(static_cast(ucell.ntype)); for (int it = 0; it < ucell.ntype; ++it) { - StruSpecies& species = metadata.species[static_cast(it)]; + StruSpecies& species = metadata.species[it]; if (static_cast(it) < ucell.pseudo_fn.size()) species.pseudo_file = ucell.pseudo_fn[it]; if (static_cast(it) < ucell.pseudo_type.size()) species.pseudo_type = ucell.pseudo_type[it]; if (static_cast(it) < ucell.orbital_fn.size()) species.orbital_file = ucell.orbital_fn[it]; diff --git a/source/source_io/module_parameter/read_inp_sys.cpp b/source/source_io/module_parameter/read_inp_sys.cpp index 7a8d450f93f..788da1db046 100644 --- a/source/source_io/module_parameter/read_inp_sys.cpp +++ b/source/source_io/module_parameter/read_inp_sys.cpp @@ -128,13 +128,13 @@ void ReadInput::item_system() } for (int i = 0; i < 3; ++i) { - para.input.cell_replica[static_cast(i)] = std::stoi(item.str_values[static_cast(i)]); + para.input.cell_replica[i] = std::stoi(item.str_values[i]); } }; item.check_value = [](const Input_Item&, const Parameter& para) { for (int i = 0; i < 3; ++i) { - if (para.input.cell_replica[static_cast(i)] <= 0) + if (para.input.cell_replica[i] <= 0) { ModuleBase::WARNING_QUIT("ReadInput", "cell_replica values must all be positive."); } diff --git a/source/source_md/langevin.cpp b/source/source_md/langevin.cpp index 204e946bbc6..bd1098c0d97 100644 --- a/source/source_md/langevin.cpp +++ b/source/source_md/langevin.cpp @@ -41,7 +41,7 @@ void Langevin::first_half(std::ofstream& ofs) for (int i = 0; i < mdcell.owned_atoms().size(); ++i) { - LocalAtom& atom = mdcell.owned_atoms()[static_cast(i)]; + LocalAtom& atom = mdcell.owned_atoms()[i]; for (int k = 0; k < 3; ++k) { if (atom.mbl[k]) atom.vel[k] += 0.5 * total_force[i][k] * md_dt / atom.mass; @@ -62,7 +62,7 @@ void Langevin::second_half() post_force(); for (int i = 0; i < mdcell.owned_atoms().size(); ++i) { - LocalAtom& atom = mdcell.owned_atoms()[static_cast(i)]; + LocalAtom& atom = mdcell.owned_atoms()[i]; for (int k = 0; k < 3; ++k) { if (atom.mbl[k]) atom.vel[k] += 0.5 * total_force[i][k] * md_dt / atom.mass; @@ -107,7 +107,7 @@ void Langevin::post_force() { random_value[k] = static_cast(std::rand()) / RAND_MAX - 0.5; } - const LocalAtom& atom = mdcell.owned_atoms()[static_cast(i)]; + const LocalAtom& atom = mdcell.owned_atoms()[i]; ModuleBase::Vector3 fictitious_force = -atom.mass * atom.vel / md_damp; for (int j = 0; j < 3; ++j) { diff --git a/source/source_md/md_func.cpp b/source/source_md/md_func.cpp index bdc8345d22d..7b8ae5bf67a 100644 --- a/source/source_md/md_func.cpp +++ b/source/source_md/md_func.cpp @@ -244,11 +244,11 @@ void init_vel(MDCell& mdcell, std::vector offsets(static_cast(unit.ntype + 1), 0); for (int it = 0; it < unit.ntype; ++it) { - offsets[static_cast(it + 1)] = offsets[static_cast(it)] + unit.atoms[it].na; + offsets[it + 1] = offsets[it] + unit.atoms[it].na; } for (LocalAtom& atom : mdcell.owned_atoms()) { - atom.vel = velocities[static_cast(offsets[static_cast(atom.type)] + atom.type_index)]; + atom.vel = velocities[offsets[atom.type] + atom.type_index]; } return; } @@ -337,7 +337,7 @@ void force_virial(ModuleESolver::ESolver* p_esolver, static_cast(ucell.ntype)); for (int it = 0; it < ucell.ntype; ++it) { - backing_velocities[static_cast(it)] = ucell.atoms[it].vel; + backing_velocities[it] = ucell.atoms[it].vel; } // The caller reports whether positions drifted in this run; the // initial force evaluation (also of a restarted run) passes false so @@ -345,8 +345,8 @@ void force_virial(ModuleESolver::ESolver* p_esolver, mdcell.sync_backing_unitcell(positions_updated); for (int it = 0; it < ucell.ntype; ++it) { - std::copy(backing_velocities[static_cast(it)].begin(), - backing_velocities[static_cast(it)].end(), + std::copy(backing_velocities[it].begin(), + backing_velocities[it].end(), ucell.atoms[it].vel.begin()); } p_esolver->runner(ucell, istep); potential = 0.5 * p_esolver->cal_energy(); @@ -484,8 +484,8 @@ void dump_info(const int& step, { std::ostringstream row; row << std::fixed << std::setprecision(12); - row << " " << type_offsets[static_cast(atom.type)] + atom.type_index - << " " << mdcell.type_labels()[static_cast(atom.type)] + row << " " << type_offsets[atom.type] + atom.type_index + << " " << mdcell.type_labels()[atom.type] << " " << atom.cart.x * unit_pos << " " << atom.cart.y * unit_pos << " " << atom.cart.z * unit_pos; if (mdp.dump_force) row << " " << atom.force.x * unit_force << " " << atom.force.y * unit_force << " " << atom.force.z * unit_force; @@ -502,7 +502,7 @@ void dump_info(const int& step, const std::size_t maximum_count = std::numeric_limits::max(); for (const LocalAtom& atom : mdcell.owned_atoms()) { - const std::int64_t index = type_offsets[static_cast(atom.type)] + atom.type_index; + const std::int64_t index = type_offsets[atom.type] + atom.type_index; const LocalAtom* atom_pointer = &atom; ordered_atoms.emplace_back(index, atom_pointer); const std::string row = format_atom(atom); @@ -653,7 +653,7 @@ std::int64_t global_dof(const MDCell& mdcell) std::int64_t local_frozen[3] = {0, 0, 0}; for (int i = 0; i < mdcell.owned_atoms().size(); ++i) { - const ModuleBase::Vector3& mbl = mdcell.owned_atoms()[static_cast(i)].mbl; + const ModuleBase::Vector3& mbl = mdcell.owned_atoms()[i].mbl; if (mbl.x == 0) ++local_frozen[0]; if (mbl.y == 0) ++local_frozen[1]; if (mbl.z == 0) ++local_frozen[2]; diff --git a/source/source_md/module_lj/lj_forcefield.cpp b/source/source_md/module_lj/lj_forcefield.cpp index 59d404e6db2..b797334b070 100644 --- a/source/source_md/module_lj/lj_forcefield.cpp +++ b/source/source_md/module_lj/lj_forcefield.cpp @@ -93,7 +93,7 @@ void LJ::compute(BaseCell& cell, for (int local_i = 0; local_i < neighbor_list.get_ncentral_atoms(); ++local_i) { - const NeighborAtom& center_atom = inside_atoms[static_cast(local_i)]; + const NeighborAtom& center_atom = inside_atoms[local_i]; const int it = center_atom.atom_type; const int ia = center_atom.atom_index; const int iat = atom_offsets[it] + ia; @@ -149,7 +149,7 @@ void LJ::compute(BaseCell& cell, for (int local_i = 0; local_i < neighbor_list.get_ncentral_atoms(); ++local_i) { - LocalAtom& center_atom = owned_atoms[static_cast(local_i)]; + LocalAtom& center_atom = owned_atoms[local_i]; ModuleBase::Vector3 tau1(center_atom.cart.x, center_atom.cart.y, center_atom.cart.z); for (int ad = 0; ad < neighbor_list.get_numneigh(local_i); ++ad) { diff --git a/source/source_md/module_nep/nep_forcefield.cpp b/source/source_md/module_nep/nep_forcefield.cpp index 2f779318b60..08f44407219 100644 --- a/source/source_md/module_nep/nep_forcefield.cpp +++ b/source/source_md/module_nep/nep_forcefield.cpp @@ -141,19 +141,19 @@ void NEPPotential::compute(BaseCell& basecell, std::vector force_ptrs(static_cast(natom), NULL); for (int iat = 0; iat < natom; ++iat) { - const LocalAtom& atom = iat < nowned_atoms ? owned_atoms[static_cast(iat)] - : ghost_atoms[static_cast(iat - nowned_atoms)]; + const LocalAtom& atom = iat < nowned_atoms ? owned_atoms[iat] + : ghost_atoms[iat - nowned_atoms]; if (atom.type < 0 || static_cast(atom.type) >= md_type_to_nep_type_.size()) { ModuleBase::WARNING_QUIT("ESolver_NEP", "MDCell atom type is outside the NEP type map."); } - local_type[static_cast(iat)] = atom.type; - position[static_cast(iat)][0] = atom.cart.x * mdcell.lat0() * ModuleBase::BOHR_TO_A; - position[static_cast(iat)][1] = atom.cart.y * mdcell.lat0() * ModuleBase::BOHR_TO_A; - position[static_cast(iat)][2] = atom.cart.z * mdcell.lat0() * ModuleBase::BOHR_TO_A; - force[static_cast(iat)].fill(0.0); - position_ptrs[static_cast(iat)] = position[static_cast(iat)].data(); - force_ptrs[static_cast(iat)] = force[static_cast(iat)].data(); + local_type[iat] = atom.type; + position[iat][0] = atom.cart.x * mdcell.lat0() * ModuleBase::BOHR_TO_A; + position[iat][1] = atom.cart.y * mdcell.lat0() * ModuleBase::BOHR_TO_A; + position[iat][2] = atom.cart.z * mdcell.lat0() * ModuleBase::BOHR_TO_A; + force[iat].fill(0.0); + position_ptrs[iat] = position[iat].data(); + force_ptrs[iat] = force[iat].data(); } const NeighborList& neighbor_list = mdcell.neighbor_search().get_neighbor_list(); @@ -162,9 +162,9 @@ void NEPPotential::compute(BaseCell& basecell, std::vector firstneigh(static_cast(natom), NULL); for (int iat = 0; iat < nowned_atoms; ++iat) { - ilist[static_cast(iat)] = iat; - numneigh[static_cast(iat)] = neighbor_list.get_numneigh(iat); - firstneigh[static_cast(iat)] = const_cast(neighbor_list.get_firstneigh(iat)); + ilist[iat] = iat; + numneigh[iat] = neighbor_list.get_numneigh(iat); + firstneigh[iat] = const_cast(neighbor_list.get_firstneigh(iat)); } double local_energy = 0.0; @@ -187,15 +187,15 @@ void NEPPotential::compute(BaseCell& basecell, std::vector& mutable_ghost_atoms = mdcell.ghost_atoms(); for (int iat = 0; iat < nowned_atoms; ++iat) { - mutable_owned_atoms[static_cast(iat)].force.set(force[static_cast(iat)][0], - force[static_cast(iat)][1], - force[static_cast(iat)][2]); + mutable_owned_atoms[iat].force.set(force[iat][0], + force[iat][1], + force[iat][2]); } for (int iat = 0; iat < nghost; ++iat) { - mutable_ghost_atoms[static_cast(iat)].force.set(force[static_cast(nowned_atoms + iat)][0], - force[static_cast(nowned_atoms + iat)][1], - force[static_cast(nowned_atoms + iat)][2]); + mutable_ghost_atoms[iat].force.set(force[nowned_atoms + iat][0], + force[nowned_atoms + iat][1], + force[nowned_atoms + iat][2]); } ModuleBase::CommunicationDomain domain; @@ -211,7 +211,7 @@ void NEPPotential::compute(BaseCell& basecell, energy = local_energy * fact_e; for (int iat = 0; iat < nowned_atoms; ++iat) { - LocalAtom& atom = mutable_owned_atoms[static_cast(iat)]; + LocalAtom& atom = mutable_owned_atoms[iat]; atom.force *= fact_f; } for (LocalAtom& atom : mutable_ghost_atoms) @@ -314,7 +314,7 @@ void NEPPotential::type_map(const UnitCell& ucell) std::vector type_labels(static_cast(ucell.ntype)); for (int it = 0; it < ucell.ntype; ++it) { - type_labels[static_cast(it)] = ucell.atoms[it].label; + type_labels[it] = ucell.atoms[it].label; } initialize_type_map_(type_labels); @@ -323,7 +323,7 @@ void NEPPotential::type_map(const UnitCell& ucell) { for (int ia = 0; ia < ucell.atoms[it].na; ++ia) { - atype[static_cast(iat++)] = md_type_to_nep_type_[static_cast(it)]; + atype[iat++] = md_type_to_nep_type_[it]; } } assert(ucell.nat == iat); diff --git a/source/source_md/module_snap/snap_calculator.cpp b/source/source_md/module_snap/snap_calculator.cpp index d646507fbd4..99d578031a5 100644 --- a/source/source_md/module_snap/snap_calculator.cpp +++ b/source/source_md/module_snap/snap_calculator.cpp @@ -151,8 +151,8 @@ ForceResult Calculator::compute_with_analytic_force(const std::vector& { derivative += force_coefficients[index] * db[index]; } - result.center_force[static_cast(direction)] += derivative; - result.neighbor_forces[neighbor_index][static_cast(direction)] = -derivative; + result.center_force[direction] += derivative; + result.neighbor_forces[neighbor_index][direction] = -derivative; } } return result; @@ -194,8 +194,8 @@ ForceResult Calculator::compute_with_finite_difference_force(const std::vector(direction)] += derivative; - result.neighbor_forces[neighbor_index][static_cast(direction)] -= derivative; + result.center_force[direction] += derivative; + result.neighbor_forces[neighbor_index][direction] -= derivative; } } return result; @@ -231,8 +231,8 @@ void CellAccumulator::add(const std::size_t center_index, energy_ += result.energy.energy; for (int direction = 0; direction < 3; ++direction) { - forces_[center_index][static_cast(direction)] += - result.center_force[static_cast(direction)]; + forces_[center_index][direction] += + result.center_force[direction]; } for (std::size_t index = 0; index < neighbors.size(); ++index) { @@ -241,15 +241,15 @@ void CellAccumulator::add(const std::size_t center_index, const std::size_t atom = neighbor_indices[index]; for (int direction = 0; direction < 3; ++direction) { - forces_[atom][static_cast(direction)] += - result.neighbor_forces[index][static_cast(direction)]; + forces_[atom][direction] += + result.neighbor_forces[index][direction]; } for (int row = 0; row < 3; ++row) { for (int column = 0; column < 3; ++column) { - virial_[static_cast(3 * row + column)] += - displacement[row] * result.neighbor_forces[index][static_cast(column)]; + virial_[3 * row + column] += + displacement[row] * result.neighbor_forces[index][column]; } } } diff --git a/source/source_md/module_snap/snap_derivative.cpp b/source/source_md/module_snap/snap_derivative.cpp index fc3e15d568c..c415fea0b0b 100644 --- a/source/source_md/module_snap/snap_derivative.cpp +++ b/source/source_md/module_snap/snap_derivative.cpp @@ -164,8 +164,8 @@ UWithDerivative DescriptorEvaluator::compute_u_with_derivative(const Neighbor& n { const std::size_t current = u_index(j, ma, mb); const std::size_t previous = u_index(j - 1, ma, mb); - const double first_root = root_factors_[static_cast((j - ma) * dimension + (j - mb))]; - const double second_root = root_factors_[static_cast((ma + 1) * dimension + (j - mb))]; + const double first_root = root_factors_[(j - ma) * dimension + (j - mb)]; + const double second_root = root_factors_[(ma + 1) * dimension + (j - mb)]; raw[current] += Dual(first_root) * std::complex(ar, -ai) * raw[previous]; raw[current + 1] = Dual(-second_root) * std::complex(br, -bi) * raw[previous]; } diff --git a/source/source_md/module_snap/snap_descriptor.cpp b/source/source_md/module_snap/snap_descriptor.cpp index 9b36bbec284..4cfb5e4b863 100644 --- a/source/source_md/module_snap/snap_descriptor.cpp +++ b/source/source_md/module_snap/snap_descriptor.cpp @@ -23,7 +23,7 @@ DescriptorEvaluator::DescriptorEvaluator(const ModelParameters& parameters) u_block_.resize(static_cast(parameters_.twojmax + 1), 0); for (int j = 0; j <= parameters_.twojmax; ++j) { - u_block_[static_cast(j)] = u_size_; + u_block_[j] = u_size_; u_size_ += static_cast((j + 1) * (j + 1)); } init_root_factors(); @@ -55,14 +55,14 @@ void DescriptorEvaluator::init_root_factors() { for (int q = 1; q <= parameters_.twojmax; ++q) { - root_factors_[static_cast(p * dimension + q)] = std::sqrt(static_cast(p) / q); + root_factors_[p * dimension + q] = std::sqrt(static_cast(p) / q); } } } std::size_t DescriptorEvaluator::u_index(const int j, const int ma, const int mb) const { - return u_block_[static_cast(j)] + static_cast(mb * (j + 1) + ma); + return u_block_[j] + static_cast(mb * (j + 1) + ma); } DescriptorEvaluator::SwitchValue DescriptorEvaluator::switching(const double distance, @@ -141,8 +141,8 @@ std::vector > DescriptorEvaluator::compute_u(const Neighbor { const std::size_t current = u_index(j, ma, mb); const std::size_t previous = u_index(j - 1, ma, mb); - const double first_root = root_factors_[static_cast((j - ma) * dimension + (j - mb))]; - const double second_root = root_factors_[static_cast((ma + 1) * dimension + (j - mb))]; + const double first_root = root_factors_[(j - ma) * dimension + (j - mb)]; + const double second_root = root_factors_[(ma + 1) * dimension + (j - mb)]; result[current] += first_root * std::complex(ar, -ai) * result[previous]; result[current + 1] = -second_root * std::complex(br, -bi) * result[previous]; } diff --git a/source/source_md/module_snap/snap_forcefield.cpp b/source/source_md/module_snap/snap_forcefield.cpp index b8c89eb1989..823cbe5ced1 100644 --- a/source/source_md/module_snap/snap_forcefield.cpp +++ b/source/source_md/module_snap/snap_forcefield.cpp @@ -49,9 +49,9 @@ ModuleMD::SNAP::Neighbor make_neighbor(const NeighborAtom& center, result.x = (neighbor.position_x - center.position_x) * lat0 * ModuleBase::BOHR_TO_A; result.y = (neighbor.position_y - center.position_y) * lat0 * ModuleBase::BOHR_TO_A; result.z = (neighbor.position_z - center.position_z) * lat0 * ModuleBase::BOHR_TO_A; - result.weight = parameters.element_weights[static_cast(neighbor.atom_type)]; - result.cutoff_radius = (parameters.element_radii[static_cast(center.atom_type)] - + parameters.element_radii[static_cast(neighbor.atom_type)]) + result.weight = parameters.element_weights[neighbor.atom_type]; + result.cutoff_radius = (parameters.element_radii[center.atom_type] + + parameters.element_radii[neighbor.atom_type]) * parameters.rcutfac; result.element_index = static_cast(neighbor.atom_type); if (parameters.switchinner_flag) @@ -146,10 +146,10 @@ void SnapPotential::compute(BaseCell& cell, ModuleMD::SNAP::CellAccumulator contribution(all_atoms.size()); for (int i = 0; i < nowned; ++i) { - const NeighborAtom center(owned_atoms[static_cast(i)].cart.x, - owned_atoms[static_cast(i)].cart.y, - owned_atoms[static_cast(i)].cart.z, - owned_atoms[static_cast(i)].type, + const NeighborAtom center(owned_atoms[i].cart.x, + owned_atoms[i].cart.y, + owned_atoms[i].cart.z, + owned_atoms[i].type, i, i); std::vector neighbors; @@ -157,7 +157,7 @@ void SnapPotential::compute(BaseCell& cell, for (int k = 0; k < list.get_numneigh(i); ++k) { const int neighbor_index = list.get_firstneigh(i)[k]; - const NeighborAtom& neighbor = all_atoms[static_cast(neighbor_index)]; + const NeighborAtom& neighbor = all_atoms[neighbor_index]; if (neighbor.atom_type < 0 || static_cast(neighbor.atom_type) >= model_.parameters.elements.size()) { fail("MDCell atom type is outside the SNAP element map.", rank_); @@ -198,11 +198,11 @@ void SnapPotential::compute(BaseCell& cell, domain.sum(stress.c, 9); for (int i = 0; i < nowned; ++i) { - const std::array& value = contribution.forces()[static_cast(i)]; + const std::array& value = contribution.forces()[i]; const double fx = value[0] * force_scale; const double fy = value[1] * force_scale; const double fz = value[2] * force_scale; - owned_atoms[static_cast(i)].force.set(fx, fy, fz); + owned_atoms[i].force.set(fx, fy, fz); } return; } @@ -221,24 +221,24 @@ void SnapPotential::compute(BaseCell& cell, std::vector offsets(static_cast(ucell.ntype + 1), 0); for (int it = 0; it < ucell.ntype; ++it) { - offsets[static_cast(it + 1)] = offsets[static_cast(it)] + ucell.atoms[it].na; + offsets[it + 1] = offsets[it] + ucell.atoms[it].na; } for (int local_i = 0; local_i < list.get_ncentral_atoms(); ++local_i) { - const NeighborAtom& center = inside[static_cast(local_i)]; + const NeighborAtom& center = inside[local_i]; std::vector neighbors; std::vector atom_indices; for (int k = 0; k < list.get_numneigh(local_i); ++k) { - const NeighborAtom& neighbor = all[static_cast(list.get_firstneigh(local_i)[k])]; + const NeighborAtom& neighbor = all[list.get_firstneigh(local_i)[k]]; neighbors.push_back(make_neighbor(center, neighbor, ucell.lat0, model_.parameters)); - const int atom_index = offsets[static_cast(neighbor.atom_type)] + neighbor.atom_index; + const int atom_index = offsets[neighbor.atom_type] + neighbor.atom_index; const std::size_t index = static_cast(atom_index); atom_indices.push_back(index); } const std::size_t center_element = static_cast(center.atom_type); const ModuleMD::SNAP::ForceResult result = calculator_->compute_with_analytic_force(neighbors, center_element); - const int center_index = offsets[static_cast(center.atom_type)] + center.atom_index; + const int center_index = offsets[center.atom_type] + center.atom_index; const std::size_t index = static_cast(center_index); contribution.add(index, atom_indices, neighbors, result); } diff --git a/source/source_md/module_snap/snap_model.cpp b/source/source_md/module_snap/snap_model.cpp index 131e3d2eded..bd10d10e3cd 100644 --- a/source/source_md/module_snap/snap_model.cpp +++ b/source/source_md/module_snap/snap_model.cpp @@ -242,12 +242,12 @@ bool ModelData::load(const std::string& coefficient_file, return false; } std::istringstream value_line(line); - if (!(value_line >> values[static_cast(coefficient)])) + if (!(value_line >> values[coefficient])) { error = "Invalid SNAP coefficient value."; return false; } - if (!std::isfinite(values[static_cast(coefficient)]) || value_line >> extra) + if (!std::isfinite(values[coefficient]) || value_line >> extra) { error = "Invalid or extra SNAP coefficient value for element: " + element; return false; diff --git a/source/source_md/msst.cpp b/source/source_md/msst.cpp index 02f311a7395..cec8a2c5daf 100644 --- a/source/source_md/msst.cpp +++ b/source/source_md/msst.cpp @@ -98,7 +98,7 @@ void MSST::first_half(std::ofstream& ofs) old_v.resize(mdcell.owned_atoms().size()); for (int i = 0; i < mdcell.owned_atoms().size(); ++i) { - old_v[static_cast(i)] = mdcell.owned_atoms()[static_cast(i)].vel; + old_v[i] = mdcell.owned_atoms()[i].vel; } /// propagate velocity sum 1/2 step by temporarily propagating the velocities @@ -109,7 +109,7 @@ void MSST::first_half(std::ofstream& ofs) /// reset the velocities for (int i = 0; i < mdcell.owned_atoms().size(); ++i) { - mdcell.owned_atoms()[static_cast(i)].vel = old_v[static_cast(i)]; + mdcell.owned_atoms()[i].vel = old_v[i]; } /// propagate velocities 1/2 step using the new velocity sum diff --git a/source/source_md/unittests/test_fire.cpp b/source/source_md/unittests/test_fire.cpp index fd8e4d04303..8de61987fd3 100644 --- a/source/source_md/unittests/test_fire.cpp +++ b/source/source_md/unittests/test_fire.cpp @@ -82,31 +82,31 @@ TEST_F(FIREtest, FirstHalf) { mdrun->first_half(GlobalV::ofs_running); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00045447059554315662, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00032646833232493271, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.215709523063016e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.0005213674681407162, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00059486888444406608, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00035886062145122004, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00052406920303529794, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, 4.8706739346586155e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00020129054406946794, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00045717233044145918, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00021969381277291936, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00010541298215149392, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00010993118004167345, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.8968913216100539e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.2616198016939999e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00012611275970351733, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00014389190209072655, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 8.6804233262820007e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00012676627812260489, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, 1.1781596840062159e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -4.8689854212330001e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.00011058469846166102, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 5.3141392034653857e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.5498181033639999e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00045447059554315662, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00032646833232493271, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.215709523063016e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.0005213674681407162, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00059486888444406608, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00035886062145122004, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00052406920303529794, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, 4.8706739346586155e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00020129054406946794, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00045717233044145918, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00021969381277291936, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00010541298215149392, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00010993118004167345, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.8968913216100539e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.2616198016939999e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00012611275970351733, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00014389190209072655, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 8.6804233262820007e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00012676627812260489, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, 1.1781596840062159e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -4.8689854212330001e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.00011058469846166102, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 5.3141392034653857e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.5498181033639999e-05, doublethreshold); } TEST_F(FIREtest, SecondHalf) @@ -114,31 +114,31 @@ TEST_F(FIREtest, SecondHalf) mdrun->first_half(GlobalV::ofs_running); mdrun->second_half(); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00045447059554315662, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00032646833232493271, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.215709523063016e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.0005213674681407162, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00059486888444406608, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00035886062145122004, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00052406920303529794, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, 4.8706739346586155e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00020129054406946794, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00045717233044145918, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00021969381277291936, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00010541298215149392, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00010978976887416819, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.9202349471957007e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.2616198016939999e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00012592893778281191, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00014408187344675441, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 8.6804233262820007e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00012686679539500493, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, 1.2011267908381344e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -4.8689854212330001e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.00011072762648726122, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 5.2868256066506055e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.5498181033639999e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00045447059554315662, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00032646833232493271, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.215709523063016e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.0005213674681407162, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00059486888444406608, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00035886062145122004, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00052406920303529794, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, 4.8706739346586155e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00020129054406946794, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00045717233044145918, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00021969381277291936, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00010541298215149392, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00010978976887416819, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.9202349471957007e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.2616198016939999e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00012592893778281191, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00014408187344675441, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 8.6804233262820007e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00012686679539500493, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, 1.2011267908381344e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -4.8689854212330001e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.00011072762648726122, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 5.2868256066506055e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.5498181033639999e-05, doublethreshold); } TEST_F(FIREtest, WriteRestart) diff --git a/source/source_md/unittests/test_langevin.cpp b/source/source_md/unittests/test_langevin.cpp index 48afff41654..fac652619cf 100644 --- a/source/source_md/unittests/test_langevin.cpp +++ b/source/source_md/unittests/test_langevin.cpp @@ -82,31 +82,31 @@ TEST_F(Langevin_test, first_half) { mdrun->first_half(GlobalV::ofs_running); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, 0.00012104549072633688, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 2.6272991724490339e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, 0.0002984728051383459, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00066077703137157329, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, 0.00017245549939737259, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, -0.00015046260270490386, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00046755850510571406, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, 0.00030490494761200812, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00036886672854369307, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00029624371924650601, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00013444493932002199, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, 9.0496812405138627e-05, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, 2.9279504031204254e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 6.3551327892765255e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, 7.2197119023712585e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00015983432044991118, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, 4.1714990451188365e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, -3.639516314080526e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.0001130969939724264, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, 7.3752979885251439e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -8.9224594824346108e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 7.1657928931092104e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 3.2520675649909766e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, 2.189013211254232e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, 0.00012104549072633688, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 2.6272991724490339e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, 0.0002984728051383459, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00066077703137157329, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, 0.00017245549939737259, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, -0.00015046260270490386, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00046755850510571406, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, 0.00030490494761200812, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00036886672854369307, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00029624371924650601, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00013444493932002199, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, 9.0496812405138627e-05, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, 2.9279504031204254e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 6.3551327892765255e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, 7.2197119023712585e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00015983432044991118, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, 4.1714990451188365e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, -3.639516314080526e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.0001130969939724264, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, 7.3752979885251439e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -8.9224594824346108e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 7.1657928931092104e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 3.2520675649909766e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, 2.189013211254232e-05, doublethreshold); } TEST_F(Langevin_test, second_half) @@ -115,31 +115,31 @@ TEST_F(Langevin_test, second_half) mdrun->second_half(); ; - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, 0.00012104549072633688, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 2.6272991724490339e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, 0.0002984728051383459, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00066077703137157329, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, 0.00017245549939737259, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, -0.00015046260270490386, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00046755850510571406, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, 0.00030490494761200812, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00036886672854369307, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00029624371924650601, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00013444493932002199, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, 9.0496812405138627e-05, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -2.3049731761587064e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.1603385162874621e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, 0.00016262437779022168, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.0001961773016510733, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, 5.8637246942200678e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 4.259822700946159e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00015692223255483009, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, 6.7034146380577021e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -0.00017994277784966602, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, -3.5963807276704002e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, -8.5508938351509974e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, 9.6048301397465443e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, 0.00012104549072633688, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 2.6272991724490339e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, 0.0002984728051383459, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00066077703137157329, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, 0.00017245549939737259, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, -0.00015046260270490386, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00046755850510571406, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, 0.00030490494761200812, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00036886672854369307, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00029624371924650601, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00013444493932002199, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, 9.0496812405138627e-05, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -2.3049731761587064e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.1603385162874621e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, 0.00016262437779022168, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.0001961773016510733, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, 5.8637246942200678e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 4.259822700946159e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00015692223255483009, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, 6.7034146380577021e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -0.00017994277784966602, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, -3.5963807276704002e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, -8.5508938351509974e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, 9.6048301397465443e-05, doublethreshold); } TEST_F(Langevin_test, write_restart) diff --git a/source/source_md/unittests/test_lj_forcefield.cpp b/source/source_md/unittests/test_lj_forcefield.cpp index a21bdd14253..0d84efe098c 100644 --- a/source/source_md/unittests/test_lj_forcefield.cpp +++ b/source/source_md/unittests/test_lj_forcefield.cpp @@ -105,7 +105,7 @@ TEST_F(LJ_pot_test, mdcell_cal_force) p_esolver->cal_force(mdcell, force); for (int iat = 0; iat < mdcell.owned_atoms().size(); ++iat) { - const LocalAtom& atom = mdcell.owned_atoms()[static_cast(iat)]; + const LocalAtom& atom = mdcell.owned_atoms()[iat]; EXPECT_DOUBLE_EQ(force(iat, 0), atom.force.x); EXPECT_DOUBLE_EQ(force(iat, 1), atom.force.y); EXPECT_DOUBLE_EQ(force(iat, 2), atom.force.z); diff --git a/source/source_md/unittests/test_msst.cpp b/source/source_md/unittests/test_msst.cpp index 3024280cf1e..c77e34cacc9 100644 --- a/source/source_md/unittests/test_msst.cpp +++ b/source/source_md/unittests/test_msst.cpp @@ -66,18 +66,18 @@ class MSST_test : public testing::Test TEST_F(MSST_test, setup) { - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.0001314186733659715, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.0985331994796372e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.3947731701005279e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00015227275651566311, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00014579875939315496, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 9.5965690649087203e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00013311885204189453, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -3.0298400368294885e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.3828659173134662e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.00011226476889319793, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7843267435287586e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.8189299775046767e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.0001314186733659715, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.0985331994796372e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.3947731701005279e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00015227275651566311, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00014579875939315496, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 9.5965690649087203e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00013311885204189453, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -3.0298400368294885e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.3828659173134662e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.00011226476889319793, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7843267435287586e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.8189299775046767e-05, doublethreshold); EXPECT_NEAR(mdrun->stress(0, 0), 5.9579909955800075e-06, doublethreshold); EXPECT_NEAR(mdrun->stress(0, 1), -1.4582038138067117e-06, doublethreshold); @@ -107,31 +107,31 @@ TEST_F(MSST_test, first_half) EXPECT_NEAR(mdcell.latvec().e33, 9.9959581179144905, doublethreshold); EXPECT_NEAR(mdcell.omega(), 999.59581179144902, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054271823071484467, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029442816868202821, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7685149290774873e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00062875654254500096, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00060353746208327032, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.0003968957326219519, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00055074716824834991, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -1.1576283073263842e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00022262503373940808, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00046470885642230719, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00032068557647491725, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00011658554959218052, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054271823071484467, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029442816868202821, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7685149290774873e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00062875654254500096, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00060353746208327032, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.0003968957326219519, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00055074716824834991, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -1.1576283073263842e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00022262503373940808, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00046470885642230719, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00032068557647491725, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00011658554959218052, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00013127726219846624, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.121876825065284e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.3947730561390963e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.0001520889345949577, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00014598873074918282, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 9.596568280810794e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00013321936931429457, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -2.8001689685103039e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.3828654775006574e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.00011240769691879813, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7570131467139791e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.8189297471809918e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00013127726219846624, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.121876825065284e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.3947730561390963e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.0001520889345949577, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00014598873074918282, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 9.596568280810794e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00013321936931429457, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -2.8001689685103039e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.3828654775006574e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.00011240769691879813, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7570131467139791e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.8189297471809918e-05, doublethreshold); } TEST_F(MSST_test, second_half) @@ -153,31 +153,31 @@ TEST_F(MSST_test, second_half) EXPECT_NEAR(mdcell.latvec().e33, 9.9959581179144905, doublethreshold); EXPECT_NEAR(mdcell.omega(), 999.59581179144902, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054271823071484467, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029442816868202821, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7685149290774873e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00062875654254500096, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00060353746208327032, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.0003968957326219519, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00055074716824834991, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -1.1576283073263842e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00022262503373940808, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00046470885642230719, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00032068557647491725, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00011658554959218052, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054271823071484467, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029442816868202821, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7685149290774873e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00062875654254500096, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00060353746208327032, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.0003968957326219519, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00055074716824834991, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -1.1576283073263842e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00022262503373940808, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00046470885642230719, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00032068557647491725, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00011658554959218052, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00013113585103096098, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.1452204506509308e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.3953371489538059e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00015190511267425228, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00014617870210521068, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 9.600449453585996e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00013331988658669462, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -2.5704979001911192e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.3850424881082548e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.00011255062494439833, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7296995498991997e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.8200698165338931e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00013113585103096098, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.1452204506509308e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.3953371489538059e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00015190511267425228, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00014617870210521068, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 9.600449453585996e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00013331988658669462, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -2.5704979001911192e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.3850424881082548e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.00011255062494439833, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7296995498991997e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.8200698165338931e-05, doublethreshold); } TEST_F(MSST_test, write_restart) diff --git a/source/source_md/unittests/test_nhchain.cpp b/source/source_md/unittests/test_nhchain.cpp index 4333bd893bb..da406dd0262 100644 --- a/source/source_md/unittests/test_nhchain.cpp +++ b/source/source_md/unittests/test_nhchain.cpp @@ -84,31 +84,31 @@ TEST_F(NHC_test, first_half) { mdrun->first_half(GlobalV::ofs_running); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00035596392702161582, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00026566987683715606, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -6.4082739615824722e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00037007414441809518, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00052501803299631633, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00044091358349508534, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00036876922955593201, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -2.6151466573228018e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00024731533582713971, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00035465901216238645, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00028549962273273618, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00012951550805257814, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00010335325828338315, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 6.6973537793984337e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.4644123959592966e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00010943331752057692, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00013283409023334643, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 0.00010075713383789103, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00010717693628353973, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -6.2046899135633754e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.6516254714969195e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.00010109687704718878, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.2065242353013738e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.9596755163433345e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00035596392702161582, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00026566987683715606, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -6.4082739615824722e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00037007414441809518, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00052501803299631633, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00044091358349508534, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00036876922955593201, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -2.6151466573228018e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00024731533582713971, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00035465901216238645, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00028549962273273618, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00012951550805257814, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00010335325828338315, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 6.6973537793984337e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.4644123959592966e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00010943331752057692, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00013283409023334643, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 0.00010075713383789103, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00010717693628353973, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -6.2046899135633754e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.6516254714969195e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.00010109687704718878, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.2065242353013738e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.9596755163433345e-05, doublethreshold); } TEST_F(NHC_test, second_half) @@ -116,31 +116,31 @@ TEST_F(NHC_test, second_half) mdrun->first_half(GlobalV::ofs_running); mdrun->second_half(); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00035596392702161582, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00026566987683715606, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -6.4082739615824722e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00037007414441809518, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00052501803299631633, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00044091358349508534, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00036876922955593201, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -2.6151466573228018e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00024731533582713971, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00035465901216238645, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00028549962273273618, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00012951550805257814, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -8.4972683205367143e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 6.6834262571392232e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.6287026488367857e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 7.8726485842843947e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00012727726730227848, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 0.00011206092711573642, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -9.0636235945876312e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -9.9771188254262979e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -6.285672943672849e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 9.6882433309157637e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.0420123556394411e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -3.2917171190756263e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00035596392702161582, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00026566987683715606, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -6.4082739615824722e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00037007414441809518, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00052501803299631633, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00044091358349508534, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00036876922955593201, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -2.6151466573228018e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00024731533582713971, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00035465901216238645, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00028549962273273618, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00012951550805257814, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -8.4972683205367143e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 6.6834262571392232e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.6287026488367857e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 7.8726485842843947e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00012727726730227848, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 0.00011206092711573642, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -9.0636235945876312e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -9.9771188254262979e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -6.285672943672849e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 9.6882433309157637e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.0420123556394411e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -3.2917171190756263e-05, doublethreshold); } TEST_F(NHC_test, write_restart) diff --git a/source/source_md/unittests/test_snap_calculator.cpp b/source/source_md/unittests/test_snap_calculator.cpp index 64a7429ae5c..58f4424952e 100644 --- a/source/source_md/unittests/test_snap_calculator.cpp +++ b/source/source_md/unittests/test_snap_calculator.cpp @@ -166,11 +166,11 @@ TEST(SnapCalculator, SupportsChemicalChannels) EXPECT_NEAR(analytic.energy.energy, finite_difference.energy.energy, 1.0e-12); for (int direction = 0; direction < 3; ++direction) { - EXPECT_NEAR(analytic.center_force[static_cast(direction)], - finite_difference.center_force[static_cast(direction)], + EXPECT_NEAR(analytic.center_force[direction], + finite_difference.center_force[direction], 1.0e-5); - EXPECT_NEAR(analytic.neighbor_forces[0][static_cast(direction)], - finite_difference.neighbor_forces[0][static_cast(direction)], + EXPECT_NEAR(analytic.neighbor_forces[0][direction], + finite_difference.neighbor_forces[0][direction], 1.0e-5); } } @@ -312,8 +312,8 @@ TEST(SnapCalculator, FiniteDifferenceForcesConservePairContribution) for (int direction = 0; direction < 3; ++direction) { - EXPECT_DOUBLE_EQ(result.center_force[static_cast(direction)] - + result.neighbor_forces[0][static_cast(direction)], + EXPECT_DOUBLE_EQ(result.center_force[direction] + + result.neighbor_forces[0][direction], 0.0); } } @@ -330,8 +330,8 @@ TEST(SnapCalculator, AnalyticForceMatchesFiniteDifference) const ModuleMD::SNAP::ForceResult finite = calculator.compute_with_finite_difference_force(neighbors, 0, 1.0e-6); for (int direction = 0; direction < 3; ++direction) { - EXPECT_NEAR(analytic.neighbor_forces[0][static_cast(direction)], - finite.neighbor_forces[0][static_cast(direction)], + EXPECT_NEAR(analytic.neighbor_forces[0][direction], + finite.neighbor_forces[0][direction], 1.0e-6); } } @@ -362,8 +362,8 @@ TEST(SnapCalculator, InnerSwitchMatchesFiniteDifference) { for (int direction = 0; direction < 3; ++direction) { - EXPECT_NEAR(analytic.neighbor_forces[i][static_cast(direction)], - finite.neighbor_forces[i][static_cast(direction)], 1.0e-5); + EXPECT_NEAR(analytic.neighbor_forces[i][direction], + finite.neighbor_forces[i][direction], 1.0e-5); } } @@ -378,8 +378,8 @@ TEST(SnapCalculator, InnerSwitchMatchesFiniteDifference) { for (int direction = 0; direction < 3; ++direction) { - EXPECT_NEAR(quadratic_analytic.neighbor_forces[i][static_cast(direction)], - quadratic_finite.neighbor_forces[i][static_cast(direction)], 1.0e-5); + EXPECT_NEAR(quadratic_analytic.neighbor_forces[i][direction], + quadratic_finite.neighbor_forces[i][direction], 1.0e-5); } } } @@ -414,9 +414,9 @@ TEST(SnapCalculator, InnerSwitchSkipsSingularRadius) EXPECT_TRUE(std::isfinite(near_analytic.energy.energy)); for (int direction = 0; direction < 3; ++direction) { - EXPECT_TRUE(std::isfinite(near_analytic.neighbor_forces[0][static_cast(direction)])); - EXPECT_NEAR(near_analytic.neighbor_forces[0][static_cast(direction)], - near_finite.neighbor_forces[0][static_cast(direction)], 1.0e-4); + EXPECT_TRUE(std::isfinite(near_analytic.neighbor_forces[0][direction])); + EXPECT_NEAR(near_analytic.neighbor_forces[0][direction], + near_finite.neighbor_forces[0][direction], 1.0e-4); } } @@ -435,8 +435,8 @@ TEST(SnapCalculator, ZeroWeightSkipsInvalidRadius) EXPECT_DOUBLE_EQ(result.energy.energy, isolated_energy); for (int direction = 0; direction < 3; ++direction) { - EXPECT_DOUBLE_EQ(result.center_force[static_cast(direction)], 0.0); - EXPECT_DOUBLE_EQ(result.neighbor_forces[0][static_cast(direction)], 0.0); + EXPECT_DOUBLE_EQ(result.center_force[direction], 0.0); + EXPECT_DOUBLE_EQ(result.neighbor_forces[0][direction], 0.0); } neighbor.weight = 1.0; const std::vector active(1, neighbor); @@ -458,12 +458,12 @@ TEST(SnapCalculator, AngularQuadraticForcesMatchEnergyGradientAndStrain) { std::array, 3> plus = positions; std::array, 3> minus = positions; - plus[atom][static_cast(direction)] += displacement; - minus[atom][static_cast(direction)] -= displacement; + plus[atom][direction] += displacement; + minus[atom][direction] -= displacement; const double energy_gradient = (evaluate_small_cell(calculator, plus).energy - evaluate_small_cell(calculator, minus).energy) / (2.0 * displacement); - EXPECT_NEAR(result.forces[atom][static_cast(direction)], + EXPECT_NEAR(result.forces[atom][direction], -energy_gradient, 1.0e-4); } } @@ -473,7 +473,7 @@ TEST(SnapCalculator, AngularQuadraticForcesMatchEnergyGradientAndStrain) double total_force = 0.0; for (std::size_t atom = 0; atom < positions.size(); ++atom) { - total_force += result.forces[atom][static_cast(direction)]; + total_force += result.forces[atom][direction]; } EXPECT_NEAR(total_force, 0.0, 1.0e-10); } diff --git a/source/source_md/unittests/test_verlet.cpp b/source/source_md/unittests/test_verlet.cpp index 9a0ad631bd9..2fbd884e553 100644 --- a/source/source_md/unittests/test_verlet.cpp +++ b/source/source_md/unittests/test_verlet.cpp @@ -84,31 +84,31 @@ TEST_F(Verlet_test, first_half) { mdrun->first_half(GlobalV::ofs_running); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054545529007222658, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029590658162135359, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7952328034033513e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00063192793031220879, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00060657401578200095, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00039873402383468892, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00055351963726126224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -1.1639385612741475e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00022365616007718661, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00046704699702541431, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00032230681977380224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00011712553572388214, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00013193932519649473, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.1576379239356465e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.40179977966e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00015285605661129458, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00014672323796402785, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 9.6449148069800003e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00013388999749840003, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -2.8154327428808153e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.4099838013700003e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.0001129732660846002, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7962291467652202e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.83313122596e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054545529007222658, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029590658162135359, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7952328034033513e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00063192793031220879, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00060657401578200095, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00039873402383468892, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00055351963726126224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -1.1639385612741475e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00022365616007718661, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00046704699702541431, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00032230681977380224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00011712553572388214, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00013193932519649473, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.1576379239356465e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.40179977966e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00015285605661129458, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00014672323796402785, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 9.6449148069800003e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00013388999749840003, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -2.8154327428808153e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.4099838013700003e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.0001129732660846002, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7962291467652202e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.83313122596e-05, doublethreshold); } TEST_F(Verlet_test, NVE) @@ -118,31 +118,31 @@ TEST_F(Verlet_test, NVE) mdrun->second_half(); ; - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054545529007222658, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029590658162135359, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7952328034033513e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00063192793031220879, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00060657401578200095, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00039873402383468892, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00055351963726126224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -1.1639385612741475e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00022365616007718661, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00046704699702541431, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00032230681977380224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00011712553572388214, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00013179791402898947, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.1809815495212933e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.40179977966e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00015267223469058917, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.00014691320932005571, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 9.6449148069800003e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00013399051477080008, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -2.5857616745616307e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.4099838013700003e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.0001131161941102004, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7689155499504408e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.83313122596e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054545529007222658, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029590658162135359, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7952328034033513e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00063192793031220879, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00060657401578200095, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00039873402383468892, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00055351963726126224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -1.1639385612741475e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00022365616007718661, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00046704699702541431, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00032230681977380224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00011712553572388214, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00013179791402898947, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.1809815495212933e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.40179977966e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00015267223469058917, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.00014691320932005571, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 9.6449148069800003e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00013399051477080008, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -2.5857616745616307e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.4099838013700003e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.0001131161941102004, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7689155499504408e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.83313122596e-05, doublethreshold); } TEST_F(Verlet_test, Anderson) @@ -153,31 +153,31 @@ TEST_F(Verlet_test, Anderson) mdrun->second_half(); ; - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054545529007222658, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029590658162135359, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7952328034033513e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00063192793031220879, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00060657401578200095, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00039873402383468892, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00055351963726126224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -1.1639385612741475e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00022365616007718661, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00046704699702541431, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00032230681977380224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00011712553572388214, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00013179791402898947, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.1809815495212933e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.40179977966e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 6.9452562329904563e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, 7.321611395307015e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, -8.133446733603267e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, 0.00013239881096711222, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, 0.00030862680563211305, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -0.00012925479702246553, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.0001131161941102004, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7689155499504408e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.83313122596e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054545529007222658, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029590658162135359, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7952328034033513e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00063192793031220879, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00060657401578200095, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00039873402383468892, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00055351963726126224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -1.1639385612741475e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00022365616007718661, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00046704699702541431, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00032230681977380224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00011712553572388214, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00013179791402898947, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.1809815495212933e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.40179977966e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 6.9452562329904563e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, 7.321611395307015e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, -8.133446733603267e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, 0.00013239881096711222, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, 0.00030862680563211305, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -0.00012925479702246553, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.0001131161941102004, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7689155499504408e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.83313122596e-05, doublethreshold); } TEST_F(Verlet_test, Berendsen) @@ -188,31 +188,31 @@ TEST_F(Verlet_test, Berendsen) mdrun->second_half(); ; - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054545529007222658, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029590658162135359, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7952328034033513e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00063192793031220879, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00060657401578200095, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00039873402383468892, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00055351963726126224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -1.1639385612741475e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00022365616007718661, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00046704699702541431, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00032230681977380224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00011712553572388214, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00013179175250738632, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.1806458403162173e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.4017342458487154e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00015266509729938552, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.0001469063411619389, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 9.6444639094723906e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00013398425074562592, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -2.5856407908091386e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.4097308858947404e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.00011311090595462667, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7685523549685863e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.8329987777389342e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054545529007222658, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029590658162135359, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7952328034033513e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00063192793031220879, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00060657401578200095, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00039873402383468892, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00055351963726126224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -1.1639385612741475e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00022365616007718661, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00046704699702541431, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00032230681977380224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00011712553572388214, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00013179175250738632, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.1806458403162173e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.4017342458487154e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00015266509729938552, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.0001469063411619389, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 9.6444639094723906e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00013398425074562592, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -2.5856407908091386e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.4097308858947404e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.00011311090595462667, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7685523549685863e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.8329987777389342e-05, doublethreshold); } TEST_F(Verlet_test, rescaling) @@ -223,31 +223,31 @@ TEST_F(Verlet_test, rescaling) mdrun->second_half(); ; - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054545529007222658, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029590658162135359, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7952328034033513e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00063192793031220879, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00060657401578200095, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00039873402383468892, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00055351963726126224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -1.1639385612741475e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00022365616007718661, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00046704699702541431, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00032230681977380224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00011712553572388214, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00013178559069770653, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.1803101154153484e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.4016687089734539e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00015265795957447931, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.0001468994726827073, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 9.6440129908834563e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00013397798642758268, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -2.5855199014048311e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.4094779585946356e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.0001131056175518098, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7681891430058639e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.8328663233253657e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054545529007222658, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029590658162135359, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7952328034033513e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00063192793031220879, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00060657401578200095, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00039873402383468892, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00055351963726126224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -1.1639385612741475e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00022365616007718661, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00046704699702541431, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00032230681977380224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00011712553572388214, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00013178559069770653, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.1803101154153484e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.4016687089734539e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00015265795957447931, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.0001468994726827073, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 9.6440129908834563e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00013397798642758268, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -2.5855199014048311e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.4094779585946356e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.0001131056175518098, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7681891430058639e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.8328663233253657e-05, doublethreshold); } TEST_F(Verlet_test, rescale_v) @@ -258,31 +258,31 @@ TEST_F(Verlet_test, rescale_v) mdrun->second_half(); ; - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054545529007222658, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029590658162135359, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7952328034033513e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).x, 0.00063192793031220879, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).y, -0.00060657401578200095, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(1)]).z, 0.00039873402383468892, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).x, -0.00055351963726126224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).y, -1.1639385612741475e-05, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(2)]).z, -0.00022365616007718661, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).x, 0.00046704699702541431, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).y, 0.00032230681977380224, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(3)]).z, -0.00011712553572388214, doublethreshold); - - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.x, -0.00013178559069770653, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.y, 7.1803101154153484e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(0)].vel.z, -1.4016687089734539e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.x, 0.00015265795957447931, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.y, -0.0001468994726827073, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(1)].vel.z, 9.6440129908834563e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.x, -0.00013397798642758268, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.y, -2.5855199014048311e-06, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(2)].vel.z, -5.4094779585946356e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.x, 0.0001131056175518098, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.y, 7.7681891430058639e-05, doublethreshold); - EXPECT_NEAR(mdcell.owned_atoms()[static_cast(3)].vel.z, -2.8328663233253657e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054545529007222658, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029590658162135359, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7952328034033513e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).x, 0.00063192793031220879, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).y, -0.00060657401578200095, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[1]).z, 0.00039873402383468892, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).x, -0.00055351963726126224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).y, -1.1639385612741475e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[2]).z, -0.00022365616007718661, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).x, 0.00046704699702541431, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).y, 0.00032230681977380224, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[3]).z, -0.00011712553572388214, doublethreshold); + + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.x, -0.00013178559069770653, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.y, 7.1803101154153484e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[0].vel.z, -1.4016687089734539e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.x, 0.00015265795957447931, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.y, -0.0001468994726827073, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[1].vel.z, 9.6440129908834563e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.x, -0.00013397798642758268, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.y, -2.5855199014048311e-06, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[2].vel.z, -5.4094779585946356e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.x, 0.0001131056175518098, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.y, 7.7681891430058639e-05, doublethreshold); + EXPECT_NEAR(mdcell.owned_atoms()[3].vel.z, -2.8328663233253657e-05, doublethreshold); } TEST_F(Verlet_test, CSVR) @@ -296,9 +296,9 @@ TEST_F(Verlet_test, CSVR) mdrun->second_half(); // Check that positions are updated correctly - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).x, -0.00054545529007222658, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).y, 0.00029590658162135359, doublethreshold); - EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[static_cast(0)]).z, -5.7952328034033513e-05, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).x, -0.00054545529007222658, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).y, 0.00029590658162135359, doublethreshold); + EXPECT_NEAR(Setcell::fractional_displacement(mdcell.owned_atoms()[0]).z, -5.7952328034033513e-05, doublethreshold); // Check that temperature is in reasonable range double temp = mdrun->t_current * ModuleBase::Hartree_to_K;