pypromice 1.5.3__py3-none-any.whl → 1.7.0__py3-none-any.whl

pypromice/{process → pipeline}/join_l2.py

@@ -3,21 +3,20 @@ import logging, sys, os, unittest
 import pandas as pd
 import xarray as xr
 from argparse import ArgumentParser
-from pypromice.process.L1toL2 import correctPrecip
-from pypromice.process.write import prepare_and_write
+from pypromice.io.write import prepare_and_write
 logger = logging.getLogger(__name__)
 
 def parse_arguments_join():
     parser = ArgumentParser(description="AWS L2 joiner for merging together two L2 products, for example an L2 RAW and L2 TX data product. An hourly, daily and monthly L2 data product is outputted to the defined output path")
     parser.add_argument('-s', '--file1', type=str, required=True,
                         help='Path to source L2 file, which will be preferenced in merge process')
-    parser.add_argument('-t', '--file2', type=str, required=True, 
+    parser.add_argument('-t', '--file2', type=str, required=True,
                         help='Path to target L2 file, which will be used to fill gaps in merge process')
-    parser.add_argument('-o', '--outpath', default=os.getcwd(), type=str, required=True, 
+    parser.add_argument('-o', '--outpath', default=os.getcwd(), type=str, required=True,
                         help='Path where to write output')
-    parser.add_argument('-v', '--variables', default=None, type=str, required=False, 
+    parser.add_argument('-v', '--variables', default=None, type=str, required=False,
     			 help='Path to variables look-up table .csv file for variable name retained'''),
-    parser.add_argument('-m', '--metadata', default=None, type=str, required=False, 
+    parser.add_argument('-m', '--metadata', default=None, type=str, required=False,
     			 help='Path to metadata table .csv file for metadata information'''),
     args = parser.parse_args()
     return args
@@ -25,7 +24,7 @@ def parse_arguments_join():
 def loadArr(infile):
     if infile.split('.')[-1].lower() == 'csv':
         df = pd.read_csv(infile, index_col=0, parse_dates=True)
-        ds = xr.Dataset.from_dataframe(df)  
+        ds = xr.Dataset.from_dataframe(df)
     elif infile.split('.')[-1].lower() == 'nc':
         with xr.open_dataset(infile) as ds:
             ds.load()
@@ -35,7 +34,7 @@ def loadArr(infile):
                 ds[varname].encoding = {}
 
     try:
-        name = ds.attrs['station_id'] 
+        name = ds.attrs['station_id']
     except:
         name = infile.split('/')[-1].split('.')[0].split('_hour')[0].split('_10min')[0]
         ds.attrs['station_id'] = name
@@ -46,7 +45,6 @@ def loadArr(infile):
 
     logger.info(f'{name} array loaded from {infile}')
     return ds, name
-    
 
 def join_l2(file1,file2,outpath,variables,metadata) -> xr.Dataset:
     logging.basicConfig(
@@ -55,43 +53,44 @@ def join_l2(file1,file2,outpath,variables,metadata) -> xr.Dataset:
         stream=sys.stdout,
     )
     # Check files
-    if os.path.isfile(file1) and os.path.isfile(file2): 
+    if os.path.isfile(file1) and os.path.isfile(file2):
 
         # Load data arrays
         ds1, n1 = loadArr(file1)
-        ds2, n2 = loadArr(file2)    	
-        
+        ds2, n2 = loadArr(file2)
+
         # Check stations match
         if n1.lower() == n2.lower():
-            
-        	# Merge arrays
+            	# Merge arrays
             logger.info(f'Combining {file1} with {file2}...')
             name = n1
             all_ds = ds1.combine_first(ds2)
             
-            # Re-calculate corrected precipitation
-            if hasattr(all_ds, 'precip_u_cor'):
-                if ~all_ds['precip_u_cor'].isnull().all():
-                    all_ds['precip_u_cor'],  _ = correctPrecip(all_ds['precip_u'], 
-                                                                all_ds['wspd_u'])
-            if hasattr(all_ds, 'precip_l_cor'):
-                if ~all_ds['precip_l_cor'].isnull().all():
-                    all_ds['precip_l_cor'],  _ = correctPrecip(all_ds['precip_l'], 
-                                                                all_ds['wspd_l'])                    
+            # combine_first works terrible for accumulated values
+            # we rather combine semi-accumulated precipitation in block
+            for var in ['precip_u', 'precip_l']:
+                if hasattr(all_ds, var):
+                    if all_ds[var].notnull().any():
+                        tx_data_no_overlap =(ds2[var]
+                                             .sel(time=slice(ds1.time.values[-1], ds2.time.values[-1]))
+                                             .isel(time=slice(1, None))) # this line prevents redundant timestamps
+                        all_ds[var] = xr.concat(
+                                        [ds1[var], tx_data_no_overlap], dim='time'
+                                    ).sortby('time')
         else:
             logger.info(f'Mismatched station names {n1}, {n2}')
-            exit()            
-    
-    elif os.path.isfile(file1):  
+            exit()
+
+    elif os.path.isfile(file1):
         ds1, name = loadArr(file1)
         logger.info(f'Only one file found {file1}...')
-        all_ds = ds1  
+        all_ds = ds1
 
     elif os.path.isfile(file2):
         ds2, name = loadArr(file2)
         logger.info(f'Only one file found {file2}...')
-        all_ds = ds2  
-    
+        all_ds = ds2
+
     else:
         logger.info(f'Invalid files {file1}, {file2}')
         exit()
@@ -100,13 +99,13 @@ def join_l2(file1,file2,outpath,variables,metadata) -> xr.Dataset:
 
     # Resample to hourly, daily and monthly datasets and write to file
     prepare_and_write(all_ds, outpath, variables, metadata, resample = False)
-    
+
     logger.info(f'Files saved to {os.path.join(outpath, name)}...')
     return all_ds
 
 def main():
     args = parse_arguments_join()
     _ = join_l2(args.file1, args.file2, args.outpath, args.variables, args.metadata)
-    
-if __name__ == "__main__":  
+
+if __name__ == "__main__":
     main()

pypromice/{process → pipeline}/join_l3.py

@@ -3,10 +3,11 @@ import json
 import logging, os, sys, toml
 from argparse import ArgumentParser
 
-from pypromice.utilities.git import get_commit_hash_and_check_dirty
+from pypromice.io.ingest.git import get_commit_hash_and_check_dirty
 
 import pypromice.resources
-from pypromice.process.write import prepare_and_write
+from pypromice.io.write import prepare_and_write
+
 import numpy as np
 import pandas as pd
 import xarray as xr
@@ -493,20 +494,21 @@ def join_l3(config_folder, site, folder_l3, folder_gcnet, outpath, variables, me
                             l3_merged.z_ice_surf.to_series(), l3.z_ice_surf.to_series()
                         ),
                     )
-            
+
             # saves attributes
             attrs = l3_merged.attrs
             # merging by time block
-            l3_merged = xr.concat(
-                (
-                    l3.sel(
-                        time=slice(l3.time.isel(time=0), l3_merged.time.isel(time=0))
-                    ),
-                    l3_merged,
-                ),
-                dim="time",
-            )
-            
+            t_start = l3.time.values[0]
+            t_stop = l3_merged.time.values[0]
+
+            l3_part = l3.sel(time=slice(t_start, t_stop))
+
+            # we don't want the first timestamp of l3_merged to also be in l3
+            if l3_part.time.values[-1] == t_stop:
+                l3_part = l3_part.isel(time=slice(None, -1))
+
+            l3_merged = xr.concat([l3_part, l3_merged], dim="time")
+
             # restauring attributes
             l3_merged.attrs = attrs
 
@@ -540,7 +542,7 @@ def join_l3(config_folder, site, folder_l3, folder_gcnet, outpath, variables, me
     if outpath is not None:
         prepare_and_write(l3_merged, outpath, v, m, "60min", nc_compression=True)
         prepare_and_write(l3_merged, outpath, v, m, "1D", nc_compression=True)
-        prepare_and_write(l3_merged, outpath, v, m, "M", nc_compression=True)
+        prepare_and_write(l3_merged, outpath, v, m, "MS", nc_compression=True)
     return l3_merged, sorted_list_station_data
 
 

pypromice/{process → pipeline}/resample.py

@@ -1,17 +1,15 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-"""
-Created on Mon Jun 10 10:58:39 2024
-
-@author: pho
-"""
 import logging
 import numpy as np
+import pandas as pd
 import xarray as xr
-from pypromice.process.wind import calculate_directional_wind_speed
+
+from pypromice.core.resampling import get_completeness_mask, DEFAULT_COMPLETENESS_THRESHOLDS
+from pypromice.core.variables.wind import calculate_directional_wind_speed
 logger = logging.getLogger(__name__)
 
-def resample_dataset(ds_h, t):
+def resample_dataset(ds_h, t, completeness_thresholds=DEFAULT_COMPLETENESS_THRESHOLDS):
     '''Resample L2 AWS data, e.g. hourly to daily average. This uses pandas
     DataFrame resampling at the moment as a work-around to the xarray Dataset
     resampling. As stated, xarray resampling is a lengthy process that takes
@@ -24,8 +22,13 @@ def resample_dataset(ds_h, t):
     ds_h : xarray.Dataset
         L3 AWS dataset either at 10 min (for raw data) or hourly (for tx data)
     t : str
-        Resample factor, same variable definition as in
+        Resample factor( "60min", "1D" or "MS"), same variable definition as in
         pandas.DataFrame.resample()
+    completeness_thresholds : Dict
+        A dict with, for each variable, the lower limit of completness of an
+        hourly/daily/monthly aggregate (nr of samples in aggregate / expected
+        nr of samples). Aggregates below that limit are replaced by NaNs.
+        Must include a "default" value used for variables not listed explicitly.
 
     Returns
     -------
@@ -33,20 +36,42 @@ def resample_dataset(ds_h, t):
         L3 AWS dataset resampled to the frequency defined by t
     '''
     # Convert dataset to DataFrame
-    df_d = ds_h.to_dataframe()
-    
+    df_h = ds_h.to_dataframe()
+
     # Identify non-numeric columns
-    non_numeric_cols = df_d.select_dtypes(exclude=['number']).columns
-    
+    non_numeric_cols = df_h.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}")
+            unique_values = df_h[col].unique()
+            logger.warning(f"Dropping column '{col}' because it is of type '{df_h[col].dtype}' and contains unique values: {unique_values}")
 
-        df_d = df_d.drop(columns=non_numeric_cols)
+        df_h = df_h.drop(columns=non_numeric_cols)
     # Resample the DataFrame
-    df_d = df_d.resample(t).mean()
+    df_resampled = df_h.resample(t).mean()
+
+    # exception for precip_u and precip_l which are semi-accumulated with some resets
+    # Taking the max value within the resampled time step will preserve the
+    #  general shape of the curve
+    for var in ['precip_u', 'precip_l']:
+        if var in df_h.columns:
+            df_resampled[var] = df_h[var].resample(t).max()
+
+    # exception for rainfall which should be summed when aggregated into
+    # hourly/daily/monthly values. This ignores missing data.
+    for var in ['rainfall_u', 'rainfall_cor_u', 'rainfall_l', 'rainfall_cor_l']:
+        if var in df_h.columns:
+            df_resampled[var] = df_h[var].resample(t).sum()
+
+    # Apply completeness filter based on the the data frame time index
+    completeness_mask = get_completeness_mask(
+        data_frame=df_h,
+        resample_offset=t,
+        completeness_thresholds=completeness_thresholds,
+    )
+
+    df_resampled[~completeness_mask] = np.nan
 
     # taking the 10 min data and using it as instantaneous values:
     is_10_minutes_timestamp = (ds_h.time.diff(dim='time') / np.timedelta64(1, 's') == 600)
@@ -54,75 +79,75 @@ def resample_dataset(ds_h, t):
         cols_to_update = ['p_i', 't_i', 'rh_i', 'rh_i_wrt_ice_or_water', 'wspd_i', 'wdir_i','wspd_x_i','wspd_y_i']
         cols_origin = ['p_u', 't_u', 'rh_u', 'rh_u_wrt_ice_or_water', 'wspd_u', 'wdir_u','wspd_x_u','wspd_y_u']
         timestamp_10min = ds_h.time.where(is_10_minutes_timestamp, drop=True).to_index()
-        timestamp_round_hour = df_d.index
+        timestamp_round_hour = df_resampled.index
         timestamp_to_update = timestamp_round_hour.intersection(timestamp_10min)
-        
+
         for col, col_org in zip(cols_to_update, cols_origin):
-            if col not in df_d.columns:
-                df_d[col] = np.nan
+            if col not in df_resampled.columns:
+                df_resampled[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(
+            df_resampled.loc[timestamp_to_update, col] = ds_h.reindex(
                 time= timestamp_to_update
                 )[col_org].values
             if col == 'p_i':
-                df_d.loc[timestamp_to_update, col] = df_d.loc[timestamp_to_update, col].values-1000
-            
+                df_resampled.loc[timestamp_to_update, col] = df_resampled.loc[timestamp_to_update, col].values-1000
 
     # recalculating wind direction from averaged directional wind speeds
     for var in ['wdir_u','wdir_l']:
         boom = var.split('_')[1]
-        if var in df_d.columns:
-            if ('wspd_x_'+boom in df_d.columns) & ('wspd_y_'+boom in df_d.columns):
-                df_d[var] = _calcWindDir(df_d['wspd_x_'+boom], df_d['wspd_y_'+boom])
+        if var in df_resampled.columns:
+            if ('wspd_x_'+boom in df_resampled.columns) & ('wspd_y_'+boom in df_resampled.columns):
+                df_resampled[var] = _calcWindDir(df_resampled['wspd_x_'+boom], df_resampled['wspd_y_'+boom])
             else:
                 logger.info(var+' in dataframe but not wspd_x_'+boom+' nor wspd_y_'+boom+', recalculating them')
                 ds_h['wspd_x_'+boom], ds_h['wspd_y_'+boom] = calculate_directional_wind_speed(ds_h['wspd_'+boom], ds_h['wdir_'+boom])
-                df_d[['wspd_x_'+boom, 'wspd_y_'+boom]] = ds_h[['wspd_x_'+boom, 'wspd_y_'+boom]].to_dataframe().resample(t).mean()
-                df_d[var] = _calcWindDir(df_d['wspd_x_'+boom], df_d['wspd_y_'+boom])
-    
+                df_resampled[['wspd_x_'+boom, 'wspd_y_'+boom]] = ds_h[['wspd_x_'+boom, 'wspd_y_'+boom]].to_dataframe().resample(t).mean()
+                df_resampled[var] = _calcWindDir(df_resampled['wspd_x_'+boom], df_resampled['wspd_y_'+boom])
+
     # recalculating relative humidity from average vapour pressure and average
     # saturation vapor pressure
     for var in ['rh_u','rh_l']:
         lvl = var.split('_')[1]
-        if var in df_d.columns:
+        if var in df_resampled.columns:
             if ('t_'+lvl in ds_h.keys()):
                 es_wtr, es_cor = calculateSaturationVaporPressure(ds_h['t_'+lvl])
                 p_vap = ds_h[var] / 100 * es_wtr
-                
-                df_d[var] = (p_vap.to_series().resample(t).mean() \
+
+                df_resampled[var] = (p_vap.to_series().resample(t).mean() \
                            / es_wtr.to_series().resample(t).mean())*100
-                if var+'_wrt_ice_or_water' in df_d.keys():
-                    df_d[var+'_wrt_ice_or_water'] = (p_vap.to_series().resample(t).mean() \
+                if var+'_wrt_ice_or_water' in df_resampled.keys():
+                    df_resampled[var+'_wrt_ice_or_water'] = (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:
+    for c in df_resampled.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))
+                data=df_resampled[c], dims=['time'],
+               coords={'time':df_resampled.index}, attrs=ds_h[c].attrs))
         else:
             vals.append(xr.DataArray(
-                data=df_d[c], dims=['time'],
-               coords={'time':df_d.index}, attrs=None))
-            
-    ds_d = xr.Dataset(dict(zip(df_d.columns,vals)), attrs=ds_h.attrs)
-    return ds_d
+                data=df_resampled[c], dims=['time'],
+               coords={'time':df_resampled.index}, attrs=None))
+
+    ds_resampled = xr.Dataset(dict(zip(df_resampled.columns,vals)), attrs=ds_h.attrs)
+
+    return ds_resampled
 
 
 def calculateSaturationVaporPressure(t, T_0=273.15, T_100=373.15, es_0=6.1071,
-                                     es_100=1013.246, eps=0.622):            
+                                     es_100=1013.246, eps=0.622):
     '''Calculate specific humidity
-    
+
     Parameters
     ----------
-    T_0 : float 
+    T_0 : float
         Steam point temperature. Default is 273.15.
     T_100 : float
         Steam point temperature in Kelvin
@@ -132,14 +157,13 @@ def calculateSaturationVaporPressure(t, T_0=273.15, T_100=373.15, es_0=6.1071,
         Saturation vapour pressure at the melting point (hPa)
     es_100 : float
         Saturation vapour pressure at steam point temperature (hPa)
-    
     Returns
     -------
     xarray.DataArray
         Saturation vapour pressure with regard to water above 0 C (hPa)
     xarray.DataArray
         Saturation vapour pressure where subfreezing timestamps are with regards to ice (hPa)
-    '''                                                         
+    '''
     # Saturation vapour pressure above 0 C (hPa)
     es_wtr = 10**(-7.90298 * (T_100 / (t + T_0) - 1) + 5.02808 * np.log10(T_100 / (t + T_0))
                   - 1.3816E-7 * (10**(11.344 * (1 - (t + T_0) / T_100)) - 1)
@@ -149,11 +173,11 @@ def calculateSaturationVaporPressure(t, T_0=273.15, T_100=373.15, es_0=6.1071,
     es_ice = 10**(-9.09718 * (T_0 / (t + T_0) - 1) - 3.56654
                   * np.log10(T_0 / (t + T_0)) + 0.876793
                   * (1 - (t + T_0) / T_0)
-                  + np.log10(es_0)) 
-    
+                  + np.log10(es_0))
+
     # Saturation vapour pressure (hPa)
     es_cor = xr.where(t < 0, es_ice, es_wtr)
-    
+
     return es_wtr, es_cor
 
 def _calcWindDir(wspd_x, wspd_y):

pypromice/{process → pipeline}/utilities.py

@@ -44,25 +44,3 @@ def addBasicMeta(ds, vars_df):
             ds[v].attrs[c] = vars_df[c][v]
     return ds
 
-def populateMeta(ds, conf, skip):
-    '''Populate L0 Dataset with metadata dictionary
-
-    Parameters
-    ----------
-    ds : xarray.Dataset
-        L0 dataset
-    conf : dict
-        Metadata dictionary
-    skip : list
-        List of column names to skip parsing to metadata
-
-    Returns
-    -------
-    ds : xarray.Dataset
-        L0 dataset with metadata populated as Dataset attributes
-    '''
-    # skip = ["columns", "skiprows"]
-    for k in conf.keys():
-        if k not in skip: ds.attrs[k] = conf[k]
-    return ds
-

pypromice/resources/file_attributes.csv

@@ -3,13 +3,13 @@ acknowledgements,The Programme for Monitoring of the Greenland Ice Sheet (PROMIC
 alt.axis,Z
 alt.coverage_content_type,coordinate
 gps_alt.positive,up
-cdm_data_type,
+cdm_data_type,Station
 comment,https://doi.org/10.22008/promice/data/aws
 contributor_name,
 contributor_role,
 conventions,ACDD-1.3; CF-1.7
-creater_email,pho@geus.dk
-creater_url,https://promice.dk
+creator_email,pho@geus.dk
+creator_url,https://promice.dk
 creator_institution,Geological Survey of Denmark and Greenland (GEUS)
 creator_name,Penelope How
 creator_type,person
@@ -22,7 +22,7 @@ geospatial_lon_extents_match,gps_lon
 geospatial_lon_resolution,
 geospatial_lon_units,degrees_east
 geospatial_vertical_resolution,
-geospatial_vertical_units,EPSG:4979
+geospatial_vertical_units,meters
 institution,Geological Survey of Denmark and Greenland (GEUS)
 instrument,See https://doi.org/10.5194/essd-13-3819-2021
 instrument_vocabulary,GCMD:GCMD Keywords

pypromice/resources/variable_aliases_GC-Net.csv

@@ -27,8 +27,8 @@ dlhf_u,LHF
 dlhf_l,
 dshf_u,SHF
 dshf_l,
-z_boom_u,HW2
-z_boom_l,HW1
+z_boom_cor_u,HW2
+z_boom_cor_l,HW1
 precip_u,
 precip_u_cor,
 precip_l,

pypromice/resources/variables.csv

@@ -1,18 +1,18 @@
-field,standard_name,long_name,units,coverage_content_type,coordinates,instantaneous_hourly,where_to_find,lo,hi,OOL,station_type,L0,L2,L3,max_decimals
+field,standard_name,long_name,units,coverage_content_type,coordinates,instantaneous_hourly,where_to_find,lo,hi,dependent_variables,station_type,L0,L2,L3,max_decimals
 time,time,Time,yyyy-mm-dd HH:MM:SS,physicalMeasurement,time,,,,,,all,1,1,1,
 rec,record,Record,-,referenceInformation,time,,L0 or L2,,,,all,1,1,0,0
-p_u,air_pressure,Air pressure (upper boom),hPa,physicalMeasurement,time,FALSE,,650,1100,"",all,1,1,1,4
-p_l,air_pressure,Air pressure (lower boom),hPa,physicalMeasurement,time,FALSE,,650,1100,"",two-boom,1,1,1,4
-t_u,air_temperature,Air temperature (upper boom),degrees_C,physicalMeasurement,time,FALSE,,-80,40,"",all,1,1,1,4
-t_l,air_temperature,Air temperature (lower boom),degrees_C,physicalMeasurement,time,FALSE,,-80,40,"",two-boom,1,1,1,4
-rh_u,relative_humidity,Relative humidity (upper boom),%,physicalMeasurement,time,FALSE,,0,100,"",all,1,1,1,4
+p_u,air_pressure,Air pressure (upper boom),hPa,physicalMeasurement,time,FALSE,,650,1100,z_pt_cor dlhf_u dshf_u,all,1,1,1,4
+p_l,air_pressure,Air pressure (lower boom),hPa,physicalMeasurement,time,FALSE,,650,1100,dlhf_l dshf_l,two-boom,1,1,1,4
+t_u,air_temperature,Air temperature (upper boom),degrees_C,physicalMeasurement,time,FALSE,,-80,40,z_boom_cor_l z_boom_cor_u z_stake_cor qh_u rh_u_wrt_ice_or_water dlhf_u dshf_u,all,1,1,1,4
+t_l,air_temperature,Air temperature (lower boom),degrees_C,physicalMeasurement,time,FALSE,,-80,40,dlhf_l dshf_l,two-boom,1,1,1,4
+rh_u,relative_humidity,Relative humidity (upper boom),%,physicalMeasurement,time,FALSE,,0,100,qh_u rh_u_wrt_ice_or_water dlhf_u dshf_u,all,1,1,1,4
 rh_u_wrt_ice_or_water,relative_humidity_with_respect_to_ice_or_water,Relative humidity (upper boom) with respect to saturation over ice in subfreezing conditions and over water otherwise,%,modelResult,time,FALSE,L2 or later,0,150,"",all,0,1,1,4
 qh_u,specific_humidity,Specific humidity (upper boom),kg/kg,modelResult,time,FALSE,L2 or later,0,100,"",all,0,1,1,4
-rh_l,relative_humidity,Relative humidity (lower boom),%,physicalMeasurement,time,FALSE,,0,100,"",two-boom,1,1,1,4
+rh_l,relative_humidity,Relative humidity (lower boom),%,physicalMeasurement,time,FALSE,,0,100,qh_l rh_l_wrt_ice_or_water dlhf_l dshf_l,two-boom,1,1,1,4
 rh_l_wrt_ice_or_water,relative_humidity_with_respect_to_ice_or_water,Relative humidity (lower boom) with respect to saturation over ice in subfreezing conditions and over water otherwise,%,modelResult,time,FALSE,L2 or later,0,150,"",two-boom,0,1,1,4
 qh_l,specific_humidity,Specific humidity (lower boom),kg/kg,modelResult,time,FALSE,L2 or later,0,100,,two-boom,0,1,1,4
-wspd_u,wind_speed,Wind speed (upper boom),m s-1,physicalMeasurement,time,FALSE,,0,100,wdir_u wspd_x_u wspd_y_u,all,1,1,1,4
-wspd_l,wind_speed,Wind speed (lower boom),m s-1,physicalMeasurement,time,FALSE,,0,100,wdir_l wspd_x_l wspd_y_l,two-boom,1,1,1,4
+wspd_u,wind_speed,Wind speed (upper boom),m s-1,physicalMeasurement,time,FALSE,,0,100,wdir_u wspd_x_u wspd_y_u rainfall_cor_u,all,1,1,1,4
+wspd_l,wind_speed,Wind speed (lower boom),m s-1,physicalMeasurement,time,FALSE,,0,100,wdir_l wspd_x_l wspd_y_l rainfall_cor_l,two-boom,1,1,1,4
 wdir_u,wind_from_direction,Wind from direction (upper boom),degrees,physicalMeasurement,time,FALSE,,1,360,wspd_x_u wspd_y_u,all,1,1,1,4
 wdir_std_u,wind_from_direction_standard_deviation,Wind from direction (standard deviation),degrees,qualityInformation,time,FALSE,L0 or L2,,,,one-boom,1,1,0,4
 wdir_l,wind_from_direction,Wind from direction (lower boom),degrees,physicalMeasurement,time,FALSE,,1,360,wspd_x_l wspd_y_l,two-boom,1,1,1,4
@@ -33,23 +33,26 @@ dlhf_u,surface_downward_latent_heat_flux,Latent heat flux (upper boom),W m-2,mod
 dlhf_l,surface_downward_latent_heat_flux,Latent heat flux (lower boom),W m-2,modelResult,time,FALSE,L3 or later,,,,two-boom,0,0,1,4
 dshf_u,surface_downward_sensible_heat_flux,Sensible heat flux (upper boom),W m-2,modelResult,time,FALSE,L3 or later,,,,all,0,0,1,4
 dshf_l,surface_downward_sensible_heat_flux,Sensible heat flux (lower boom),W m-2,modelResult,time,FALSE,L3 or later,,,,two-boom,0,0,1,4
-z_boom_u,distance_to_surface_from_boom,Upper boom height,m,physicalMeasurement,time,TRUE,,0.3,10,"",all,1,1,1,4
+z_boom_u,distance_to_surface_from_boom,Upper boom height,m,physicalMeasurement,time,TRUE,,0.3,10,z_boom_cor_u,all,1,1,1,4
+z_boom_cor_u,distance_to_surface_from_boom_corrected,Upper boom height - corrected,m,modelResult,time,TRUE,,0.3,10,z_boom_u,all,1,1,1,4
 z_boom_q_u,distance_to_surface_from_boom_quality,Upper boom height (quality),-,qualityInformation,time,TRUE,L0 or L2,,,,all,1,1,0,4
-z_boom_l,distance_to_surface_from_boom,Lower boom height,m,physicalMeasurement,time,TRUE,,0.3,5,"",two-boom,1,1,1,4
+z_boom_l,distance_to_surface_from_boom,Lower boom height,m,physicalMeasurement,time,TRUE,,0.3,5,z_boom_cor_l,two-boom,1,1,1,4
+z_boom_cor_l,distance_to_surface_from_boom_corrected,Lower boom height - corrected,m,modelResult,time,TRUE,,0.3,5,z_boom_l,two-boom,1,1,1,4
 z_boom_q_l,distance_to_surface_from_boom_quality,Lower boom height (quality),-,qualityInformation,time,TRUE,L0 or L2,,,,two-boom,1,1,0,4
-z_stake,distance_to_surface_from_stake_assembly,Stake height,m,physicalMeasurement,time,TRUE,,0.3,8,,one-boom,1,1,1,4
+z_stake,distance_to_surface_from_stake_assembly,Stake height,m,physicalMeasurement,time,TRUE,,0.3,8,z_stake_cor,one-boom,1,1,1,4
+z_stake_cor,distance_to_surface_from_stake_assembly_corrected,Stake height - corrected,m,physicalMeasurement,time,TRUE,,0.3,8,z_stake,one-boom,1,1,1,4
 z_stake_q,distance_to_surface_from_stake_assembly_quality,Stake height (quality),-,qualityInformation,time,TRUE,L0 or L2,,,,one-boom,1,1,0,4
-z_pt,depth_of_pressure_transducer_in_ice,Depth of pressure transducer in ice,m,physicalMeasurement,time,FALSE,,0,30,"",one-boom,1,1,1,4
+z_pt,depth_of_pressure_transducer_in_ice,Depth of pressure transducer in ice,m,physicalMeasurement,time,FALSE,,0,30,z_pt_cor,one-boom,1,1,1,4
 z_pt_cor,depth_of_pressure_transducer_in_ice_corrected,Depth of pressure transducer in ice - corrected,m,modelResult,time,FALSE,L2 or later,0,30,,one-boom,0,1,1,4
 z_surf_combined,height_of_surface_combined,"Surface height combined from multiple sensors, relative to ice surface height at installation",m,modelResult,time,FALSE,L3,,,,all,0,0,1,4
 z_ice_surf,height_of_ice_surface,"Ice surface height, relative to ice surface height at installation and calculated from pt_cor and z_stake",m,modelResult,time,FALSE,L3,,,,one-boom,0,0,1,4
 snow_height,height_of_snow,"Snow surface height, relative to ice surface",m,modelResult,time,FALSE,L3,0,,,one-boom,0,0,1,4
-precip_u,precipitation,Precipitation (upper boom) (cumulative solid & liquid),mm,physicalMeasurement,time,TRUE,,0,,"",all,1,1,1,4
-precip_u_cor,precipitation_corrected,Precipitation (upper boom) (cumulative solid & liquid) – corrected,mm,modelResult,time,TRUE,L2 or later,0,,,all,0,1,1,4
-precip_u_rate,precipitation_rate,Precipitation rate (upper boom) (cumulative solid & liquid) – corrected,mm,modelResult,time,TRUE,L2 or later,0,,,all,0,1,1,4
-precip_l,precipitation,Precipitation (lower boom) (cumulative solid & liquid),mm,physicalMeasurement,time,TRUE,,0,,"",two-boom,1,1,1,4
-precip_l_cor,precipitation_corrected,Precipitation (lower boom) (cumulative solid & liquid) – corrected,mm,modelResult,time,TRUE,L2 or later,0,,,two-boom,0,1,1,4
-precip_l_rate,precipitation_rate,Precipitation rate (lower boom) (cumulative solid & liquid) – corrected,mm,modelResult,time,TRUE,L2 or later,0,,,two-boom,0,1,1,4
+precip_u,precipitation_raw_upper,Semi-accumulated uncorrected liquid precipitation (upper boom),mm,physicalMeasurement,time,TRUE,L0 or L2,0,,rainfall_u,all,1,1,0,4
+rainfall_u,rainfall_per_timestep_uncorrected_upper,Rainfall within timestep uncorrected for undercatch (upper boom),mm,modelResult,time,FALSE,L2 or later,0,,rainfall_cor_u,all,0,1,1,4
+rainfall_cor_u,rainfall_per_timestep_corrected_upper,Rainfall within timestep corrected for undercatch (upper boom),mm,modelResult,time,FALSE,L2 or later,0,,,all,0,1,1,4
+precip_l,precipitation_raw_lower,Semi-accumulated uncorrected liquid precipitation (lower boom),mm,physicalMeasurement,time,TRUE,L0 or L2,0,,rainfall_l,two-boom,1,1,0,4
+rainfall_l,rainfall_per_timestep_uncorrected_lower,Rainfall within timestep uncorrected for undercatch (lower boom),mm,modelResult,time,FALSE,L2 or later,0,,rainfall_cor_l,all,0,1,1,4
+rainfall_cor_l,rainfall_per_timestep_corrected_lower,Rainfall within timestep corrected for undercatch (lower boom),mm,modelResult,time,FALSE,L2 or later,0,,,all,0,1,1,4
 t_i_1,ice_temperature_at_t1,Ice temperature at sensor 1,degrees_C,physicalMeasurement,time,FALSE,,-80,1,,all,1,1,1,4
 t_i_2,ice_temperature_at_t2,Ice temperature at sensor 2,degrees_C,physicalMeasurement,time,FALSE,,-80,1,,all,1,1,1,4
 t_i_3,ice_temperature_at_t3,Ice temperature at sensor 3,degrees_C,physicalMeasurement,time,FALSE,,-80,1,,all,1,1,1,4
@@ -73,8 +76,8 @@ d_t_i_9,depth_of_thermistor_9,Depth of thermistor 9,m,modelResult,time,FALSE,L3,
 d_t_i_10,depth_of_thermistor_10,Depth of thermistor 10,m,modelResult,time,FALSE,L3,-10,100,,two-boom,0,0,1,4
 d_t_i_11,depth_of_thermistor_11,Depth of thermistor 11,m,modelResult,time,FALSE,L3,-10,100,,two-boom,0,0,1,4
 t_i_10m,10m_subsurface_temperature,10 m subsurface temperature,degrees_C,modelResult,time,FALSE,L3,-70,0,,all,0,0,1,4
-tilt_x,platform_view_angle_x,Tilt to east,degrees,physicalMeasurement,time,FALSE,,-30,30,"",all,1,1,1,4
-tilt_y,platform_view_angle_y,Tilt to north,degrees,physicalMeasurement,time,FALSE,,-30,30,"",all,1,1,1,4
+tilt_x,platform_view_angle_x,Tilt to east,degrees,physicalMeasurement,time,FALSE,,-30,30,dsr_cor usr_cor,all,1,1,1,4
+tilt_y,platform_view_angle_y,Tilt to north,degrees,physicalMeasurement,time,FALSE,,-30,30,dsr_cor usr_cor,all,1,1,1,4
 rot,platform_azimuth_angle,Station rotation from true North,degrees,physicalMeasurement,time,FALSE,,0,360,,all,1,1,1,2
 gps_lat,gps_latitude,Latitude,degrees_north,physicalMeasurement,time,TRUE,,50,83,,all,1,1,1,6
 gps_lon,gps_longitude,Longitude,degrees_east,physicalMeasurement,time,TRUE,,5,70,,all,1,1,1,6
@@ -95,10 +98,10 @@ fan_dc_u,fan_current,Fan current (upper boom),mA,physicalMeasurement,time,TRUE,L
 fan_dc_l,fan_current,Fan current (lower boom),mA,physicalMeasurement,time,TRUE,,0,200,,two-boom,1,1,0,2
 freq_vw,frequency_of_precipitation_wire_vibration,Frequency of vibrating wire in precipitation gauge,Hz,physicalMeasurement,time,TRUE,L0 or L2,0,10000,"",,1,1,0,
 t_log,temperature_of_logger,Logger temperature,degrees_C,physicalMeasurement,time,TRUE,,-80,40,,one-boom,1,1,0,4
-t_rad,temperature_of_radiation_sensor,Radiation sensor temperature,degrees_C,physicalMeasurement,time,FALSE,,-80,40,"",all,1,1,1,4
+t_rad,temperature_of_radiation_sensor,Radiation sensor temperature,degrees_C,physicalMeasurement,time,FALSE,,-80,40,dlr ulr,all,1,1,1,4
 p_i,air_pressure,Air pressure (instantaneous) minus 1000,hPa,physicalMeasurement,time,TRUE,,-350,100,,all,1,1,1,4
-t_i,air_temperature,Air temperature (instantaneous),degrees_C,physicalMeasurement,time,TRUE,,-80,40,,all,1,1,1,4
-rh_i,relative_humidity,Relative humidity (instantaneous),%,physicalMeasurement,time,TRUE,,0,150,"",all,1,1,1,4
+t_i,air_temperature,Air temperature (instantaneous),degrees_C,physicalMeasurement,time,TRUE,,-80,40,rh_i_wrt_ice_or_water,all,1,1,1,4
+rh_i,relative_humidity,Relative humidity (instantaneous),%,physicalMeasurement,time,TRUE,,0,150,rh_i_wrt_ice_or_water,all,1,1,1,4
 rh_i_wrt_ice_or_water,relative_humidity_with_respect_to_ice_or_water,Relative humidity (instantaneous) with respect to saturation over ice in subfreezing conditions and over water otherwise,%,modelResult,time,TRUE,L2 or later,0,100,,all,0,1,1,4
 wspd_i,wind_speed,Wind speed (instantaneous),m s-1,physicalMeasurement,time,TRUE,,0,100,wdir_i wspd_x_i wspd_y_i,all,1,1,1,4
 wdir_i,wind_from_direction,Wind from direction (instantaneous),degrees,physicalMeasurement,time,TRUE,,1,360,wspd_x_i wspd_y_i,all,1,1,1,4

{pypromice-1.5.3.dist-info → pypromice-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypromice
-Version: 1.5.3
+Version: 1.7.0
 Summary: PROMICE/GC-Net data processing toolbox
 Home-page: https://github.com/GEUS-Glaciology-and-Climate/pypromice
 Author: GEUS Glaciology and Climate
@@ -25,7 +25,6 @@ Requires-Dist: toml
 Requires-Dist: scipy>=1.9.0
 Requires-Dist: Bottleneck
 Requires-Dist: netcdf4
-Requires-Dist: pyDataverse==0.3.1
 Requires-Dist: eccodes
 Requires-Dist: scikit-learn>=1.1.0
 Dynamic: author