Add missing factors of avo to rates output

Author: rjfarmer

net/private/net_derivs.f90

@@ -284,11 +284,11 @@ subroutine get_general_1_to_1_derivs(i,ierr) ! e.g., 2 c12 -> mg24, 3 he4 -> c12
             dydt(i_rate,i1) = dydt(i_rate,i1) - c1*b
             dydt(i_rate,i2) = dydt(i_rate,i2) + c2*b
 
-            n% raw_rate(i) = d_f * n% rate_raw(i)
-            n% raw_rate(r_i) = d_r * n% rate_raw(r_i)
+            n% raw_rate(i) = d_f * n% rate_raw(i) * avo
+            n% raw_rate(r_i) = d_r * n% rate_raw(r_i) * avo
 
-            n% screened_rate(i) = d_f * n% rate_screened(i)
-            n% screened_rate(r_i) = d_r * n% rate_screened(r_i)
+            n% screened_rate(i) = d_f * n% rate_screened(i) * avo
+            n% screened_rate(r_i) = d_r * n% rate_screened(r_i) * avo
 
             if (just_dydt) return
 
@@ -450,11 +450,11 @@ subroutine get_general_2_to_1_derivs(i,ierr) ! e.g., r_he4_si28_to_o16_o16
             dydt(i_rate,i2) = dydt(i_rate,i2) - c2*b
             dydt(i_rate,i3) = dydt(i_rate,i3) + c3*b
 
-            n% raw_rate(i) = d_f * n% rate_raw(i)
-            n% raw_rate(r_i) = d_r * n% rate_raw(r_i)
+            n% raw_rate(i) = d_f * n% rate_raw(i) * avo
+            n% raw_rate(r_i) = d_r * n% rate_raw(r_i) * avo
 
-            n% screened_rate(i) = d_f * n% rate_screened(i)
-            n% screened_rate(r_i) = d_r * n% rate_screened(r_i)
+            n% screened_rate(i) = d_f * n% rate_screened(i) * avo
+            n% screened_rate(r_i) = d_r * n% rate_screened(r_i) * avo
 
             if (just_dydt) return
 
@@ -699,11 +699,11 @@ subroutine get_general_2_to_2_derivs(i,ierr)
             dydt(i_rate,i3) = dydt(i_rate,i3) + c3*b
             dydt(i_rate,i4) = dydt(i_rate,i4) + c4*b
 
-            n% raw_rate(i) = d_f * n% rate_raw(i)
-            n% raw_rate(r_i) = d_r * n% rate_raw(r_i)
+            n% raw_rate(i) = d_f * n% rate_raw(i) * avo
+            n% raw_rate(r_i) = d_r * n% rate_raw(r_i) * avo
 
-            n% screened_rate(i) = d_f * n% rate_screened(i)
-            n% screened_rate(r_i) = d_r * n% rate_screened(r_i)
+            n% screened_rate(i) = d_f * n% rate_screened(i) * avo
+            n% screened_rate(r_i) = d_r * n% rate_screened(r_i) * avo
 
             if (just_dydt) return
 
@@ -847,11 +847,11 @@ subroutine get_basic_2_to_2_derivs(i,ierr)
             dydt(i_rate,i3) = dydt(i_rate,i3) + b
             dydt(i_rate,i4) = dydt(i_rate,i4) + b
 
-            n% raw_rate(i) = d_f * n% rate_raw(i)
-            n% raw_rate(r_i) = d_r * n% rate_raw(r_i)
+            n% raw_rate(i) = d_f * n% rate_raw(i) * avo
+            n% raw_rate(r_i) = d_r * n% rate_raw(r_i) * avo
 
-            n% screened_rate(i) = d_f * n% rate_screened(i)
-            n% screened_rate(r_i) = d_r * n% rate_screened(r_i)
+            n% screened_rate(i) = d_f * n% rate_screened(i) * avo
+            n% screened_rate(r_i) = d_r * n% rate_screened(r_i) * avo
 
             if (just_dydt) return
 
@@ -989,11 +989,11 @@ subroutine get_basic_2_to_1_derivs(i,ierr)
             dydt(i_rate,i2) = dydt(i_rate,i2) - b
             dydt(i_rate,i3) = dydt(i_rate,i3) + b
 
-            n% raw_rate(i) = d_f * n% rate_raw(i)
-            n% raw_rate(r_i) = d_r * n% rate_raw(r_i)
+            n% raw_rate(i) = d_f * n% rate_raw(i) * avo
+            n% raw_rate(r_i) = d_r * n% rate_raw(r_i) * avo
 
-            n% screened_rate(i) = d_f * n% rate_screened(i)
-            n% screened_rate(r_i) = d_r * n% rate_screened(r_i)
+            n% screened_rate(i) = d_f * n% rate_screened(i) * avo
+            n% screened_rate(r_i) = d_r * n% rate_screened(r_i) * avo
 
             if (just_dydt) return
 

net/private/net_derivs_support.f90

@@ -151,8 +151,8 @@ subroutine do_in_out_neu( &
         rvs(i_rate_dT) = r * n% rate_screened_dT(i)
         rvs(i_rate_dRho) = r * n% rate_screened_dRho(i)
 
-        n% raw_rate(i) = n% rate_raw(i) * r
-        n% screened_rate(i) = n% rate_screened(i) * r
+        n% raw_rate(i) = n% rate_raw(i) * r * avo
+        n% screened_rate(i) = n% rate_screened(i) * r * avo
         n% eps_nuc_rate(i) = n% rate_screened(i) * r * (Q - Qneu)  * Qconv
         n% eps_neu_rate(i) = n% rate_screened(i) * r * Qneu  * Qconv