mirror of
https://github.com/TREX-CoE/irpjast.git
synced 2024-12-22 20:36:08 +01:00
Fixed orders
This commit is contained in:
parent
fac1c40693
commit
45987d8699
2
Makefile
2
Makefile
@ -2,7 +2,7 @@ IRPF90 = irpf90 #-a -d
|
||||
FC = gfortran
|
||||
FCFLAGS= -O2 -ffree-line-length-none -I .
|
||||
NINJA = ninja
|
||||
AR = ar
|
||||
AR = ar crs
|
||||
RANLIB = ranlib
|
||||
|
||||
SRC=
|
||||
|
@ -45,9 +45,9 @@ BEGIN_PROVIDER [double precision, factor_een]
|
||||
z = b
|
||||
endif
|
||||
do l = iand(p - k, 1), lmax, 2
|
||||
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
|
||||
! 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(l, k, p, alpha) * (y + z) * t
|
||||
t = t * c_inv
|
||||
y = y * a2
|
||||
z = z * b2
|
||||
|
@ -13,13 +13,11 @@ BEGIN_PROVIDER [ double precision, nuc_coord, (nnuc, 3) ]
|
||||
! Nuclei coordinates
|
||||
END_DOC
|
||||
integer :: i, j
|
||||
PROVIDE seed
|
||||
do j = 1 , 3
|
||||
do i = 1, nnuc
|
||||
call random_number(nuc_coord(i, j))
|
||||
nuc_coord(i, j) = dble(i)
|
||||
enddo
|
||||
enddo
|
||||
FREE seed
|
||||
|
||||
END_PROVIDER
|
||||
|
||||
|
14
orders.irp.f
14
orders.irp.f
@ -24,7 +24,7 @@ END_PROVIDER
|
||||
|
||||
BEGIN_PROVIDER [double precision, aord_vect, (naord)]
|
||||
&BEGIN_PROVIDER [double precision, bord_vect, (nbord)]
|
||||
&BEGIN_PROVIDER [double precision, cord_vect, ((ncord + 1) * (ncord + 1) * ncord * nnuc)]
|
||||
&BEGIN_PROVIDER [double precision, cord_vect, (0:ncord , 0:ncord , ncord , nnuc)]
|
||||
implicit none
|
||||
BEGIN_DOC
|
||||
! Read Jastow coefficients from file (NEEDS OPTIMIZATION!)
|
||||
@ -34,19 +34,15 @@ PROVIDE nbord
|
||||
PROVIDE ncord
|
||||
character(len=*), parameter :: FILE_NAME = "orders_inp"
|
||||
integer :: i, fu, rc, maxord
|
||||
double precision, dimension((ncord + 1) * (ncord + 1) * ncord * nnuc + naord + nbord) :: allord_vect
|
||||
double precision, dimension((ncord + 1) * (ncord + 1) * ncord * nnuc) :: allord_vect
|
||||
|
||||
maxord = (ncord + 1) * (ncord + 1) * ncord * nnuc + naord + nbord
|
||||
|
||||
open(action='read', file=FILE_NAME, iostat=rc, newunit=fu)
|
||||
|
||||
do i = 1, maxord
|
||||
read(fu, *) allord_vect(i)
|
||||
end do
|
||||
|
||||
aord_vect = allord_vect(1:naord)
|
||||
bord_vect = allord_vect(naord + 1: naord + nbord)
|
||||
cord_vect = allord_vect(naord + nbord + 1:)
|
||||
read(fu, *) aord_vect
|
||||
read(fu, *) bord_vect
|
||||
read(fu, *) cord_vect
|
||||
|
||||
close(fu)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user