Skip to content

Hybrid axes support#176

Merged
rbeucher merged 21 commits intomainfrom
hybrid_axes
Feb 1, 2026
Merged

Hybrid axes support#176
rbeucher merged 21 commits intomainfrom
hybrid_axes

Conversation

@rbeucher
Copy link
Member

work in progress

@rbeucher rbeucher marked this pull request as draft January 22, 2026 08:14
@codecov
Copy link

codecov bot commented Jan 22, 2026

Codecov Report

❌ Patch coverage is 40.68966% with 86 lines in your changes missing coverage. Please review.
✅ Project coverage is 61.06%. Comparing base (1460e7e) to head (b5f85cb).
⚠️ Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
src/access_moppy/derivations/calc_utils.py 6.25% 30 Missing ⚠️
src/access_moppy/base.py 6.45% 29 Missing ⚠️
src/access_moppy/vocabulary_processors.py 63.63% 16 Missing ⚠️
src/access_moppy/atmosphere.py 78.57% 6 Missing ⚠️
src/access_moppy/derivations/calc_atmos.py 37.50% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #176      +/-   ##
==========================================
- Coverage   62.24%   61.06%   -1.18%     
==========================================
  Files          19       19              
  Lines        2961     3054      +93     
==========================================
+ Hits         1843     1865      +22     
- Misses       1118     1189      +71     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

…CCESS-ESM1.6_mappings.json, and vocabulary_processors.py for improved readability
…ca.pa-298810_mon.nc in multiple test modules
Copy link
Collaborator

@rhaegar325 rhaegar325 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whole update looks good, working on further test on it, and after that I think it's ready to be merged

@pytest.mark.integration
@pytest.mark.skipif(
not (DATA_DIR / "esm1-6/atmosphere/aiihca.pa-101909_mon.nc").exists(),
not (DATA_DIR / "esm1-6/atmosphere/aiihca.pa-298810_mon.nc").exists(),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those data hasn't been upload yet with this branch.

@rhaegar325 rhaegar325 self-requested a review January 27, 2026 05:25
Copy link
Collaborator

@rhaegar325 rhaegar325 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review: Integration Test Failures

Thanks for adding comprehensive integration tests! The test infrastructure looks solid, but I've identified two critical issues that need to be addressed before this can be merged.

Issue 1: Coordinate Renaming Conflict (huss variable)

Location: atmosphere.pyselect_and_process_variables()

Error:

ValueError: the new name 'lat' conflicts

Root Cause:
The dataset contains both lat (145 points) and lat_v (144 points) as separate variables. When the code attempts to rename lat_vlat, it creates a naming conflict because lat already exists.

Impact: Affects all variables that use staggered grids (V-grid for atmosphere).

Alternatively, we might need to select the appropriate coordinate based on the variable's grid (U-grid vs V-grid) before attempting the rename.


Issue 2: Missing Required Variable (mrso calculation)

Location: derivations/__init__.pyevaluate_expression()

Error:

KeyError: 'depth'

Root Cause:
The calculation for mrso (total soil moisture content) references a depth variable that doesn't exist in the input dataset. The dataset contains soil_model_level_number but not the actual depth values in meters.

Impact: Affects all land variables requiring soil depth information.

Context from logs:

fld_s08i223: data variable → time:1, soil_model_level_number:6, lat:145, lon:192

Might be some issue with the mapping, I will look into those

@rbeucher
Copy link
Member Author

I think the mapping for huss and hus was wrong...I fixed it

@rbeucher
Copy link
Member Author

I have fixed huss and mrso.

@rbeucher rbeucher marked this pull request as ready for review January 30, 2026 01:54
@rbeucher rbeucher merged commit dbca318 into main Feb 1, 2026
2 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants