Merge branch 'master' into vectorize_PropsSI

This commit is contained in:
Ian Bell
2014-12-30 14:32:11 -05:00
4 changed files with 42 additions and 6 deletions

View File

@@ -216,6 +216,8 @@ public:
long double calc_conductivity(void);
long double calc_conductivity_background(void);
long double calc_saturated_liquid_keyed_output(parameters key) { return SatL->keyed_output(key); }
long double calc_saturated_vapor_keyed_output(parameters key) { return SatV->keyed_output(key); }
long double calc_Tmin(void);
long double calc_Tmax(void);