pyVPRM 5.1__tar.gz → 5.2__tar.gz

{pyvprm-5.1/pyVPRM.egg-info → pyvprm-5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyVPRM
-Version: 5.1
+Version: 5.2
 Summary: Vegetation Photosynthesis and Respiration Model
 Home-page: https://github.com/tglauch/pyVPRM/
 Author: Theo Glauch
@@ -12,6 +12,7 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
+Classifier: Programming Language :: Python :: 3.14
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: scipy

{pyvprm-5.1 → pyvprm-5.2}/README.md

@@ -1,4 +1,9 @@
 [![DOI](https://zenodo.org/badge/626435494.svg)](https://doi.org/10.5281/zenodo.14216613)
+[![PyPI version](https://img.shields.io/pypi/v/pyVPRM.svg)](https://pypi.org/project/pyVPRM/)
+[![License](https://img.shields.io/pypi/l/pyVPRM.svg)](https://pypi.org/project/pyVPRM/)
+[![Downloads](https://img.shields.io/pypi/dm/pyVPRM.svg)](https://pypi.org/project/pyVPRM/)
+![GitHub stars](https://img.shields.io/github/stars/tglauch/pyVPRM?style=social)
+
 
 <figure>
 <img src="https://github.com/tglauch/pyVPRM/assets/29706254/ba2565e6-1434-4a95-8086-936462f8d05d", height=150pt>

{pyvprm-5.1 → pyvprm-5.2}/pyVPRM/VPRM.py

@@ -37,7 +37,7 @@ regridder_options = dict()
 regridder_options["conservative"] = "conserve"
 
 
-class vprm:
+class vprm_preprocessor:
     """
     Main class for the  Vegetation Photosynthesis and Respiration Model
     """
@@ -71,12 +71,11 @@ class vprm:
         self.t2m = None
 
         # self.target_shape = None
-
-        self.sat_img_buffer = dict()
+        
         self.buffer = dict()
         self.buffer["cur_lat"] = None
         self.buffer["cur_lon"] = None
-        self.prototype_lat_lon = None
+        self.empty_xr_lat_lon_grid = None
 
         self.land_cover_type = land_cover_map
         # land_cover_type: tmin, topt, tmax
@@ -511,15 +510,15 @@ class vprm:
                 if prod > x_time_y:
                     biggest = h
                     x_time_y = prod
-            self.prototype = copy.deepcopy(biggest)
-            keys = list(self.prototype.sat_img.keys())
-            self.prototype.sat_img = self.prototype.sat_img.drop(keys)
+            self.prototype_satellite_manager = copy.deepcopy(biggest)
+            keys = list(self.prototype_satellite_manager.sat_img.keys())
+            self.prototype_satellite_manager.sat_img = self.prototype_satellite_manager.sat_img.drop(keys)
         #  for h in self.sat_imgs:
-        #      h.sat_img = h.sat_img.rio.reproject_match(self.prototype.sat_img, nodata=np.nan)
+        #      h.sat_img = h.sat_img.rio.reproject_match(self.prototype_satellite_manager.sat_img, nodata=np.nan)
         else:
-            self.prototype = copy.deepcopy(self.sat_imgs[0])
-            keys = list(self.prototype.sat_img.keys())
-            self.prototype.sat_img = self.prototype.sat_img.drop(keys)
+            self.prototype_satellite_manager = copy.deepcopy(self.sat_imgs[0])
+            keys = list(self.prototype_satellite_manager.sat_img.keys())
+            self.prototype_satellite_manager.sat_img = self.prototype_satellite_manager.sat_img.drop(keys)
         self.sat_imgs = satellite_data_manager(
             sat_img=xr.concat([k.sat_img for k in self.sat_imgs], "time")
         )
@@ -536,7 +535,7 @@ class vprm:
         )
         day_steps = [i.days for i in (self.timestamps - self.timestamp_start)]
         self.sat_imgs.sat_img = self.sat_imgs.sat_img.assign_coords({"time": day_steps})
-        self.prototype.sat_img = self.prototype.sat_img.assign_coords(
+        self.prototype_satellite_manager.sat_img = self.prototype_satellite_manager.sat_img.assign_coords(
             {"time": day_steps}
         )
 
@@ -592,7 +591,7 @@ class vprm:
             bounds[0], bounds[1], bounds[2], bounds[3]
         )
         keys = list(self.sat_imgs.sat_img.keys())
-        self.prototype = satellite_data_manager(
+        self.prototype_satellite_manager = satellite_data_manager(
             sat_img=self.sat_imgs.sat_img.drop(keys)
         )
         return
@@ -748,7 +747,7 @@ class vprm:
                     .to_array()
                     .values[0]
                 )
-                self.land_cover_type = copy.deepcopy(self.prototype)
+                self.land_cover_type = copy.deepcopy(self.prototype_satellite_manager)
                 self.land_cover_type.sat_img = self.land_cover_type.sat_img.assign(
                     {var_name: (["y", "x"], t)}
                 )
@@ -780,9 +779,9 @@ class vprm:
             Returns:
                     None
         """
-        self.max_lswi = copy.deepcopy(self.prototype)
-        self.min_lswi = copy.deepcopy(self.prototype)
-        self.min_max_evi = copy.deepcopy(self.prototype)
+        self.max_lswi = copy.deepcopy(self.prototype_satellite_manager)
+        self.min_lswi = copy.deepcopy(self.prototype_satellite_manager)
+        self.min_max_evi = copy.deepcopy(self.prototype_satellite_manager)
         shortcut = self.sat_imgs.sat_img
         # if self.flux_tower_instances is None:
         self.min_lswi.sat_img["min_lswi"] = shortcut["lswi"].min(
@@ -1073,7 +1072,7 @@ class vprm:
             ).values.flatten()
         else:
             self.buffer[key] = self.sat_imgs.sat_img[key].isel(select_dict)
-        return self.sat_img_buffer[key]
+        return self.buffer[key]
 
     def get_sat_img_values_for_all_keys(self, lon=None, lat=None, counter_range=None):
         """
@@ -1125,21 +1124,21 @@ class vprm:
             self.new = False
             return  # Still same satellite image
 
-    def _set_prototype_lat_lon(self):
-        src_x = self.prototype.sat_img.coords["x"].values
-        src_y = self.prototype.sat_img.coords["y"].values
+    def _set_empty_xr_lat_lon_grid(self):
+        src_x = self.prototype_satellite_manager.sat_img.coords["x"].values
+        src_y = self.prototype_satellite_manager.sat_img.coords["y"].values
         X, Y = np.meshgrid(src_x, src_y)
         t = Transformer.from_crs(
-            self.prototype.sat_img.rio.crs, "+proj=longlat +datum=WGS84"
+            self.prototype_satellite_manager.sat_img.rio.crs, "+proj=longlat +datum=WGS84"
         )
         x_long, y_lat = t.transform(X, Y)
-        self.prototype_lat_lon = xr.Dataset(
+        self.empty_xr_lat_lon_grid = xr.Dataset(
             {
                 "lon": (["y", "x"], x_long, {"units": "degrees_east"}),
                 "lat": (["y", "x"], y_lat, {"units": "degrees_north"}),
             }
         )
-        self.prototype_lat_lon = self.prototype_lat_lon.set_coords(["lon", "lat"])
+        self.empty_xr_lat_lon_grid = self.empty_xr_lat_lon_grid.set_coords(["lon", "lat"])
         return
 
     def save(self, save_path):
@@ -1150,7 +1149,7 @@ class vprm:
         return
 
     def is_disjoint(self, this_sat_img):
-        bounds = self.prototype.sat_img.rio.transform_bounds(
+        bounds = self.prototype_satellite_manager.sat_img.rio.transform_bounds(
             this_sat_img.sat_img.rio.crs
         )
         dj = rasterio.coords.disjoint_bounds(bounds, this_sat_img.sat_img.rio.bounds())
@@ -1163,7 +1162,7 @@ class vprm:
                 [v.sat_imgs for v in vprm_insts], reproject=allow_reproject
             )
             keys = list(self.sat_imgs.sat_img.keys())
-            self.prototype = satellite_data_manager(
+            self.prototype_satellite_manager = satellite_data_manager(
                 sat_img=self.sat_imgs.sat_img.drop(keys)
             )
 

pyvprm-5.2/pyVPRM/__init__.py

@@ -0,0 +1,3 @@
+__version__ = "5.2"
+
+

{pyvprm-5.1 → pyvprm-5.2}/pyVPRM/sat_managers/modis.py

@@ -32,6 +32,19 @@ import numpy as np
 from pyVPRM.sat_managers.base_manager import earthdata
 from loguru import logger
 
+
+crs_str = 'PROJCS["unnamed",\
+            GEOGCS["Unknown datum based upon the custom spheroid", \
+            DATUM["Not specified (based on custom spheroid)", \
+            SPHEROID["Custom spheroid",6371007.181,0]], \
+            PRIMEM["Greenwich",0],\
+            UNIT["degree",0.0174532925199433]],\
+            PROJECTION["Sinusoidal"], \
+            PARAMETER["longitude_of_center",0], \
+            PARAMETER["false_easting",0], \
+            PARAMETER["false_northing",0], \
+            UNIT["Meter",1]]'
+
 class modis(earthdata):
     # Class to download and load MODIS data
 
@@ -60,6 +73,7 @@ class modis(earthdata):
         self.product = product
         self.path = "MOLT"
         self.resolution = None
+        self.default_crs_str = crs_str
         if self.bands is not None:
             self.bands = [i for i in list(self.sat_img.keys()) if "sur_refl_b" in i]
 
@@ -200,6 +214,12 @@ class modis(earthdata):
             self.sat_img = rxr.open_rasterio(
                 self.sat_image_path, masked=True, cache=False
             ).squeeze()
+        if self.sat_img.rio.crs is None:
+            self.sat_img = xr.open_dataset(self.sat_image_path)
+            self.sat_img = self.sat_img.rio.write_crs(crs_str)
+            # Add as an attribute to each data variable
+            for var in self.sat_img.data_vars:
+                self.sat_img[var].attrs['scale_factor'] = 1.0
         if self.use_keys is None:
             self.use_keys = list(self.sat_img.keys())
         self.sat_img = self.sat_img[self.use_keys]

{pyvprm-5.1 → pyvprm-5.2}/pyVPRM/sat_managers/viirs.py

@@ -32,6 +32,18 @@ import numpy as np
 from pyVPRM.sat_managers.base_manager import earthdata
 from loguru import logger
 
+crs_str = 'PROJCS["unnamed",\
+            GEOGCS["Unknown datum based upon the custom spheroid", \
+            DATUM["Not specified (based on custom spheroid)", \
+            SPHEROID["Custom spheroid",6371007.181,0]], \
+            PRIMEM["Greenwich",0],\
+            UNIT["degree",0.0174532925199433]],\
+            PROJECTION["Sinusoidal"], \
+            PARAMETER["longitude_of_center",0], \
+            PARAMETER["false_easting",0], \
+            PARAMETER["false_northing",0], \
+            UNIT["Meter",1]]'
+
 class VIIRS(earthdata):
     # Class to download and load VIIRS data
 
@@ -41,6 +53,7 @@ class VIIRS(earthdata):
         self.load_kwargs = {"variable": self.use_keys}
         self.sat = "VIIRS"
         self.path = "VIIRS"
+        self.default_crs_str = crs_str
         self.product = "VNP09H1.001"  #'VNP09GA.001' #
         self.pixel_size = 463.31271652777775
 
@@ -79,18 +92,6 @@ class VIIRS(earthdata):
             self.sat_img = self.sat_img.squeeze()
             self.keys = self.sat_img.data_vars
 
-        crs_str = 'PROJCS["unnamed",\
-                    GEOGCS["Unknown datum based upon the custom spheroid", \
-                    DATUM["Not specified (based on custom spheroid)", \
-                    SPHEROID["Custom spheroid",6371007.181,0]], \
-                    PRIMEM["Greenwich",0],\
-                    UNIT["degree",0.0174532925199433]],\
-                    PROJECTION["Sinusoidal"], \
-                    PARAMETER["longitude_of_center",0], \
-                    PARAMETER["false_easting",0], \
-                    PARAMETER["false_northing",0], \
-                    UNIT["Meter",1]]'
-
         rename_dict = dict()
         for i in self.keys:
             rename_dict[i] = i.split("Data_Fields_")[1]
@@ -195,7 +196,7 @@ class VIIRS(earthdata):
         return
 
     def mask_water(self, bands=None):
-        print("Water Masking not yet implemented for VIIRS')
+        print('Water Masking not yet implemented for VIIRS')
         #Not yet implemented
         return
 

pyvprm-5.1/pyVPRM/vprm_models/vprm_base.py → pyvprm-5.2/pyVPRM/vprm_models/vprm_base_model.py

@@ -13,7 +13,7 @@ import itertools
 from scipy.optimize import curve_fit
 from loguru import logger
 
-class vprm_base:
+class vprm_base_model:
     """
     Base class for all meteorologies
     """
@@ -395,14 +395,14 @@ class vprm_base:
 
         if len(era_keys) > 0:
 
-            if self.vprm_pre.prototype_lat_lon is None:
-                self.vprm_pre._set_prototype_lat_lon()
+            if self.vprm_pre.empty_xr_lat_lon_grid is None:
+                self.vprm_pre._set_empty_xr_lat_lon_grid()
 
             self.load_weather_data(hour, day, month, year, era_keys=era_keys)
 
             if (lat is None) & (lon is None):
                 self.era5_inst.regrid(
-                    dataset=self.vprm_pre.prototype_lat_lon,
+                    dataset=self.vprm_pre.empty_xr_lat_lon_grid,
                     weights=regridder_weights,
                     n_cpus=self.vprm_pre.n_cpus,
                 )

pyvprm-5.1/pyVPRM/vprm_models/vprm_base_no_xeric.py → pyvprm-5.2/pyVPRM/vprm_models/vprm_base_model_no_xeric.py

@@ -13,7 +13,7 @@ import itertools
 from scipy.optimize import curve_fit
 from loguru import logger
 
-class vprm_base_no_xeric:
+class vprm_base_model_no_xeric:
     """
     Base class for all meteorologies
     """
@@ -347,14 +347,14 @@ class vprm_base_no_xeric:
 
         if len(era_keys) > 0:
 
-            if self.vprm_pre.prototype_lat_lon is None:
-                self.vprm_pre._set_prototype_lat_lon()
+            if self.vprm_pre._empty_xr_lat_lon_grid is None:
+                self.vprm_pre._set_empty_xr_lat_lon_grid()
 
             self.load_weather_data(hour, day, month, year, era_keys=era_keys)
 
             if (lat is None) & (lon is None):
                 self.era5_inst.regrid(
-                    dataset=self.vprm_pre.prototype_lat_lon,
+                    dataset=self.vprm_pre.empty_xr_lat_lon_grid,
                     weights=regridder_weights,
                     n_cpus=self.vprm_pre.n_cpus,
                 )

pyvprm-5.1/pyVPRM/vprm_models/vprm_modified.py → pyvprm-5.2/pyVPRM/vprm_models/vprm_modified_model.py

@@ -8,13 +8,13 @@ import pygrib
 import copy
 import uuid
 import datetime
-from pyVPRM.vprm_models.vprm_base import vprm_base
+from pyVPRM.vprm_models.vprm_base_model import vprm_base_model
 import pandas as pd
 import itertools
 from scipy.optimize import curve_fit
 from loguru import logger
 
-class vprm_modified(vprm_base):
+class vprm_modified_model(vprm_base_model):
     """
     Base class for all meteorologies
     """
@@ -212,14 +212,14 @@ class vprm_modified(vprm_base):
 
         if len(era_keys) > 0:
 
-            if self.vprm_pre.prototype_lat_lon is None:
-                self.vprm_pre._set_prototype_lat_lon()
+            if self.vprm_pre._empty_xr_lat_lon_grid is None:
+                self.vprm_pre._set_empty_xr_lat_lon_grid()
 
             self.load_weather_data(hour, day, month, year, era_keys=era_keys)
 
             if (lat is None) & (lon is None):
                 self.era5_inst.regrid(
-                    dataset=self.vprm_pre.prototype_lat_lon,
+                    dataset=self.vprm_pre.empty_xr_lat_lon_grid,
                     weights=regridder_weights,
                     n_cpus=self.vprm_pre.n_cpus,
                 )

{pyvprm-5.1 → pyvprm-5.2/pyVPRM.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyVPRM
-Version: 5.1
+Version: 5.2
 Summary: Vegetation Photosynthesis and Respiration Model
 Home-page: https://github.com/tglauch/pyVPRM/
 Author: Theo Glauch
@@ -12,6 +12,7 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
+Classifier: Programming Language :: Python :: 3.14
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: scipy

{pyvprm-5.1 → pyvprm-5.2}/pyVPRM.egg-info/SOURCES.txt

@@ -42,8 +42,8 @@ pyVPRM/vprm_configs/copernicus_land_cover.yaml
 pyVPRM/vprm_configs/esa_world_cover.yaml
 pyVPRM/vprm_configs/synmap.yaml
 pyVPRM/vprm_models/__init__.py
-pyVPRM/vprm_models/vprm_base.py
-pyVPRM/vprm_models/vprm_base_no_xeric.py
-pyVPRM/vprm_models/vprm_modified.py
-pyVPRM/vprm_models/vprm_nn.py
+pyVPRM/vprm_models/vprm_base_model.py
+pyVPRM/vprm_models/vprm_base_model_no_xeric.py
+pyVPRM/vprm_models/vprm_modified_model.py
+pyVPRM/vprm_models/vprm_nn_model.py
 pyVPRM/vprm_models/model_params/__init__.py

{pyvprm-5.1 → pyvprm-5.2}/setup.py

@@ -8,7 +8,7 @@ def readme():
 
 setup(
     name="pyVPRM",
-    version="5.1",
+    version="5.2",
     description="Vegetation Photosynthesis and Respiration Model",
     long_description="A tool to calculate the CO2 exchange flux between atmosphere and terrestrial biosphere using the Vegetation Photosynthesis and Respiration Model",
     classifiers=[
@@ -17,6 +17,7 @@ setup(
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: MIT License",
         "Topic :: Scientific/Engineering :: Atmospheric Science",
+        "Programming Language :: Python :: 3.14"
     ],
     keywords="CO2 Biosphere Atmosphere Physics VPRM",
     url="https://github.com/tglauch/pyVPRM/",

pyvprm-5.1/pyVPRM/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "5.1"
-