Skip to content

Commit 194323c

Browse files
committed
Merge branch 'develop' into feature/sbasu1/verbose_print
2 parents 70b40cd + b539f69 commit 194323c

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12+
- Added macro _RETURN(_SUCCESS) to fetch_data
1213
- Allow update offsets of ±timestep in ExtData2G
1314
- Minor revision (and generalization) of grid-def for GSI purposes
1415
- Trajectory sampler: fix a bug when group_name does not exist in netCDF file and a bug that omitted the first time point

pfio/AbstractDataReference.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ subroutine fetch_data(this,offset_address,global_shape,offset_start, rc)
319319
case default
320320
_FAIL("dimension not supported yet")
321321
end select
322-
322+
_RETURN(_SUCCESS)
323323
end subroutine fetch_data
324324

325325
integer function get_length_base(this) result(length)

pfio/ServerThread.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ subroutine get_DataFromMem( this, multi_data_read, rc)
11541154

11551155
offset_address = c_loc(i_ptr(offset+1))
11561156

1157-
call mem_data_reference%fetch_data(offset_address,q%global_count,q%start-q%global_start+1)
1157+
call mem_data_reference%fetch_data(offset_address,q%global_count,q%start-q%global_start+1, _RC)
11581158

11591159
call this%insert_RequestHandle(q%request_id, &
11601160
& connection%put(q%request_id, mem_data_reference))

0 commit comments

Comments
 (0)