-
Notifications
You must be signed in to change notification settings - Fork 363
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug-fixes and upgrades to the Active Space Module
- bug fixes of some incorrect indices - extension to support UKS calculations - implementation of an FCIDump checksum to ease testing - addition of regression tests - minor documentation improvements After this PR, the active space module can be used in conjunction with HF-style calculations. This includes: - GAPW with the ALL electron potential - GAPW with the GTH-HF potential - GPW with the GTH-HF potential Regression tests for all of the above scenarios have been added in `tests/QS/regtest-as-1`. ``` % ../tools/regtesting/do_regtest -cp2kdir ../ -version sdbg -arch local -nobuild -restrictdir QS/regtest-as-1 <...> --------------------------------- Summary -------------------------------- Number of FAILED tests 0 Number of WRONG tests 0 Number of CORRECT tests 26 Total number of tests 26 GREPME 0 0 26 0 26 X Summary: correct: 26 / 26; 3min Status: OK ```
- Loading branch information
Showing
18 changed files
with
1,447 additions
and
164 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
# runs are executed in the same order as in this file | ||
# the second field tells which test should be run in order to compare with the last available output | ||
# e.g. 0 means do not compare anything, running is enough | ||
# 1 compares the last total energy in the file | ||
# for details see cp2k/tools/do_regtest | ||
# | ||
h2_gapw_2-2.inp 1 1e-12 -1.12703481947359 | ||
h2_gapw_2-2.inp 92 1e-8 4.08762365 | ||
h2_gapw_2-3.inp 1 1e-12 -1.12703481947359 | ||
h2_gapw_2-3.inp 92 1e-8 6.34129968 | ||
h2_gapw_2-4.inp 1 1e-12 -1.12703481947359 | ||
h2_gapw_2-4.inp 92 1e-8 10.57997133 | ||
h2_gapw_pp_2-2.inp 1 1e-12 -1.12609343153655 | ||
h2_gapw_pp_2-2.inp 92 1e-8 4.08439200 | ||
h2_gapw_pp_2-3.inp 1 1e-12 -1.12609343153655 | ||
h2_gapw_pp_2-3.inp 92 1e-8 6.33490411 | ||
h2_gapw_pp_2-4.inp 1 1e-12 -1.12609343153655 | ||
h2_gapw_pp_2-4.inp 92 1e-8 10.58497448 | ||
h2_gpw_pp_2-2.inp 1 1e-12 -1.12622646044780 | ||
h2_gpw_pp_2-2.inp 92 1e-8 4.08480362 | ||
h2_gpw_pp_2-3.inp 1 1e-12 -1.12622646044780 | ||
h2_gpw_pp_2-3.inp 92 1e-8 6.33542725 | ||
h2_gpw_pp_2-4.inp 1 1e-12 -1.12622646044780 | ||
h2_gpw_pp_2-4.inp 92 1e-8 10.58532335 | ||
h2o_gapw_2-2.inp 1 1e-12 -76.011970410506123 | ||
h2o_gapw_2-2.inp 92 1e-8 77.48403361 | ||
ch2_gapw_2-3.inp 1 1e-12 -38.91914381184247 | ||
ch2_gapw_2-3.inp 92 1e-8 50.38752107 | ||
ch2_gapw_pp_2-3.inp 1 1e-12 -6.51646227467145 | ||
ch2_gapw_pp_2-3.inp 92 1e-8 17.95445655 | ||
ch2_gpw_pp_2-3.inp 1 1e-12 -6.51682932586237 | ||
ch2_gpw_pp_2-3.inp 92 1e-8 17.95513412 | ||
#EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
&FORCE_EVAL | ||
METHOD Quickstep | ||
&DFT | ||
&QS | ||
METHOD GAPW | ||
&END QS | ||
UKS TRUE | ||
MULTIPLICITY 3 | ||
&XC | ||
&XC_FUNCTIONAL NONE | ||
&END XC_FUNCTIONAL | ||
&HF 1.0 | ||
&END HF | ||
&END XC | ||
&POISSON | ||
POISSON_SOLVER ANALYTIC | ||
PERIODIC NONE | ||
&END POISSON | ||
&MGRID | ||
CUTOFF 500 | ||
&END MGRID | ||
&SCF | ||
ADDED_MOS 17 | ||
MAX_SCF 20 | ||
&RESTART OFF | ||
&END RESTART | ||
&END PRINT | ||
&END SCF | ||
&AO_MATRICES | ||
CORE_HAMILTONIAN TRUE | ||
KINETIC_ENERGY TRUE | ||
POTENTIAL_ENERGY TRUE | ||
&END AO_MATRICES | ||
&ACTIVE_SPACE | ||
ACTIVE_ELECTRONS 2 | ||
ACTIVE_ORBITALS 3 3 | ||
INACTIVE_ELECTRONS 3 3 | ||
ISOLATED_SYSTEM TRUE | ||
&ERI | ||
METHOD FULL_GPW | ||
PERIODICITY 0 0 0 | ||
&END ERI | ||
&ERI_GPW | ||
CUTOFF 500 | ||
&END ERI_GPW | ||
&FCIDUMP | ||
FILENAME __STD_OUT__ | ||
&END FCIDUMP | ||
&END ACTIVE_SPACE | ||
&END PRINT | ||
&END DFT | ||
&SUBSYS | ||
&CELL | ||
ABC 6.0 6.0 6.0 | ||
PERIODIC NONE | ||
&END CELL | ||
&COORD | ||
C 0.000 0.000 0.112 | ||
H 0.000 0.974 0.335 | ||
H 0.000 -0.974 -0.335 | ||
&END COORD | ||
&KIND H | ||
BASIS_SET 6-31G* | ||
POTENTIAL ALL | ||
&END KIND | ||
&KIND C | ||
BASIS_SET 6-31G* | ||
POTENTIAL ALL | ||
&END KIND | ||
&END SUBSYS | ||
&END FORCE_EVAL | ||
&GLOBAL | ||
RUN_TYPE ENERGY | ||
PRINT_LEVEL LOW | ||
PROJECT ch2_gapw | ||
&END GLOBAL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
&FORCE_EVAL | ||
METHOD Quickstep | ||
&DFT | ||
&QS | ||
METHOD GAPW | ||
&END QS | ||
UKS TRUE | ||
MULTIPLICITY 3 | ||
&XC | ||
&XC_FUNCTIONAL NONE | ||
&END XC_FUNCTIONAL | ||
&HF 1.0 | ||
&END HF | ||
&END XC | ||
&POISSON | ||
POISSON_SOLVER ANALYTIC | ||
PERIODIC NONE | ||
&END POISSON | ||
&MGRID | ||
CUTOFF 500 | ||
&END MGRID | ||
&SCF | ||
ADDED_MOS 17 | ||
MAX_SCF 20 | ||
&RESTART OFF | ||
&END RESTART | ||
&END PRINT | ||
&END SCF | ||
&AO_MATRICES | ||
CORE_HAMILTONIAN TRUE | ||
KINETIC_ENERGY TRUE | ||
POTENTIAL_ENERGY TRUE | ||
&END AO_MATRICES | ||
&ACTIVE_SPACE | ||
ACTIVE_ELECTRONS 2 | ||
ACTIVE_ORBITALS 3 3 | ||
INACTIVE_ELECTRONS 2 2 | ||
ISOLATED_SYSTEM TRUE | ||
&ERI | ||
METHOD FULL_GPW | ||
PERIODICITY 0 0 0 | ||
&END ERI | ||
&ERI_GPW | ||
CUTOFF 500 | ||
&END ERI_GPW | ||
&FCIDUMP | ||
FILENAME __STD_OUT__ | ||
&END FCIDUMP | ||
&END ACTIVE_SPACE | ||
&END PRINT | ||
&END DFT | ||
&SUBSYS | ||
&CELL | ||
ABC 6.0 6.0 6.0 | ||
PERIODIC NONE | ||
&END CELL | ||
&COORD | ||
C 0.000 0.000 0.112 | ||
H 0.000 0.974 0.335 | ||
H 0.000 -0.974 -0.335 | ||
&END COORD | ||
&KIND H | ||
BASIS_SET 6-31G* | ||
POTENTIAL GTH-HF | ||
&END KIND | ||
&KIND C | ||
BASIS_SET 6-31G* | ||
POTENTIAL GTH-HF | ||
&END KIND | ||
&END SUBSYS | ||
&END FORCE_EVAL | ||
&GLOBAL | ||
RUN_TYPE ENERGY | ||
PRINT_LEVEL LOW | ||
PROJECT ch2_gapw_pp | ||
&END GLOBAL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
&FORCE_EVAL | ||
METHOD Quickstep | ||
&DFT | ||
&QS | ||
METHOD GPW | ||
&END QS | ||
UKS TRUE | ||
MULTIPLICITY 3 | ||
&XC | ||
&XC_FUNCTIONAL NONE | ||
&END XC_FUNCTIONAL | ||
&HF 1.0 | ||
&END HF | ||
&END XC | ||
&POISSON | ||
POISSON_SOLVER ANALYTIC | ||
PERIODIC NONE | ||
&END POISSON | ||
&MGRID | ||
CUTOFF 500 | ||
&END MGRID | ||
&SCF | ||
ADDED_MOS 17 | ||
MAX_SCF 20 | ||
&RESTART OFF | ||
&END RESTART | ||
&END PRINT | ||
&END SCF | ||
&AO_MATRICES | ||
CORE_HAMILTONIAN TRUE | ||
KINETIC_ENERGY TRUE | ||
POTENTIAL_ENERGY TRUE | ||
&END AO_MATRICES | ||
&ACTIVE_SPACE | ||
ACTIVE_ELECTRONS 2 | ||
ACTIVE_ORBITALS 3 3 | ||
INACTIVE_ELECTRONS 2 2 | ||
ISOLATED_SYSTEM TRUE | ||
&ERI | ||
METHOD FULL_GPW | ||
PERIODICITY 0 0 0 | ||
&END ERI | ||
&ERI_GPW | ||
CUTOFF 500 | ||
&END ERI_GPW | ||
&FCIDUMP | ||
FILENAME __STD_OUT__ | ||
&END FCIDUMP | ||
&END ACTIVE_SPACE | ||
&END PRINT | ||
&END DFT | ||
&SUBSYS | ||
&CELL | ||
ABC 6.0 6.0 6.0 | ||
PERIODIC NONE | ||
&END CELL | ||
&COORD | ||
C 0.000 0.000 0.112 | ||
H 0.000 0.974 0.335 | ||
H 0.000 -0.974 -0.335 | ||
&END COORD | ||
&KIND H | ||
BASIS_SET 6-31G* | ||
POTENTIAL GTH-HF | ||
&END KIND | ||
&KIND C | ||
BASIS_SET 6-31G* | ||
POTENTIAL GTH-HF | ||
&END KIND | ||
&END SUBSYS | ||
&END FORCE_EVAL | ||
&GLOBAL | ||
RUN_TYPE ENERGY | ||
PRINT_LEVEL LOW | ||
PROJECT ch2_gpw_pp | ||
&END GLOBAL |
Oops, something went wrong.