mirror of
https://github.com/TREX-CoE/irpjast.git
synced 2025-01-03 10:06:11 +01:00
Flattened array working.
This commit is contained in:
parent
66db010d0e
commit
fac1c40693
@ -45,12 +45,8 @@ BEGIN_PROVIDER [double precision, factor_een]
|
||||
z = b
|
||||
endif
|
||||
do l = iand(p - k, 1), lmax, 2
|
||||
! factor_een = factor_een + cord_vect(l, k, p, alpha) * (y + z) * t
|
||||
! cidx = l + (ncord + 1) * k + (ncord + 1) * (ncord + 1) * p + &
|
||||
! (ncord + 1) * (ncord + 1) * ncord * alpha
|
||||
! here I try to use the flattened version of the array
|
||||
cidx = l + 6 * k + 6 * 6 * p + 6 * 6 * 5 * alpha
|
||||
print *, cidx
|
||||
cidx = 1 + l + (ncord + 1) * k + (ncord + 1) * (ncord + 1) * (p - 1) + &
|
||||
(ncord + 1) * (ncord + 1) * ncord * (alpha - 1)
|
||||
factor_een = factor_een + cord_vect(cidx) * (y + z) * t
|
||||
t = t * c_inv
|
||||
y = y * a2
|
||||
|
36
orders.irp.f
36
orders.irp.f
@ -24,21 +24,23 @@ END_PROVIDER
|
||||
|
||||
BEGIN_PROVIDER [double precision, aord_vect, (naord)]
|
||||
&BEGIN_PROVIDER [double precision, bord_vect, (nbord)]
|
||||
&BEGIN_PROVIDER [double precision, cord_vect, (ncord * ncord * ncord * nnuc)]
|
||||
&BEGIN_PROVIDER [double precision, cord_vect, ((ncord + 1) * (ncord + 1) * ncord * nnuc)]
|
||||
implicit none
|
||||
PROVIDE naord
|
||||
PROVIDE nbord
|
||||
PROVIDE ncord
|
||||
BEGIN_DOC
|
||||
! Read Jastow coefficients from file (NEEDS OPTIMIZATION!)
|
||||
END_DOC
|
||||
PROVIDE naord
|
||||
PROVIDE nbord
|
||||
PROVIDE ncord
|
||||
character(len=*), parameter :: FILE_NAME = "orders_inp"
|
||||
integer :: i, fu, rc
|
||||
double precision, dimension(naord + nbord + ncord * ncord * ncord * nnuc) :: allord_vect
|
||||
integer :: i, fu, rc, maxord
|
||||
double precision, dimension((ncord + 1) * (ncord + 1) * ncord * nnuc + naord + nbord) :: allord_vect
|
||||
|
||||
maxord = (ncord + 1) * (ncord + 1) * ncord * nnuc + naord + nbord
|
||||
|
||||
open(action='read', file=FILE_NAME, iostat=rc, newunit=fu)
|
||||
|
||||
do i = 1, naord + nbord + ncord * ncord * ncord * nnuc
|
||||
do i = 1, maxord
|
||||
read(fu, *) allord_vect(i)
|
||||
end do
|
||||
|
||||
@ -74,13 +76,13 @@ END_PROVIDER
|
||||
! FREE seed
|
||||
! END_PROVIDER
|
||||
!
|
||||
BEGIN_PROVIDER [double precision, cord_vect_0, (0:ncord,0:ncord,ncord,nnuc)]
|
||||
implicit none
|
||||
BEGIN_DOC
|
||||
! Vector of the `c' coefficients
|
||||
END_DOC
|
||||
PROVIDE seed
|
||||
call random_number(cord_vect_0)
|
||||
cord_vect_0 = cord_vect_0 * .1d-4
|
||||
FREE seed
|
||||
END_PROVIDER
|
||||
! BEGIN_PROVIDER [double precision, cord_vect, (0:ncord,0:ncord,ncord,nnuc)]
|
||||
! implicit none
|
||||
! BEGIN_DOC
|
||||
! ! Vector of the `c' coefficients
|
||||
! END_DOC
|
||||
! PROVIDE seed
|
||||
! call random_number(cord_vect)
|
||||
! cord_vect_0 = cord_vect_0 * .1d-4
|
||||
! FREE seed
|
||||
! END_PROVIDER
|
||||
|
Loading…
Reference in New Issue
Block a user