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 CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ authors:
title: oceanarray
version: 0.0.1
date-released: 2025-06-07
url: https://github.com/eleanorfrajka/oceanarray
url: https://github.com/ocean-uhh/oceanarray
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ OceanArray processes raw oceanographic instrument data following CF conventions.
### Installation

```bash
git clone https://github.com/eleanorfrajka/oceanarray.git
git clone https://github.com/ocean-uhh/oceanarray.git
cd oceanarray
pip install -r requirements-dev.txt
pip install -e .
Expand Down Expand Up @@ -48,7 +48,7 @@ stage2.process_mooring('mooring_name')
- Preserve all original data with standardized variable names and metadata
- No quality control applied - pure format conversion

**Stage 2: Temporal Corrections** (`stage2.py`)
**Stage 2: Temporal Corrections** (`stage2.py`)
- Apply clock offset corrections between instruments
- Trim data to deployment period (start_time to end_time)
- Add deployment metadata and processing provenance
Expand Down Expand Up @@ -160,7 +160,7 @@ make html

The documentation includes:
- **Processing Methods**: Methodology for each stage
- **API Reference**: Function and class documentation
- **API Reference**: Function and class documentation
- **Demo Notebooks**: Tutorials and examples
- **Development Guide**: Roadmap and contribution guidelines

Expand All @@ -170,7 +170,7 @@ The documentation includes:

### Current Support
- **Sea-Bird SBE**: CNV and ASCII formats (`.cnv`, `.asc`)
- **RBR**: RSK and ASCII formats (`.rsk`, `.dat`)
- **RBR**: RSK and ASCII formats (`.rsk`, `.dat`)
- **Nortek**: ASCII format with header files (`.aqd`)

### Planned Support
Expand All @@ -189,7 +189,7 @@ pytest
# With coverage
pytest --cov=oceanarray

# Specific test categories
# Specific test categories
pytest tests/test_stage1.py tests/test_stage2.py
```

Expand Down Expand Up @@ -256,7 +256,7 @@ If you use OceanArray in your research, please cite:
@software{oceanarray,
title = {{OceanArray}: A Python framework for oceanographic mooring array processing},
author = {Frajka-Williams, Eleanor},
url = {https://github.com/eleanorfrajka/oceanarray},
url = {https://github.com/ocean-uhh/oceanarray},
year = {2025}
}
```
```
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Contents
:maxdepth: 2
:caption: Help and reference

GitHub Repo <http://github.com/eleanorfrajka/oceanarray>
GitHub Repo <https://github.com/ocean-uhh/oceanarray>
roadmap
oceanarray
faq
Expand Down
2 changes: 1 addition & 1 deletion oceanarray/config/legacy/project_RAPID.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ creator_url: "https://www.noc.ac.uk"
creator_institution: "National Oceanography Centre"
creator_id: https://edmo.seadatanet.org/report/17
array: RAPID
comment: Data file in OS format produced using http://github.com/eleanorfrajka/oceanarray
comment: Data file in OS format produced using https://github.com/ocean-uhh/oceanarray
sea_area: North Atlantic Ocean
sea_area_vocabulary: https://vocab.nerc.ac.uk/collection/C19/current/
#geospatial_lat_min:
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ dynamic = [
"dependencies",
"version",
]
urls.documentation = "https://github.com/eleanorfrajka/oceanarray"
urls.homepage = "https://github.com/eleanorfrajka/oceanarray"
urls.repository = "https://github.com/eleanorfrajka/oceanarray"
urls.documentation = "https://github.com/ocean-uhh/oceanarray"
urls.homepage = "https://github.com/ocean-uhh/oceanarray"
urls.repository = "https://github.com/ocean-uhh/oceanarray"


[tool.setuptools.packages.find]
Expand Down
5 changes: 3 additions & 2 deletions tests/legacy/test_process_rodb.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def test_apply_microcat_with_flags(tmp_path):

# Patch rodbload to return this dataset
import oceanarray.legacy.process_rodb as process_rodb

process_rodb.rodb.rodbload = lambda _: ds

ds_cal = apply_microcat_calibration_from_txt(txt, use_path)
Expand All @@ -85,7 +86,7 @@ def test_apply_microcat_calibration_from_txt(tmp_path):
data_dir = Path(__file__).parent.parent / "data"
txt_file = data_dir / "wb1_12_2015_005.microcat.txt"
use_file = data_dir / "wb1_12_2015_6123.use"

if not txt_file.exists() or not use_file.exists():
pytest.skip("Legacy test data files not available")

Expand All @@ -103,7 +104,7 @@ def test_apply_microcat_calibration_from_txt(tmp_path):
def test_stage2_trim_from_raw(tmp_path):
data_dir = Path(__file__).parent.parent / "data"
raw_file = data_dir / "wb1_12_2015_6123.raw"

if not raw_file.exists():
pytest.skip("Legacy test data files not available")

Expand Down
6 changes: 3 additions & 3 deletions tests/legacy/test_rodb.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ def test_rodbload_missing_time(tmp_path, caplog):

def test_rodbload_raw_file():
file_path = Path(__file__).parent.parent / "data" / "wb1_12_2015_6123.raw"

if not file_path.exists():
pytest.skip("Legacy test data files not available")

variables = ["YY", "MM", "DD", "HH", "T", "C", "P"]
ds = rodbload(file_path, variables)

Expand Down Expand Up @@ -83,7 +83,7 @@ def test_format_latlon():

def test_rodb_read_write_roundtrip():
infile = Path(__file__).parent.parent / "data" / "wb1_12_2015_6123_head10.use"

if not infile.exists():
pytest.skip("Legacy test data files not available")

Expand Down
Loading