Show
Ignore:
Timestamp:
02/11/08 03:57:06 (9 months ago)
Author:
gary
Message:

these changes clean up the cosmic ray / secondary ionization code. Variables have been renamed to be appropriate for their function. The cosmic ray secondary excitation efficiency was changed slightly, causing small changes in some asserted quantities.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/source/cont_gammas.cpp

    r1732 r1789  
    168168 
    169169        /* add corrected high energy heat to total */ 
    170         thermal.HeatNet += thermal.HeatHiEnr*secondaries.heatef; 
     170        thermal.HeatNet += thermal.HeatHiEnr*secondaries.HeatEfficPrimary; 
    171171 
    172172        /* final product is heating in erg */ 
    … …  
    454454        /* net heating include high energy heat, with correction for 
    455455         * secondary ionization */ 
    456         thermal.HeatNet += thermal.HeatHiEnr*secondaries.heatef; 
     456        thermal.HeatNet += thermal.HeatHiEnr*secondaries.HeatEfficPrimary; 
    457457 
    458458        /* final product is heating in erg */ 
    … …  
    566566 
    567567        /* net heating includes high energy heating corrected for secondary ionizations */ 
    568         thermal.HeatNet += thermal.HeatHiEnr*secondaries.heatef; 
     568        thermal.HeatNet += thermal.HeatHiEnr*secondaries.HeatEfficPrimary; 
    569569 
    570570        /* final product is heating in erg */ 
    … …  
    705705 
    706706        /* net heating includes high energy heat corrected for secondary ionization */ 
    707         thermal.HeatNet += thermal.HeatHiEnr*secondaries.heatef; 
     707        thermal.HeatNet += thermal.HeatHiEnr*secondaries.HeatEfficPrimary; 
    708708 
    709709        /* final product is heating in erg */