cavapy 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

{cavapy-0.1.2.dist-info → cavapy-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cavapy
-Version: 0.1.2
+Version: 0.1.3
 Summary: CAVA Python package. Retrive and analyze climate data.
 Home-page: https://github.com/Risk-Team/cavapy
 License: MIT

cavapy-0.1.3.dist-info/RECORD

@@ -0,0 +1,5 @@
+cavapy.py,sha256=i9ULBOrL4NrtG13KFl7g9JEytsXJkF0Vepudebw7MEY,24377
+cavapy-0.1.3.dist-info/LICENSE,sha256=1etyG4_n-Tb3yoNMwQ38g_WxXFQ4E_ZCjZc-AGYPc9U,1151
+cavapy-0.1.3.dist-info/METADATA,sha256=M2KwoqRuQFd7SAubXRnwFKSJaVci1HfU1Q-BwOoT9Vo,6002
+cavapy-0.1.3.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+cavapy-0.1.3.dist-info/RECORD,,

cavapy.py

@@ -461,10 +461,14 @@ def _climate_data_for_variable(
         filtered_data["models"] = downloaded_models
         
         if historical or bias_correction:
-            hist = filtered_data[filtered_data["experiment"] == "historical"]["models"].iloc[0].interpolate_na(dim="time", method="linear")
-            proj = filtered_data[filtered_data["experiment"] == rcp]["models"].iloc[0].interpolate_na(dim="time", method="linear")
+            hist = filtered_data[filtered_data["experiment"] == "historical"]["models"].iloc[0]
+            proj = filtered_data[filtered_data["experiment"] == rcp]["models"].iloc[0]
+            
+            hist = hist.interpolate_na(dim="time", method="linear")
+            proj = proj.interpolate_na(dim="time", method="linear")
         else:
-            proj = filtered_data["models"].iloc[0].interpolate_na(dim="time", method="linear")
+            proj = filtered_data["models"].iloc[0]
+            proj = proj.interpolate_na(dim="time", method="linear")
             
         if bias_correction and historical:
             # Load observations for bias correction
@@ -587,6 +591,14 @@ def _download_data(
     else:
         log.info(f"Establishing connection to CORDEX data for {variable}")
         ds_var = xr.open_dataset(url)[variable]
+        
+        # Check if time dimension has a prefix, indicating variable is not available
+        time_dims = [dim for dim in ds_var.dims if dim.startswith('time_')]
+        if time_dims:
+            msg = f"Variable {variable} is not available for this model: {url}"
+            log.exception(msg)
+            raise ValueError(msg)
+            
         log.info(f"Connection to CORDEX data for {variable} has been established")
         ds_cropped = ds_var.sel(
             longitude=slice(bbox["xlim"][0], bbox["xlim"][1]),
@@ -642,14 +654,15 @@ def _download_data(
 
 if __name__ == "__main__":
     data = get_climate_data(
-        country="Zambia",
+        country="Togo",
+        variables=["hurs"],
         cordex_domain="AFR-22",
         rcp="rcp26",
         gcm="MPI",
-        rcm="REMO",
+        rcm="Reg",
         years_up_to=2030,
         obs=False,
-        bias_correction=True,
+        bias_correction=False,
         historical=False,
     )
     print(data)

cavapy-0.1.2.dist-info/RECORD

@@ -1,5 +0,0 @@
-cavapy.py,sha256=hie9HYVNepHlAiUF7zT0I1Y6Yghf-8WiVm2LLKddeB0,23903
-cavapy-0.1.2.dist-info/LICENSE,sha256=1etyG4_n-Tb3yoNMwQ38g_WxXFQ4E_ZCjZc-AGYPc9U,1151
-cavapy-0.1.2.dist-info/METADATA,sha256=zig0HriF0p6YpEAOAyy07vOCD33lt7sv9ZRUSzVQJ_0,6002
-cavapy-0.1.2.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-cavapy-0.1.2.dist-info/RECORD,,