Skip to content
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

Auto PR - develop → MAPL-v3 - Fixes #1483. Fixed the rank of variable declaration #1485

Merged
merged 10 commits into from
Apr 19, 2022
+17 −7
Merged

Auto PR - develop → MAPL-v3 - Fixes #1483. Fixed the rank of variable declaration #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a6d0a7
more infomation if get_var fails
weiyuan-jiang Feb 6, 2022
3a482c5
Merge branch 'develop' into feature/wjiang/get_var_info
weiyuan-jiang Feb 7, 2022
ac13f10
Prepare for 2.20.0 Release
mathomp4 Apr 18, 2022
47c6e09
Merge branch 'develop' into feature/mathomp4/prepare-for-mapl-2200
mathomp4 Apr 18, 2022
141daec
Fixes #1483. Fixed the rank of variable declaration
atrayano Apr 18, 2022
a3b2214
Merge pull request #1484 from GEOS-ESM/bugfix/atrayano/#1483_correct_…
mathomp4 Apr 18, 2022
72522e2
Merge branch 'develop' into feature/mathomp4/prepare-for-mapl-2200
mathomp4 Apr 18, 2022
f97ed87
Merge pull request #1481 from GEOS-ESM/feature/mathomp4/prepare-for-m…
mathomp4 Apr 19, 2022
71e3916
Merge branch 'develop' into feature/wjiang/get_var_info
tclune Apr 19, 2022
ad9f468
Merge pull request #1339 from GEOS-ESM/feature/wjiang/get_var_info
mathomp4 Apr 19, 2022
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
18 changes: 14 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

### Added

### Changed

### Removed

### Deprecated

## [2.20.0] - 2022-04-19

### Fixed

- Removed one redundant get_file_extension call
- Fix issue where ACG was called when no file had changed
- Add missing `rc=status` in `MAPL_GetResourceFromMAPL_scalar`
- Fixed bugs with next generation ExtData
- Fixed variable PTR40 declaration in GenericCplComp.F90

### Added

- Added support for 4d variables in the coupler. Intentionally decided not to support 4d in the coupler's ReadRestart and WriteRestart to catch errors
- Added ability to use multiple rules for different time periods in next generation ExtData

Expand All @@ -26,10 +40,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- ESMA_env v3.13.0
- ESMA_cmake v3.12.0

### Removed

### Deprecated

## [2.19.2] - 2022-03-28

### Fixed
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 @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)

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

# Set the default build type to release
Expand Down
2 changes: 1 addition & 1 deletion generic/GenericCplComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ subroutine ZERO_CLEAR_COUNT(STATE, RC)
real, pointer :: PTR10(:)
real, pointer :: PTR20(:,:)
real, pointer :: PTR30(:,:,:)
real, pointer :: PTR40(:,:,:)
real, pointer :: PTR40(:,:,:,:)

character(*), parameter :: IAm="ZERO_CLEAR_COUNT"
integer :: STATUS
Expand Down
2 changes: 1 addition & 1 deletion pfio/NetCDF4_get_var.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
status = nf90_inq_varid(this%ncid, name=var_name, varid=varid)
!$omp end critical

_VERIFY(status)
_ASSERT(status==0,"Variable not found: "//trim(var_name))
!$omp critical
#if (_RANK == 0)
status = nf90_get_var(this%ncid, varid, values)
Expand Down