Skip to content

Commit

Permalink
Implementation of Actinides. (#48)
Browse files Browse the repository at this point in the history
* Crude implementation of Actinides.

* Finished implementation of Actinides. Added tests for CN and weights.

* Cleanup.

* Cleanup.

* Cleanup.

* Minor fixes.

* Minor fixes.

* Fixed the error "../src/dftd3/reference.f90(2436): catastrophic error: Statement too long".

* Temporarily removed c6ab_view pointer.

* Split c6ab read-in and added another test.
  • Loading branch information
lukaswittmann authored Nov 21, 2023
1 parent cdd0a85 commit eb7998d
Show file tree
Hide file tree
Showing 6 changed files with 67,179 additions and 23,270 deletions.
1,576 changes: 1,076 additions & 500 deletions src/dftd3/data/vdwrad.f90

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions src/dftd3/output.f90
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ subroutine ascii_atomic_references(unit, mol, disp)
do iref = 1, disp%ref(isp)
write(unit, '(i4, 1x, f7.4, 1x, f9.4)', advance='no') &
iref, disp%cn(iref, isp), disp%c6(iref, iref, isp, isp)
if (iref == 3 .and. disp%ref(isp) > 3) then
if ((iref == 3 .and. disp%ref(isp) > 3) .or. &
(iref == 6 .and. disp%ref(isp) > 6)) then
write(unit, '(/,9x)', advance='no')
end if
end do
Expand Down Expand Up @@ -126,16 +127,16 @@ subroutine ascii_system_properties(unit, mol, disp, cn, c6)
integer :: iat, isp

write(unit, '(a,":")') "Dispersion properties (in atomic units)"
write(unit, '(50("-"))')
write(unit, '(a6,1x,a4,5x,*(1x,a10))') "#", "Z", "CN", "C6(AA)", "C8(AA)"
write(unit, '(50("-"))')
write(unit, '(56("-"))')
write(unit, '(a6,1x,a4,5x,*(1x,a12))') "#", "Z", "CN", "C6(AA)", "C8(AA)"
write(unit, '(56("-"))')
do iat = 1, mol%nat
isp = mol%id(iat)
write(unit, '(i6,1x,i4,1x,a4,*(1x,f10.4))') &
write(unit, '(i6,1x,i4,1x,a4,*(1x,f12.4))') &
& iat, mol%num(isp), mol%sym(isp), cn(iat), c6(iat, iat), &
& c6(iat, iat)*3*disp%r4r2(isp)**2
end do
write(unit, '(50("-"))')
write(unit, '(56("-"))')

end subroutine ascii_system_properties

Expand Down
Loading

0 comments on commit eb7998d

Please sign in to comment.