FIX: thetaFm conversion (#40)

The track files store the direction of motion in degrees, but the wind field calculations require it in radians. This fix converts the bearing into radians within `wind.windmodels.WindFieldModel()`. Required an update to the test data as well.
GeoscienceAustralia · Oct 3, 2017 · c044158 · c044158
1 parent 5f051d6
commit c044158
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tests/test_data/windFieldTestData.pck b/tests/test_data/windFieldTestData.pck
diff --git a/wind/windmodels.py b/wind/windmodels.py
@@ -936,7 +936,7 @@ class HubbertWindField(WindFieldModel):
 
     def field(self, R, lam, vFm, thetaFm, thetaMax=0.):
         V = self.velocity(R)
-        thetaFm = np.pi/2. - thetaFm
+        thetaFm = np.pi/2. - np.pi * thetaFm / 180.
         Km = .70
         inflow = -np.sign(self.f) * 25. * np.ones(np.shape(R))
         core = np.where(R < self.rMax)
@@ -981,7 +981,7 @@ def field(self, R, lam, vFm, thetaFm, thetaMax=0.):
                                motion.
         """
         V = self.velocity(R)
-        thetaFm = np.pi/2. - thetaFm
+        thetaFm = np.pi/2. - np.pi * thetaFm / 180.
         inflow = 25. * np.ones(np.shape(R))
         mid = np.where(R < 1.2 * self.rMax)
         inflow[mid] = 10. + 75. * (R[mid] / self.rMax - 1.)
@@ -1041,7 +1041,7 @@ def field(self, R, lam, vFm, thetaFm, thetaMax=0.):
         Z = self.vorticity(R)
         K = 50.  # Diffusivity
         Cd = 0.002  # Constant drag coefficient
-        thetaFm = np.pi/2. - thetaFm
+        thetaFm = np.pi/2. - np.pi * thetaFm / 180.
         Vm = np.abs(V).max()
         if (vFm > 0) and (Vm/vFm < 5.):
             Umod = vFm * (1. - (1. - Vm/vFm)/5.)