Skip to content

vdW-D4: Switch to smooth cutoff #7810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Growl1234 wants to merge 1 commit into
base: develop
Choose a base branch
from
+32 −23
Open

vdW-D4: Switch to smooth cutoff #7810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions source/source_hamilt/module_vdw/test/vdw_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ TEST_F(vdwd4Test, D4GetEnergy)
auto vdw_solver = vdw::make_vdw(ucell, input);
const vdw::VdwResult result = vdw_solver->evaluate(vdw::VdwRequest(false, false));
const double ene = result.energy;
EXPECT_NEAR(ene, -0.04998837990336073, 1E-10);
EXPECT_NEAR(ene, -0.049988405722573105, 1E-10);
}

TEST_F(vdwd4Test, D4GetEnergyForChargedSystem)
Expand All @@ -700,21 +700,21 @@ TEST_F(vdwd4Test, D4GetEnergyForChargedSystem)
auto vdw_solver = vdw::make_vdw(ucell, input);
const vdw::VdwResult result = vdw_solver->evaluate(vdw::VdwRequest(false, false));
const double ene = result.energy;
EXPECT_NEAR(ene, -0.04359451765256733, 1E-10);
EXPECT_NEAR(ene, -0.04359454509118302, 1E-10);
}

TEST_F(vdwd4Test, D4GetForce)
{
auto vdw_solver = vdw::make_vdw(ucell, input);
const vdw::VdwResult result = vdw_solver->evaluate(vdw::VdwRequest(true, false));
EXPECT_NEAR(result.energy, -0.04998837990336073, 1E-10);
EXPECT_NEAR(result.energy, -0.049988405722573105, 1E-10);
ASSERT_TRUE(result.has_force);
EXPECT_FALSE(result.has_stress);
const std::vector<ModuleBase::Vector3<double>>& force = result.force;
EXPECT_NEAR(force[0].x, -0.0023357259921368717, 1e-12);
EXPECT_NEAR(force[0].x, -0.002339156758188389, 1e-12);
EXPECT_NEAR(force[0].y, 0.0, 1e-12);
EXPECT_NEAR(force[0].z, 0.0, 1e-12);
EXPECT_NEAR(force[1].x, 0.0023357259921368730, 1e-12);
EXPECT_NEAR(force[1].x, 0.0023391567581883886, 1e-12);
EXPECT_NEAR(force[1].y, 0.0, 1e-12);
EXPECT_NEAR(force[1].z, 0.0, 1e-12);
}
Expand All @@ -723,19 +723,19 @@ TEST_F(vdwd4Test, D4GetStress)
{
auto vdw_solver = vdw::make_vdw(ucell, input);
const vdw::VdwResult result = vdw_solver->evaluate(vdw::VdwRequest(true, true));
EXPECT_NEAR(result.energy, -0.04998837990336073, 1E-10);
EXPECT_NEAR(result.energy, -0.049988405722573105, 1E-10);
ASSERT_TRUE(result.has_force);
ASSERT_TRUE(result.has_stress);
const ModuleBase::Matrix3& stress = result.stress;
EXPECT_NEAR(stress.e11, 0.00015830384474877792, 1e-12);
EXPECT_NEAR(stress.e11, 0.0001583939298091549, 1e-12);
EXPECT_NEAR(stress.e12, 0.0, 1e-12);
EXPECT_NEAR(stress.e13, 0.0, 1e-12);
EXPECT_NEAR(stress.e21, 0.0, 1e-12);
EXPECT_NEAR(stress.e22, 0.00016694998515968720, 1e-12);
EXPECT_NEAR(stress.e23, -1.5500973166318808e-05, 1e-12);
EXPECT_NEAR(stress.e22, 0.00016697881796423088, 1e-12);
EXPECT_NEAR(stress.e23, -1.527806618822572e-05, 1e-12);
EXPECT_NEAR(stress.e31, 0.0, 1e-12);
EXPECT_NEAR(stress.e32, -1.5500973166318808e-05, 1e-12);
EXPECT_NEAR(stress.e33, 0.00016694998515968726, 1e-12);
EXPECT_NEAR(stress.e32, -1.527806618822572e-05, 1e-12);
EXPECT_NEAR(stress.e33, 0.0001669788179642309, 1e-12);
}

TEST_F(vdwd4Test, D4SGetEnergy)
Expand All @@ -744,22 +744,22 @@ TEST_F(vdwd4Test, D4SGetEnergy)
auto vdw_solver = vdw::make_vdw(ucell, input);
const vdw::VdwResult result = vdw_solver->evaluate(vdw::VdwRequest(false, false));
const double ene = result.energy;
EXPECT_NEAR(ene, -0.05638517144755526, 1E-10);
EXPECT_NEAR(ene, -0.05638520357171156, 1E-10);
}

