Skip to content
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

Jump to bottom

Workarounds for Cray compilers #77

Merged
merged 4 commits into from
Aug 12, 2024
Merged

Workarounds for Cray compilers #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08f768b
Workarounds for Cray compilers.
fedepedron Aug 12, 2024
9bd4056
Formatting
awvwgk Aug 12, 2024
19c11da
Formatting
awvwgk Aug 12, 2024
f40f6be
Formatting
awvwgk Aug 12, 2024
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
28 changes: 20 additions & 8 deletions src/dftd3/output.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,11 @@
if (present(method)) then
write(unit, '(a, "-")', advance="no") method
end if
write(unit, '(a)') &
& trim(merge("D3(0)-ATM", "D3(0) ", abs(param%s9) > 0))
if (abs(param%s9) > 0) then
write(unit, '(a)') "D3(0)-ATM"

Check warning on line 293 in src/dftd3/output.f90

View check run for this annotation

Codecov / codecov/patch

src/dftd3/output.f90#L293 

Added line #L293 was not covered by tests
else
write(unit, '(a)') "D3(0)"

Check warning on line 295 in src/dftd3/output.f90

View check run for this annotation

Codecov / codecov/patch

src/dftd3/output.f90#L295 

Added line #L295 was not covered by tests
end if
write(unit, '(20("-"))')
write(unit, '(a4, t10, f10.4)') &
& "s6", param%s6, &
Expand All @@ -306,8 +309,11 @@
if (present(method)) then
write(unit, '(a, "-")', advance="no") method
end if
write(unit, '(a)') &
& trim(merge("D3(0M)-ATM", "D3(0M) ", abs(param%s9) > 0))
if (abs(param%s9) > 0) then
write(unit, '(a)') "D3(0M)-ATM"

Check warning on line 313 in src/dftd3/output.f90

View check run for this annotation

Codecov / codecov/patch

src/dftd3/output.f90#L313 

Added line #L313 was not covered by tests
else
write(unit, '(a)') "D3(0M)"

Check warning on line 315 in src/dftd3/output.f90

View check run for this annotation

Codecov / codecov/patch

src/dftd3/output.f90#L315 

Added line #L315 was not covered by tests
end if
write(unit, '(20("-"))')
write(unit, '(a5, t10, f10.4)') &
& "s6", param%s6, &
Expand All @@ -324,8 +330,11 @@
if (present(method)) then
write(unit, '(a, "-")', advance="no") method
end if
write(unit, '(a)') &
& trim(merge("D3(op)-ATM", "D3(op) ", abs(param%s9) > 0))
if (abs(param%s9) > 0) then
write(unit, '(a)') "D3(op)-ATM"

Check warning on line 334 in src/dftd3/output.f90

View check run for this annotation

Codecov / codecov/patch

src/dftd3/output.f90#L334 

Added line #L334 was not covered by tests
else
write(unit, '(a)') "D3(op)"

Check warning on line 336 in src/dftd3/output.f90

View check run for this annotation

Codecov / codecov/patch

src/dftd3/output.f90#L336 

Added line #L336 was not covered by tests
end if
write(unit, '(20("-"))')
write(unit, '(a5, t10, f10.4)') &
& "s6", param%s6, &
Expand All @@ -342,8 +351,11 @@
if (present(method)) then
write(unit, '(a, "-")', advance="no") method
end if
write(unit, '(a)') &
& trim(merge("D3(BJ)-ATM", "D3(BJ) ", abs(param%s9) > 0))
if (abs(param%s9) > 0) then
write(unit, '(a)') "D3(BJ)-ATM"
else
write(unit, '(a)') "D3(BJ)"

Check warning on line 357 in src/dftd3/output.f90

View check run for this annotation

Codecov / codecov/patch

src/dftd3/output.f90#L357 

Added line #L357 was not covered by tests
end if
write(unit, '(21("-"))')
write(unit, '(a4, t10, f10.4)') &
& "s6", param%s6, &
Expand Down
4 changes: 2 additions & 2 deletions src/dftd3/reference.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ module dftd3_reference
& +0.0000_wp, +0.9710_wp, +1.9564_wp, +2.9515_wp, +3.9353_wp, -1.0000_wp, -1.0000_wp, & ! Md
& +0.0000_wp, +0.9722_wp, +1.9605_wp, +2.9452_wp, +3.9296_wp, +4.2582_wp, +4.5511_wp, & ! No
& +0.0000_wp, +0.9569_wp, +1.9215_wp, +2.8958_wp, +3.7644_wp, +4.6808_wp, +5.5939_wp],& ! Lr
& shape(reference_cn))
& [max_ref, max_elem])
awvwgk marked this conversation as resolved.
Show resolved Hide resolved


real(wp), allocatable :: reference_c6(:, :, :)
Expand Down Expand Up @@ -66219,4 +66219,4 @@ pure subroutine copy_c6(c6ab)
& ]

end subroutine copy_c6
end module dftd3_reference
end module dftd3_reference
Loading