Merge branch 'hotfix/NOAA-EMC#301-exportdata' into feature/gocart-int…

…egration
rmontuoro · May 23, 2021 · fd0e4ef · fd0e4ef
2 parents 6b0ef7e + c75cb0a
commit fd0e4ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/atmos_model.F90 b/atmos_model.F90
@@ -771,6 +771,7 @@ subroutine update_atmos_model_state (Atmos, rc)
   type (atmos_data_type), intent(inout) :: Atmos
   integer, optional,      intent(out)   :: rc
 !--- local variables
+  integer :: localrc
   integer :: isec, seconds, isec_fhzero
   real(kind=GFS_kind_phys) :: time_int, time_intfull
 !
@@ -834,9 +835,9 @@ subroutine update_atmos_model_state (Atmos, rc)
 
     !if in coupled mode, set up coupled fields
     if (.not. GFS_control%cplchm) then
-      call setup_exportdata(rc=rc)
-      if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
-        line=__LINE__, file=__FILE__)) return
+      call setup_exportdata(rc=localrc)
+      if (ESMF_LogFoundError(rcToCheck=localrc, msg=ESMF_LOGERR_PASSTHRU, &
+        line=__LINE__, file=__FILE__, rcToReturn=rc)) return
     endif
 
  end subroutine update_atmos_model_state
@@ -2360,7 +2361,7 @@ subroutine setup_exportdata(rc)
                call ESMF_FieldGet(exportFields(n),farrayPtr=datar82d,localDE=0, rc=localrc)
                if (ESMF_LogFoundError(rcToCheck=localrc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__, rcToReturn=rc)) return
              case (3)
-               call ESMF_FieldGet(exportFields(n),farrayPtr=datar82d,localDE=0, rc=localrc)
+               call ESMF_FieldGet(exportFields(n),farrayPtr=datar83d,localDE=0, rc=localrc)
                if (ESMF_LogFoundError(rcToCheck=localrc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__, rcToReturn=rc)) return
              case default
                !--- skip field

diff --git a/module_fcst_grid_comp.F90 b/module_fcst_grid_comp.F90
@@ -808,7 +808,8 @@ subroutine fcst_run_phase_2(fcst_comp, importState, exportState,clock,rc)
       call atmos_model_exchange_phase_2 (atm_int_state%Atm, rc=rc)
       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
 
-      call update_atmos_model_state (atm_int_state%Atm)
+      call update_atmos_model_state (atm_int_state%Atm, rc=rc)
+      if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
 
 !--- intermediate restart
       if (atm_int_state%intrm_rst>0) then