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 #3110

Merged
merged 6 commits into from
Oct 18, 2024
Merged

Auto GitFlow - main → develop #3110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f67c4d6
Merge pull request #3090 from GEOS-ESM/develop
mathomp4 Oct 10, 2024
f89ac71
fixes #3073
bena-nasa Oct 18, 2024
9ee50f5
update changelog
bena-nasa Oct 18, 2024
3f73aac
Merge branch 'main' into hotfix/bmauer/fixes-#3073
mathomp4 Oct 18, 2024
a975d51
Update changelog and version for 2.50.1 release
mathomp4 Oct 18, 2024
3baff6e
Merge pull request #3107 from GEOS-ESM/hotfix/bmauer/fixes-#3073
mathomp4 Oct 18, 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.1] - 2024-10-18

### Fixed

- Fixed unitialized variable bug in ExtData exposed by gfortran

## [2.50.0] - 2024-10-10

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

# Set the possible values of build type for cmake-gui
Expand Down
4 changes: 2 additions & 2 deletions gridcomps/ExtData2G/ExtDataBracket.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ module MAPL_ExtDataBracket
real :: offset = 0.0
logical :: disable_interpolation = .false.
logical :: intermittent_disable = .false.
logical :: new_file_right
logical :: new_file_left
logical :: new_file_right = .false.
logical :: new_file_left = .false.
logical :: exact = .false.
contains
procedure :: interpolate_to_time
Expand Down
1 change: 1 addition & 0 deletions gridcomps/ExtData2G/ExtDataOldTypesCreator.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ subroutine fillin_primary(this,item_name,base_name,primary_item,time,clock,unusa
primary_item%cycling=.true.
else if (trim(time_sample%extrap_outside) == "persist_closest") then
primary_item%persist_closest=.true.
primary_item%cycling=.false.
else if (trim(time_sample%extrap_outside) == "none") then
primary_item%cycling=.false.
primary_item%persist_closest=.false.
Expand Down
4 changes: 2 additions & 2 deletions gridcomps/ExtData2G/ExtDataSample.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ function new_ExtDataTimeSample(config,unusable,rc) result(TimeSample)

call TimeSample%set_defaults()

TimeSample%extrap_outside = "none"
if (ESMF_HConfigIsDefined(config,keyString="extrapolation")) then
TimeSample%extrap_outside=ESMF_HConfigAsString(config,keyString="extrapolation",_RC)
end if

TimeSample%time_interpolation = .true.
if (ESMF_HConfigIsDefined(config,keyString="time_interpolation")) then
TimeSample%time_interpolation = ESMF_HConfigAsLogical(config,keyString="time_interpolation",_RC)
else
TimeSample%time_interpolation = .true.
end if

if (ESMF_HConfigIsDefined(config,keyString="exact")) then
Expand Down
Loading