summaryrefslogtreecommitdiffstats
path: root/core/deco.c
diff options
context:
space:
mode:
authorGravatar Rick Walsh <rickmwalsh@gmail.com>2016-09-24 18:02:07 +1000
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-09-24 08:29:56 -0700
commit7b891904e77364719471098a7bdf4eacc589807c (patch)
tree9493f9d13b69fb9d13865a5c1a130f1f8fca4f1f /core/deco.c
parent2b14a9c95d6179fb4cff352dc20036594c8a5aff (diff)
downloadsubsurface-7b891904e77364719471098a7bdf4eacc589807c.tar.gz
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>
Diffstat (limited to 'core/deco.c')
-rw-r--r--core/deco.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/deco.c b/core/deco.c
index 6c3d6dd23..628550d6c 100644
--- a/core/deco.c
+++ b/core/deco.c
@@ -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;
}