Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/run-test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
os: [macOS, ubuntu]
inlcude:
include:
- os: macos-latest
PLAT: arm64
INTERFACE64: ""
Expand Down
1 change: 1 addition & 0 deletions continuous-integration/environment-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ dependencies:
- matplotlib
- dask
- boto3
- arm-test-data
- distributed
- xarray==2025.6.1
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "radclss"
version = "2026.3.3"
version = "2026.2.24"
description = "Extracted Radar Columns and In Situ Sensors"
readme = "README.md"
requires-python = ">=3.9"
Expand All @@ -19,7 +19,6 @@ dependencies = [
"act-atmos",
"matplotlib",
"dask",
"boto3",
]

[tool.setuptools]
Expand Down
18 changes: 18 additions & 0 deletions src/radclss/config/default_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,24 @@
"signal_to_noise_ratio_copolar_h",
"signal_to_noise_ratio_copolar_v",
],
"radar_csapr2": [
"classification_mask",
"censor_mask",
"uncorrected_copol_correlation_coeff",
"uncorrected_differential_phase",
"uncorrected_differential_reflectivity",
"uncorrected_differential_reflectivity_lag_1",
"uncorrected_mean_doppler_velocity_h",
"uncorrected_mean_doppler_velocity_v",
"uncorrected_reflectivity_h",
"uncorrected_reflectivity_v",
"uncorrected_spectral_width_h",
"uncorrected_spectral_width_v",
"signal_to_noise_ratio_copolar_h",
"signal_to_noise_ratio_copolar_v",
"normalized_coherent_power",
"normalized_coherent_power_v",
],
"met": [
"base_time",
"time_offset",
Expand Down
2 changes: 1 addition & 1 deletion src/radclss/config/output_config.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OUTPUT_SITE = "BNF"
OUTPUT_FACILITY = "S2"
OUTPUT_FACILITY = "M1"
OUTPUT_PLATFORM = "radclss"
OUTPUT_LEVEL = "c2"
OUTPUT_GATE_TIME_ATTRS = {
Expand Down
21 changes: 12 additions & 9 deletions src/radclss/core/radclss_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def radclss(
time_coords : str
The instrument to base the time coordinates off of, or an averaging interval
in minutes or seconds. For example "radar_csapr2cmac" will use the CSAPR2 times as
the time coordinate for all of the data. "5Min" will average all data to a five
minute resolution using pandas date_range.
the time coordinate for all of the data. NEXRAD is currently not supported as a time coordinate, but can be used as a reference for reindexing.
If the specified time coordinate is not found in the volumes, then an error will be raised.
serial : bool, optional
Option to denote serial processing. Set to False to use dask cluster for
subsetting columns in parallel. Default is True.
Expand Down Expand Up @@ -90,6 +90,9 @@ def radclss(
if discard_var == {}:
discard_var = DEFAULT_DISCARD_VAR

if "sonde" not in volumes.keys():
volumes["sonde"] = None

if verbose:
print("=" * 80)
print(f"RadCLss Processing for {volumes['date']}")
Expand All @@ -114,7 +117,10 @@ def radclss(
if verbose:
print(f"Using {time_coords} as time basis")
print(f"Number of {time_coords} files: {len(volumes[time_coords])}")

else:
raise NotImplementedError(
"Currently, only radar-based time coordinates are supported. Please specify a radar key from the volumes dictionary as the time_coords argument."
)
# Call Subset Points
columns = {}
if verbose:
Expand Down Expand Up @@ -241,18 +247,13 @@ def radclss(
f" NEXRAD site: {nexrad_site if nexrad_site else 'auto-detect from ARM site'}"
)

if "radar" in time_coords or time_coords.lower() == "nexrad":
if "radar" in time_coords:
time_list = sorted(
[
str(x["base_time"].dt.strftime("%Y-%m-%dT%H:%M:%S").values[0])
for x in columns[time_coords]
]
)
else:
time_list = [
x.strftime("%Y-%m-%dT%H:%M:%S")
for x in pd.date_range(min_time, max_time, time_coords)
]

if verbose:
print(f" Number of NEXRAD time steps to fetch: {len(time_list)}")
Expand Down Expand Up @@ -620,6 +621,8 @@ def _get_nexrad_wrapper(time_str):
# Find all of the met stations and match to columns
vol_keys = list(volumes.keys())
for k in vol_keys:
if k == "sonde":
continue
if len(volumes[k]) == 0:
if verbose:
print(f"No files found for instrument/site: {k}")
Expand Down
2 changes: 1 addition & 1 deletion src/radclss/util/column_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def subset_points(
input_site_dict,
sonde=None,
height_bins=np.arange(500, 8500, 250),
rad_key="radar_cmaccsapr2",
rad_key="radar_csapr2",
**kwargs,
):
"""
Expand Down
Loading
Loading