Merge branch 'develop' into feature/sbasu1/verbose_print

GEOS-ESM · Dec 5, 2024 · 194323c · 194323c
2 parents 70b40cd + b539f69
commit 194323c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added macro _RETURN(_SUCCESS) to fetch_data
 - Allow update offsets of &#177;timestep in ExtData2G
 - Minor revision (and generalization) of grid-def for GSI purposes
 - Trajectory sampler: fix a bug when group_name does not exist in netCDF file and a bug that omitted the first time point

diff --git a/pfio/AbstractDataReference.F90 b/pfio/AbstractDataReference.F90
@@ -319,7 +319,7 @@ subroutine fetch_data(this,offset_address,global_shape,offset_start, rc)
          case default
             _FAIL("dimension not supported yet")
       end select
-
+      _RETURN(_SUCCESS)
    end subroutine fetch_data
 
    integer function get_length_base(this) result(length)

diff --git a/pfio/ServerThread.F90 b/pfio/ServerThread.F90
@@ -1154,7 +1154,7 @@ subroutine get_DataFromMem( this, multi_data_read, rc)
 
            offset_address = c_loc(i_ptr(offset+1))
 
-           call mem_data_reference%fetch_data(offset_address,q%global_count,q%start-q%global_start+1)
+           call mem_data_reference%fetch_data(offset_address,q%global_count,q%start-q%global_start+1, _RC)
 
            call this%insert_RequestHandle(q%request_id, &
               & connection%put(q%request_id, mem_data_reference))