use from xarray.ufuncs import isnan, isinf

Author: peterdudfield

nowcasting_dataset/data_sources/gsp/gsp_model.py

@@ -1,6 +1,6 @@
 """ Model for output of GSP data """
 import logging
-import numpy as np
+from xarray.ufuncs import isnan, isinf
 
 from nowcasting_dataset.data_sources.datasource_output import (
     DataSourceOutput,
@@ -19,8 +19,8 @@ class GSP(DataSourceOutput):
     @classmethod
     def model_validation(cls, v):
         """ Check that all values are non NaNs """
-        assert (~np.isnan(v.data)).all(), f"Some gsp data values are NaNs"
-        assert (~np.isinf(v.data)).all(), f"Some gsp data values are Infinite"
+        assert (~isnan(v.data)).all(), f"Some gsp data values are NaNs"
+        assert (~isinf(v.data)).all(), f"Some gsp data values are Infinite"
         assert (v.data >= 0).all(), f"Some gsp data values are below 0 {v.data.min()}"
 
         return v

nowcasting_dataset/data_sources/nwp/nwp_model.py

@@ -3,7 +3,7 @@
 
 import logging
 
-import numpy as np
+from xarray.ufuncs import isnan, isinf
 
 from nowcasting_dataset.data_sources.datasource_output import (
     DataSourceOutput,
@@ -24,6 +24,6 @@ class NWP(DataSourceOutput):
     @classmethod
     def model_validation(cls, v):
         """ Check that all values are not NaNs """
-        assert (~np.isnan(v.data)).all(), "Some nwp data values are NaNs"
-        assert (~np.isinf(v.data)).all(), f"Some nwp data values are Infinite"
+        assert (~isnan(v.data)).all(), "Some nwp data values are NaNs"
+        assert (~isinf(v.data)).all(), f"Some nwp data values are Infinite"
         return v

nowcasting_dataset/data_sources/pv/pv_model.py

@@ -2,6 +2,7 @@
 import logging
 
 import numpy as np
+from xarray.ufuncs import isnan, isinf
 from pydantic import Field, validator
 
 from nowcasting_dataset.consts import (
@@ -32,8 +33,8 @@ class PV(DataSourceOutput):
     @classmethod
     def model_validation(cls, v):
         """ Check that all values are non NaNs """
-        assert (~np.isnan(v.data)).all(), f"Some pv data values are NaNs"
-        assert (v.data != np.Inf).all(), f"Some pv data values are Infinite"
+        assert (~isnan(v.data)).all(), f"Some pv data values are NaNs"
+        assert (~isinf(v.data)).all(), f"Some pv data values are Infinite"
 
         assert (v.data >= 0).all(), f"Some pv data values are below 0"
 

nowcasting_dataset/data_sources/satellite/satellite_model.py

@@ -4,7 +4,7 @@
 import logging
 
 import numpy as np
-import xarray as xr
+from xarray.ufuncs import isnan, isinf
 from pydantic import Field
 
 from nowcasting_dataset.consts import Array
@@ -27,7 +27,7 @@ class Satellite(DataSourceOutput):
     @classmethod
     def model_validation(cls, v):
         """ Check that all values are non negative """
-        assert (~np.isnan(v.data)).all(), f"Some satellite data values are NaNs"
-        assert (~np.isinf(v.data)).all(), f"Some satellite data values are Infinite"
+        assert (~isnan(v.data)).all(), f"Some satellite data values are NaNs"
+        assert (~isinf(v.data)).all(), f"Some satellite data values are Infinite"
         assert (v.data != -1).all(), f"Some satellite data values are -1's"
         return v

nowcasting_dataset/data_sources/sun/sun_model.py

@@ -2,6 +2,7 @@
 import logging
 
 import numpy as np
+from xarray.ufuncs import isnan, isinf
 from pydantic import Field, validator
 
 from nowcasting_dataset.consts import Array, SUN_AZIMUTH_ANGLE, SUN_ELEVATION_ANGLE
@@ -23,11 +24,11 @@ class Sun(DataSourceOutput):
     @classmethod
     def model_validation(cls, v):
         """ Check that all values are non NaNs """
-        assert (~np.isnan(v.elevation)).all(), f"Some elevation data values are NaNs"
-        assert (~np.isinf(v.elevation)).all(), f"Some elevation data values are Infinite"
+        assert (~isnan(v.elevation)).all(), f"Some elevation data values are NaNs"
+        assert (~isinf(v.elevation)).all(), f"Some elevation data values are Infinite"
 
-        assert (~np.isnan(v.azimuth)).all(), f"Some azimuth data values are NaNs"
-        assert (~np.isinf(v.azimuth)).all(), f"Some azimuth data values are Infinite"
+        assert (~isnan(v.azimuth)).all(), f"Some azimuth data values are NaNs"
+        assert (~isinf(v.azimuth)).all(), f"Some azimuth data values are Infinite"
 
         assert (0 <= v.azimuth).all(), f"Some azimuth data values are lower 0, {v.azimuth.min()}"
         assert (

nowcasting_dataset/data_sources/topographic/topographic_model.py

@@ -2,6 +2,7 @@
 import logging
 
 import numpy as np
+from xarray.ufuncs import isnan, isinf
 from pydantic import Field, validator
 
 from nowcasting_dataset.consts import Array
@@ -21,6 +22,6 @@ class Topographic(DataSourceOutput):
     @classmethod
     def model_validation(cls, v):
         """ Check that all values are non NaNs """
-        assert (~np.isnan(v.data)).all(), f"Some topological data values are NaNs"
-        assert (~np.isinf(v.data)).all(), f"Some topological data values are Infinite"
+        assert (~isnan(v.data)).all(), f"Some topological data values are NaNs"
+        assert (~isinf(v.data)).all(), f"Some topological data values are Infinite"
         return v