diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2014-06-25 21:36:30 +0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-25 21:41:58 +0800 |
commit | 7f3efbdc98deeb4e4bcd481335761b6439b9552c (patch) | |
tree | 429daf20fa70a9148a4253914e705d444ea58bf8 /units.h | |
parent | 65c5d6815cf7c78231abd76440bb5bab54d9d51c (diff) | |
download | subsurface-7f3efbdc98deeb4e4bcd481335761b6439b9552c.tar.gz |
Make gas mod be reasonable for users of imperial units as well
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'units.h')
-rw-r--r-- | units.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -16,6 +16,12 @@ extern "C" { #define SURFACE_PRESSURE_STRING "1013" #define ZERO_C_IN_MKELVIN 273150 // mKelvin +#ifdef __cplusplus +#define M_OR_FT(_m, _f) ((prefs.units.length == units::METERS) ? ((_m) * 1000) : (feet_to_mm(_f))) +#else +#define M_OR_FT(_m, _f) ((prefs.units.length == METERS) ? ((_m) * 1000) : (feet_to_mm(_f))) +#endif + /* Salinity is expressed in weight in grams per 10l */ #define SEAWATER_SALINITY 10300 #define FRESHWATER_SALINITY 10000 |