From 0fe2a6582f1ab99a76a04426bdb4b371629ef30d Mon Sep 17 00:00:00 2001 From: Patrick Seewald Date: Mon, 4 Apr 2016 07:56:09 +0000 Subject: [PATCH] make templates pretty svn-origin-rev: 16778 --- src/common/cp_array_sort_i4.F | 2 +- src/common/cp_array_sort_i8.F | 2 +- src/common/cp_array_sort_r.F | 2 +- src/common/cp_array_utils_logical.F | 2 +- src/dbcsr/base/btree_i8_k_cp2d_v.F | 50 ++++++++++++++-------------- src/dbcsr/base/btree_i8_k_dp2d_v.F | 50 ++++++++++++++-------------- src/dbcsr/base/btree_i8_k_sp2d_v.F | 50 ++++++++++++++-------------- src/dbcsr/base/btree_i8_k_zp2d_v.F | 50 ++++++++++++++-------------- src/dbcsr/base/dbcsr_array_sort_d.F | 2 +- src/dbcsr/base/dbcsr_array_sort_i4.F | 2 +- src/dbcsr/base/dbcsr_array_sort_i8.F | 2 +- src/dbcsr/base/dbcsr_array_sort_s.F | 2 +- 12 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/common/cp_array_sort_i4.F b/src/common/cp_array_sort_i4.F index d9bfa6ede0..9a39d6bdfc 100644 --- a/src/common/cp_array_sort_i4.F +++ b/src/common/cp_array_sort_i4.F @@ -93,7 +93,7 @@ CONTAINS INTEGER(kind=int_4) :: a LOGICAL :: swapped -! a,t: used during swaping of elements in arr and indices + ! a,t: used during swaping of elements in arr and indices swapped = .TRUE. diff --git a/src/common/cp_array_sort_i8.F b/src/common/cp_array_sort_i8.F index e24bbfaca2..526b7768db 100644 --- a/src/common/cp_array_sort_i8.F +++ b/src/common/cp_array_sort_i8.F @@ -93,7 +93,7 @@ CONTAINS INTEGER(kind=int_8) :: a LOGICAL :: swapped -! a,t: used during swaping of elements in arr and indices + ! a,t: used during swaping of elements in arr and indices swapped = .TRUE. diff --git a/src/common/cp_array_sort_r.F b/src/common/cp_array_sort_r.F index 95e72552af..d635791a62 100644 --- a/src/common/cp_array_sort_r.F +++ b/src/common/cp_array_sort_r.F @@ -93,7 +93,7 @@ CONTAINS REAL(kind=dp) :: a LOGICAL :: swapped -! a,t: used during swaping of elements in arr and indices + ! a,t: used during swaping of elements in arr and indices swapped = .TRUE. diff --git a/src/common/cp_array_utils_logical.F b/src/common/cp_array_utils_logical.F index 8125e42bea..ad821ccb11 100644 --- a/src/common/cp_array_utils_logical.F +++ b/src/common/cp_array_utils_logical.F @@ -40,7 +40,7 @@ ! ************************************************************************************************** MODULE cp_array_utils_logical USE cp_log_handling, ONLY: cp_to_string -! dummy line needed for coverage broadcasting + ! dummy line needed for coverage broadcasting USE machine, ONLY: m_flush #include "../base/base_uses.f90" diff --git a/src/dbcsr/base/btree_i8_k_cp2d_v.F b/src/dbcsr/base/btree_i8_k_cp2d_v.F index 91a1a261ce..b0d7b9ca36 100644 --- a/src/dbcsr/base/btree_i8_k_cp2d_v.F +++ b/src/dbcsr/base/btree_i8_k_cp2d_v.F @@ -70,7 +70,7 @@ CONTAINS INTEGER :: maxs, mins -! + ! IF (PRESENT(order)) THEN maxs = order-1 @@ -115,7 +115,7 @@ CONTAINS INTEGER :: pos -! + ! IF (ASSOCIATED(tree%b%root)) THEN pos = 0 @@ -145,8 +145,8 @@ CONTAINS INTEGER :: i -! -! + ! + ! IF (node%filled .GT. 0 .AND. ASSOCIATED(node%subtrees(1)%node)) THEN DO i = 1, node%filled+1 @@ -195,8 +195,8 @@ CONTAINS INTEGER :: ge_pos, position TYPE(btree_node), POINTER :: node -! -! + ! + ! IF (PRESENT(exists)) THEN CALL btree_find_full(tree, key, node, position, ge_pos, short=.TRUE.) @@ -243,9 +243,9 @@ CONTAINS TYPE(btree_node), POINTER :: new_node TYPE(cp2d) :: upgrade_value -! -! -! Root is special + ! + ! + ! Root is special IF (.NOT. ASSOCIATED(node)) THEN CALL btree_new_root(tree, key, value) @@ -334,8 +334,8 @@ CONTAINS INTEGER, INTENT(IN) :: before TYPE(btree_node), OPTIONAL, POINTER :: subtree -! -! Shift keys + ! + ! Shift keys node%keys(before+1:node%filled+1) = node%keys(before:node%filled) node%keys(before) = key @@ -371,7 +371,7 @@ CONTAINS INTEGER, INTENT(IN) :: before, split_pos TYPE(btree_node), OPTIONAL, POINTER :: subtree -! + ! new_node%filled = (tree%b%max_fill)-(split_pos-1) new_node%keys(1:new_node%filled) = & @@ -426,7 +426,7 @@ CONTAINS INTEGER, INTENT(IN) :: before, split_pos TYPE(btree_node), OPTIONAL, POINTER :: subtree -! + ! new_node%filled = (tree%b%max_fill+1)-split_pos new_node%keys(1:before-split_pos-1) = & @@ -458,8 +458,8 @@ CONTAINS INTEGER :: i -! -! Assume that node is not a leaf! + ! + ! Assume that node is not a leaf! DO i = 1, node%filled+1 !IF (ASSOCIATED (node%subtrees(i)%node)) THEN @@ -484,7 +484,7 @@ CONTAINS TYPE(btree_node), POINTER :: new_root, old_root -! + ! CALL btree_new_node(tree, new_root) new_root%filled = 1 @@ -510,7 +510,7 @@ CONTAINS INTEGER :: i -! + ! ALLOCATE (node) ALLOCATE (node%keys(tree%b%max_fill)) @@ -532,7 +532,7 @@ CONTAINS SUBROUTINE btree_free_node(node) TYPE(btree_node), POINTER :: node -! + ! DEALLOCATE (node%keys) DEALLOCATE (node%values) @@ -556,8 +556,8 @@ CONTAINS INTEGER :: position TYPE(btree_node), POINTER :: node -! -! + ! + ! CALL btree_find_full(tree, key, node, position, short=.TRUE.) IF (PRESENT(exists)) THEN @@ -583,7 +583,7 @@ CONTAINS INTEGER :: left, right -! + ! IF (keys(1) .GE. key) THEN position = 1 @@ -621,7 +621,7 @@ CONTAINS INTEGER :: left, right -! + ! IF (keys(1) .GT. key) THEN position = 1 @@ -660,7 +660,7 @@ CONTAINS INTEGER :: left, one, right -! + ! one = 1 IF (PRESENT(FIRST)) one = first @@ -710,7 +710,7 @@ CONTAINS LOGICAL :: stop_short ! Used mark searches -! + ! stop_short = .FALSE. IF (PRESENT(short)) stop_short = short @@ -769,7 +769,7 @@ CONTAINS TYPE(btree_node), POINTER :: node INTEGER, INTENT(OUT) :: gti -! + ! NULLIFY (node) !IF (tree%b%n .EQ. 0) RETURN diff --git a/src/dbcsr/base/btree_i8_k_dp2d_v.F b/src/dbcsr/base/btree_i8_k_dp2d_v.F index 53fcfc2406..3329162a36 100644 --- a/src/dbcsr/base/btree_i8_k_dp2d_v.F +++ b/src/dbcsr/base/btree_i8_k_dp2d_v.F @@ -70,7 +70,7 @@ CONTAINS INTEGER :: maxs, mins -! + ! IF (PRESENT(order)) THEN maxs = order-1 @@ -115,7 +115,7 @@ CONTAINS INTEGER :: pos -! + ! IF (ASSOCIATED(tree%b%root)) THEN pos = 0 @@ -145,8 +145,8 @@ CONTAINS INTEGER :: i -! -! + ! + ! IF (node%filled .GT. 0 .AND. ASSOCIATED(node%subtrees(1)%node)) THEN DO i = 1, node%filled+1 @@ -195,8 +195,8 @@ CONTAINS INTEGER :: ge_pos, position TYPE(btree_node), POINTER :: node -! -! + ! + ! IF (PRESENT(exists)) THEN CALL btree_find_full(tree, key, node, position, ge_pos, short=.TRUE.) @@ -243,9 +243,9 @@ CONTAINS TYPE(btree_node), POINTER :: new_node TYPE(dp2d) :: upgrade_value -! -! -! Root is special + ! + ! + ! Root is special IF (.NOT. ASSOCIATED(node)) THEN CALL btree_new_root(tree, key, value) @@ -334,8 +334,8 @@ CONTAINS INTEGER, INTENT(IN) :: before TYPE(btree_node), OPTIONAL, POINTER :: subtree -! -! Shift keys + ! + ! Shift keys node%keys(before+1:node%filled+1) = node%keys(before:node%filled) node%keys(before) = key @@ -371,7 +371,7 @@ CONTAINS INTEGER, INTENT(IN) :: before, split_pos TYPE(btree_node), OPTIONAL, POINTER :: subtree -! + ! new_node%filled = (tree%b%max_fill)-(split_pos-1) new_node%keys(1:new_node%filled) = & @@ -426,7 +426,7 @@ CONTAINS INTEGER, INTENT(IN) :: before, split_pos TYPE(btree_node), OPTIONAL, POINTER :: subtree -! + ! new_node%filled = (tree%b%max_fill+1)-split_pos new_node%keys(1:before-split_pos-1) = & @@ -458,8 +458,8 @@ CONTAINS INTEGER :: i -! -! Assume that node is not a leaf! + ! + ! Assume that node is not a leaf! DO i = 1, node%filled+1 !IF (ASSOCIATED (node%subtrees(i)%node)) THEN @@ -484,7 +484,7 @@ CONTAINS TYPE(btree_node), POINTER :: new_root, old_root -! + ! CALL btree_new_node(tree, new_root) new_root%filled = 1 @@ -510,7 +510,7 @@ CONTAINS INTEGER :: i -! + ! ALLOCATE (node) ALLOCATE (node%keys(tree%b%max_fill)) @@ -532,7 +532,7 @@ CONTAINS SUBROUTINE btree_free_node(node) TYPE(btree_node), POINTER :: node -! + ! DEALLOCATE (node%keys) DEALLOCATE (node%values) @@ -556,8 +556,8 @@ CONTAINS INTEGER :: position TYPE(btree_node), POINTER :: node -! -! + ! + ! CALL btree_find_full(tree, key, node, position, short=.TRUE.) IF (PRESENT(exists)) THEN @@ -583,7 +583,7 @@ CONTAINS INTEGER :: left, right -! + ! IF (keys(1) .GE. key) THEN position = 1 @@ -621,7 +621,7 @@ CONTAINS INTEGER :: left, right -! + ! IF (keys(1) .GT. key) THEN position = 1 @@ -660,7 +660,7 @@ CONTAINS INTEGER :: left, one, right -! + ! one = 1 IF (PRESENT(FIRST)) one = first @@ -710,7 +710,7 @@ CONTAINS LOGICAL :: stop_short ! Used mark searches -! + ! stop_short = .FALSE. IF (PRESENT(short)) stop_short = short @@ -769,7 +769,7 @@ CONTAINS TYPE(btree_node), POINTER :: node INTEGER, INTENT(OUT) :: gti -! + ! NULLIFY (node) !IF (tree%b%n .EQ. 0) RETURN diff --git a/src/dbcsr/base/btree_i8_k_sp2d_v.F b/src/dbcsr/base/btree_i8_k_sp2d_v.F index 431c2aee7f..f97e8f5e23 100644 --- a/src/dbcsr/base/btree_i8_k_sp2d_v.F +++ b/src/dbcsr/base/btree_i8_k_sp2d_v.F @@ -70,7 +70,7 @@ CONTAINS INTEGER :: maxs, mins -! + ! IF (PRESENT(order)) THEN maxs = order-1 @@ -115,7 +115,7 @@ CONTAINS INTEGER :: pos -! + ! IF (ASSOCIATED(tree%b%root)) THEN pos = 0 @@ -145,8 +145,8 @@ CONTAINS INTEGER :: i -! -! + ! + ! IF (node%filled .GT. 0 .AND. ASSOCIATED(node%subtrees(1)%node)) THEN DO i = 1, node%filled+1 @@ -195,8 +195,8 @@ CONTAINS INTEGER :: ge_pos, position TYPE(btree_node), POINTER :: node -! -! + ! + ! IF (PRESENT(exists)) THEN CALL btree_find_full(tree, key, node, position, ge_pos, short=.TRUE.) @@ -243,9 +243,9 @@ CONTAINS TYPE(btree_node), POINTER :: new_node TYPE(sp2d) :: upgrade_value -! -! -! Root is special + ! + ! + ! Root is special IF (.NOT. ASSOCIATED(node)) THEN CALL btree_new_root(tree, key, value) @@ -334,8 +334,8 @@ CONTAINS INTEGER, INTENT(IN) :: before TYPE(btree_node), OPTIONAL, POINTER :: subtree -! -! Shift keys + ! + ! Shift keys node%keys(before+1:node%filled+1) = node%keys(before:node%filled) node%keys(before) = key @@ -371,7 +371,7 @@ CONTAINS INTEGER, INTENT(IN) :: before, split_pos TYPE(btree_node), OPTIONAL, POINTER :: subtree -! + ! new_node%filled = (tree%b%max_fill)-(split_pos-1) new_node%keys(1:new_node%filled) = & @@ -426,7 +426,7 @@ CONTAINS INTEGER, INTENT(IN) :: before, split_pos TYPE(btree_node), OPTIONAL, POINTER :: subtree -! + ! new_node%filled = (tree%b%max_fill+1)-split_pos new_node%keys(1:before-split_pos-1) = & @@ -458,8 +458,8 @@ CONTAINS INTEGER :: i -! -! Assume that node is not a leaf! + ! + ! Assume that node is not a leaf! DO i = 1, node%filled+1 !IF (ASSOCIATED (node%subtrees(i)%node)) THEN @@ -484,7 +484,7 @@ CONTAINS TYPE(btree_node), POINTER :: new_root, old_root -! + ! CALL btree_new_node(tree, new_root) new_root%filled = 1 @@ -510,7 +510,7 @@ CONTAINS INTEGER :: i -! + ! ALLOCATE (node) ALLOCATE (node%keys(tree%b%max_fill)) @@ -532,7 +532,7 @@ CONTAINS SUBROUTINE btree_free_node(node) TYPE(btree_node), POINTER :: node -! + ! DEALLOCATE (node%keys) DEALLOCATE (node%values) @@ -556,8 +556,8 @@ CONTAINS INTEGER :: position TYPE(btree_node), POINTER :: node -! -! + ! + ! CALL btree_find_full(tree, key, node, position, short=.TRUE.) IF (PRESENT(exists)) THEN @@ -583,7 +583,7 @@ CONTAINS INTEGER :: left, right -! + ! IF (keys(1) .GE. key) THEN position = 1 @@ -621,7 +621,7 @@ CONTAINS INTEGER :: left, right -! + ! IF (keys(1) .GT. key) THEN position = 1 @@ -660,7 +660,7 @@ CONTAINS INTEGER :: left, one, right -! + ! one = 1 IF (PRESENT(FIRST)) one = first @@ -710,7 +710,7 @@ CONTAINS LOGICAL :: stop_short ! Used mark searches -! + ! stop_short = .FALSE. IF (PRESENT(short)) stop_short = short @@ -769,7 +769,7 @@ CONTAINS TYPE(btree_node), POINTER :: node INTEGER, INTENT(OUT) :: gti -! + ! NULLIFY (node) !IF (tree%b%n .EQ. 0) RETURN diff --git a/src/dbcsr/base/btree_i8_k_zp2d_v.F b/src/dbcsr/base/btree_i8_k_zp2d_v.F index 38a2dd1f4d..25a972cb44 100644 --- a/src/dbcsr/base/btree_i8_k_zp2d_v.F +++ b/src/dbcsr/base/btree_i8_k_zp2d_v.F @@ -70,7 +70,7 @@ CONTAINS INTEGER :: maxs, mins -! + ! IF (PRESENT(order)) THEN maxs = order-1 @@ -115,7 +115,7 @@ CONTAINS INTEGER :: pos -! + ! IF (ASSOCIATED(tree%b%root)) THEN pos = 0 @@ -145,8 +145,8 @@ CONTAINS INTEGER :: i -! -! + ! + ! IF (node%filled .GT. 0 .AND. ASSOCIATED(node%subtrees(1)%node)) THEN DO i = 1, node%filled+1 @@ -195,8 +195,8 @@ CONTAINS INTEGER :: ge_pos, position TYPE(btree_node), POINTER :: node -! -! + ! + ! IF (PRESENT(exists)) THEN CALL btree_find_full(tree, key, node, position, ge_pos, short=.TRUE.) @@ -243,9 +243,9 @@ CONTAINS TYPE(btree_node), POINTER :: new_node TYPE(zp2d) :: upgrade_value -! -! -! Root is special + ! + ! + ! Root is special IF (.NOT. ASSOCIATED(node)) THEN CALL btree_new_root(tree, key, value) @@ -334,8 +334,8 @@ CONTAINS INTEGER, INTENT(IN) :: before TYPE(btree_node), OPTIONAL, POINTER :: subtree -! -! Shift keys + ! + ! Shift keys node%keys(before+1:node%filled+1) = node%keys(before:node%filled) node%keys(before) = key @@ -371,7 +371,7 @@ CONTAINS INTEGER, INTENT(IN) :: before, split_pos TYPE(btree_node), OPTIONAL, POINTER :: subtree -! + ! new_node%filled = (tree%b%max_fill)-(split_pos-1) new_node%keys(1:new_node%filled) = & @@ -426,7 +426,7 @@ CONTAINS INTEGER, INTENT(IN) :: before, split_pos TYPE(btree_node), OPTIONAL, POINTER :: subtree -! + ! new_node%filled = (tree%b%max_fill+1)-split_pos new_node%keys(1:before-split_pos-1) = & @@ -458,8 +458,8 @@ CONTAINS INTEGER :: i -! -! Assume that node is not a leaf! + ! + ! Assume that node is not a leaf! DO i = 1, node%filled+1 !IF (ASSOCIATED (node%subtrees(i)%node)) THEN @@ -484,7 +484,7 @@ CONTAINS TYPE(btree_node), POINTER :: new_root, old_root -! + ! CALL btree_new_node(tree, new_root) new_root%filled = 1 @@ -510,7 +510,7 @@ CONTAINS INTEGER :: i -! + ! ALLOCATE (node) ALLOCATE (node%keys(tree%b%max_fill)) @@ -532,7 +532,7 @@ CONTAINS SUBROUTINE btree_free_node(node) TYPE(btree_node), POINTER :: node -! + ! DEALLOCATE (node%keys) DEALLOCATE (node%values) @@ -556,8 +556,8 @@ CONTAINS INTEGER :: position TYPE(btree_node), POINTER :: node -! -! + ! + ! CALL btree_find_full(tree, key, node, position, short=.TRUE.) IF (PRESENT(exists)) THEN @@ -583,7 +583,7 @@ CONTAINS INTEGER :: left, right -! + ! IF (keys(1) .GE. key) THEN position = 1 @@ -621,7 +621,7 @@ CONTAINS INTEGER :: left, right -! + ! IF (keys(1) .GT. key) THEN position = 1 @@ -660,7 +660,7 @@ CONTAINS INTEGER :: left, one, right -! + ! one = 1 IF (PRESENT(FIRST)) one = first @@ -710,7 +710,7 @@ CONTAINS LOGICAL :: stop_short ! Used mark searches -! + ! stop_short = .FALSE. IF (PRESENT(short)) stop_short = short @@ -769,7 +769,7 @@ CONTAINS TYPE(btree_node), POINTER :: node INTEGER, INTENT(OUT) :: gti -! + ! NULLIFY (node) !IF (tree%b%n .EQ. 0) RETURN diff --git a/src/dbcsr/base/dbcsr_array_sort_d.F b/src/dbcsr/base/dbcsr_array_sort_d.F index b2a69c4061..6284d80afb 100644 --- a/src/dbcsr/base/dbcsr_array_sort_d.F +++ b/src/dbcsr/base/dbcsr_array_sort_d.F @@ -91,7 +91,7 @@ CONTAINS REAL(kind=real_8) :: a LOGICAL :: swapped -! a,t: used during swaping of elements in arr and indices + ! a,t: used during swaping of elements in arr and indices swapped = .TRUE. diff --git a/src/dbcsr/base/dbcsr_array_sort_i4.F b/src/dbcsr/base/dbcsr_array_sort_i4.F index 63e2168dd5..bbfc936739 100644 --- a/src/dbcsr/base/dbcsr_array_sort_i4.F +++ b/src/dbcsr/base/dbcsr_array_sort_i4.F @@ -91,7 +91,7 @@ CONTAINS INTEGER(kind=int_4) :: a LOGICAL :: swapped -! a,t: used during swaping of elements in arr and indices + ! a,t: used during swaping of elements in arr and indices swapped = .TRUE. diff --git a/src/dbcsr/base/dbcsr_array_sort_i8.F b/src/dbcsr/base/dbcsr_array_sort_i8.F index 538bd88280..6d282acc87 100644 --- a/src/dbcsr/base/dbcsr_array_sort_i8.F +++ b/src/dbcsr/base/dbcsr_array_sort_i8.F @@ -91,7 +91,7 @@ CONTAINS INTEGER(kind=int_8) :: a LOGICAL :: swapped -! a,t: used during swaping of elements in arr and indices + ! a,t: used during swaping of elements in arr and indices swapped = .TRUE. diff --git a/src/dbcsr/base/dbcsr_array_sort_s.F b/src/dbcsr/base/dbcsr_array_sort_s.F index 4873633066..6879594236 100644 --- a/src/dbcsr/base/dbcsr_array_sort_s.F +++ b/src/dbcsr/base/dbcsr_array_sort_s.F @@ -91,7 +91,7 @@ CONTAINS REAL(kind=real_4) :: a LOGICAL :: swapped -! a,t: used during swaping of elements in arr and indices + ! a,t: used during swaping of elements in arr and indices swapped = .TRUE.