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

pypromice/postprocess/bufr_to_csv.py

@@ -1,15 +1,22 @@
 import argparse
 from pathlib import Path
 
+import pandas as pd
+
 from pypromice.postprocess.bufr_utilities import read_bufr_file
 
 
 def main():
     parser = argparse.ArgumentParser("BUFR to CSV converter")
-    parser.add_argument("path", type=Path)
+    parser.add_argument("path", type=Path, nargs='+')
     args = parser.parse_args()
 
-    print(read_bufr_file(args.path).to_csv())
+    paths = []
+    for path in args.path:
+        paths += list(path.parent.glob(path.name))
+
+    df = pd.concat([read_bufr_file(path) for path in paths])
+    print(df.to_csv())
 
 
 if __name__ == "__main__":

pypromice/process/L2toL3.py

@@ -254,6 +254,7 @@ def process_surface_height(ds, data_adjustments_dir, station_config={}):
         
         ds['z_surf_combined'] = np.maximum(ds['z_surf_combined'], ds['z_ice_surf'])
         ds['snow_height'] = np.maximum(0, ds['z_surf_combined'] - ds['z_ice_surf'])
+        ds['z_ice_surf'] = ds['z_ice_surf'].where(ds.snow_height.notnull())
     elif ds.attrs['site_type'] in ['accumulation', 'bedrock']:
         # Handle accumulation and bedrock site types
         ds['z_ice_surf'] = ('time', ds['z_surf_1'].data * np.nan)

pypromice/process/aws.py

