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

fixes #1522 #1523

Merged
merged 2 commits into from
May 24, 2022
Merged

fixes #1522 #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77607cf
fixes #1522
bena-nasa May 24, 2022
33599f9
Fix CI. Update changelog and cmakelists for 2.21.1 release
mathomp4 May 24, 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
8 changes: 5 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@ workflows:
resource_class: xlarge
repo: GEOSadas
checkout_fixture: true
fixture_branch: develop
# This branch on GEOSadas will be used to track subrepos needed
# for GEOSadas + MAPL develop much like how we do with MAPL 3
fixture_branch: feature/mathomp4/mapldevelop
checkout_mapl_branch: true
mepodevelop: true
develop_repos: "cmake GEOSana_GridComp" # GEOSadas needs some extra branches to work with mainline MAPL
mepodevelop: false
rebuild_procs: 8

##################################################
# - ci/run_fv3: #
# name: run-FV3-on-<< matrix.compiler >> #
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Adding missing _RETURN and _VERIFY macros in GriddedIO.F90

### Added

### Changed
Expand All @@ -17,6 +19,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.21.1] - 2022-05-24

### Fixed

- Adding missing _RETURN and _VERIFY macros in GriddedIO.F90
- Update CircleCI to work with latest GEOSadas

## [2.21.0] - 2022-05-05

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

# Set the default build type to release
Expand Down
12 changes: 9 additions & 3 deletions griddedio/GriddedIO.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ subroutine CreateFileMetaData(this,items,bundle,timeInfo,vdata,ogrid,global_attr
call s_iter%next()
enddo
end if
_RETURN(_SUCCESS)

end subroutine CreateFileMetaData

Expand Down Expand Up @@ -323,12 +324,14 @@ subroutine CreateVariable(this,itemName,rc)
newField = MAPL_FieldCreate(field,this%output_grid,lm=this%vData%lm,rc=status)
_VERIFY(status)
call MAPL_FieldBundleAdd(this%output_bundle,newField,rc=status)
_VERIFY(status)
else
newField = MAPL_FieldCreate(field,this%output_grid,rc=status)
_VERIFY(status)
call MAPL_FieldBundleAdd(this%output_bundle,newField,rc=status)
_VERIFY(status)
end if

_RETURN(_SUCCESS)

end subroutine CreateVariable

Expand Down Expand Up @@ -389,7 +392,7 @@ subroutine bundlepost(this,filename,oClients,rc)

tindex = size(this%times)
if (tindex==1) then
call this%stage2DLatLon(filename,oClients=oClients,rc=status)
call this%stage2DLatLon(filename,oClients=oClients,_RC)
end if

if (this%vdata%regrid_type==VERTICAL_METHOD_ETA2LEV) then
Expand Down Expand Up @@ -545,6 +548,7 @@ subroutine RegridScalar(this,itemName,rc)
end if

if (allocated(ptr3d_inter)) deallocate(ptr3d_inter)
_RETURN(_SUCCESS)

end subroutine RegridScalar

Expand Down Expand Up @@ -711,6 +715,7 @@ subroutine RegridVector(this,xName,yName,rc)

if (allocated(xptr3d_inter)) deallocate(xptr3d_inter)
if (allocated(yptr3d_inter)) deallocate(yptr3d_inter)
_RETURN(_SUCCESS)

end subroutine RegridVector

Expand Down Expand Up @@ -786,7 +791,7 @@ subroutine stage2DLatLon(this, fileName, oClients, rc)
call oClients%collective_stage_data(this%write_collection_id,trim(filename),'corner_lats', &
ref,start=localStart, global_start=GlobalStart, global_count=GlobalCount)
end if

_RETURN(_SUCCESS)

end subroutine stage2DLatLon

Expand Down Expand Up @@ -855,6 +860,7 @@ subroutine stageData(this, field, fileName, tIndex, oClients, rc)
end if
call oClients%collective_stage_data(this%write_collection_id,trim(filename),trim(fieldName), &
ref,start=localStart, global_start=GlobalStart, global_count=GlobalCount)
_RETURN(_SUCCESS)

end subroutine stageData

Expand Down