TEST_F(vdwd4Test, D4SGetForce)
{
input.vdw_d4_model = "d4s";
auto vdw_solver = vdw::make_vdw(ucell, input);
const vdw::VdwResult result = vdw_solver->evaluate(vdw::VdwRequest(true, false));
EXPECT_NEAR(result.energy, -0.05638517144755526, 1E-10);
EXPECT_NEAR(result.energy, -0.05638520357171156, 1E-10);
ASSERT_TRUE(result.has_force);
EXPECT_FALSE(result.has_stress);
const std::vector<ModuleBase::Vector3<double>>& force = result.force;
EXPECT_NEAR(force[0].x, -0.005448661796788402, 1e-12);
EXPECT_NEAR(force[0].x, -0.005452776236973487, 1e-12);
EXPECT_NEAR(force[0].y, 0.0, 1e-12);
EXPECT_NEAR(force[0].z, 0.0, 1e-12);
EXPECT_NEAR(force[1].x, 0.005448661796788397, 1e-12);
EXPECT_NEAR(force[1].x, 0.005452776236973491, 1e-12);
EXPECT_NEAR(force[1].y, 0.0, 1e-12);
EXPECT_NEAR(force[1].z, 0.0, 1e-12);
}
Expand All @@ -769,19 +769,19 @@ TEST_F(vdwd4Test, D4SGetStress)
input.vdw_d4_model = "d4s";
auto vdw_solver = vdw::make_vdw(ucell, input);
const vdw::VdwResult result = vdw_solver->evaluate(vdw::VdwRequest(true, true));
EXPECT_NEAR(result.energy, -0.05638517144755526, 1E-10);
EXPECT_NEAR(result.energy, -0.05638520357171156, 1E-10);
ASSERT_TRUE(result.has_force);
ASSERT_TRUE(result.has_stress);
const ModuleBase::Matrix3& stress = result.stress;
EXPECT_NEAR(stress.e11, 0.00013831119855416262, 1e-12);
EXPECT_NEAR(stress.e11, 0.0001384186027460731, 1e-12);
EXPECT_NEAR(stress.e12, 0.0, 1e-12);
EXPECT_NEAR(stress.e13, 0.0, 1e-12);
EXPECT_NEAR(stress.e21, 0.0, 1e-12);
EXPECT_NEAR(stress.e22, 0.00015770515797834415, 1e-12);
EXPECT_NEAR(stress.e23, -3.862972112000666e-05, 1e-12);
EXPECT_NEAR(stress.e22, 0.00015772616666498505, 1e-12);
EXPECT_NEAR(stress.e23, -3.836792114896563e-05, 1e-12);
EXPECT_NEAR(stress.e31, 0.0, 1e-12);
EXPECT_NEAR(stress.e32, -3.862972112000666e-05, 1e-12);
EXPECT_NEAR(stress.e33, 0.00015770515797834423, 1e-12);
EXPECT_NEAR(stress.e32, -3.836792114896563e-05, 1e-12);
EXPECT_NEAR(stress.e33, 0.0001577261666649851, 1e-12);
}

#endif // __DFTD4
Expand Down
13 changes: 11 additions & 2 deletions source/source_hamilt/module_vdw/vdwd4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ namespace vdw
namespace
{

constexpr double d4_smooth_cutoff_width_2 = 0.05; // Bohr
constexpr double d4_smooth_cutoff_width_3 = 0.05; // Bohr

std::string to_lower(std::string value)
{
std::transform(value.begin(), value.end(), value.begin(), [](unsigned char c) {
Expand Down Expand Up @@ -191,8 +194,14 @@ void Vdwd4::compute(double& energy_ha,
ModuleBase::WARNING_QUIT("Vdwd4::compute", "Unsupported DFT-D4 model: " + model_name_);
}

dftd4_set_model_realspace_cutoff(error, model, cutoff_disp2_, cutoff_disp3_, cutoff_cn_);
check_dftd4_error(error, "dftd4_set_model_realspace_cutoff");
dftd4_set_model_realspace_cutoff_smooth(error,
model,
cutoff_disp2_,
cutoff_disp3_,
cutoff_cn_,
d4_smooth_cutoff_width_2,
d4_smooth_cutoff_width_3);
check_dftd4_error(error, "dftd4_set_model_realspace_cutoff_smooth");

std::vector<char> method(xc_name_.begin(), xc_name_.end());
method.push_back('\0');
Expand Down
Loading