Simplify copying of inputs

master
Dan Howe 6 years ago
parent 524ef81f68
commit 248e6daf60

@ -3,8 +3,6 @@ import pint
def _convert(x, length_scale_factor, from_unit, to_unit): def _convert(x, length_scale_factor, from_unit, to_unit):
x_scaled = x.copy()
# Initialise unit definitions # Initialise unit definitions
ureg = pint.UnitRegistry() ureg = pint.UnitRegistry()
@ -24,18 +22,18 @@ def _convert(x, length_scale_factor, from_unit, to_unit):
from_unit.dimensionality['[time]'] * froude_t_exponent + from_unit.dimensionality['[time]'] * froude_t_exponent +
from_unit.dimensionality['[mass]'] * froude_m_exponent) from_unit.dimensionality['[mass]'] * froude_m_exponent)
# Scale time (dataframe only)
try:
x_scaled.index *= length_scale_factor**froude_t_exponent
except AttributeError:
pass
# Scale values # Scale values
x_scaled *= froude_scale_factor x_scaled = x * froude_scale_factor
# Convert to output units # Convert to output units
x_scaled *= unit_conversion_factor x_scaled *= unit_conversion_factor
# Scale time (dataframe or series only)
try:
x_scaled.index *= length_scale_factor**froude_t_exponent
except (AttributeError, TypeError):
pass
return x_scaled return x_scaled

Loading…
Cancel
Save