Skip to content

Commit

Permalink
Merge pull request #3245 from GEOS-ESM/feature/pchakrab/update-config…
Browse files Browse the repository at this point in the history
…urable-gridcomp-follow-up

Follow up for #3231
  • Loading branch information
tclune authored Dec 12, 2024
2 parents e2aceda + b85db7a commit 0d4ae10
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion generic3g/vertical/BasicVerticalGrid.F90
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ logical function can_connect_to(this, dst, rc)
_RETURN(_SUCCESS)
end if

_RETURN(_SUCCESS)
_FAIL("BasicVerticalGrid::can_connect_to - NOT implemented yet")
end function can_connect_to

logical function is_identical_to(this, that, rc)
Expand Down
12 changes: 9 additions & 3 deletions gridcomps/configurable/ConfigurableGridComp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ subroutine init(gridcomp, importState, exportState, clock, rc)
integer :: status

_RETURN(_SUCCESS)
_UNUSED_DUMMY(gridcomp)
_UNUSED_DUMMY(importState)
_UNUSED_DUMMY(exportState)
_UNUSED_DUMMY(clock)
end subroutine init

recursive subroutine run(gridcomp, importState, exportState, clock, rc)
Expand All @@ -45,12 +49,13 @@ recursive subroutine run(gridcomp, importState, exportState, clock, rc)
integer, intent(out) :: rc

integer :: status
character(len=ESMF_MAXSTR) :: gc_name

call ESMF_GridCompGet(gridcomp, name=gc_name, _RC)
call MAPL_RunChildren(gridcomp, phase_name="run", _RC)

_RETURN(_SUCCESS)
_UNUSED_DUMMY(importState)
_UNUSED_DUMMY(exportState)
_UNUSED_DUMMY(clock)
end subroutine run

end module ConfigurableGridComp
Expand All @@ -64,6 +69,7 @@ subroutine setServices(gridcomp, rc)

integer :: status

call Configurable_setServices(gridcomp,_RC)
call Configurable_setServices(gridcomp, _RC)

_RETURN(_SUCCESS)
end subroutine setServices

0 comments on commit 0d4ae10

Please sign in to comment.