Merge pull request #7 from NGWPC/mdeshotel_NGWPC-9009

Mdeshotel ngwpc 9009

Author: mdeshotel

data_assimilation_engine/soil_moisture/SMAP_preprocessing/smap_gage.py

@@ -10,7 +10,6 @@
 import xarray as xr
 from dotenv import find_dotenv, load_dotenv
 from shapely import MultiPoint, Polygon, voronoi_polygons
-
 from utils.utils import time_function, timing_block
 
 load_dotenv(find_dotenv())
@@ -226,7 +225,6 @@ def process_yearly_data(self, output_directory: str):
         if not os.path.exists(output_directory):
             os.makedirs(output_directory)
         for col in df.columns:
-            print(col)
             file = os.path.join(output_directory, f"gages-{col}_soil_moisture.csv")
             df["basin_avg_soil_moisture"] = df[col]
             df.drop(columns=[col], inplace=True)

data_assimilation_engine/soil_moisture/mapping/simulated_data.py

@@ -156,7 +156,36 @@ def __init__(self, csv_directory: str, dates: list, output_file: str):
 
     def convert_units(self, df: pd.DataFrame, mask: pd.DataFrame):
         """Convert Units."""
-        return df.loc[mask, self.column1].values
+        return np.average(
+            df.loc[mask, self.columns].values, axis=1, weights=self.soil_thickness
+        )
+
+    @property
+    def depths(self):
+        """Get depths from column names."""
+        depths = []
+        for column in self.columns:
+            depths.append(
+                float(
+                    column.replace("sm_profile_", "").replace("_", ".").replace("m", "")
+                )
+            )
+        return depths
+
+    @property
+    def soil_thickness(self):
+        """Get soil thickness from column names."""
+        sorted_depths = sorted(self.depths, reverse=True) + [0]
+        soil_thickness = [
+            sorted_depths[i] - sorted_depths[i + 1]
+            for i in range(len(sorted_depths) - 1)
+            if i + 1 < len(sorted_depths + [0])
+        ]
+        ordered_soil_thickness = []
+        for depth in self.depths:
+            idx = sorted_depths.index(depth)
+            ordered_soil_thickness.append(soil_thickness[idx])
+        return ordered_soil_thickness
 
     def check_columns(self, df: pd.DataFrame, file_path: str):
         """Check that columns exists."""
@@ -165,13 +194,8 @@ def check_columns(self, df: pd.DataFrame, file_path: str):
             logger.info(f"{self.variable_name} columns not found in {file_path}")
             return False
 
-        elif len(columns) > 1:
-            logger.info(
-                f"Too many ({len(columns)}) {self.variable_name} columns found in {file_path}"
-            )
-            return False
         else:
-            self.column1 = columns[0]
+            self.columns = columns
             return True
 
     @property

data_assimilation_engine/soil_moisture/timeseries/timeseries.py

@@ -113,18 +113,41 @@ def check_columns(self, df: pd.DataFrame, file_path: str):
             logger.info(f"{self.variable_name} columns not found in {file_path}")
             return False
 
-        elif len(columns) > 1:
-            logger.info(
-                f"Too many ({len(columns)}) {self.variable_name} columns found in {file_path}"
-            )
-            return False
-        else:
-            self.column1 = columns[0]
-            return True
+        self.columns = columns
+        return True
 
     def convert_units(self, df: pd.DataFrame, mask: pd.DataFrame):
         """Convert Units."""
-        return df.loc[mask, self.column1].values
+        return np.average(
+            df.loc[mask, self.columns].values, axis=1, weights=self.soil_thickness
+        )
+
+    @property
+    def depths(self):
+        """Get depths from column names."""
+        depths = []
+        for column in self.columns:
+            depths.append(
+                float(
+                    column.replace("sm_profile_", "").replace("_", ".").replace("m", "")
+                )
+            )
+        return depths
+
+    @property
+    def soil_thickness(self):
+        """Get soil thickness from column names."""
+        sorted_depths = sorted(self.depths, reverse=True) + [0]
+        soil_thickness = [
+            sorted_depths[i] - sorted_depths[i + 1]
+            for i in range(len(sorted_depths) - 1)
+            if i + 1 < len(sorted_depths + [0])
+        ]
+        ordered_soil_thickness = []
+        for depth in self.depths:
+            idx = sorted_depths.index(depth)
+            ordered_soil_thickness.append(soil_thickness[idx])
+        return ordered_soil_thickness
 
 
 class SoilMoistureS3Loader(S3Loader):