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 GitFlow - main → develop #3134

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Auto GitFlow - main → develop #3134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
087b3ba
fixs #3131
bena-nasa Oct 28, 2024
958144c
Update CMakelists and changelog for 2.50.2
mathomp4 Oct 29, 2024
306ca39
Merge pull request #3132 from GEOS-ESM/hotfix/bmauer/fixes-#3131
tclune Oct 29, 2024
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
6 changes: 6 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,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.50.2] - 2024-10-30

### Fixed

- Fixed bug with cycle placement in coupler loop in History

## [2.50.1] - 2024-10-18

### 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 @@ -8,7 +8,7 @@ endif ()

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

# Set the possible values of build type for cmake-gui
Expand Down
2 changes: 1 addition & 1 deletion gridcomps/History/MAPL_HistoryGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3394,9 +3394,9 @@ subroutine Run ( gc, import, export, clock, rc )
!-------------------------------

do n = 1, nlist
if(Ignore(n)) cycle
call MAPL_TimerOn(GENSTATE,trim(list(n)%collection))
call MAPL_TimerOn(GENSTATE,"Couplers")
if(Ignore(n)) cycle
if (.not.list(n)%disabled .and. IntState%average(n)) then
! R8 to R4 copy (if needed!)
do m=1,list(n)%field_set%nfields
Expand Down
Loading