Merge pull request #328 from gafusion/tglf_fixes

Tglf edits
gafusion · Nov 6, 2023 · f14648b · f14648b
2 parents bcb33cd + 6aae4f2
commit f14648b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tglf/src/tglf_LS.f90 b/tglf/src/tglf_LS.f90
@@ -630,7 +630,7 @@ SUBROUTINE get_QL_weights
           u_par(is,i) = v(j+nbasis+i)
           p_par(is,i) = v(j+nbasis*2+i)
           p_tot(is,i) = v(j+nbasis*3+i)
-          q_par(is,i) = v(j+nbasis*4+1)
+          q_par(is,i) = v(j+nbasis*4+i)
           q_tot(is,i) = v(j+nbasis*5+i)
           if(nroot.gt.6)then
             n(is,i) = n(is,i) -v(j+nbasis*6+i)+v(j+nbasis*12+i)

diff --git a/tglf/src/tglf_eigensolver.f90 b/tglf/src/tglf_eigensolver.f90
@@ -227,9 +227,9 @@ SUBROUTINE tglf_eigensolver
        damp_sig = 0.0
        if(use_bpar_in)then
          if(nbasis.eq.2)then
-           betae_psi = 0.5*betae_s/(ky*ky+(damp_sig_in*vs(2)/(q_unit*width_in))**2)
+           betae_sig = 0.5*betae_s/(ky*ky+(damp_sig_in*vs(2)/(q_unit*width_in))**2)
          else
-           betae_psi = 0.5*betae_s/(ky*ky)
+           betae_sig = 0.5*betae_s/(ky*ky)
          endif
 !      damp_sig = damp_sig_in/MAX(betae_sig*vs(1)*vs(1),0.001)
        endif
@@ -979,7 +979,7 @@ SUBROUTINE tglf_eigensolver
           kpar_gp1p0 = k_par0*ave_kpargp1p0(is,ib,jb)
           kpar_gp3p0 = k_par0*ave_kpargp3p0(is,ib,jb)
           if(use_bper_in)then
-            kpar_gp1b0 = k_par0*ave_kpargp1p0(is,ib,jb)
+            kpar_gp1b0 = k_par0*ave_kpargp1b0(is,ib,jb)
             kpar_gr11b0 = k_par0*ave_kpargr11b0(is,ib,jb)
             kpar_gr13b0 = k_par0*ave_kpargr13b0(is,ib,jb)
             if(vpar_model_in.eq.0)then

diff --git a/tglf/src/tglf_matrix.f90 b/tglf/src/tglf_matrix.f90
@@ -1297,7 +1297,7 @@ SUBROUTINE wd_h
        ave_wdhr13p0(is,ib,jb) = wdhr13p0
        ave_wdhp1b0(is,ib,jb) = wdhp1b0
        ave_wdhr11b0(is,ib,jb) = wdhr11b0
-       ave_wdhr13b0(is,ib,jb) = wdhr13bp
+       ave_wdhr13b0(is,ib,jb) = wdhr13b0
        ave_wdhp1bp(is,ib,jb) = wdhp1bp
        ave_wdhr11bp(is,ib,jb) = wdhr11bp
        ave_wdhr13bp(is,ib,jb) = wdhr13bp
@@ -1544,7 +1544,7 @@ SUBROUTINE kpar_h
         ave_kparhp3bp(is,ib,jb) = kp_hp3bp
         ave_kparhp1bp(is,ib,jb) = kp_hp1bp
         ave_kparhr11bp(is,ib,jb) = kp_hr11bp
-        ave_kparhr13bp(is,ib,jb) = kp_hr13b0
+        ave_kparhr13bp(is,ib,jb) = kp_hr13bp
         ave_kparhu1(is,ib,jb) = kp_hu1
         ave_kparhu3(is,ib,jb) = kp_hu3
         ave_kparht1(is,ib,jb) = kp_ht1