Merge branch 'v2.0' of github.com:GeoscienceAustralia/tcrm into v2.0

Conflicts: wind/__init__.py
GeoscienceAustralia · Oct 31, 2016 · 7eabf1e · 7eabf1e
2 parents 738b073 + b45e0a7
commit 7eabf1e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/wind/__init__.py b/wind/__init__.py
@@ -175,8 +175,8 @@ def localWindField(self, i):
         eP = convert(self.track.EnvPressure[i], 'hPa', 'Pa')
         cP = convert(self.track.CentralPressure[i], 'hPa', 'Pa')
         rMax = self.track.rMax[i]
-        vFm = convert(self.track.Speed[i], 'kmh', 'mps')
-        thetaFm = bearing2theta(self.track.Bearing[i] * np.pi/180.),
+        vFm = convert(self.track.Speed[i], 'kph', 'mps')
+        thetaFm = bearing2theta(self.track.Bearing[i] * np.pi/180.)
         thetaMax = self.thetaMax
 
         #FIXME: temporary way to do this