removed unused variables KR0KH A0KH and CANCEL_ODD_P

src/grid_mod.F90

@@ -21,7 +21,6 @@ MODULE grid
   INTEGER,  PUBLIC, PROTECTED :: Nkz   = 16     ! Number of total internal grid points in kz
   REAL(dp), PUBLIC, PROTECTED :: Lkz   = 1._dp  ! vertical length of the fourier box
   REAL(dp), PUBLIC, PROTECTED :: kpar  = 0_dp   ! parallel wave vector component
-  LOGICAL,  PUBLIC, PROTECTED :: CANCEL_ODD_P = .false. ! To cancel odd Hermite polynomials
   INTEGER,  PUBLIC, PROTECTED :: pskip = 0      ! variable to skip p degrees or not
   ! For Orszag filter
   REAL(dp), PUBLIC, PROTECTED :: two_third_krmax
@@ -66,18 +65,13 @@ CONTAINS
     USE prec_const
     IMPLICIT NONE
     INTEGER :: ip, ij
-    IF (CANCEL_ODD_P) THEN
-      pskip = 1
-    ELSE
-      pskip = 0
-    ENDIF
 
     ips_e = 1; ipe_e = pmaxe/(1+pskip) + 1
     ips_i = 1; ipe_i = pmaxi/(1+pskip) + 1
     ALLOCATE(parray_e(ips_e:ipe_e))
     ALLOCATE(parray_i(ips_i:ipe_i))
-    DO ip = ips_e,ipe_e; parray_e(ip) = (1+pskip)*(ip-1); END DO
-    DO ip = ips_i,ipe_i; parray_i(ip) = (1+pskip)*(ip-1); END DO
+    DO ip = ips_e,ipe_e; parray_e(ip) = (ip-1); END DO
+    DO ip = ips_i,ipe_i; parray_i(ip) = (ip-1); END DO
 
     ijs_e = 1; ije_e = jmaxe + 1
     ijs_i = 1; ije_i = jmaxi + 1
@@ -177,7 +171,7 @@ CONTAINS
     INTEGER :: lu_in   = 90              ! File duplicated from STDIN
 
     NAMELIST /GRID/ pmaxe, jmaxe, pmaxi, jmaxi, &
-                    Nr,  Lr,  Nz,  Lz, kpar, CANCEL_ODD_P
+                    Nr,  Lr,  Nz,  Lz, kpar
     READ(lu_in,grid)
 
   END SUBROUTINE grid_readinputs

src/inital.F90

@@ -28,7 +28,7 @@ SUBROUTINE inital
 
 
   !!!!!! Set Sepj, Sipj and dnjs coeff table !!!!!!
-  IF ( NON_LIN .OR. (A0KH .NE. 0)) THEN;
+  IF ( NON_LIN ) THEN;
     IF (my_id .EQ. 1) WRITE(*,*) 'Init Sapj'
     CALL compute_Sapj
     ! WRITE(*,*) 'Building Dnjs table'
@@ -146,7 +146,7 @@ SUBROUTINE load_cp
     CALL getarr(fidrst, dset_name, moments_e(ips_e:ipe_e,ijs_e:ije_e,ikrs:ikre,ikzs:ikze,1),pardim=3)
     WRITE(dset_name, "(A, '/', i6.6)") "/Basic/phi", n_
     CALL getarr(fidrst, dset_name, phi(ikrs:ikre,ikzs:ikze),pardim=1)
-    
+
     ! Read time dependent attributes
     CALL getatt(fidrst, dset_name, 'cstep', cstep)
     CALL getatt(fidrst, dset_name, 'time', time)

src/memory.F90

@@ -6,7 +6,7 @@ SUBROUTINE memory
   USE fields
   USE grid
   USE time_integration
-  USE model, ONLY: CO, NON_LIN, A0KH
+  USE model, ONLY: CO, NON_LIN
 
   USE prec_const
   IMPLICIT NONE
@@ -32,7 +32,7 @@ SUBROUTINE memory
   ENDIF
 
   ! Non linear terms and dnjs table
-  IF ( NON_LIN .OR. (A0KH .NE. 0) ) THEN
+  IF ( NON_LIN ) THEN
     CALL allocate_array( Sepj, ips_e,ipe_e, ijs_e,ije_e, ikrs,ikre, ikzs,ikze )
     CALL allocate_array( Sipj, ips_i,ipe_i, ijs_i,ije_i, ikrs,ikre, ikzs,ikze )
     CALL allocate_array( dnjs, 1,maxj+1, 1,maxj+1, 1,maxj+1)

src/model_mod.F90

@@ -20,9 +20,6 @@ MODULE model
   REAL(dp), PUBLIC, PROTECTED ::   eta_T =  1._dp     ! Temperature gradient
   REAL(dp), PUBLIC, PROTECTED ::   eta_B =  1._dp     ! Magnetic gradient
   REAL(dp), PUBLIC, PROTECTED :: lambdaD =  1._dp     ! Debye length
-  REAL(dp), PUBLIC            ::   kr0KH =  0._dp     ! background wave frequ. for Rayleigh Taylor instability
-  INTEGER,  PUBLIC            ::  ikz0KH =  0         ! '' index
-  REAL(dp), PUBLIC, PROTECTED ::    A0KH =  0._dp     ! background amplitude
 
   PUBLIC :: model_readinputs, model_outputinputs
 
