diff --git a/src/SURFEX/write_diag_seb_watfluxn.F90 b/src/SURFEX/write_diag_seb_watfluxn.F90
index b3bd0c1e243eac07f95b2384826f394a4c4d2c4a..eeee0b2f77c696f8779a2b27e1652c6e16a8b4fa 100644
--- a/src/SURFEX/write_diag_seb_watfluxn.F90
+++ b/src/SURFEX/write_diag_seb_watfluxn.F90
@@ -257,54 +257,7 @@ ENDIF
 !
 IF (DWO%N2M>=1) THEN
   !
-  YRECFM='T2M_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (K)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XT2M(:),IRESP,HCOMMENT=YCOMMENT)
-  !
-  YRECFM='T2MMIN_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (K)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XT2M_MIN(:),IRESP,HCOMMENT=YCOMMENT)
-  IF(GRESET)D%XT2M_MIN(:)=XUNDEF
-  !
-  YRECFM='T2MMAX_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (K)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XT2M_MAX(:),IRESP,HCOMMENT=YCOMMENT)
-  IF(GRESET)D%XT2M_MAX(:)=0.0
-  !
-  YRECFM='Q2M_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (KG/KG)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XQ2M(:),IRESP,HCOMMENT=YCOMMENT)
-  !
-  YRECFM='HU2M_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (-)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XHU2M(:),IRESP,HCOMMENT=YCOMMENT)
-  !
-  YRECFM='HU2MMIN_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (-)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XHU2M_MIN(:),IRESP,HCOMMENT=YCOMMENT)
-  IF(GRESET)D%XHU2M_MIN(:)=XUNDEF
-  !
-  YRECFM='HU2MMAX_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (-)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XHU2M_MAX(:),IRESP,HCOMMENT=YCOMMENT)
-  IF(GRESET)D%XHU2M_MAX(:)=-XUNDEF
-  !
-  YRECFM='ZON10M_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (M/S)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XZON10M(:),IRESP,HCOMMENT=YCOMMENT)
-  !
-  YRECFM='MER10M_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (M/S)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XMER10M(:),IRESP,HCOMMENT=YCOMMENT)
-  !
-  YRECFM='W10M_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (M/S)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XWIND10M(:),IRESP,HCOMMENT=YCOMMENT)
-  !
-  YRECFM='W10MMAX_WAT'
-  YCOMMENT='X_Y_'//YRECFM//' (M/S)'
-  CALL WRITE_SURF(DUO%CSELECT,HPROGRAM,YRECFM,D%XWIND10M_MAX(:),IRESP,HCOMMENT=YCOMMENT)
-  IF(GRESET)D%XWIND10M_MAX(:)=0.0
+  CALL WRITE_DIAG_2M_10M(DUO, DWO, D, '_WAT', HPROGRAM)
   !
 END IF
 !