Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Check userRC in ESMF_GridCompRun in GOCART2G gridcomp
- The pressure lid change associated with the introduction of run0 to set 0 above the lid
- Fwet value in dust modified from 0.8 to 1.0
- Dust and Sea salt Emission scale factors updated for L181
Expand Down
16 changes: 11 additions & 5 deletions ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ subroutine Run1 (GC, import, export, clock, RC)
type(ESMF_Alarm) :: alarm
logical :: timeToDoWork

integer :: i
integer :: i, user_status

__Iam__('Run1')

Expand Down Expand Up @@ -543,7 +543,9 @@ subroutine Run1 (GC, import, export, clock, RC)
! Run the children
! -----------------
do i = 1, size(gcs)
call ESMF_GridCompRun (gcs(i), importState=gim(i), exportState=gex(i), phase=1, clock=clock, __RC__)
call ESMF_GridCompRun (gcs(i), importState=gim(i), exportState=gex(i), phase=1, clock=clock, userRC=user_status, rc=status)
_VERIFY(status)
_VERIFY(user_status)
end do


Expand Down Expand Up @@ -653,7 +655,7 @@ subroutine Run2 (GC, import, export, clock, RC)
real :: nifactor
real, parameter :: pi = 3.141529265
integer :: ind550, ind532
integer :: i1, i2, j1, j2, km, k,kk
integer :: i1, i2, j1, j2, km, k,kk, user_status
type(ESMF_Alarm) :: alarm
logical :: timeToDoWork

Expand Down Expand Up @@ -684,7 +686,9 @@ subroutine Run2 (GC, import, export, clock, RC)
do i = 1, size(gcs)
call ESMF_GridCompGet (gcs(i), NAME=child_name, __RC__ )
if ((index(child_name, 'data')) == 0) then ! only execute phase3 method if a computational instance
call ESMF_GridCompRun (gcs(i), importState=gim(i), exportState=gex(i), phase=3, clock=clock, __RC__)
call ESMF_GridCompRun (gcs(i), importState=gim(i), exportState=gex(i), phase=3, clock=clock, userRC=user_status, rc=status)
_VERIFY(status)
_VERIFY(user_status)
end if
end do

Expand Down Expand Up @@ -734,7 +738,9 @@ subroutine Run2 (GC, import, export, clock, RC)
do i = 1, size(gcs)
call ESMF_GridCompGet (gcs(i), NAME=child_name, __RC__ )
if ((index(child_name, 'data')) == 0) then ! only execute phase2 method if a computational instance
call ESMF_GridCompRun (gcs(i), importState=gim(i), exportState=gex(i), phase=2, clock=clock, __RC__)
call ESMF_GridCompRun (gcs(i), importState=gim(i), exportState=gex(i), phase=2, clock=clock, userRC=user_status, rc=status)
_VERIFY(status)
_VERIFY(user_status)
end if
end do

Expand Down
Loading