diff --git a/interface/model/eclm/enkf_clm_5.F90 b/interface/model/eclm/enkf_clm_5.F90
index 873c9722..4dd6bda2 100644
--- a/interface/model/eclm/enkf_clm_5.F90
+++ b/interface/model/eclm/enkf_clm_5.F90
@@ -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)
@@ -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
@@ -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