Skip to content
Snippets Groups Projects
Commit 45ec2316 authored by Antoine Cyril David Hoffmann's avatar Antoine Cyril David Hoffmann :seedling:
Browse files

minor changes

parent d0d7cf3b
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,6 @@ MODULE circular ...@@ -8,7 +8,6 @@ MODULE circular
USE grid, ONLY: local_Nky, local_Nkx, local_nz, ngz, nzgrid, kyarray, kxarray, zarray, total_nz, local_nz_offset, iodd, ieven USE grid, ONLY: local_Nky, local_Nkx, local_nz, ngz, nzgrid, kyarray, kxarray, zarray, total_nz, local_nz_offset, iodd, ieven
! use discretization ! use discretization
USE lagrange_interpolation USE lagrange_interpolation
USE model
implicit none implicit none
public:: get_circ public:: get_circ
......
...@@ -99,7 +99,7 @@ CONTAINS ...@@ -99,7 +99,7 @@ CONTAINS
subroutine eval_magnetic_geometry subroutine eval_magnetic_geometry
USE grid, ONLY: total_nky, total_nz, local_nkx, local_nky, local_nz, ngz,& USE grid, ONLY: total_nky, total_nz, local_nkx, local_nky, local_nz, ngz,&
kxarray, kyarray, set_kparray, nzgrid, zweights_SR, ieven, set_kxgrid set_kparray, nzgrid, zweights_SR, ieven, set_kxgrid
USE basic, ONLY: speak USE basic, ONLY: speak
USE miller, ONLY: set_miller_parameters, get_miller USE miller, ONLY: set_miller_parameters, get_miller
USE circular, ONLY: get_circ USE circular, ONLY: get_circ
...@@ -108,10 +108,8 @@ CONTAINS ...@@ -108,10 +108,8 @@ CONTAINS
USE species, ONLY: Ptot USE species, ONLY: Ptot
! evalute metrix, elementwo_third_kpmaxts, jacobian and gradient ! evalute metrix, elementwo_third_kpmaxts, jacobian and gradient
implicit none implicit none
REAL(xp) :: kx,ky
COMPLEX(xp), DIMENSION(local_nz) :: integrant COMPLEX(xp), DIMENSION(local_nz) :: integrant
real(xp) :: Cx, Cy, g_xz, g_yz, g_zz
INTEGER :: eo,iz,iky,ikx
! Allocate arrays ! Allocate arrays
CALL geometry_allocate_mem(local_nky,local_nkx,local_nz,ngz,nzgrid) CALL geometry_allocate_mem(local_nky,local_nkx,local_nz,ngz,nzgrid)
......
...@@ -73,7 +73,7 @@ MODULE grid ...@@ -73,7 +73,7 @@ MODULE grid
integer(C_INTPTR_T), PUBLIC,PROTECTED :: local_nkx_ptr, local_nky_ptr integer(C_INTPTR_T), PUBLIC,PROTECTED :: local_nkx_ptr, local_nky_ptr
integer(C_INTPTR_T), PUBLIC,PROTECTED :: local_nkx_ptr_offset, local_nky_ptr_offset integer(C_INTPTR_T), PUBLIC,PROTECTED :: local_nkx_ptr_offset, local_nky_ptr_offset
! Grid spacing and limits ! Grid spacing and limits
REAL(xp), PUBLIC, PROTECTED :: deltap, deltaz, inv_deltaz REAL(xp), PUBLIC, PROTECTED :: deltap, deltaz, inv_deltaz, inv_dkx
REAL(xp), PUBLIC, PROTECTED :: deltakx, deltaky, kx_max, ky_max, kx_min, ky_min!, kp_max REAL(xp), PUBLIC, PROTECTED :: deltakx, deltaky, kx_max, ky_max, kx_min, ky_min!, kp_max
INTEGER , PUBLIC, PROTECTED :: local_pmin, local_pmax INTEGER , PUBLIC, PROTECTED :: local_pmin, local_pmax
INTEGER , PUBLIC, PROTECTED :: local_jmin, local_jmax INTEGER , PUBLIC, PROTECTED :: local_jmin, local_jmax
...@@ -492,7 +492,8 @@ CONTAINS ...@@ -492,7 +492,8 @@ CONTAINS
! x length is adapted ! x length is adapted
Lx = Lx_adapted*Nexc Lx = Lx_adapted*Nexc
ENDIF ENDIF
deltakx = 2._xp*PI/Lx deltakx = 2._xp*PI/Lx
inv_dkx = 1._xp/deltakx
IF(MODULO(total_nkx,2) .EQ. 0) THEN ! Even number of kx (-2 -1 0 1 2 3) IF(MODULO(total_nkx,2) .EQ. 0) THEN ! Even number of kx (-2 -1 0 1 2 3)
! Creating a grid ordered as dk*(0 1 2 3 -2 -1) ! Creating a grid ordered as dk*(0 1 2 3 -2 -1)
DO ikx = 1,total_nkx DO ikx = 1,total_nkx
...@@ -629,10 +630,10 @@ CONTAINS ...@@ -629,10 +630,10 @@ CONTAINS
two_third_kpmax = 2._xp/3._xp * MAXVAL(kparray) two_third_kpmax = 2._xp/3._xp * MAXVAL(kparray)
END SUBROUTINE END SUBROUTINE
SUBROUTINE update_grids (sky,gxx,gxy,gyy,inv_hatB2) SUBROUTINE update_grids (sky,gxx,gxy,inv_hatB2)
IMPLICIT NONE IMPLICIT NONE
REAL(xp), DIMENSION(local_nky),INTENT(IN) :: sky ! ExB grid shift REAL(xp), DIMENSION(local_nky),INTENT(IN) :: sky ! ExB grid shift
REAL(xp), DIMENSION(local_nz+ngz,nzgrid), INTENT(IN) :: gxx,gxy,gyy,inv_hatB2 REAL(xp), DIMENSION(local_nz+ngz,nzgrid), INTENT(IN) :: gxx,gxy,inv_hatB2
INTEGER :: eo,iz,iky,ikx INTEGER :: eo,iz,iky,ikx
REAL(xp) :: kx, ky, skp2 REAL(xp) :: kx, ky, skp2
! Update the kx grid ! Update the kx grid
......
...@@ -9,7 +9,6 @@ MODULE miller ...@@ -9,7 +9,6 @@ MODULE miller
USE grid, ONLY: local_Nky, local_Nkx, local_nz, ngz, nzgrid, kyarray, kxarray, zarray, total_nz, local_nz_offset, iodd, ieven USE grid, ONLY: local_Nky, local_Nkx, local_nz, ngz, nzgrid, kyarray, kxarray, zarray, total_nz, local_nz_offset, iodd, ieven
! use discretization ! use discretization
USE lagrange_interpolation USE lagrange_interpolation
USE model
implicit none implicit none
public:: get_miller, set_miller_parameters public:: get_miller, set_miller_parameters
......
...@@ -41,9 +41,9 @@ CONTAINS ...@@ -41,9 +41,9 @@ CONTAINS
SUBROUTINE model_readinputs SUBROUTINE model_readinputs
! Read the input parameters ! Read the input parameters
USE basic, ONLY: lu_in, speak USE basic, ONLY: lu_in, speak
USE parallel, ONLY: num_procs_p USE parallel, ONLY: num_procs_p
USE prec_const USE prec_const, ONLY: xp
IMPLICIT NONE IMPLICIT NONE
NAMELIST /MODEL_PAR/ KERN, LINEARITY, RM_LD_T_EQ, FORCE_SYMMETRY, MHD_PD, & NAMELIST /MODEL_PAR/ KERN, LINEARITY, RM_LD_T_EQ, FORCE_SYMMETRY, MHD_PD, &
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment