Skip to content

GitFlow: Merge develop into main for 2.64 release #4229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathomp4 merged 15 commits into from
Dec 5, 2025
Merged

GitFlow: Merge develop into main for 2.64 release #4229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e1e83a7
added pfaf index to MAPL_Locstream
weiyuan-jiang Aug 15, 2025
9f2da3f
change pfaf_index to local
weiyuan-jiang Aug 19, 2025
9150e99
add a simple mapl_locstream
weiyuan-jiang Aug 25, 2025
b99acba
remove use_pfaf
weiyuan-jiang Sep 10, 2025
24468d0
Merge branch 'develop' into feature/wjiang/pfaf_index
mathomp4 Sep 11, 2025
2e01a70
Merge branch 'develop' into feature/wjiang/pfaf_index
mathomp4 Sep 11, 2025
d22d1af
Merge branch 'develop' into feature/wjiang/pfaf_index
weiyuan-jiang Oct 24, 2025
332cc0e
Merge branch 'develop' into feature/wjiang/pfaf_index
mathomp4 Oct 30, 2025
a7ea4eb
Fix Changelog
mathomp4 Oct 30, 2025
90dcf04
Merge branch 'develop' into feature/wjiang/pfaf_index
mathomp4 Oct 30, 2025
a31ed4b
Merge branch 'develop' into feature/wjiang/pfaf_index
weiyuan-jiang Dec 3, 2025
f17f32b
Fix typo in CHANGELOG.md for grid enforcement
gmao-rreichle Dec 3, 2025
5f8581d
Merge branch 'develop' into feature/wjiang/pfaf_index
mathomp4 Dec 5, 2025
83af781
Prepare for 2.64.0 release
mathomp4 Dec 5, 2025
a761bfa
Merge pull request #4000 from GEOS-ESM/feature/wjiang/pfaf_index
mathomp4 Dec 5, 2025
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.64.0] - 2025-12-05

### Added

- Added `pfaf_index` to `MAPL_Losctream`
- Added a simple MAPL_LosctreamCreate

### Changed

- Enforced presence of `grid` when reading binary tile file

## [2.63.1] - 2025-11-25

### Changed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif ()

project (
MAPL
VERSION 2.63.1
VERSION 2.64.0
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the possible values of build type for cmake-gui
Expand Down
Loading
Loading