Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not terminate SURFSTAT when running with CICE6 #1030

Merged
merged 3 commits into from
Dec 5, 2024
Merged

do not terminate SURFSTAT when running with CICE6 #1030

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23923cc
do not terminate SURFSTAT when running with CICE6
zhaobin74 Nov 5, 2024
6da8f54
only CICE4 needs this dealloc
zhaobin74 Nov 5, 2024
197de51
Merge branch 'develop' into bugfix/zhaobin1974/do-not-terminate-surfst
sdrabenh Dec 5, 2024
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
9 changes: 7 additions & 2 deletions GEOSdataatm_GridComp/GEOS_DataAtmGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,12 @@ subroutine SetServices ( GC, RC )

! This call is needed only when we use ReadForcing.
! If we switch to use ExtData, next line has be commented out
call MAPL_TerminateImport ( GC, ALL=.true., __RC__ )
if (DO_CICE_THERMO == 2) then
call MAPL_TerminateImport ( GC, SHORT_NAMES=['SURFSTATE'], &
CHILD_IDS=[SURF], __RC__ )
else
call MAPL_TerminateImport ( GC, ALL=.true., __RC__ )
endif

call MAPL_GenericSetServices ( GC, __RC__)

Expand Down Expand Up @@ -1070,7 +1075,7 @@ subroutine Finalize ( gc, import, export, clock, rc )
call MAPL_TimerOn(MAPL,"TOTAL" )
call MAPL_TimerOn(MAPL,"FINALIZE")

if (DO_CICE_THERMO /= 0) call dealloc_column_physics( MAPL_AM_I_Root(), Iam )
if (DO_CICE_THERMO == 1) call dealloc_column_physics( MAPL_AM_I_Root(), Iam )

call MAPL_TimerOff(MAPL,"FINALIZE")
call MAPL_TimerOff(MAPL,"TOTAL" )
Expand Down
Loading