Skip to content

eCLM-ParFlow related fixes in PDAF interface #30

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

Draft
wants to merge 5 commits into
base: tsmp-pdaf-patched
Choose a base branch
from
Draft

eCLM-ParFlow related fixes in PDAF interface #30

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fcb330
enkf_clm: do not load CLMSA-specific subroutines
jjokella Jul 11, 2025
f26e982
enkf_clm: COUP_OAS_PFL, experimental `cime_pre_init1` call
jjokella Jul 11, 2025
40f3e53
Merge branch 'tsmp-pdaf-patched' into tsmp-pdaf-patched-eclm-pfl-fixes
jjokella Oct 29, 2025
9c6c608
fortitude fix
jjokella Oct 29, 2025
8171094
fix
jjokella Oct 29, 2025
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
12 changes: 12 additions & 0 deletions interface/model/eclm/enkf_clm_5.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,18 @@ subroutine clm_init(finname, pdaf_id, pdaf_max, mype) bind(C,name="clm_init")
!!>> TSMP PDAF comment out beginning
! call cime_pre_init1(esmf_logfile_option)
!!>> TSMP PDAF addition beginning
#if defined CLMSA
call cime_pre_init1(esmf_logfile_option, &
COMM_model_clm, &
pdaf_id=pdaf_id, &
pdaf_max=pdaf_max)
#endif

#if defined COUP_OAS_PFL
! EXPERIMENTAL: For eCLM-ParFlow-PDAF, the whole management of
! communicators has to be re-traced
call cime_pre_init1(esmf_logfile_option)
#endif
!!<< TSMP PDAF addition end

end_count = shr_sys_irtc(irtc_rate)
Expand Down Expand Up @@ -201,7 +209,9 @@ end subroutine clm_init
!--------------------------------------------------------------------------
subroutine clm_advance(ntstep, tstartcycle, mype) bind(C,name="clm_advance")
use cime_comp_mod, only : cime_run
#if defined CLMSA
use enkf_clm_mod, only : set_clm_statevec
#endif
use iso_C_binding, only : c_int

implicit none
Expand Down Expand Up @@ -231,7 +241,9 @@ subroutine clm_finalize() bind(C,name="clm_finalize")

! use ESMF, only : ESMF_Initialize, ESMF_Finalize
use cime_comp_mod, only : cime_final
#if defined CLMSA
use enkf_clm_mod, only : cleanup_clm_statevec
#endif

implicit none

Expand Down