Merge pull request #261 from kprussing/develop

NumPy 2.0+ support

Author: kafitzgerald

build_envs/environment.yml

@@ -11,6 +11,7 @@ dependencies:
   - matplotlib
   - netcdf4
   - numpy
+  - packaging
   - pycodestyle
   - setuptools
   - sphinx

src/wrf/constants.py

@@ -59,11 +59,15 @@ class ProjectionTypes(object):
                      np.dtype(np.uint32): 4294967295,
                      np.dtype(np.int64): Constants.DEFAULT_FILL_INT64,
                      np.dtype(np.uint64): 18446744073709551614,
-                     np.dtype(np.float_): Constants.DEFAULT_FILL_DOUBLE,
                      np.dtype(np.float32): Constants.DEFAULT_FILL_FLOAT,
                      np.dtype(np.float64): Constants.DEFAULT_FILL_DOUBLE
                      }
 
+try:
+    _DEFAULT_FILL_MAP[np.dtype(np.float_)] = Constants.DEFAULT_FILL_DOUBLE
+except AttributeError:
+    pass
+
 if version_info >= (3, ):
     _DEFAULT_FILL_MAP[np.int_] = Constants.DEFAULT_FILL_INT64
 else:

test/ci_tests/utests.py

@@ -107,7 +107,7 @@ def test(self):
             # print (hts_850)
             hts_850 = interplevel(hts, p, 850)
 
-            nt.assert_allclose(to_np(hts_850), ref_ht_850)
+            nt.assert_allclose(to_np(hts_850), ref_ht_850, rtol=1e-06)
 
         elif (varname == "vertcross"):
             ref_ht_cross = _get_refvals(referent, "vertcross", repeat, multi)