water-column-sonar-processing 25.1.5__tar.gz → 25.1.6__tar.gz

{water_column_sonar_processing-25.1.5 → water_column_sonar_processing-25.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: water_column_sonar_processing
-Version: 25.1.5
+Version: 25.1.6
 Summary: Processing tool for water column sonar data.
 Author-email: Rudy Klucik <rudy.klucik@noaa.gov>
 Project-URL: Homepage, https://github.com/CI-CMG/water-column-sonar-processing
@@ -136,7 +136,7 @@ https://colab.research.google.com/drive/1KiLMueXiz9WVB9o4RuzYeGjNZ6PsZU7a#scroll
 # Tag a Release
 Step 1 --> increment the semantic version in the zarr_manager.py "metadata" & the "pyproject.toml"
 ```commandline
-git tag -a v25.1.5 -m "Releasing version v25.1.5"
+git tag -a v25.1.6 -m "Releasing version v25.1.6"
 git push origin --tags
 ```
 

{water_column_sonar_processing-25.1.5 → water_column_sonar_processing-25.1.6}/README.md

@@ -86,7 +86,7 @@ https://colab.research.google.com/drive/1KiLMueXiz9WVB9o4RuzYeGjNZ6PsZU7a#scroll
 # Tag a Release
 Step 1 --> increment the semantic version in the zarr_manager.py "metadata" & the "pyproject.toml"
 ```commandline
-git tag -a v25.1.5 -m "Releasing version v25.1.5"
+git tag -a v25.1.6 -m "Releasing version v25.1.6"
 git push origin --tags
 ```
 

{water_column_sonar_processing-25.1.5 → water_column_sonar_processing-25.1.6}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "water_column_sonar_processing"
-version = "25.1.5"
+version = "25.1.6"
 authors = [
   { name="Rudy Klucik", email="rudy.klucik@noaa.gov" },
 ]

{water_column_sonar_processing-25.1.5 → water_column_sonar_processing-25.1.6}/water_column_sonar_processing/cruise/resample_regrid.py

@@ -63,6 +63,7 @@ class ResampleRegrid:
             for channel in range(
                 len(channels)
             ):  # TODO: leaving off here, need to subset for just indices in time axis
+                gc.collect()
                 print(
                     np.nanmax(
                         input_xr.echo_range.sel(
@@ -88,6 +89,7 @@ class ResampleRegrid:
                 )  # removes nan's
                 # iterate through partitions of data with similar depths and resample
                 for select_max_depth in set_of_max_depths:
+                    gc.collect()
                     # TODO: for nan just skip and leave all nan's
                     select_indices = [
                         i
@@ -134,7 +136,7 @@ class ResampleRegrid:
             print(f"Problem finding the dynamodb table: {err}")
             raise err
         print("Done interpolating data.")
-        return regrid_resample
+        return regrid_resample.values.copy()
 
     #################################################################
     def resample_regrid(
@@ -226,21 +228,11 @@ class ResampleRegrid:
                 min_echo_range = np.nanmin(np.float32(cruise_df["MIN_ECHO_RANGE"]))
                 max_echo_range = np.nanmax(np.float32(cruise_df["MAX_ECHO_RANGE"]))
 
-                print("Creating empty ndarray for Sv data.")  # Note: cruise dims (depth, time, frequency)
-                output_zarr_store_shape = output_zarr_store.Sv.shape
-                end_ping_time_index - start_ping_time_index
-                output_zarr_store_height = output_zarr_store_shape[0]
-                output_zarr_store_width = end_ping_time_index - start_ping_time_index
-                output_zarr_store_depth = output_zarr_store_shape[2]
-                cruise_sv_subset = np.empty(
-                    shape=(output_zarr_store_height, output_zarr_store_width, output_zarr_store_depth)
-                )
-                cruise_sv_subset[:, :, :] = np.nan
-
+                # Note: cruise dims (depth, time, frequency)
                 all_cruise_depth_values = zarr_manager.get_depth_values(
                     min_echo_range=min_echo_range,
                     max_echo_range=max_echo_range
-                ) # (5262,) and
+                )
 
                 print(" ".join(list(input_xr_zarr_store.Sv.dims)))
                 if set(input_xr_zarr_store.Sv.dims) != {
@@ -284,7 +276,7 @@ class ResampleRegrid:
                 # write Sv values to cruise-level-model-store
 
                 for fff in range(regrid_resample.shape[-1]):
-                    output_zarr_store.Sv[:, start_ping_time_index:end_ping_time_index, fff] = regrid_resample.values[:, :, fff]
+                    output_zarr_store.Sv[:, start_ping_time_index:end_ping_time_index, fff] = regrid_resample[:, :, fff]
                 #########################################################################
                 # TODO: add the "detected_seafloor_depth/" to the
                 #  L2 cruise dataarrays

{water_column_sonar_processing-25.1.5 → water_column_sonar_processing-25.1.6}/water_column_sonar_processing/model/zarr_manager.py

@@ -91,7 +91,7 @@ class ZarrManager:
             chunks=Constants.SPATIOTEMPORAL_CHUNK_SIZE.value,
             dtype=np.dtype(Coordinates.TIME_DTYPE.value),
             compressor=self.__compressor,
-            fill_value=np.nan,  # TODO: do i want nan's?
+            fill_value=np.nan,
             overwrite=self.__overwrite,
         )
 

{water_column_sonar_processing-25.1.5 → water_column_sonar_processing-25.1.6}/water_column_sonar_processing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: water_column_sonar_processing
-Version: 25.1.5
+Version: 25.1.6
 Summary: Processing tool for water column sonar data.
 Author-email: Rudy Klucik <rudy.klucik@noaa.gov>
 Project-URL: Homepage, https://github.com/CI-CMG/water-column-sonar-processing
@@ -136,7 +136,7 @@ https://colab.research.google.com/drive/1KiLMueXiz9WVB9o4RuzYeGjNZ6PsZU7a#scroll
 # Tag a Release
 Step 1 --> increment the semantic version in the zarr_manager.py "metadata" & the "pyproject.toml"
 ```commandline
-git tag -a v25.1.5 -m "Releasing version v25.1.5"
+git tag -a v25.1.6 -m "Releasing version v25.1.6"
 git push origin --tags
 ```