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

Jump to bottom

Auto GitFlow - main → develop #1974

Merged
merged 5 commits into from
Feb 14, 2023
Merged

Auto GitFlow - main → develop #1974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c5dcd8
fixes issue #1957
bena-nasa Feb 13, 2023
7c58ad5
update changelog
bena-nasa Feb 13, 2023
548188d
don't need comms mod
bena-nasa Feb 14, 2023
2c9266c
Update changelog and cmakelists for 2.34.3 release
mathomp4 Feb 14, 2023
ecbaecd
Merge pull request #1972 from GEOS-ESM/hotfix/bmauer/fixes-#1957
tclune Feb 14, 2023
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
10 changes: 10 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,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.34.3] - 2023-02-14

### Added

- Added test cases 28 and 29 to ExtData testing framework

### Fixed

- Fix bug in ExtData2G when used in "Replay" in the GEOSgcm

## [2.34.2] - 2023-01-19

### 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.34.2
VERSION 2.34.3
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the default build type to release
Expand Down
3 changes: 2 additions & 1 deletion Tests/ExtDataDriverGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ subroutine run_MultipleTimes(gc, rc)
call cap%run_one_step(status)
_VERIFY(status)
enddo
if (mapl_am_i_root()) write(*,*)"Rewinding Clock"
call ESMF_ClockSet(cap%clock,direction=ESMF_DIRECTION_REVERSE,_RC)
do n=1,cap%nsteps
call ESMF_ClockAdvance(cap%clock,rc=status)
Expand Down Expand Up @@ -687,7 +688,7 @@ subroutine run_one_step(this, rc)
end if
call MAPL_MemCommited ( mem_total, mem_commit, mem_percent, RC=STATUS )
if (this%AmIRoot) write(6,1000) AGCM_YY,AGCM_MM,AGCM_DD,AGCM_H,AGCM_M,AGCM_S,mem_percent
1000 format(1x,'AGCM Date: ',i4.4,'/',i2.2,'/',i2.2,2x,'Time: ',i2.2,':',i2.2,':',i2.2,2x,f5.1,'%Memory Committed')
1000 format(1x,'TestDriver Date: ',i4.4,'/',i2.2,'/',i2.2,2x,'Time: ',i2.2,':',i2.2,':',i2.2,2x,f5.1,'%Memory Committed')


_RETURN(ESMF_SUCCESS)
Expand Down
Loading