updated test_vdb.py and OpenVDB.py

Author: spyke7

gridData/OpenVDB.py

@@ -228,15 +228,15 @@ def _get_best_grid_type(self):
         """
         datatypes = {
             numpy.dtype("bool"): ["BoolGrid"],
-            numpy.dtype("int8"): [DownCastTo("Int32Grid"), DownCastTo("FloatGrid")],
-            numpy.dtype("uint8"): [DownCastTo("Int32Grid"), DownCastTo("FloatGrid")],
-            numpy.dtype("int16"): [DownCastTo("Int32Grid"), DownCastTo("FloatGrid")],
-            numpy.dtype("uint16"): [DownCastTo("Int32Grid"), DownCastTo("FloatGrid")],
+            numpy.dtype("int8"): ["Int32Grid", "FloatGrid"],
+            numpy.dtype("uint8"): ["Int32Grid", "FloatGrid"],
+            numpy.dtype("int16"): ["Int32Grid", "FloatGrid"],
+            numpy.dtype("uint16"): ["Int32Grid", "FloatGrid"],
             numpy.dtype("int32"): ["Int32Grid", DownCastTo("FloatGrid")],
-            numpy.dtype("uint32"): ["Int32Grid", DownCastTo("FloatGrid")],
+            numpy.dtype("uint32"): [DownCastTo("Int32Grid"), DownCastTo("FloatGrid")],
             numpy.dtype("int64"): ["Int64Grid", DownCastTo("FloatGrid")],
             numpy.dtype("uint64"): ["Int64Grid", DownCastTo("FloatGrid")],
-            numpy.dtype("float16"): [DownCastTo("HalfGrid"), DownCastTo("FloatGrid")],
+            numpy.dtype("float16"): ["HalfGrid", "FloatGrid"],
             numpy.dtype("float32"): ["FloatGrid"],
             numpy.dtype("float64"): ["DoubleGrid", DownCastTo("FloatGrid")],
         }
@@ -257,16 +257,18 @@ def _get_best_grid_type(self):
             except AttributeError:
                 continue
             else:
-                if isinstance(gridtype_downcast, DownCastTo):
-                    warnings.warn(
-                        f"Grid type {vdb_gridtypes[0]} not available. Using {gridtype} instead. Data may lose precision.",
-                        UserWarning,
-                    )
-                return VDB_Grid()
-
-        raise TypeError(
-            f"Could not find any VDB grid type for numpy dtype {self.grid.dtype}"
-        )
+                break
+        else:
+            raise TypeError(
+                f"Could not find any VDB grid type for numpy dtype {self.grid.dtype}"
+            )
+
+        if isinstance(gridtype_downcast, DownCastTo):
+            warnings.warn(
+                f"Grid type {vdb_gridtypes[0]} not available. Using {gridtype} instead. Data may lose precision.",
+                RuntimeWarning,
+            )
+        return VDB_Grid()
 
     def _create_openvdb_grid(self):
         """Create and populate an OpenVDB grid

gridData/tests/test_vdb.py

@@ -279,7 +279,7 @@ def test_write_vdb_float64_conversion_warning(self, tmpdir):
         outfile = str(tmpdir / "float64.vdb")
 
         with pytest.warns(
-            UserWarning, match="Grid type DoubleGrid not available.*FloatGrid"
+            RuntimeWarning, match="Grid type DoubleGrid not available.*FloatGrid"
         ):
             g.export(outfile)
 
@@ -293,7 +293,7 @@ def test_write_vdb_int32_conversion_warning(self, tmpdir):
         outfile = str(tmpdir / "int32.vdb")
 
         with pytest.warns(
-            UserWarning, match="Grid type Int32Grid not available.*FloatGrid"
+            RuntimeWarning, match="Grid type Int32Grid not available.*FloatGrid"
         ):
             g.export(outfile)