@@ -36,7 +33,7 @@ CONTAINS
     IMPLICIT NONE
 
     NAMELIST /MODEL_PAR/ CO, DK, NON_LIN, mu, nu, tau_e, tau_i, sigma_e, sigma_i, &
-                         q_e, q_i, eta_n, eta_T, eta_B, lambdaD, kr0KH, A0KH
+                         q_e, q_i, eta_n, eta_T, eta_B, lambdaD
 
     READ(lu_in,model_par)
     !WRITE(*,model_par)

src/moments_eq_rhs.F90

@@ -134,13 +134,13 @@ SUBROUTINE moments_eq_rhs
           ! term propto N_e^{p,j}
           TNapj = xNapj * moments_e(ip,ij,ikr,ikz,updatetlevel)
           ! term propto N_e^{p+1,j} and kparallel
-          IF ( (ip+1 .LE. pmaxe+1) .AND. (.NOT. CANCEL_ODD_P) ) THEN ! OoB check
+          IF ( (ip+1 .LE. pmaxe+1) ) THEN ! OoB check
             TNapp1j = xNapp1j * moments_e(ip+1,ij,ikr,ikz,updatetlevel)
           ELSE
             TNapp1j = 0._dp
           ENDIF
           ! term propto N_e^{p-1,j} and kparallel
-          IF ( (ip-1 .GE. 1) .AND. (.NOT. CANCEL_ODD_P) ) THEN ! OoB check
+          IF ( (ip-1 .GE. 1) ) THEN ! OoB check
             TNapm1j = xNapm1j * moments_e(ip-1,ij,ikr,ikz,updatetlevel)
           ELSE
             TNapm1j = 0._dp
@@ -182,7 +182,7 @@ SUBROUTINE moments_eq_rhs
             ELSE
               TColl01 = 0._dp
             ENDIF
-            IF ( (pmaxe .GE. 1) .AND. (.NOT. CANCEL_ODD_P) ) THEN ! OoB + odd number for Hermite degrees check
+            IF ( (pmaxe .GE. 1) ) THEN ! OoB + odd number for Hermite degrees check
               TColl10 = xCa10 * moments_e(2,1,ikr,ikz,updatetlevel)
             ELSE
               TColl10 = 0._dp
@@ -245,7 +245,7 @@ SUBROUTINE moments_eq_rhs
               + TColl
 
           ! Adding non linearity
-          IF ( NON_LIN .OR. (A0KH .NE. 0) ) THEN
+          IF ( NON_LIN ) THEN
             moments_rhs_e(ip,ij,ikr,ikz,updatetlevel) = &
               moments_rhs_e(ip,ij,ikr,ikz,updatetlevel) - Sepj(ip,ij,ikr,ikz)
           ENDIF
@@ -345,13 +345,13 @@ SUBROUTINE moments_eq_rhs
           ! term propto N_i^{p,j}
           TNapj = xNapj * moments_i(ip,ij,ikr,ikz,updatetlevel)
           ! term propto N_i^{p+1,j}
-          IF ( (ip+1 .LE. pmaxi+1)  .AND. (.NOT. CANCEL_ODD_P) ) THEN ! OoB check
+          IF ( (ip+1 .LE. pmaxi+1) ) THEN ! OoB check
             TNapp1j = xNapp1j * moments_i(ip+1,ij,ikr,ikz,updatetlevel)
           ELSE
             TNapp1j = 0._dp
           ENDIF
           ! term propto N_i^{p-1,j}
-          IF ( (ip-1 .GE. 1) .AND. (.NOT. CANCEL_ODD_P) ) THEN ! OoB check
+          IF ( (ip-1 .GE. 1) ) THEN ! OoB check
             TNapm1j = xNapm1j * moments_i(ip-1,ij,ikr,ikz,updatetlevel)
           ELSE
             TNapm1j = 0._dp
@@ -393,7 +393,7 @@ SUBROUTINE moments_eq_rhs
             ELSE
               TColl01 = 0._dp
             ENDIF
-            IF ( (pmaxi .GE. 1) .AND. (.NOT. CANCEL_ODD_P) ) THEN ! OoB check
+            IF ( (pmaxi .GE. 1) ) THEN ! OoB check
               TColl10 = xCa10 * moments_i(2,1,ikr,ikz,updatetlevel)
             ELSE
               TColl10 = 0._dp
@@ -456,7 +456,7 @@ SUBROUTINE moments_eq_rhs
                + TColl
 
           ! Adding non linearity
-          IF ( NON_LIN .OR. (A0KH .NE. 0) ) THEN
+          IF ( NON_LIN ) THEN
            moments_rhs_i(ip,ij,ikr,ikz,updatetlevel) = &
              moments_rhs_i(ip,ij,ikr,ikz,updatetlevel) - Sipj(ip,ij,ikr,ikz)
           ENDIF

src/stepon.F90

@@ -44,7 +44,7 @@ SUBROUTINE stepon
       CALL poisson
 
       ! Update nonlinear term
-      IF ( NON_LIN .OR. (A0KH .NE. 0) ) THEN
+      IF ( NON_LIN ) THEN
         CALL compute_Sapj
       ENDIF