diff --git a/.gitignore b/.gitignore index 9063f86c4..7977ab19d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ $ cat .gitignore *.tws *~ *.png +*.index # Directories **/__pycache__/ diff --git a/LICENSE.md b/LICENSE.md index 67b9ca56e..e431b7efd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2019, Alliance for Sustainable Energy, LLC under the terms of Contract DE-AC36-08GO28308, Battelle Memorial Institute under the terms of Contract DE-AC05-76RL01830, and National Technology & Engineering Solutions of Sandia, LLC under the terms of Contract DE-NA0003525. The U.S. Government retains certain rights in this software. +Copyright (c) 2025, Alliance for Sustainable Energy, LLC under the terms of Contract DE-AC36-08GO28308, Battelle Memorial Institute under the terms of Contract DE-AC05-76RL01830, and National Technology & Engineering Solutions of Sandia, LLC under the terms of Contract DE-NA0003525. The U.S. Government retains certain rights in this software. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/examples/adcp_example.ipynb b/examples/adcp_example.ipynb index 8df4aa02b..d476e0d21 100644 --- a/examples/adcp_example.ipynb +++ b/examples/adcp_example.ipynb @@ -44,7 +44,7 @@ }, { "cell_type": "code", - "execution_count": 33, + "execution_count": 1, "metadata": { "scrolled": true }, @@ -73,7 +73,7 @@ }, { "cell_type": "code", - "execution_count": 34, + "execution_count": 2, "metadata": { "scrolled": true }, @@ -82,6 +82,7 @@ "name": "stdout", "output_type": "stream", "text": [ + "Indexing data/dolfyn/Sig1000_tidal.ad2cp... Done.\n", "Reading file data/dolfyn/Sig1000_tidal.ad2cp ...\n" ] } @@ -100,7 +101,7 @@ }, { "cell_type": "code", - "execution_count": 35, + "execution_count": 3, "metadata": {}, "outputs": [ { @@ -520,33 +521,33 @@ " coord_sys: earth\n", " fs: 1\n", " has_imu: 1\n", - " beam_angle: 25
<xarray.Dataset> Size: 379kB\n",
- "Dimensions: (time: 183, range: 28, dirIMU: 3, dir: 4, beam: 4,\n",
+ "Dimensions: (time: 183, dirIMU: 3, dir: 4, range: 28, beam: 4,\n",
" earth: 3, inst: 3, q: 4, time_b5: 183, range_b5: 28)\n",
"Coordinates:\n",
" * time (time) datetime64[ns] 1kB 2020-08-15T00:22:30.001030683 ....\n",
" * dirIMU (dirIMU) <U10 120B 'streamwise' 'x-stream' 'vert'\n",
- " * range (range) float64 224B 1.2 1.7 2.2 2.7 ... 13.2 13.7 14.2 14.7\n",
" * dir (dir) <U10 160B 'streamwise' 'x-stream' 'vert1' 'vert2'\n",
+ " * range (range) float64 224B 1.2 1.7 2.2 2.7 ... 13.2 13.7 14.2 14.7\n",
" * beam (beam) int32 16B 1 2 3 4\n",
" * earth (earth) <U1 12B 'E' 'N' 'U'\n",
" * inst (inst) <U1 12B 'X' 'Y' 'Z'\n",
@@ -2018,18 +2019,18 @@
" * range_b5 (range_b5) float64 224B 1.2 1.7 2.2 2.7 ... 13.7 14.2 14.7\n",
"Data variables: (12/38)\n",
" c_sound (time) float32 732B 1.502e+03 1.502e+03 ... 1.498e+03\n",
- " U_std (range, time) float32 20kB 0.04232 0.04293 ... nan nan\n",
" temp (time) float32 732B 14.49 14.59 14.54 ... 13.62 13.56 13.5\n",
" pressure (time) float32 732B 9.712 9.699 9.685 ... 9.58 9.584 9.591\n",
" mag (dirIMU, time) float32 2kB 3.534 3.565 ... -197.1 -197.1\n",
" accel (dirIMU, time) float32 2kB -1.261 -1.263 ... 9.714 9.712\n",
+ " batt (time) float32 732B 16.48 16.48 16.48 ... 16.25 16.26 16.26\n",
" ... ...\n",
- " boost_running (time) float32 732B 0.1267 0.1333 0.13 ... 0.2267 0.22 0.22\n",
" heading (time) float32 732B 3.287 3.261 3.337 ... 3.331 3.352 3.352\n",
" pitch (time) float32 732B -0.05523 -0.07217 ... -0.04288 -0.0429\n",
" roll (time) float32 732B -7.414 -7.424 -7.404 ... -6.433 -6.436\n",
" water_density (time) float32 732B 1.023e+03 1.023e+03 ... 1.023e+03\n",
" depth (time) float32 732B 10.28 10.26 10.25 ... 10.14 10.15 10.15\n",
+ " U_std (range, time) float32 20kB 0.04232 0.04293 ... nan nan\n",
"Attributes: (12/41)\n",
" fs: 1\n",
" n_bin: 300\n",
@@ -2043,7 +2044,7 @@
" range_offset: 0.6\n",
" declination: 15.8\n",
" declination_in_orientmat: 1\n",
- " principal_heading: 11.1898<xarray.Dataset> Size: 11MB\n",
+ "Dimensions: (time: 18073, time_altraw: 35, range: 13, beam: 4,\n",
+ " dir: 4, dirIMU: 3, n_altraw: 2583, x1: 4, x2: 4,\n",
+ " earth: 3, inst: 3)\n",
+ "Coordinates:\n",
+ " * time (time) datetime64[ns] 145kB 2024-10-22T19:29:36.3...\n",
+ " * time_altraw (time_altraw) datetime64[ns] 280B 2024-10-22T19:2...\n",
+ " * range (range) float64 104B 38.7 42.2 45.7 ... 77.2 80.7\n",
+ " * beam (beam) int32 16B 1 2 3 4\n",
+ " * dir (dir) int32 16B 1 2 3 4\n",
+ " * dirIMU (dirIMU) <U1 12B 'X' 'Y' 'Z'\n",
+ " * x1 (x1) int32 16B 1 2 3 4\n",
+ " * x2 (x2) int32 16B 1 2 3 4\n",
+ " * earth (earth) <U1 12B 'E' 'N' 'U'\n",
+ " * inst (inst) <U1 12B 'X' 'Y' 'Z'\n",
+ "Dimensions without coordinates: n_altraw\n",
+ "Data variables: (12/39)\n",
+ " c_sound (time) float32 72kB 1.503e+03 ... 1.485e+03\n",
+ " temp (time) float32 72kB 13.93 13.92 13.92 ... 8.23 8.23\n",
+ " pressure (time) float32 72kB 0.768 0.765 ... 74.71 74.71\n",
+ " heading (time) float32 72kB 216.1 215.8 ... 212.7 212.9\n",
+ " pitch (time) float32 72kB -27.59 -28.03 ... 2.21 2.22\n",
+ " roll (time) float32 72kB 73.04 71.68 67.74 ... -0.36 -0.4\n",
+ " ... ...\n",
+ " low_volt_skip (time) uint8 18kB 0 0 0 0 0 0 0 0 ... 0 0 0 0 0 0 0\n",
+ " active_config (time) uint8 18kB 0 0 0 0 0 0 0 0 ... 0 0 0 0 0 0 0\n",
+ " telemetry_data (time) uint8 18kB 0 0 0 0 0 0 0 0 ... 0 0 0 0 0 0 0\n",
+ " boost_running (time) uint8 18kB 0 0 0 0 0 0 0 0 ... 0 0 0 0 0 0 0\n",
+ " beam2inst_orientmat (x1, x2) float32 64B 1.462 0.0 -1.462 ... 0.0 0.532\n",
+ " orientmat (earth, inst, time) float32 651kB -0.5221 ... 0.9992\n",
+ "Attributes: (12/39)\n",
+ " filehead_config: {"CLOCKSTR": {"TIME": "\\"2024-10-22 19:29:32\\""}, ...\n",
+ " inst_model: Signature250\n",
+ " inst_make: Nortek\n",
+ " inst_type: ADCP\n",
+ " burst_config: {"press_valid": true, "temp_valid": true, "compass...\n",
+ " n_cells: 13\n",
+ " ... ...\n",
+ " rotate_vars: ['vel', 'accel', 'mag']\n",
+ " coord_sys: beam\n",
+ " fs: 1\n",
+ " bandwidth: "BROAD"\n",
+ " has_imu: 0\n",
+ " beam_angle: 20