Refactor chunking configuration in write_geozarr_group and create_geozarr_compliant_multiscales functions for improved alignment; remove unnecessary align_chunks parameter in write_dataset_band_by_band_with_validation function.

emmanuelmathot · emmanuelmathot · commit 2623a1276cab · 2025-07-28T12:25:16.000+02:00
diff --git a/eopf_geozarr/conversion/geozarr.py b/eopf_geozarr/conversion/geozarr.py
@@ -535,7 +535,7 @@ def write_geozarr_group(
                 spatial_chunk_aligned = spatial_chunk
 
             encoding[var] = {
-                "chunks": (1, spatial_chunk_aligned, spatial_chunk_aligned),
+                "chunks": (spatial_chunk_aligned, spatial_chunk_aligned),
                 "compressors": compressor,
             }
 
@@ -784,7 +784,7 @@ def create_geozarr_compliant_multiscales(
                     utils.calculate_aligned_chunk_size(height, spatial_chunk),
                 )
                 encoding[var] = {
-                    "chunks": (1, spatial_chunk_aligned, spatial_chunk_aligned),
+                    "chunks": (spatial_chunk_aligned, spatial_chunk_aligned),
                     "compressors": compressor,
                 }
 
@@ -1242,7 +1242,6 @@ def write_dataset_band_by_band_with_validation(
                         consolidated=False,
                         zarr_format=3,
                         encoding=var_encoding,
-                        align_chunks=True,
                         storage_options=storage_options,
                     )
                 else:
@@ -1252,7 +1251,6 @@ def write_dataset_band_by_band_with_validation(
                         consolidated=False,
                         zarr_format=3,
                         encoding=var_encoding,
-                        align_chunks=True,
                     )
 
                 print(f"    ✅ Successfully wrote {var}")

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ def write_geozarr_group(`
`535`	`535`	`spatial_chunk_aligned = spatial_chunk`
`536`	`536`
`537`	`537`	`encoding[var] = {`
`538`		`- "chunks": (1, spatial_chunk_aligned, spatial_chunk_aligned),`
	`538`	`+ "chunks": (spatial_chunk_aligned, spatial_chunk_aligned),`
`539`	`539`	`"compressors": compressor,`
`540`	`540`	`}`
`541`	`541`
`@@ -784,7 +784,7 @@ def create_geozarr_compliant_multiscales(`
`784`	`784`	`utils.calculate_aligned_chunk_size(height, spatial_chunk),`
`785`	`785`	`)`
`786`	`786`	`encoding[var] = {`
`787`		`- "chunks": (1, spatial_chunk_aligned, spatial_chunk_aligned),`
	`787`	`+ "chunks": (spatial_chunk_aligned, spatial_chunk_aligned),`
`788`	`788`	`"compressors": compressor,`
`789`	`789`	`}`
`790`	`790`
`@@ -1242,7 +1242,6 @@ def write_dataset_band_by_band_with_validation(`
`1242`	`1242`	`consolidated=False,`
`1243`	`1243`	`zarr_format=3,`
`1244`	`1244`	`encoding=var_encoding,`
`1245`		`- align_chunks=True,`
`1246`	`1245`	`storage_options=storage_options,`
`1247`	`1246`	`)`
`1248`	`1247`	`else:`
`@@ -1252,7 +1251,6 @@ def write_dataset_band_by_band_with_validation(`
`1252`	`1251`	`consolidated=False,`
`1253`	`1252`	`zarr_format=3,`
`1254`	`1253`	`encoding=var_encoding,`
`1255`		`- align_chunks=True,`
`1256`	`1254`	`)`
`1257`	`1255`
`1258`	`1256`	`print(f" ✅ Successfully wrote {var}")`