Rename conservatism_level to vpmb_conservatism

Make the variable purpose less ambiguous

Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Rick Walsh 2016-09-24 18:02:07 +10:00 committed by Dirk Hohndel
parent 2b14a9c95d
commit 7b891904e7
11 changed files with 28 additions and 28 deletions

View file

@ -174,15 +174,15 @@ double initial_he_gradient[16];
double get_crit_radius_He()
{
if (prefs.conservatism_level <= 4)
return vpmb_config.crit_radius_He * conservatism_lvls[prefs.conservatism_level] * subsurface_conservatism_factor;
if (prefs.vpmb_conservatism <= 4)
return vpmb_config.crit_radius_He * conservatism_lvls[prefs.vpmb_conservatism] * subsurface_conservatism_factor;
return vpmb_config.crit_radius_He;
}
double get_crit_radius_N2()
{
if (prefs.conservatism_level <= 4)
return vpmb_config.crit_radius_N2 * conservatism_lvls[prefs.conservatism_level] * subsurface_conservatism_factor;
if (prefs.vpmb_conservatism <= 4)
return vpmb_config.crit_radius_N2 * conservatism_lvls[prefs.vpmb_conservatism] * subsurface_conservatism_factor;
return vpmb_config.crit_radius_N2;
}