diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90
index 27b2ba813832ee02ad12e05c4cefcd46eccf39e4..c1be2c51e65e7c16f078c8010a3e21b7f2bf4727 100644
--- a/src/MNH/default_desfmn.f90
+++ b/src/MNH/default_desfmn.f90
@@ -605,7 +605,7 @@ XLON_STAT(:) = XUNDEF
CNAME_STAT(:) = ''
CTYPE_STAT(:) = ''
CFILE_STAT = 'NO_INPUT_CSV'
-LDIAG_RESULTS = .FALSE.
+LDIAG_SURFRAD = .TRUE.
!
!-------------------------------------------------------------------------------
!
diff --git a/src/MNH/modd_allstationn.f90 b/src/MNH/modd_allstationn.f90
index c31413b78a08bf8ea7480265110dcc58331bdff4..933c1657174cab1dfee31f99a8be37abddbb3a12 100644
--- a/src/MNH/modd_allstationn.f90
+++ b/src/MNH/modd_allstationn.f90
@@ -51,7 +51,7 @@ TYPE ALLSTATION_t
CHARACTER(LEN=7), DIMENSION(100) :: CNAME_STAT, CTYPE_STAT
CHARACTER(LEN=20) :: CFILE_STAT
REAL :: XSTEP_STAT
- LOGICAL :: LDIAG_RESULTS
+ LOGICAL :: LDIAG_SURFRAD
!
!
END TYPE ALLSTATION_t
@@ -68,7 +68,7 @@ REAL, DIMENSION(:), POINTER :: XZ_STAT=>NULL()
CHARACTER (LEN=7),DIMENSION(:), POINTER :: CNAME_STAT=>NULL()
CHARACTER (LEN=7),DIMENSION(:), POINTER :: CTYPE_STAT=>NULL()
CHARACTER (LEN=20),POINTER :: CFILE_STAT=>NULL()
-LOGICAL, POINTER :: LDIAG_RESULTS=>NULL()
+LOGICAL, POINTER :: LDIAG_SURFRAD=>NULL()
CONTAINS
SUBROUTINE ALLSTATION_GOTO_MODEL(KFROM, KTO)
@@ -88,7 +88,7 @@ XLON_STAT =>ALLSTATION_MODEL(KTO)%XLON_STAT
CNAME_STAT =>ALLSTATION_MODEL(KTO)%CNAME_STAT
CTYPE_STAT =>ALLSTATION_MODEL(KTO)%CTYPE_STAT
CFILE_STAT =>ALLSTATION_MODEL(KTO)%CFILE_STAT
-LDIAG_RESULTS =>ALLSTATION_MODEL(KTO)%LDIAG_RESULTS
+LDIAG_SURFRAD =>ALLSTATION_MODEL(KTO)%LDIAG_SURFRAD
END SUBROUTINE ALLSTATION_GOTO_MODEL
END MODULE MODD_ALLSTATION_n
diff --git a/src/MNH/modn_stationn.f90 b/src/MNH/modn_stationn.f90
index 6715b3c645ea69132add98d2d21a4371fd3fd78c..f388061e72fd7fc36bf3abc91db723843803f80d 100644
--- a/src/MNH/modn_stationn.f90
+++ b/src/MNH/modn_stationn.f90
@@ -36,7 +36,7 @@ USE MODD_ALLSTATION_n, ONLY:&
CNAME_STAT_n =>CNAME_STAT ,&
CTYPE_STAT_n =>CTYPE_STAT ,&
CFILE_STAT_n =>CFILE_STAT ,&
- LDIAG_RESULTS_n =>LDIAG_RESULTS
+ LDIAG_SURFRAD_n =>LDIAG_SURFRAD
!!
!-----------------------------------------------------------------------------
!
@@ -48,14 +48,14 @@ REAL ,SAVE:: XSTEP_STAT
REAL, DIMENSION(100) ,SAVE:: XX_STAT, XY_STAT, XZ_STAT, XLAT_STAT, XLON_STAT
CHARACTER (LEN=7), DIMENSION(100),SAVE:: CNAME_STAT, CTYPE_STAT
CHARACTER (LEN=20) ,SAVE:: CFILE_STAT !filename
-LOGICAL ,SAVE:: LDIAG_RESULTS
+LOGICAL ,SAVE:: LDIAG_SURFRAD
NAMELIST /NAM_STATIONn/ &
NNUMB_STAT, XSTEP_STAT, &
XX_STAT,XY_STAT,XZ_STAT,&
XLON_STAT,XLAT_STAT,&
CNAME_STAT,CTYPE_STAT,&
- CFILE_STAT,LDIAG_RESULTS
+ CFILE_STAT,LDIAG_SURFRAD
!
CONTAINS
@@ -71,7 +71,7 @@ SUBROUTINE INIT_NAM_STATIONn
CNAME_STAT = CNAME_STAT_n
CTYPE_STAT = CTYPE_STAT_n
CFILE_STAT = CFILE_STAT_n
- LDIAG_RESULTS= LDIAG_RESULTS_n
+ LDIAG_SURFRAD= LDIAG_SURFRAD_n
END SUBROUTINE INIT_NAM_STATIONn
SUBROUTINE UPDATE_NAM_STATIONn
@@ -85,6 +85,6 @@ SUBROUTINE UPDATE_NAM_STATIONn
CNAME_STAT_n = CNAME_STAT
CTYPE_STAT_n = CTYPE_STAT
CFILE_STAT_n = CFILE_STAT
- LDIAG_RESULTS_n= LDIAG_RESULTS
+ LDIAG_SURFRAD_n= LDIAG_SURFRAD
END SUBROUTINE UPDATE_NAM_STATIONn
END MODULE MODN_STATION_n
diff --git a/src/MNH/stationn.f90 b/src/MNH/stationn.f90
index 9af464af447a087c0c898f20d2034684509572d3..4de047e716b3d60dda687a4abe41342d8f6dabcb 100644
--- a/src/MNH/stationn.f90
+++ b/src/MNH/stationn.f90
@@ -91,11 +91,12 @@ USE MODD_CST
USE MODD_DIAG_IN_RUN
USE MODD_GRID
USE MODD_PARAMETERS
-USE MODD_PARAM_n, only: CRAD
-use modd_station_n
-use modd_sub_station_n
-use modd_time, only: tdtexp
-use modd_time_n, only: tdtcur
+USE MODD_PARAM_n, ONLY: CRAD
+USE MODD_STATION_n
+USE MODD_ALLSTATION_n, ONLY: LDIAG_SURFRAD
+USE MODD_SUB_STATION_n
+USE MODD_TIME, ONLY: tdtexp
+USE MODD_TIME_n, ONLY: tdtcur
!
USE MODE_ll
!
@@ -358,7 +359,7 @@ IF (GSTORE) THEN
IF (SIZE(PTS) >0) TSTATION%TSRAD(IN,I) = STATION_INTERP_2D(PTS)
TSTATION%ZS(I) = STATION_INTERP_2D(PZ(:,:,1+JPVEXT))
!
- IF (LDIAG_IN_RUN) THEN
+ IF (LDIAG_SURFRAD) THEN
TSTATION%ZON10M(IN,I) = STATION_INTERP_2D(XCURRENT_ZON10M)
TSTATION%MER10M(IN,I) = STATION_INTERP_2D(XCURRENT_MER10M)
TSTATION%T2M (IN,I) = STATION_INTERP_2D(XCURRENT_T2M )
@@ -411,7 +412,7 @@ IF (GSTORE) THEN
IF (SIZE(PTKE)>0) CALL DISTRIBUTE_STATION(TSTATION%TKE (IN,I))
IF (SIZE(PTS) >0) CALL DISTRIBUTE_STATION(TSTATION%TSRAD(IN,I))
CALL DISTRIBUTE_STATION(TSTATION%ZS (I))
- IF (LDIAG_IN_RUN) THEN
+ IF (LDIAG_SURFRAD) THEN
CALL DISTRIBUTE_STATION(TSTATION%T2M (IN,I))
CALL DISTRIBUTE_STATION(TSTATION%Q2M (IN,I))
CALL DISTRIBUTE_STATION(TSTATION%HU2M (IN,I))
diff --git a/src/MNH/write_stationn.f90 b/src/MNH/write_stationn.f90
index cbe5bec7fa0ea18447bbe583d6d43cead26e837f..7efb9adaa863a844ec485d803cec0a409b8b69e6 100644
--- a/src/MNH/write_stationn.f90
+++ b/src/MNH/write_stationn.f90
@@ -65,7 +65,7 @@ END MODULE MODI_WRITE_STATION_n
!* 0. DECLARATIONS
! ------------
!
-use modd_budget, only: tbudiachrometadata
+use MODD_BUDGET, ONLY: tbudiachrometadata
USE MODD_CH_M9_n, ONLY: CNAMES
USE MODD_CH_AEROSOL, ONLY: CAERONAMES, LORILAM, JPMODE
USE MODD_CONF
@@ -86,11 +86,12 @@ USE MODD_PASPOL
USE MODD_RAIN_C2R2_DESCR, ONLY: C2R2NAMES
USE MODD_SALT, ONLY: CSALTNAMES, LSALT, NMODE_SLT
USE MODD_STATION_n
+USE MODD_ALLSTATION_n, ONLY: LDIAG_SURFRAD
!
USE MODE_AERO_PSD
USE MODE_DUST_PSD
USE MODE_SALT_PSD
-use mode_write_diachro, only: Write_diachro
+use MODE_WRITE_DIACHRO, ONLY: Write_diachro
!
IMPLICIT NONE
!
@@ -161,7 +162,7 @@ IPROC = 8 + SIZE(TSTATION%R,3) + SIZE(TSTATION%SV,3)
IF (TSTATION%X(II)==XUNDEF) IPROC = IPROC + 2
IF (SIZE(TSTATION%TKE )>0) IPROC = IPROC + 1
-IF (LDIAG_IN_RUN) THEN
+IF (LDIAG_SURFRAD) THEN
IF(CSURF=="EXTE") IPROC = IPROC + 10
IF(CRAD/="NONE") IPROC = IPROC + 7
END IF
@@ -263,7 +264,7 @@ YUNIT (JPROC) = 'K'
YCOMMENT (JPROC) = 'Potential temperature'
ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%TH(:,II)
!
-IF (LDIAG_IN_RUN) THEN
+IF (LDIAG_SURFRAD) THEN
IF (CSURF=="EXTE") THEN
JPROC = JPROC + 1
YTITLE (JPROC) = 'T2m'