TNO Intern

Commit ef0516dd authored by Arjo Segers's avatar Arjo Segers
Browse files

Changed size calculation after deprication warning.

parent b5baf084

CHANGELOG

+6 −0
Original line number Diff line number Diff line
@@ -446,3 +446,9 @@ Inquire Dataspace per month after change in allowed maximum number of records. 
Sort listing files by processing and processor version.

  py/cso_dataspace.py



v2.9.5

~~~~~~



Changed size calculation after deprication warning.

  py/cso_superobs.py

  py/cso_colocate.py

py/cso_colocate.py

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ class CSO_CoLocate(utopya.UtopyaRc): 
                        das_in[vkey] = sources[stype]["file"].ds[sname]

                        # check ..

                        shp = das_in[vkey].shape[1:]

                        if numpy.product(shp) != 1:

                        if numpy.prod(shp) != 1:

                            logging.error(

                                'source variable "%s" has shape %s per pixel, but currently only scalars supported ...'

                                % (vkey, str(shp))

py/cso_superobs.py

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
# 2024-06, Arjo Segers

#   Improved check on minimum covarage.

#

# 2024-11, Arjo Segers

#   Changed size calculation after deprication warning.

#





########################################################################
@@ -453,7 +456,7 @@ class CSO_SuperObs(utopya.UtopyaRc): 
                    vkeys.append(vkey)



                    # number of data values per pixel:

                    nv = int(numpy.product(vshp[1:]))

                    nv = int(numpy.prod(vshp[1:]))

                    # create dataframe columns "var_1","var_2", etc for the data values;

                    # columns have length np*npix (one value for each sampling point in footprint)

                    # and are filled with the pixel value times weight of the point,
@@ -695,7 +698,7 @@ class CSO_SuperObs(utopya.UtopyaRc): 
                    vdims = source_file.ds[vkey].dims

                    vshp = source_file.ds[vkey].shape

                    # number of data values per pixels:

                    nv = int(numpy.product(vshp[1:]))

                    nv = int(numpy.prod(vshp[1:]))



                    # set attributes:

                    attrs = source_file.ds[vkey].attrs