Merge branch 'develop' into feature/mathomp4/fixes-for-flang

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 ±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
@@ -42,6 +43,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Use v7.27.0 Baselibs
   - Use GCC 14 for GNU tests
   - Add pFUnit-less build test
+- Improve some writes to be more informative
+  - In `base/MAPL_CFIO.F90`, added `Iam` to a print statement so that when a read fails we know which routine failed
+  - In `gridcomps/ExtData2G/ExtDataConfig.F90`, print out the name of the duplicate collection that causes model to fail
 
 ### Fixed
 

base/MAPL_CFIO.F90

@@ -2840,8 +2840,8 @@ subroutine MAPL_CFIOReadBundle ( FILETMPL, TIME, BUNDLE, NOREAD, RC, &
     call fill_grads_template ( filename, filetmpl, &
                            experiment_id=EXPID, nymd=nymd, nhms=nhms, rc=status )
     _VERIFY(STATUS)
-    !call WRITE_PARALLEL("CFIO: Reading " // trim(filename))
-    if (mapl_am_i_root()) write(*,*)"CFIO: Reading ",trim(filename)," at ",nymd," ",nhms
+
+    if (mapl_am_i_root()) write(*,'(a, ": Reading ", a, " at ", i8, " ", i6)') Iam, trim(filename), nymd, nhms
 
 
     cfioIsCreated = .false.

gridcomps/ExtData2G/ExtDataConfig.F90

@@ -107,7 +107,7 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_
          do while (ESMF_HConfigIterLoop(hconfigIter,hconfigIterBegin,hconfigIterEnd))
             hconfig_key = ESMF_HConfigAsStringMapKey(hconfigIter,_RC)
             temp_ds => ext_config%file_stream_map%at(hconfig_key)
-            _ASSERT(.not.associated(temp_ds),"defined duplicate named collection")
+           _ASSERT(.not.associated(temp_ds),"defined duplicate named collection " // trim(hconfig_key))
             single_collection = ESMF_HConfigCreateAtMapVal(hconfigIter,_RC)
             ds = ExtDataFileStream(single_collection,current_time,_RC)
             call ext_config%file_stream_map%insert(trim(hconfig_key),ds)

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)

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))