eliminate screenz (#293)

Only 3 networks were using screenz (triple_alpha_plus_cago, ignition_simple, ignition_chamulak).
We swap them over to screen5.

Author: zingale

networks/ignition_chamulak/actual_rhs.F90

@@ -13,8 +13,14 @@ module actual_rhs_module
 
   subroutine actual_rhs_init()
 
+    use screening_module, only: screening_init, add_screening_factor
+
     implicit none
 
+    call add_screening_factor(zion(ic12),aion(ic12),zion(ic12),aion(ic12))
+
+    call screening_init()
+
   end subroutine actual_rhs_init
 
   subroutine get_ebin(density, ebin)
@@ -59,15 +65,15 @@ end subroutine get_ebin
 
   subroutine get_rates(state, rr)
 
-    use screening_module, only: screenz
+    use screening_module, only: screen5, plasma_state, fill_plasma_state
 
     type (burn_t), intent(in) :: state
     type (rate_t), intent(out) :: rr
 
     real(rt)         :: temp, T9, T9a, dT9dt, dT9adt
 
     real(rt)         :: scratch, dscratchdt
-    real(rt)         :: rate, dratedt, sc1212, dsc1212dt, xc12tmp
+    real(rt)         :: rate, dratedt, sc1212, dsc1212dt, dsc1212dd, xc12tmp
 
     real(rt)         :: dens
 
@@ -76,6 +82,8 @@ subroutine get_rates(state, rr)
     real(rt)         :: y(nspec)
 
     real(rt)        , parameter :: FIVE6TH = FIVE / SIX
+    integer :: jscr
+    type(plasma_state) :: pstate
 
     !$gpu
 
@@ -86,8 +94,10 @@ subroutine get_rates(state, rr)
     y(1:nspec) = state % xn(1:nspec) * aion_inv(1:nspec)
 
     ! call the screening routine
-    call screenz(temp, dens, 6.0e0_rt, 6.0e0_rt, 12.0e0_rt, 12.0e0_rt, &
-                 y, sc1212, dsc1212dt)
+    call fill_plasma_state(pstate, temp, dens, y)
+
+    jscr = 1
+    call screen5(pstate,jscr,sc1212,dsc1212dt,dsc1212dd)
 
     ! compute some often used temperature constants
     T9     = temp/1.e9_rt

networks/ignition_simple/actual_rhs.F90

@@ -13,8 +13,14 @@ module actual_rhs_module
 
   subroutine actual_rhs_init()
 
+    use screening_module, only: screening_init, add_screening_factor
+
     implicit none
 
+    call add_screening_factor(zion(ic12),aion(ic12),zion(ic12),aion(ic12))
+
+    call screening_init()
+
   end subroutine actual_rhs_init
 
 
@@ -209,7 +215,7 @@ subroutine evaluate_rates(state, rr)
 
     !$acc routine seq
 
-    use screening_module, only: screenz
+    use screening_module, only: screen5, plasma_state, fill_plasma_state
 
     implicit none
 
@@ -219,13 +225,15 @@ subroutine evaluate_rates(state, rr)
     real(rt)         :: temp, T9, T9a, dT9dt, dT9adt
 
     real(rt)         :: scratch, dscratchdt
-    real(rt)         :: rate, dratedt, sc1212, dsc1212dt, xc12tmp
+    real(rt)         :: rate, dratedt, sc1212, dsc1212dt, dsc1212dd, xc12tmp
 
     real(rt)         :: dens
 
     real(rt)         :: a, b, dadt, dbdt
 
     real(rt)         :: y(nspec)
+    integer :: jscr
+    type(plasma_state) :: pstate
 
     !$gpu
 
@@ -236,7 +244,10 @@ subroutine evaluate_rates(state, rr)
     y    = state % xn * aion_inv
 
     ! call the screening routine
-    call screenz(temp,dens,6.0e0_rt,6.0e0_rt,12.0e0_rt,12.0e0_rt,y,sc1212,dsc1212dt)
+    call fill_plasma_state(pstate, temp, dens, y)
+
+    jscr = 1
+    call screen5(pstate,jscr,sc1212,dsc1212dt,dsc1212dd)
 
     ! compute some often used temperature constants
     T9     = temp/1.e9_rt

networks/triple_alpha_plus_cago/actual_rhs.F90

@@ -16,9 +16,13 @@ module actual_rhs_module
 
   subroutine actual_rhs_init()
 
+    use screening_module, only: screening_init
+
     implicit none
 
-    !$gpu
+    call set_up_screening_factors()
+
+    call screening_init()
 
   end subroutine actual_rhs_init
 
@@ -181,4 +185,27 @@ subroutine ener_gener_rate(dydt, enuc)
 
   end subroutine ener_gener_rate
 
+  ! Compute and store the more expensive screening factors
+
+  subroutine set_up_screening_factors()
+
+    use screening_module, only: add_screening_factor
+    use network, only: aion, zion
+
+    implicit none
+
+    ! note: it is critical that these are called in the exact order
+    ! that the screening calls are done in the RHS routine, since we
+    ! use that order in the screening
+
+    call add_screening_factor(zion(ihe4),aion(ihe4),zion(ihe4),aion(ihe4))
+
+    call add_screening_factor(zion(ihe4),aion(ihe4),4.0e0_rt,8.0e0_rt)
+
+    call add_screening_factor(zion(ic12),aion(ic12),zion(ihe4),aion(ihe4))
+
+
+  end subroutine set_up_screening_factors
+
+
 end module actual_rhs_module

networks/triple_alpha_plus_cago/screen_module.F90

@@ -3,7 +3,7 @@
 ! fractions.  The triple-alpha reaction goes through a compound nucleus
 ! channel and therefore screening must be applied to both reactions.
 !
-! A call is made to screenz which lives in screen.f to apply the screening
+! A call is made to screen5 which lives in screen.f to apply the screening
 ! to a single reaction.
 module screen_module
 
@@ -19,33 +19,33 @@ subroutine screen(temp, dens, ymol, rates, dratesdt)
 
     !$acc routine seq
 
-    use screening_module, only: screenz
+    use screening_module, only: screen5, plasma_state, fill_plasma_state
 
     real(rt), intent(IN   ) :: temp, dens, ymol(nspec)
     real(rt), intent(INOUT) :: rates(nrates)
     real(rt), intent(INOUT) :: dratesdt(nrates)
 
-    real(rt) :: scorr1, dscorr1dt
-    real(rt) :: scorr2, dscorr2dt
-    real(rt) ::  scorr,  dscorrdt
+    real(rt) :: scorr1, dscorr1dt, dscorr1dd
+    real(rt) :: scorr2, dscorr2dt, dscorr2dd
+    real(rt) ::  scorr,  dscorrdt, dscorrdd
 
     real(rt) :: rates_in(nrates), dratesdt_in(nrates)
+    integer :: jscr
+
+    type (plasma_state) :: state
 
     !$gpu
 
     rates_in    = rates
     dratesdt_in = dratesdt
 
-    ! triple alpha going through compound nucleus channel
-    call screenz(temp, dens,              &
-         zion(ihe4), zion(ihe4),          &
-         aion(ihe4), aion(ihe4),          &
-         ymol, scorr1, dscorr1dt)
+    call fill_plasma_state(state, temp, dens, ymol)
+
+    jscr = 1
+    call screen5(state,jscr,scorr1,dscorr1dt,dscorr1dd)
 
-    call screenz(temp, dens,              &
-         zion(ihe4), FOUR,                &
-         aion(ihe4), EIGHT,               &
-         ymol, scorr2, dscorr2dt)
+    jscr = jscr + 1
+    call screen5(state,jscr,scorr2,dscorr2dt,dscorr2dd)
 
     scorr    = scorr1 * scorr2
     dscorrdt = dscorr1dt * scorr2 + scorr1 * dscorr2dt
@@ -55,10 +55,8 @@ subroutine screen(temp, dens, ymol, rates, dratesdt)
                      rates_in(ir3a) * dscorrdt
 
     ! C12 + alpha --> O16
-    call screenz(temp, dens,     &
-         zion(ic12), zion(ihe4), &
-         aion(ic12), aion(ihe4), &
-         ymol, scorr, dscorrdt)
+    jscr = jscr + 1
+    call screen5(state,jscr,scorr,dscorrdt,dscorrdd)
 
     rates(ircago)    = rates_in(ircago) * scorr
     dratesdt(ircago) = dratesdt_in(ircago) * scorr + &