added calculate_F. no effective speedup over calculate_age so still using calculate_age for flux
Merge branch 'release/v2.0.4' into develop