@@ -55,7 +55,15 @@ class AWS(object):
         """
         assert os.path.isfile(config_file), "cannot find " + config_file
         assert os.path.isdir(inpath), "cannot find " + inpath
-        logger.info("AWS object initialising...")
+        logger.info(
+            "AWS("
+            f"config_file={config_file},"
+            f" inpath={inpath},"
+            f" data_issues_repository={data_issues_repository},"
+            f" var_file={var_file},"
+            f" meta_file={meta_file}"
+            ")"
+        )
 
         # Load config, variables CSF standards, and L0 files
         self.config = self.loadConfig(config_file, inpath)
@@ -73,6 +81,7 @@ class AWS(object):
             l0_data_root=inpath_hash,
             data_issues=data_issues_hash,
         )
+        logger.debug('Source information: %s', source_dict)
         self.meta["source"] = json.dumps(source_dict)
 
         # Load config file

pypromice/process/resample.py

@@ -34,6 +34,15 @@ def resample_dataset(ds_h, t):
     '''
     df_d = ds_h.to_dataframe().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):
+        cols_to_update = ['p_i', 't_i', 'rh_i', 'rh_i_cor', 'wspd_i', 'wdir_i','wspd_x_i','wspd_y_i']
+        for col in cols_to_update:
+            df_d[col] = ds_h.reindex(time=df_d.index)[col.replace('_i','_u')].values
+            if col == 'p_i':
+                df_d[col] = df_d[col].values-1000
+            
+
     # recalculating wind direction from averaged directional wind speeds
     for var in ['wdir_u','wdir_l']:
         boom = var.split('_')[1]
@@ -60,9 +69,19 @@ def resample_dataset(ds_h, t):
                 if var+'_cor' in df_d.keys():
                     df_d[var+'_cor'] = (p_vap.to_series().resample(t).mean() \
                                / es_cor.to_series().resample(t).mean())*100
+    
+    # passing each variable attribute to the ressample dataset
+    vals = []
+    for c in df_d.columns:
+        if c in ds_h.data_vars:
+            vals.append(xr.DataArray(
+                data=df_d[c], dims=['time'],
+               coords={'time':df_d.index}, attrs=ds_h[c].attrs))
+        else:
+            vals.append(xr.DataArray(
+                data=df_d[c], dims=['time'],
+               coords={'time':df_d.index}, attrs=None))
             
-    vals = [xr.DataArray(data=df_d[c], dims=['time'],
-           coords={'time':df_d.index}, attrs=ds_h[c].attrs) for c in df_d.columns]
     ds_d = xr.Dataset(dict(zip(df_d.columns,vals)), attrs=ds_h.attrs)
     return ds_d
 

pypromice/utilities/git.py

@@ -7,12 +7,16 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-def get_commit_hash_and_check_dirty(file_path) -> str:
-    repo_path = Path(file_path).parent
+def get_commit_hash_and_check_dirty(file_path: str | Path) -> str:
+    if isinstance(file_path, str):
+        file_path = Path(file_path)
+    if file_path.is_dir():
+        repo_path = file_path
+    else:
+        repo_path = file_path.parent
 
     try:
         # Ensure the file path is relative to the repository
-        relative_file_path = os.path.relpath(file_path, repo_path)
 
         # Get the latest commit hash for the file
         commit_hash = (
@@ -25,8 +29,6 @@ def get_commit_hash_and_check_dirty(file_path) -> str:
                     "-n",
                     "1",
                     "--pretty=format:%H",
-                    #"--",
-                    #relative_file_path,
                 ],
                 stderr=subprocess.STDOUT,
             )
@@ -49,12 +51,11 @@ def get_commit_hash_and_check_dirty(file_path) -> str:
 
         if is_dirty:
             logger.warning(f"Warning: The file {file_path} is dirty compared to the last commit. {commit_hash}")
-            return 'unknown'
+            return f'{commit_hash} (dirty)'
         if commit_hash == "":
             logger.warning(f"Warning: The file {file_path} is not under version control.")
             return 'unknown'
 
-        print(f"Commit hash: {commit_hash}")
         return commit_hash
     except subprocess.CalledProcessError as e:
         logger.warning(f"Error: {e.output.decode('utf-8')}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypromice
-Version: 1.4.0
+Version: 1.4.1
 Summary: PROMICE/GC-Net data processing toolbox
 Home-page: https://github.com/GEUS-Glaciology-and-Climate/pypromice
 Author: GEUS Glaciology and Climate
@@ -15,7 +15,7 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Natural Language :: English
 Classifier: Topic :: Scientific/Engineering
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: numpy ~=1.23

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

@@ -4,7 +4,7 @@ pypromice/get/__init__.py,sha256=n2L6P9EeUsdjsHaeU7BEanBjlkCBX9csGseT8z-laew,32
 pypromice/get/get.py,sha256=8tdIbvdeXCpRWU7KmcKGIP9ZPdqIry3MjtJp9krumvo,7705
 pypromice/get/get_promice_data.py,sha256=bluNCaP50iRlWBzdEOXLrSPepOQdGB7SeQLkTWiqK4c,1806
 pypromice/postprocess/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypromice/postprocess/bufr_to_csv.py,sha256=S1SprYvL91um3y7Axx4CFOz7UYlr_DUQjhcgzwUIf9E,343
+pypromice/postprocess/bufr_to_csv.py,sha256=ntTJZhfBRYPbLn2u9GzO5PFCkg9DIypUZONYEs2XrqA,507
 pypromice/postprocess/bufr_utilities.py,sha256=bc9U7ZC_7jtPbzaLYNnsz-nq3xn_PHGkgk1bVWa3ltc,21176
 pypromice/postprocess/create_bufr_files.py,sha256=GizmNAW_v54MkvelPVzqIklBNHWH6nTRQC2qOo5amys,5657
 pypromice/postprocess/get_bufr.py,sha256=98BZ7tTbmvvrVAzhxJ8LgHib3w7Q3S_x757pCubHToU,16693
@@ -13,15 +13,15 @@ pypromice/postprocess/positions_seed.csv,sha256=0kVCQ8UfEALdeXNYCddmwxpseRqLRudb
 pypromice/postprocess/real_time_utilities.py,sha256=2GZUua5R8ocp-TnIjEA4ig8lC4TlI3SkiimzLxoHXFE,9476
 pypromice/process/L0toL1.py,sha256=aQmVEXhtRisHNrJuPGIg7NA4hjjmV9jUBu1DClRIGzs,23175
 pypromice/process/L1toL2.py,sha256=Hcelx8kYDq5ERtzdAO1YUuBu8_aRwgWJ9FEDHuAVZu8,30478
-pypromice/process/L2toL3.py,sha256=iK7IdyuAP0cPThsDoQXl-fKxkfM7C8DhZGyn1ywjcdY,62235
+pypromice/process/L2toL3.py,sha256=xJXEHqfgWtKj5DxmuFq2F_Ynj0gMEpBxw3-RKpcnfUs,62311
 pypromice/process/__init__.py,sha256=xvd0I-9nIyVw4M4qjgkQ5vXYpNuKcVSkIVIROQsZDo0,147
-pypromice/process/aws.py,sha256=4CGRGAGFSRxAutHVI1hMaWcfo3nUqGBiXPeXdfw9jQo,8669
+pypromice/process/aws.py,sha256=SLVfJ4VMY6F3DGzlAQXvgHqdQnqppYZofSU2VEUeRkQ,8960
 pypromice/process/get_l2.py,sha256=ALXJCMJ8qgg0_dEKx-dV5TQ9IAJnLLLGPUxlr5QVfpk,3076
 pypromice/process/get_l2tol3.py,sha256=4Qu2d5rT25H2dObyCc70ivtJg3vw6WA-hzI-kRD6ybQ,4544
 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=L0_q8GDen6tzJV3CLEjYS3S1nWu5tkZi1GSj3QRH-vw,4932
+pypromice/process/resample.py,sha256=caOqcO3AQQ6ejEbVd2AcCKycQps7U0y6GKjLYzWfZnI,5714
 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
@@ -44,10 +44,10 @@ pypromice/tx/payload_formats.csv,sha256=tzTTNuvmVwlwd7z3aF8A2dhjKNQ4lVumpnNBs3e3
 pypromice/tx/payload_types.csv,sha256=C1-xCmHytAqqAzgzPwBLWqabzWu6s6tKAd8AjVd935s,457
 pypromice/tx/tx.py,sha256=TE5lKYMJF4hAhHrKjMyx1LZWpOHlwGJI9EdlPJrQITs,34251
 pypromice/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypromice/utilities/git.py,sha256=fphNOnbX7cHHIslFve6F5RLxSyPndHG1An3cHADkb-w,1802
-pypromice-1.4.0.dist-info/LICENSE.txt,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-pypromice-1.4.0.dist-info/METADATA,sha256=st3ryglycZZ8a8P3cZpKwdoJGpmXMTiXvIMF6KzrKFs,4761
-pypromice-1.4.0.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
-pypromice-1.4.0.dist-info/entry_points.txt,sha256=ufX1npmY3nqMPtSVRKVxn3MhG9IyFHD5FjPZQcELVXo,618
-pypromice-1.4.0.dist-info/top_level.txt,sha256=cBdfwgSbWDQq3a07nKRjrfmLC7jdaYXs98GG58HpTks,10
-pypromice-1.4.0.dist-info/RECORD,,
+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.0.dist-info → pypromice-1.4.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any