pypromice 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

pypromice/process/resample.py

@@ -32,15 +32,44 @@ def resample_dataset(ds_h, t):
     ds_d : xarray.Dataset
         L3 AWS dataset resampled to the frequency defined by t
     '''
-    df_d = ds_h.to_dataframe().resample(t).mean()
+    # Convert dataset to DataFrame
+    df_d = ds_h.to_dataframe()
     
+    # Identify non-numeric columns
+    non_numeric_cols = df_d.select_dtypes(exclude=['number']).columns
+    
+    # Log a warning and drop non-numeric columns
+    if len(non_numeric_cols) > 0:
+        for col in non_numeric_cols:
+            unique_values = df_d[col].unique()
+            logger.warning(f"Dropping column '{col}' because it is of type '{df_d[col].dtype}' and contains unique values: {unique_values}")
+
+        df_d = df_d.drop(columns=non_numeric_cols)
+    # Resample the DataFrame
+    df_d = df_d.resample(t).mean()
+
     # taking the 10 min data and using it as instantaneous values:
-    if (t == '60min') and (ds_h.time.diff(dim='time').isel(time=0).dt.total_seconds() == 600):
+    is_10_minutes_timestamp = (ds_h.time.diff(dim='time') / np.timedelta64(1, 's') == 600)
+    if (t == '60min') and is_10_minutes_timestamp.any():
         cols_to_update = ['p_i', 't_i', 'rh_i', 'rh_i_cor', 'wspd_i', 'wdir_i','wspd_x_i','wspd_y_i']
+        timestamp_10min = ds_h.time.where(is_10_minutes_timestamp, drop=True).to_index()
+        timestamp_round_hour = df_d.index
+        timestamp_to_update = timestamp_round_hour.intersection(timestamp_10min)
+        
         for col in cols_to_update:
-            df_d[col] = ds_h.reindex(time=df_d.index)[col.replace('_i','_u')].values
+            if col not in df_d.columns:
+                df_d[col] = np.nan
+            else:
+                # if there are already instantaneous values in the dataset
+                # we want to keep them as they are
+                # removing timestamps where there is already t_i filled from a TX file
+                missing_instantaneous = ds_h.reindex(time=timestamp_to_update)[col].isnull()
+                timestamp_to_update = timestamp_to_update[missing_instantaneous]
+            df_d.loc[timestamp_to_update, col] = ds_h.reindex(
+                time= timestamp_to_update
+                )[col.replace('_i','_u')].values
             if col == 'p_i':
-                df_d[col] = df_d[col].values-1000
+                df_d.loc[timestamp_to_update, col] = df_d.loc[timestamp_to_update, col].values-1000
             
 
     # recalculating wind direction from averaged directional wind speeds

{pypromice-1.4.1.dist-info → pypromice-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypromice
-Version: 1.4.1
+Version: 1.4.2
 Summary: PROMICE/GC-Net data processing toolbox
 Home-page: https://github.com/GEUS-Glaciology-and-Climate/pypromice
 Author: GEUS Glaciology and Climate

{pypromice-1.4.1.dist-info → pypromice-1.4.2.dist-info}/RECORD

@@ -21,7 +21,7 @@ pypromice/process/get_l2tol3.py,sha256=4Qu2d5rT25H2dObyCc70ivtJg3vw6WA-hzI-kRD6y
 pypromice/process/join_l2.py,sha256=ifjuhFR9scVvZt3xuy-ELp-iRchxV1dEK9qJ4UNh5bE,4567
 pypromice/process/join_l3.py,sha256=nLLQbX0vuuvHET8r33ZAt5g1dtIk3foUJ9RZkwkEwE4,20158
 pypromice/process/load.py,sha256=iaFvJeaDanAA60caVj4BWupZpqgQNj3CiNU4csz9FdU,4585
-pypromice/process/resample.py,sha256=caOqcO3AQQ6ejEbVd2AcCKycQps7U0y6GKjLYzWfZnI,5714
+pypromice/process/resample.py,sha256=x0t9CE4YnwYMrn6wDRArhrQHqHOIJpYpTrgEcARUppo,7138
 pypromice/process/utilities.py,sha256=1pqSaF3bIbvRNtOjb25mbegHfuW9MY4KpCBDVXWyML8,1773
 pypromice/process/value_clipping.py,sha256=FkBiDT_HK_BDFiVjB7NdWH-_nab7vONG9LOd2PpEBI8,1573
 pypromice/process/write.py,sha256=fRCCK4g_W07M4EEsJErdTSN2Pldr9SLgqM2w_rsp2ZQ,16257
@@ -45,9 +45,9 @@ pypromice/tx/payload_types.csv,sha256=C1-xCmHytAqqAzgzPwBLWqabzWu6s6tKAd8AjVd935
 pypromice/tx/tx.py,sha256=TE5lKYMJF4hAhHrKjMyx1LZWpOHlwGJI9EdlPJrQITs,34251
 pypromice/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypromice/utilities/git.py,sha256=7EUGjDs_VZucrckakXKyZEclDAZ_mKIxhTWzhopCIxM,1785
-pypromice-1.4.1.dist-info/LICENSE.txt,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-pypromice-1.4.1.dist-info/METADATA,sha256=znYJm-tDsyrWFwkvQ9xE2BEiN9ZofRxO5EtmBYeIhrQ,4762
-pypromice-1.4.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-pypromice-1.4.1.dist-info/entry_points.txt,sha256=ufX1npmY3nqMPtSVRKVxn3MhG9IyFHD5FjPZQcELVXo,618
-pypromice-1.4.1.dist-info/top_level.txt,sha256=cBdfwgSbWDQq3a07nKRjrfmLC7jdaYXs98GG58HpTks,10
-pypromice-1.4.1.dist-info/RECORD,,
+pypromice-1.4.2.dist-info/LICENSE.txt,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+pypromice-1.4.2.dist-info/METADATA,sha256=7Y55ySy-BVM0Tb1HoVShtxYqjpIMQWBjiIypPaGqMLE,4762
+pypromice-1.4.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+pypromice-1.4.2.dist-info/entry_points.txt,sha256=ufX1npmY3nqMPtSVRKVxn3MhG9IyFHD5FjPZQcELVXo,618
+pypromice-1.4.2.dist-info/top_level.txt,sha256=cBdfwgSbWDQq3a07nKRjrfmLC7jdaYXs98GG58HpTks,10
+pypromice-1.4.2.dist-info/RECORD,,