diff --git a/cgyro/src/cgyro_globalshear.F90 b/cgyro/src/cgyro_globalshear.F90 index 19f376dce..744706852 100644 --- a/cgyro/src/cgyro_globalshear.F90 +++ b/cgyro/src/cgyro_globalshear.F90 @@ -50,9 +50,9 @@ subroutine cgyro_globalshear(ij) ! ExB shear h1 = omega_eb_base*itor*h_x(iccj+llnt,ivc,itor) ! beta_star shear - h1 = h1-omega_sbeta(iccj+llnt,ivc,itor)*cap_h_c(iccj+llnt,ivc,itor) + h1 = h1+omega_sbeta(iccj+llnt,ivc,itor)*cap_h_c(iccj+llnt,ivc,itor) ! omega_star shear - h1 = h1-sum(omega_ss(:,iccj+llnt,ivc,itor)*field(:,iccj+llnt,itor)) + h1 = h1+sum(omega_ss(:,iccj+llnt,ivc,itor)*field(:,iccj+llnt,itor)) else h1 = 0.0 endif @@ -61,9 +61,9 @@ subroutine cgyro_globalshear(ij) ! ExB shear h2 = omega_eb_base*itor*h_x(iccj-llnt,ivc,itor) ! beta_star shear - h2 = h2-omega_sbeta(iccj-llnt,ivc,itor)*cap_h_c(iccj-llnt,ivc,itor) + h2 = h2+omega_sbeta(iccj-llnt,ivc,itor)*cap_h_c(iccj-llnt,ivc,itor) ! omega_star shear - h2 = h2-sum(omega_ss(:,iccj-llnt,ivc,itor)*field(:,iccj-llnt,itor)) + h2 = h2+sum(omega_ss(:,iccj-llnt,ivc,itor)*field(:,iccj-llnt,itor)) else h2 = 0.0 endif diff --git a/cgyro/src/cgyro_init_arrays.F90 b/cgyro/src/cgyro_init_arrays.F90 index 9cc8e39eb..e4b156a23 100644 --- a/cgyro/src/cgyro_init_arrays.F90 +++ b/cgyro/src/cgyro_init_arrays.F90 @@ -447,9 +447,10 @@ subroutine cgyro_init_arrays + abs(omega_rot_edrift_r(it))) ! omega_star - carg = -i_c*k_theta_base*itor*rho*(dlnndr(is)+dlntdr(is)*(energy(ie)-1.5)) & - -i_c*k_theta_base*itor*rho*(vel2(ie)*xi(ix)/vth(is) & - *omega_gammap(it)) -i_c*k_theta_base*itor*rho*omega_rot_star(it,is) + carg = & + -i_c*k_theta_base*itor*rho*(dlnndr(is)+dlntdr(is)*(energy(ie)-1.5)) & + -i_c*k_theta_base*itor*rho*(vel2(ie)*xi(ix)/vth(is)*omega_gammap(it)) & + -i_c*k_theta_base*itor*rho*omega_rot_star(it,is) omega_s(:,ic,iv_loc,itor) = carg*jvec_c(:,ic,iv_loc,itor) @@ -462,9 +463,9 @@ subroutine cgyro_init_arrays sm = sdlnndr(is)+sdlntdr(is)*(energy(ie)-1.5) ! generalized beta/drift shear (acts on H) - sb = sbeta(is)*energy(ie)/bmag(it)**2 + sb = -sbeta(is)*energy(ie)*xi(ix)**2/bmag(it)**3 - arg = -k_theta_base*itor*length/(2*pi) + arg = k_theta_base*itor*length/(2*pi) omega_ss(:,ic,iv_loc,itor) = arg*sm*jvec_c(:,ic,iv_loc,itor) omega_sbeta(ic,iv_loc,itor) = arg*sb