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 #1991 #2001

Merged
merged 2 commits into from
Mar 6, 2023
Merged

fixes #1991 #2001

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
a0400e2
fixes #1991
bena-nasa Mar 3, 2023
e158974
Update for 2.35.2 release
mathomp4 Mar 3, 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
14 changes: 14 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,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.35.2] - 2023-03-03

### Changed

- Updated ExtData test case2 to handle a wider range of test times for more robust testing

### Fixed

- Fixed bug in climatology hanlding of data in ExtDataV2 that occurred depending on the start date of the application relative to the length of the application run time

### Removed

- Removed test case 2 for ExtDataV1 as there as an apparent bug in climatologies that has been fixed for ExtDataV2 but there appears to be a different but in ExtDataV1 that causes the extended case 2 to fail

## [2.35.1] - 2023-03-01

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

# Set the default build type to release
Expand Down
2 changes: 2 additions & 0 deletions Tests/ExtData_Testing_Framework/test_cases/case2/CAP2.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ HEARTBEAT_DT: 3600

#RUN_EXTDATA: .false.
RUN_TIMES::
20071025 210000
20071125 210000
20071126 210000
20080226 210000
::

1 change: 0 additions & 1 deletion Tests/ExtData_Testing_Framework/test_cases/extdata_1g_cases.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
case1
case2
case3
case4
case5
Expand Down
22 changes: 19 additions & 3 deletions gridcomps/ExtData2G/ExtDataFileStream.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,25 @@ function new_ExtDataFileStream(config,current_time,unusable,rc) result(data_set)
allocate(data_set%valid_range(2))
data_set%valid_range(1)=string_to_esmf_time(range_str(:idx-1))
data_set%valid_range(2)=string_to_esmf_time(range_str(idx+1:))
call ESMF_TimeGet(data_set%reff_time,yy=iyy,mm=imm,dd=idd,h=ihh,m=imn,_RC)
call ESMF_TimeGet(data_set%valid_range(1),yy=iyy,_RC)
call ESMF_TimeSet(data_set%reff_time,yy=iyy,mm=imm,dd=idd,h=ihh,m=imn,_RC)

last_token = index(data_set%file_template,'%',back=.true.)
if (last_token.gt.0) then
call ESMF_TimeGet(data_set%valid_range(1), yy=iyy, mm=imm, dd=idd,h=ihh, m=imn, s=isc ,_RC)
token = data_set%file_template(last_token+1:last_token+2)
select case(token)
case("y4")
call ESMF_TimeSet(data_set%reff_time,yy=iyy,mm=1,dd=1,h=0,m=0,s=0,_RC)
case("m2")
call ESMF_TimeSet(data_set%reff_time,yy=iyy,mm=imm,dd=1,h=0,m=0,s=0,_RC)
case("d2")
call ESMF_TimeSet(data_set%reff_time,yy=iyy,mm=imm,dd=idd,h=0,m=0,s=0,_RC)
case("h2")
call ESMF_TimeSet(data_set%reff_time,yy=iyy,mm=imm,dd=idd,h=ihh,m=0,s=0,_RC)
case("n2")
call ESMF_TimeSet(data_set%reff_time,yy=iyy,mm=imm,dd=idd,h=ihh,m=imn,s=0,_RC)
end select
end if

end if
data_set%collection_id = MAPL_DataAddCollection(data_set%file_template)

Expand Down