Skip to content

Commit 1f21451

Browse files
committed
correct a minor bug
1 parent d9de05f commit 1f21451

File tree

2 files changed

+17
-24
lines changed

2 files changed

+17
-24
lines changed

docs/advanced/input_files/input-main.md

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@
243243
- [exx\_opt\_orb\_ecut](#exx_opt_orb_ecut)
244244
- [exx\_opt\_orb\_tolerence](#exx_opt_orb_tolerence)
245245
- [exx\_real\_number](#exx_real_number)
246-
- [exx\_symmetry\_realspace](#exx_symmetry_realspace)
247246
- [rpa\_ccp\_rmesh\_times](#rpa_ccp_rmesh_times)
247+
- [exx\_symmetry\_realspace](#exx_symmetry_realspace)
248248
- [out\_ri\_cv](#out_ri_cv)
249249
- [Molecular dynamics](#molecular-dynamics)
250250
- [md\_type](#md_type)
@@ -273,6 +273,9 @@
273273
- [lj\_epsilon](#lj_epsilon)
274274
- [lj\_sigma](#lj_sigma)
275275
- [pot\_file](#pot_file)
276+
- [dp\_rescaling](#dp_rescaling)
277+
- [dp\_fparam](#dp_fparam)
278+
- [dp\_aparam](#dp_aparam)
276279
- [msst\_direction](#msst_direction)
277280
- [msst\_vel](#msst_vel)
278281
- [msst\_vis](#msst_vis)
@@ -422,11 +425,12 @@
422425
- [nocc](#nocc)
423426
- [nvirt](#nvirt)
424427
- [lr\_nstates](#lr_nstates)
428+
- [lr\_unrestricted](#lr_unrestricted)
425429
- [abs\_wavelen\_range](#abs_wavelen_range)
426430
- [out\_wfc\_lr](#out_wfc_lr)
427431
- [abs\_broadening](#abs_broadening)
428432
- [ri\_hartree\_benchmark](#ri_hartree_benchmark)
429-
- [aims_nbasis](#aims_nbasis)
433+
- [aims\_nbasis](#aims_nbasis)
430434

431435
[back to top](#full-list-of-input-keywords)
432436
## System variables
@@ -2908,46 +2912,36 @@ These variables are used to control vdW-corrected related parameters.
29082912
- **Type**: String
29092913
- **Description**: Specifies the method used for Van der Waals (VdW) correction. Available options are:
29102914
- `d2`: [Grimme's D2](https://onlinelibrary.wiley.com/doi/abs/10.1002/jcc.20495) dispersion correction method
2911-
- `d3_0`: [Grimme's DFT-D3(0)](https://aip.scitation.org/doi/10.1063/1.3382344) dispersion correction method
2912-
- `d3_bj`: [Grimme's DFTD3(BJ)](https://onlinelibrary.wiley.com/doi/abs/10.1002/jcc.21759) dispersion correction method
2915+
- `d3_0`: [Grimme's DFT-D3(0)](https://aip.scitation.org/doi/10.1063/1.3382344) dispersion correction method (zero-damping)
2916+
- `d3_bj`: [Grimme's DFTD3(BJ)](https://onlinelibrary.wiley.com/doi/abs/10.1002/jcc.21759) dispersion correction method (BJ-damping)
29132917
- `none`: no vdW correction
29142918
- **Default**: none
29152919

29162920
### vdw_s6
29172921

29182922
- **Type**: Real
29192923
- **Availability**: `vdw_method` is set to `d2`, `d3_0`, or `d3_bj`
2920-
- **Description**: This scale factor is used to optimize the interaction energy deviations in van der Waals (vdW) corrected calculations. The recommended values of this parameter are dependent on the chosen vdW correction method and the DFT functional being used. For DFT-D2, the recommended values are 0.75 (PBE), 1.2 (BLYP), 1.05 (B-P86), 1.0 (TPSS), and 1.05 (B3LYP). For DFT-D3, recommended values with different DFT functionals can be found on the [here](https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dft-d3). The default value of this parameter in ABACUS is set to be the recommended value for PBE.
2924+
- **Description**: This scale factor is used to optimize the interaction energy deviations in van der Waals (vdW) corrected calculations. The recommended values of this parameter are dependent on the chosen vdW correction method and the DFT functional being used. For DFT-D2, the recommended values are 0.75 (PBE), 1.2 (BLYP), 1.05 (B-P86), 1.0 (TPSS), and 1.05 (B3LYP). If not set, will use values of PBE functional. For DFT-D3, recommended values with different DFT functionals can be found on the [here](https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dft-d3). If not set, will search in ABACUS built-in dataset based on the `dft_functional` keywords. User set value will overwrite the searched value.
29212925
- **Default**:
29222926
- 0.75: if `vdw_method` is set to `d2`
2923-
- 1.0: if `vdw_method` is set to `d3_0` or `d3_bj`
29242927

29252928
### vdw_s8
29262929

29272930
- **Type**: Real
29282931
- **Availability**: `vdw_method` is set to `d3_0` or `d3_bj`
2929-
- **Description**: This scale factor is relevant for D3(0) and D3(BJ) van der Waals (vdW) correction methods. The recommended values of this parameter with different DFT functionals can be found on the [webpage](https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dft-d3). The default value of this parameter in ABACUS is set to be the recommended value for PBE.
2930-
- **Default**:
2931-
- 0.722: if `vdw_method` is set to `d3_0`
2932-
- 0.7875: if `vdw_method` is set to `d3_bj`
2932+
- **Description**: This scale factor is relevant for D3(0) and D3(BJ) van der Waals (vdW) correction methods. The recommended values of this parameter with different DFT functionals can be found on the [webpage](https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dft-d3). If not set, will search in ABACUS built-in dataset based on the `dft_functional` keywords. User set value will overwrite the searched value.
29332933

29342934
### vdw_a1
29352935

29362936
- **Type**: Real
29372937
- **Availability**: `vdw_method` is set to `d3_0` or `d3_bj`
2938-
- **Description**: This damping function parameter is relevant for D3(0) and D3(BJ) van der Waals (vdW) correction methods. The recommended values of this parameter with different DFT functionals can be found on the [webpage](https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dft-d3). The default value of this parameter in ABACUS is set to be the recommended value for PBE.
2939-
- **Default**:
2940-
- 1.217: if `vdw_method` is set to `d3_0`
2941-
- 0.4289: if `vdw_method` is set to `d3_bj`
2938+
- **Description**: This damping function parameter is relevant for D3(0) and D3(BJ) van der Waals (vdW) correction methods. The recommended values of this parameter with different DFT functionals can be found on the [webpage](https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dft-d3). If not set, will search in ABACUS built-in dataset based on the `dft_functional` keywords. User set value will overwrite the searched value.
29422939

29432940
### vdw_a2
29442941

29452942
- **Type**: Real
29462943
- **Availability**: `vdw_method` is set to `d3_0` or `d3_bj`
2947-
- **Description**: This damping function parameter is only relevant for D3(0) and D3(BJ) van der Waals (vdW) correction methods. The recommended values of this parameter with different DFT functionals can be found on the [webpage](https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dft-d3). The default value of this parameter in ABACUS is set to be the recommended value for PBE.
2948-
- **Default**:
2949-
- 1.0: if `vdw_method` is set to `d3_0`
2950-
- 4.4407: if `vdw_method` is set to `d3_bj`
2944+
- **Description**: This damping function parameter is only relevant for D3(0) and D3(BJ) van der Waals (vdW) correction methods. The recommended values of this parameter with different DFT functionals can be found on the [webpage](https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dft-d3). If not set, will search in ABACUS built-in dataset based on the `dft_functional` keywords. User set value will overwrite the searched value.
29512945

29522946
### vdw_d
29532947

source/module_hamilt_general/module_vdw/dftd3_xc_param.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -493,13 +493,12 @@ namespace DFTD3 {
493493
s8 = (s8_in == "default") ? param[3] : std::stod(s8_in);
494494
a1 = (a1_in == "default") ? param[2] : std::stod(a1_in);
495495
a2 = (a2_in == "default") ? param[5] : std::stod(a2_in);
496-
FmtTable ft({"Parameters", "Original", "Autoset"},
497-
4,
498-
{"%10s", "%10s", "%10.4f"});
496+
param = {s6, s8, a1, a2};
497+
FmtTable vdwd3tab({"Parameters", "Original", "Autoset"}, 4, {"%10s", "%10s", "%10.4f"});
499498
const std::vector<std::string> items = {"s6", "s8", "a1", "a2"};
500-
ft << items << flag << param;
501-
std::cout << "DFT-D3 Dispersion correction parameters autoset\n" << ft.str()
502-
<< std::endl;
499+
vdwd3tab << items << flag << param;
500+
std::cout << "DFT-D3 Dispersion correction parameters autoset\n" << vdwd3tab.str()
501+
<< std::flush;
503502
}
504503
}
505504
}

0 commit comments

Comments
 (0)