diff --git a/src/LIB/SURCOUCHE/src/io_write_field.f90 b/src/LIB/SURCOUCHE/src/io_write_field.f90
index 0eff3edc0350e257c82dfbbdde4c19e7c44c1375..70bca359e632030a6b7282d3c8a23c3d54e0e692 100644
--- a/src/LIB/SURCOUCHE/src/io_write_field.f90
+++ b/src/LIB/SURCOUCHE/src/io_write_field.f90
@@ -437,7 +437,7 @@ TZFIELD%CSTDNAME   = 'x_wind'
 TZFIELD%CLONGNAME  = ''
 TZFIELD%CUNITS     = 'm s-1'
 TZFIELD%CDIR       = 'XY'
-TZFIELD%CCOMMENT   = 'X_Y_Z_U component of wind (m/s) at lowest physical level'
+TZFIELD%CCOMMENT   = 'X_Y_Z_U component of wind at lowest physical level'
 TZFIELD%NGRID      = 2
 TZFIELD%NTYPE      = TYPEREAL
 TZFIELD%NDIMS      = 2
@@ -449,7 +449,7 @@ TZFIELD%CSTDNAME   = 'y_wind'
 TZFIELD%CLONGNAME  = ''
 TZFIELD%CUNITS     = 'm s-1'
 TZFIELD%CDIR       = 'XY'
-TZFIELD%CCOMMENT   = 'X_Y_Z_V component of wind (m/s) at lowest physical level'
+TZFIELD%CCOMMENT   = 'X_Y_Z_V component of wind at lowest physical level'
 TZFIELD%NGRID      = 3
 TZFIELD%NTYPE      = TYPEREAL
 TZFIELD%NDIMS      = 2
@@ -461,7 +461,7 @@ TZFIELD%CSTDNAME   = 'air_potential_temperature'
 TZFIELD%CLONGNAME  = ''
 TZFIELD%CUNITS     = 'K'
 TZFIELD%CDIR       = 'XY'
-TZFIELD%CCOMMENT   = 'X_Y_Z_potential temperature (K) at lowest physical level'
+TZFIELD%CCOMMENT   = 'X_Y_Z_potential temperature at lowest physical level'
 TZFIELD%NGRID      = 1
 TZFIELD%NTYPE      = TYPEREAL
 TZFIELD%NDIMS      = 2
@@ -474,7 +474,7 @@ TZFIELD%CSTDNAME   = 'specific_humidity'     !mass fraction of water vapor in (m
 TZFIELD%CLONGNAME  = ''
 TZFIELD%CUNITS     = 'kg kg-1'
 TZFIELD%CDIR       = 'XY'
-TZFIELD%CCOMMENT   = 'X_Y_Z_Vapor mixing Ratio (KG/KG) at lowest physical level'
+TZFIELD%CCOMMENT   = 'X_Y_Z_Vapor mixing Ratio at lowest physical level'
 TZFIELD%NGRID      = 1
 TZFIELD%NTYPE      = TYPEREAL
 TZFIELD%NDIMS      = 2
@@ -486,7 +486,7 @@ TZFIELD%CSTDNAME   = 'rainfall_amount'
 TZFIELD%CLONGNAME  = ''
 TZFIELD%CUNITS     = 'kg m-2'
 TZFIELD%CDIR       = ''
-TZFIELD%CCOMMENT   = 'X_Y_ACcumulated Precipitation Rain Rate during timestep (kg m-2)'
+TZFIELD%CCOMMENT   = 'X_Y_ACcumulated Precipitation Rain Rate during timestep'
 TZFIELD%NGRID      = 1
 TZFIELD%NTYPE      = TYPEREAL
 TZFIELD%NDIMS      = 2
diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index 962c74684b5de3ee6e31574e274315c1662032cb..9fd92723695d039afa95ff9f25f050a1395a374f 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -129,10 +129,10 @@ INTEGER,INTENT(IN),OPTIONAL :: KMODEL
 INTEGER :: IDX, IMODEL
 CHARACTER(LEN=42) :: YMSG
 !
-!F90/95: TFIELDLIST(1) = TFIELDDATA('UT','x_wind','m s-1','XY','X_Y_Z_U component of wind (m/s)',2)
+!F90/95: TFIELDLIST(1) = TFIELDDATA('UT','x_wind','m s-1','XY','X_Y_Z_U component of wind',2)
 !F2003:
 !TFIELDLIST(1) = TFIELDDATA(CMNHNAME='UT',CSTDNAME='x_wind',CUNITS='m s-1',CDIR='XY',&
-!                           CCOMMENT='X_Y_Z_U component of wind (m/s)',NGRID=2)
+!                           CCOMMENT='X_Y_Z_U component of wind',NGRID=2)
 !
 CALL PRINT_MSG(NVERB_DEBUG,'GEN','INI_FIELD_LIST','called')
 IF (LFIELDLIST_ISINIT) THEN
diff --git a/src/MNH/ini_prog_var.f90 b/src/MNH/ini_prog_var.f90
index ed4ec15e0132c016baf5d526d44dc2a262340835..182752bc2f77e9ffc68182b3ed941de5d2955ca6 100644
--- a/src/MNH/ini_prog_var.f90
+++ b/src/MNH/ini_prog_var.f90
@@ -276,7 +276,7 @@ IF(PRESENT(HCHEMFILE)) THEN
   ! Read scalars in chem file   
   IF (.NOT.LDUST) THEN
     TZFIELD%CSTDNAME   = ''
-    TZFIELD%CUNITS     = ''
+    TZFIELD%CUNITS     = 'ppp'
     TZFIELD%CDIR       = 'XY'
     TZFIELD%NGRID      = 1
     TZFIELD%NTYPE      = TYPEREAL
@@ -286,7 +286,7 @@ IF(PRESENT(HCHEMFILE)) THEN
     DO JSV = NSV_CHEMBEG,NSV_CHEMEND
       TZFIELD%CMNHNAME   = TRIM(CNAMES(JSV-NSV_CHEMBEG+1))//'T'
       TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-      WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (ppp)'
+      WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
       CALL IO_READ_FIELD(TZCHEMFILE,TZFIELD,XSVT(:,:,:,JSV),IRESP)
       IF (IRESP/=0) THEN
         WRITE(ILUOUT,*) TRIM(TZFIELD%CMNHNAME),' NOT FOUND IN THE CHEM FILE ',HCHEMFILE
diff --git a/src/MNH/les_specn.f90 b/src/MNH/les_specn.f90
index 7e0e834730b7c75fe2c470b065000af724de54b7..be4c3b404dde16e6273c615e8af11f35ec08f8ab 100644
--- a/src/MNH/les_specn.f90
+++ b/src/MNH/les_specn.f90
@@ -111,112 +111,112 @@ ALLOCATE( ZSPECTRAY(ISPECTRA_NJ,2,NSPECTRA_K,NLES_TIMES) )
 IF (NSPECTRA_K>0) THEN
   CALL LES_SPEC('X',XCORRi_UU,    ZSPECTRAX)
   CALL LES_SPEC('Y',XCORRj_UU,    ZSPECTRAY)
-  CALL LES_DIACHRO_SPEC(TPDIAFILE,"UU   ","U*U     spectra","m3/s2",ZSPECTRAX,ZSPECTRAY)
+  CALL LES_DIACHRO_SPEC(TPDIAFILE,"UU   ","U*U     spectra","m3 s-2",ZSPECTRAX,ZSPECTRAY)
 !
   CALL LES_SPEC('X',XCORRi_VV,    ZSPECTRAX)
   CALL LES_SPEC('Y',XCORRj_VV,    ZSPECTRAY)
-  CALL LES_DIACHRO_SPEC(TPDIAFILE,"VV   ","V*V     spectra","m3/s2",ZSPECTRAX,ZSPECTRAY)
+  CALL LES_DIACHRO_SPEC(TPDIAFILE,"VV   ","V*V     spectra","m3 s-2",ZSPECTRAX,ZSPECTRAY)
 !
   CALL LES_SPEC('X',XCORRi_WW,    ZSPECTRAX)
   CALL LES_SPEC('Y',XCORRj_WW,    ZSPECTRAY)
-  CALL LES_DIACHRO_SPEC(TPDIAFILE,"WW   ","W*W     spectra","m3/s2",ZSPECTRAX,ZSPECTRAY)
+  CALL LES_DIACHRO_SPEC(TPDIAFILE,"WW   ","W*W     spectra","m3 s-2",ZSPECTRAX,ZSPECTRAY)
 !
   CALL LES_SPEC('X',XCORRi_UV,    ZSPECTRAX)
   CALL LES_SPEC('Y',XCORRj_UV,    ZSPECTRAY)
-  CALL LES_DIACHRO_SPEC(TPDIAFILE,"UV   ","U*V     spectra","m3/s2",ZSPECTRAX,ZSPECTRAY)
+  CALL LES_DIACHRO_SPEC(TPDIAFILE,"UV   ","U*V     spectra","m3 s-2",ZSPECTRAX,ZSPECTRAY)
 !
   CALL LES_SPEC('X',XCORRi_WU,    ZSPECTRAX)
   CALL LES_SPEC('Y',XCORRj_WU,    ZSPECTRAY)
-  CALL LES_DIACHRO_SPEC(TPDIAFILE,"WU   ","W*U     spectra","m3/s2",ZSPECTRAX,ZSPECTRAY)
+  CALL LES_DIACHRO_SPEC(TPDIAFILE,"WU   ","W*U     spectra","m3 s-2",ZSPECTRAX,ZSPECTRAY)
 !
   CALL LES_SPEC('X',XCORRi_WV,    ZSPECTRAX)
   CALL LES_SPEC('Y',XCORRj_WV,    ZSPECTRAY)
-  CALL LES_DIACHRO_SPEC(TPDIAFILE,"WV   ","W*V     spectra","m3/s2",ZSPECTRAX,ZSPECTRAY)
+  CALL LES_DIACHRO_SPEC(TPDIAFILE,"WV   ","W*V     spectra","m3 s-2",ZSPECTRAX,ZSPECTRAY)
 !
   CALL LES_SPEC('X',XCORRi_ThTh,  ZSPECTRAX)
   CALL LES_SPEC('Y',XCORRj_ThTh,  ZSPECTRAY)
-  CALL LES_DIACHRO_SPEC(TPDIAFILE,"THTH ","Th*Th   spectra","mK2  ",ZSPECTRAX,ZSPECTRAY)
+  CALL LES_DIACHRO_SPEC(TPDIAFILE,"THTH ","Th*Th   spectra","m K2",ZSPECTRAX,ZSPECTRAY)
 !
   IF (LUSERC) THEN
     CALL LES_SPEC('X',XCORRi_ThlThl,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_ThlThl,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"TLTL ","Thl*Thl spectra","mK2  ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"TLTL ","Thl*Thl spectra","m K2",ZSPECTRAX,ZSPECTRAY)
   END IF
 !
   CALL LES_SPEC('X',XCORRi_WTh,  ZSPECTRAX)
   CALL LES_SPEC('Y',XCORRj_WTh,  ZSPECTRAY)
-  CALL LES_DIACHRO_SPEC(TPDIAFILE,"WTH  ","W*Th    spectra","m2K/s",ZSPECTRAX,ZSPECTRAY)
+  CALL LES_DIACHRO_SPEC(TPDIAFILE,"WTH  ","W*Th    spectra","m2 K s-1",ZSPECTRAX,ZSPECTRAY)
 !
   IF (LUSERC) THEN
     CALL LES_SPEC('X',XCORRi_WThl,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_WThl,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"WTHL ","W*Thl   spectra","m2K/s",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"WTHL ","W*Thl   spectra","m2 K s-1",ZSPECTRAX,ZSPECTRAY)
   END IF
   !
   IF (LUSERV) THEN
     CALL LES_SPEC('X',XCORRi_RvRv,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_RvRv,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"RVRV ","rv*rv   spectra","m    ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"RVRV ","rv*rv   spectra","m",ZSPECTRAX,ZSPECTRAY)
     !
     CALL LES_SPEC('X',XCORRi_ThRv,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_ThRv,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"THRV ","th*rv   spectra","Km   ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"THRV ","th*rv   spectra","K m",ZSPECTRAX,ZSPECTRAY)
     !
     IF (LUSERC) THEN
       CALL LES_SPEC('X',XCORRi_ThlRv,  ZSPECTRAX)
       CALL LES_SPEC('Y',XCORRj_ThlRv,  ZSPECTRAY)
-      CALL LES_DIACHRO_SPEC(TPDIAFILE,"TLRV ","thl*rv  spectra","Km   ",ZSPECTRAX,ZSPECTRAY)
+      CALL LES_DIACHRO_SPEC(TPDIAFILE,"TLRV ","thl*rv  spectra","K m",ZSPECTRAX,ZSPECTRAY)
     END IF
     !
     CALL LES_SPEC('X',XCORRi_WRv,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_WRv,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"WRV ","W*rv     spectra","mK/s ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"WRV ","W*rv     spectra","m K s-1",ZSPECTRAX,ZSPECTRAY)
   END IF
   IF (LUSERC) THEN
     CALL LES_SPEC('X',XCORRi_RcRc,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_RcRc,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"RCRC ","rc*rc   spectra","m    ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"RCRC ","rc*rc   spectra","m",ZSPECTRAX,ZSPECTRAY)
     !
     CALL LES_SPEC('X',XCORRi_ThRc,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_ThRc,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"THRC ","th*rc   spectra","Km   ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"THRC ","th*rc   spectra","K m",ZSPECTRAX,ZSPECTRAY)
     !
     CALL LES_SPEC('X',XCORRi_ThlRc,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_ThlRc,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"TLRC ","thl*rc  spectra","Km   ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"TLRC ","thl*rc  spectra","K m",ZSPECTRAX,ZSPECTRAY)
     !
     CALL LES_SPEC('X',XCORRi_WRc,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_WRc,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"WRC ","W*rc     spectra","mK/s ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"WRC ","W*rc     spectra","m K s-1",ZSPECTRAX,ZSPECTRAY)
   END IF
   IF (LUSERI) THEN
     CALL LES_SPEC('X',XCORRi_RiRi,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_RiRi,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"RIRI ","ri*ri   spectra","m    ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"RIRI ","ri*ri   spectra","m",ZSPECTRAX,ZSPECTRAY)
     !
     CALL LES_SPEC('X',XCORRi_ThRi,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_ThRi,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"THRI ","th*ri   spectra","Km   ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"THRI ","th*ri   spectra","K m",ZSPECTRAX,ZSPECTRAY)
     !
     CALL LES_SPEC('X',XCORRi_ThlRi,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_ThlRi,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"TLRI ","thl*ri  spectra","Km   ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"TLRI ","thl*ri  spectra","K m",ZSPECTRAX,ZSPECTRAY)
     !
     CALL LES_SPEC('X',XCORRi_WRi,  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_WRi,  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,"WRI ","W*ri     spectra","mK/s ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,"WRI ","W*ri     spectra","m K s-1",ZSPECTRAX,ZSPECTRAY)
   END IF
   DO JSV=1,NSV
     WRITE (YGROUP,FMT="(A2,I3.3)") "SS",JSV
     CALL LES_SPEC('X',XCORRi_SvSv(:,:,:,JSV),  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_SvSv(:,:,:,JSV),  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,YGROUP,"Sv*Sv    spectra","m    ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,YGROUP,"Sv*Sv    spectra","m",ZSPECTRAX,ZSPECTRAY)
   END DO
   DO JSV=1,NSV
     WRITE (YGROUP,FMT="(A2,I3.3)") "WS",JSV
     CALL LES_SPEC('X',XCORRi_WSv(:,:,:,JSV),  ZSPECTRAX)
     CALL LES_SPEC('Y',XCORRj_WSv(:,:,:,JSV),  ZSPECTRAY)
-    CALL LES_DIACHRO_SPEC(TPDIAFILE,YGROUP,"W*Sv    spectra","m2/s  ",ZSPECTRAX,ZSPECTRAY)
+    CALL LES_DIACHRO_SPEC(TPDIAFILE,YGROUP,"W*Sv    spectra","m2 s-1",ZSPECTRAX,ZSPECTRAY)
   END DO
 END IF
 !
diff --git a/src/MNH/read_field.f90 b/src/MNH/read_field.f90
index 5036c52b9fe04f517abacb463a8b507966ec1cba..355c4cf6ccc05315a294cc8e32d9248fe07546b6 100644
--- a/src/MNH/read_field.f90
+++ b/src/MNH/read_field.f90
@@ -731,7 +731,7 @@ IF (NSV_ELECEND>=NSV_ELECBEG) THEN
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
         IF (JSV .GT. NSV_ELECBEG .AND. JSV .LT. NSV_ELECEND) THEN
           TZFIELD%CUNITS     = 'C m-3'
-          WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (C/m3)'
+          WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
         ELSE
           TZFIELD%CUNITS     = 'm-3'
           WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (nb ions/m3)'
@@ -793,7 +793,7 @@ END IF
 !
 IF (NSV_CHICEND>=NSV_CHICBEG) THEN
   TZFIELD%CSTDNAME   = ''
-  TZFIELD%CUNITS     = ''
+  TZFIELD%CUNITS     = 'ppp'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%NGRID      = 1
   TZFIELD%NTYPE      = TYPEREAL
@@ -806,7 +806,7 @@ IF (NSV_CHICEND>=NSV_CHICBEG) THEN
       CASE ('READ')
         TZFIELD%CMNHNAME   = TRIM(CICNAMES(JSV-NSV_CHICBEG+1))//'T'
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (ppp)'
+        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
         CALL IO_READ_FIELD(TPINIFILE,TZFIELD,PSVT(:,:,:,JSV))
       CASE ('INIT')
         PSVT(:,:,:,JSV) = 0.
diff --git a/src/MNH/read_surf_mnh.f90 b/src/MNH/read_surf_mnh.f90
index 9681748fb0be7951b2e26d5fec6bcaef5a4dec5e..23a6d28e311b05890bb9a9fd8793a22d23608feb 100644
--- a/src/MNH/read_surf_mnh.f90
+++ b/src/MNH/read_surf_mnh.f90
@@ -1721,7 +1721,7 @@ ELSE
   TZFIELD%CLONGNAME  = 'STORAGETYPE'
   TZFIELD%CUNITS     = ''
   TZFIELD%CDIR       = '--'
-  TZFIELD%CCOMMENT   = '(-)'
+  TZFIELD%CCOMMENT   = ''
   TZFIELD%NGRID      = 0
   TZFIELD%NTYPE      = TYPECHAR
   TZFIELD%NDIMS      = 0
@@ -1847,7 +1847,7 @@ ELSE
   TZFIELD%CLONGNAME  = 'STORAGETYPE'
   TZFIELD%CUNITS     = ''
   TZFIELD%CDIR       = '--'
-  TZFIELD%CCOMMENT   = '(-)'
+  TZFIELD%CCOMMENT   = ''
   TZFIELD%NGRID      = 0
   TZFIELD%NTYPE      = TYPECHAR
   TZFIELD%NDIMS      = 0
diff --git a/src/MNH/spawn_field2.f90 b/src/MNH/spawn_field2.f90
index 51185a2d8b433d21773b1e7cdcd33f877aa83872..b083a03d68516e936982ae973153c0c63e69351b 100644
--- a/src/MNH/spawn_field2.f90
+++ b/src/MNH/spawn_field2.f90
@@ -910,10 +910,10 @@ IF (PRESENT(TPSONFILE)) THEN
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
         IF (JSV .GT. NSV_ELECBEG .AND. JSV .LT. NSV_ELECEND) THEN
           TZFIELD%CUNITS   = 'C m-3'
-          WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (C/m3)'
+          WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
         ELSE
           TZFIELD%CUNITS   = 'm-3'
-          WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (nb ions/m3)'
+          WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A)')'X_Y_Z_','SVT',JSV,' (nb ions/m3)'
         END IF
         CALL IO_READ_FIELD(TPSONFILE,TZFIELD,ZWORK3D,IRESP)
         IF(IRESP==0) PSVT(KIB2:KIE2,KJB2:KJE2,:,JSV)=ZWORK3D(KIB1:KIE1,KJB1:KJE1,:)
@@ -924,7 +924,7 @@ IF (PRESENT(TPSONFILE)) THEN
     !
     IF (NSV_CHEMEND>=NSV_CHEMBEG) THEN
       TZFIELD%CSTDNAME   = ''
-      TZFIELD%CUNITS     = ''
+      TZFIELD%CUNITS     = 'ppp'
       TZFIELD%CDIR       = 'XY'
       TZFIELD%NGRID      = 1
       TZFIELD%NTYPE      = TYPEREAL
@@ -934,7 +934,7 @@ IF (PRESENT(TPSONFILE)) THEN
       DO JSV = NSV_CHEMBEG,NSV_CHEMEND
         TZFIELD%CMNHNAME   = TRIM(CNAMES(JSV-NSV_CHEMBEG+1))//'T'
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (ppp)'
+        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
         CALL IO_READ_FIELD(TPSONFILE,TZFIELD,ZWORK3D,IRESP)
         IF(IRESP==0) PSVT(KIB2:KIE2,KJB2:KJE2,:,JSV)=ZWORK3D(KIB1:KIE1,KJB1:KJE1,:)
       END DO
@@ -944,7 +944,7 @@ IF (PRESENT(TPSONFILE)) THEN
     !
     IF (NSV_CHICEND>=NSV_CHICBEG) THEN
       TZFIELD%CSTDNAME   = ''
-      TZFIELD%CUNITS     = ''
+      TZFIELD%CUNITS     = 'ppp'
       TZFIELD%CDIR       = 'XY'
       TZFIELD%NGRID      = 1
       TZFIELD%NTYPE      = TYPEREAL
@@ -955,7 +955,7 @@ IF (PRESENT(TPSONFILE)) THEN
         CICNAMES(JSV-NSV_CHICBEG+1) = UPCASE(CICNAMES(JSV-NSV_CHICBEG+1))
         TZFIELD%CMNHNAME   = TRIM(CICNAMES(JSV-NSV_CHICBEG+1))//'T'
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (ppp)'
+        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
         CALL IO_READ_FIELD(TPSONFILE,TZFIELD,ZWORK3D,IRESP)
         IF(IRESP==0) PSVT(KIB2:KIE2,KJB2:KJE2,:,JSV)=ZWORK3D(KIB1:KIE1,KJB1:KJE1,:)
       END DO
diff --git a/src/MNH/turb_hor_dyn_corr.f90 b/src/MNH/turb_hor_dyn_corr.f90
index 089740f722cd7c92feeedcff4ba39d430cfc0c22..9409dd2258aac503a07dd101c10818d821448162 100644
--- a/src/MNH/turb_hor_dyn_corr.f90
+++ b/src/MNH/turb_hor_dyn_corr.f90
@@ -378,7 +378,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN
   TZFIELD%CMNHNAME   = 'U_VAR'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'U_VAR'
-  TZFIELD%CUNITS     = '(m s-1)^2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'X_Y_Z_U_VAR'
   TZFIELD%NGRID      = 1
@@ -474,7 +474,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN
   TZFIELD%CMNHNAME   = 'V_VAR'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'V_VAR'
-  TZFIELD%CUNITS     = '(m s-1)^2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'X_Y_Z_V_VAR'
   TZFIELD%NGRID      = 1
@@ -561,7 +561,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN
   TZFIELD%CMNHNAME   = 'W_VAR'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'W_VAR'
-  TZFIELD%CUNITS     = '(m s-1)^2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'X_Y_Z_W_VAR'
   TZFIELD%NGRID      = 1
diff --git a/src/MNH/turb_hor_thermo_corr.f90 b/src/MNH/turb_hor_thermo_corr.f90
index 3f19fbe1bf10527996075154faebfce6da0603c2..8ae8f14fdf2034b0cebd14eff768d24cc45250d4 100644
--- a/src/MNH/turb_hor_thermo_corr.f90
+++ b/src/MNH/turb_hor_thermo_corr.f90
@@ -430,7 +430,7 @@ IF ( ( KRRL > 0 .AND. OSUBG_COND) .OR. ( OTURB_FLX .AND. OCLOSE_OUT ) &
       TZFIELD%CMNHNAME   = 'R_HVAR'
       TZFIELD%CSTDNAME   = ''
       TZFIELD%CLONGNAME  = 'R_HVAR'
-      TZFIELD%CUNITS     = '(kg kg-1)^2'
+      TZFIELD%CUNITS     = 'kg2 kg-2'
       TZFIELD%CDIR       = 'XY'
       TZFIELD%CCOMMENT   = 'X_Y_Z_R_HVAR'
       TZFIELD%NGRID      = 1
diff --git a/src/MNH/turb_hor_uv.f90 b/src/MNH/turb_hor_uv.f90
index 5211fa740b84251f57884e6f774af759134a168f..d3bba36c254c1c05b42010c79d054b8be67715dc 100644
--- a/src/MNH/turb_hor_uv.f90
+++ b/src/MNH/turb_hor_uv.f90
@@ -278,7 +278,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN
   TZFIELD%CMNHNAME   = 'UV_FLX'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'UV_FLX'
-  TZFIELD%CUNITS     = '(m s-1)^2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'X_Y_Z_UV_FLX'
   TZFIELD%NGRID      = 5
diff --git a/src/MNH/turb_hor_uw.f90 b/src/MNH/turb_hor_uw.f90
index a4d369506dcd14569e6a7e6341aab075bc888dd3..be7ba4ea7b00a1b3c92de64cb7557c73319b0228 100644
--- a/src/MNH/turb_hor_uw.f90
+++ b/src/MNH/turb_hor_uw.f90
@@ -227,7 +227,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN
   TZFIELD%CMNHNAME   = 'UW_HFLX'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'UW_HFLX'
-  TZFIELD%CUNITS     = '(m s-1)^2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'X_Y_Z_UW_HFLX'
   TZFIELD%NGRID      = 6
diff --git a/src/MNH/turb_hor_vw.f90 b/src/MNH/turb_hor_vw.f90
index dc413d4688f4a7d6d53403c0832ff4b1aa0d1d4f..8b923146903d12a0bf291c57337a456f661632eb 100644
--- a/src/MNH/turb_hor_vw.f90
+++ b/src/MNH/turb_hor_vw.f90
@@ -229,7 +229,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN
   TZFIELD%CMNHNAME   = 'VW_HFLX'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'VW_HFLX'
-  TZFIELD%CUNITS     = '(m s-1)^2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'X_Y_Z_VW_HFLX'
   TZFIELD%NGRID      = 7
diff --git a/src/MNH/turb_ver_dyn_flux.f90 b/src/MNH/turb_ver_dyn_flux.f90
index 3cfc97228f5bf8484dc710140d628da99c37952e..3f39c00302125606757f85edb6dd0bc6dbfe9bb3 100644
--- a/src/MNH/turb_ver_dyn_flux.f90
+++ b/src/MNH/turb_ver_dyn_flux.f90
@@ -513,7 +513,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT ) THEN
   TZFIELD%CMNHNAME   = 'UW_VFLX'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'UW_VFLX'
-  TZFIELD%CUNITS     = 'm^2 s-2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'U wind component vertical flux'
   TZFIELD%NGRID      = 4
@@ -688,7 +688,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT ) THEN
   TZFIELD%CMNHNAME   = 'VW_VFLX'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'VW_VFLX'
-  TZFIELD%CUNITS     = 'm^2 s-2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'V wind component vertical flux'
   TZFIELD%NGRID      = 4
@@ -809,7 +809,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT .AND. HTURBDIM == '1DIM') THEN
   TZFIELD%CMNHNAME   = 'W_VVAR'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = 'W_VVAR'
-  TZFIELD%CUNITS     = 'm^2 s-2'
+  TZFIELD%CUNITS     = 'm2 s-2'
   TZFIELD%CDIR       = 'XY'
   TZFIELD%CCOMMENT   = 'X_Y_Z_W_VVAR'
   TZFIELD%NGRID      = 1
diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90
index ff672ba6426075aebc25da63c2251929ef941374..e9dcb3f1c2ae6b416fd5632a31bc6d3ed236a956 100644
--- a/src/MNH/turb_ver_thermo_corr.f90
+++ b/src/MNH/turb_ver_thermo_corr.f90
@@ -575,7 +575,7 @@ END IF
     TZFIELD%CMNHNAME   = 'THL_VVAR'
     TZFIELD%CSTDNAME   = ''
     TZFIELD%CLONGNAME  = 'THL_VVAR'
-    TZFIELD%CUNITS     = 'K^2'
+    TZFIELD%CUNITS     = 'K2'
     TZFIELD%CDIR       = 'XY'
     TZFIELD%CCOMMENT   = 'X_Y_Z_THL_VVAR'
     TZFIELD%NGRID      = 1
@@ -809,7 +809,7 @@ END IF
       TZFIELD%CMNHNAME   = 'RTOT_VVAR'
       TZFIELD%CSTDNAME   = ''
       TZFIELD%CLONGNAME  = 'RTOT_VVAR'
-      TZFIELD%CUNITS     = '(kg kg-1)^2'
+      TZFIELD%CUNITS     = 'kg2 kg-2'
       TZFIELD%CDIR       = 'XY'
       TZFIELD%CCOMMENT   = 'X_Y_Z_RTOT_VVAR'
       TZFIELD%NGRID      = 1
diff --git a/src/MNH/write_aircraft_balloon.f90 b/src/MNH/write_aircraft_balloon.f90
index 79f94557b77ae203e85dd44f12d24663f0301f7a..b9cd28388de27506234212a38328f53fd73c7f19 100644
--- a/src/MNH/write_aircraft_balloon.f90
+++ b/src/MNH/write_aircraft_balloon.f90
@@ -283,31 +283,31 @@ ENDIF
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'LON'
-YUNIT    (JPROC) = 'decimal degree'
+YUNIT    (JPROC) = 'degree'
 YCOMMENT (JPROC) = 'longitude'
 ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%XLON(:)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'LAT'
-YUNIT    (JPROC) = 'decimal degree'
+YUNIT    (JPROC) = 'degree'
 YCOMMENT (JPROC) = 'latitude'
 ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%YLAT(:)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'ZON_WIND'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'zonal wind'
 ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%ZON(:)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'MER_WIND'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'meridian wind'
 ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%MER(:)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'W'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'air vertical speed' 
 ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%W(:)
 !
@@ -319,7 +319,7 @@ ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%TH(:)
 !
 DO JRR=1,SIZE(TPFLYER%R,2)
   JPROC = JPROC+1
-  YUNIT    (JPROC) = 'kg/kg'
+  YUNIT    (JPROC) = 'kg kg-1'
   ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%R(:,JRR)
   IF (JRR==1) THEN
     YTITLE   (JPROC) = 'Rv'
@@ -365,7 +365,7 @@ IF (SIZE(TPFLYER%R,2) >1) THEN !cloud water is present
   ENDDO
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LWC'
-  YUNIT    (JPROC) = 'g/m3'
+  YUNIT    (JPROC) = 'g m-3'
   YCOMMENT (JPROC) = 'cloud liquid water content'
   ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%R(:,2)*ZRHO(1,1,:)*1.E3
   DEALLOCATE (ZRHO)
@@ -375,34 +375,34 @@ ENDIF
 IF (SIZE(TPFLYER%TKE)>0) THEN
   JPROC = JPROC+1
   YTITLE   (JPROC) = 'Tke'
-  YUNIT    (JPROC) = 'm2/s2'
+  YUNIT    (JPROC) = 'm2 s-2'
   YCOMMENT (JPROC) = 'Turbulent kinetic energy' 
   ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%TKE(:)
 END IF
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'H_FLUX'
-YUNIT    (JPROC) = 'W/m2'
+YUNIT    (JPROC) = 'W m-2'
 YCOMMENT (JPROC) = 'sensible flux' 
 ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%THW_FLUX(:)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'LE_FLUX'
-YUNIT    (JPROC) = 'W/m2'
+YUNIT    (JPROC) = 'W m-2'
 YCOMMENT (JPROC) = 'latent flux' 
 ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%RCW_FLUX(:)
 !
 DO JSV=1,SIZE(TPFLYER%SVW_FLUX,2)
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'SV_FLUX'
-  YUNIT    (JPROC) = 'SVUNIT*M/S'
+  YUNIT    (JPROC) = 'SVUNIT m s-1'
   YCOMMENT (JPROC) = 'scalar flux' 
   ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SVW_FLUX(:,JSV)
 END DO
 IF (LDIAG_IN_RUN) THEN
   JPROC = JPROC+1
   YTITLE   (JPROC) = 'Tke_Diss'
-  YUNIT    (JPROC) = 'm2/s2'
+  YUNIT    (JPROC) = 'm2 s-2'
   YCOMMENT (JPROC) = 'TKE dissipation rate' 
   ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%TKE_DISS(:)
 ENDIF
@@ -412,7 +412,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = 1,NSV_USER
     JPROC = JPROC+1
     WRITE (YTITLE(JPROC),FMT='(A2,I3.3)')   'Sv',JSV
-    YUNIT    (JPROC) = 'kg/kg'
+    YUNIT    (JPROC) = 'kg kg-1'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV)
   END DO
@@ -420,7 +420,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = NSV_C2R2BEG,NSV_C2R2END
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1))
-    YUNIT    (JPROC) = '/M3'
+    YUNIT    (JPROC) = 'm-3'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV)
   END DO
@@ -428,14 +428,14 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = NSV_C1R3BEG,NSV_C1R3END
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))
-    YUNIT    (JPROC) = '/M3'
+    YUNIT    (JPROC) = 'm-3'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV)
   END DO
 ! LIMA variables
   DO JSV=NSV_LIMA_BEG,NSV_LIMA_END
     JPROC = JPROC+1
-    YUNIT    (JPROC) = '/kg'
+    YUNIT    (JPROC) = 'kg-1'
     YCOMMENT (JPROC) = ' '
     IF (JSV==NSV_LIMA_NC) YTITLE(JPROC)=TRIM(CLIMA_WARM_NAMES(1))//'T' 
     IF (JSV==NSV_LIMA_NR) YTITLE(JPROC)=TRIM(CLIMA_WARM_NAMES(2))//'T' 
@@ -449,7 +449,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
     ENDIF
     IF (JSV .EQ. NSV_LIMA_SCAVMASS) THEN
       YTITLE(JPROC)=TRIM(CAERO_MASS(1))//'T'
-      YUNIT    (JPROC) = 'kg/kg'
+      YUNIT    (JPROC) = 'kg kg-1'
     ENDIF
     IF (JSV==NSV_LIMA_NI) YTITLE(JPROC)=TRIM(CLIMA_COLD_NAMES(1))//'T' 
     IF (JSV .GE. NSV_LIMA_IFN_FREE .AND. JSV .LT. NSV_LIMA_IFN_NUCL) THEN
@@ -473,7 +473,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = NSV_ELECBEG,NSV_ELECEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CELECNAMES(JSV-NSV_ELECBEG+1))
-    YUNIT    (JPROC) = 'Cb'
+    YUNIT    (JPROC) = 'C'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV)
   END DO
@@ -481,7 +481,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = NSV_CHEMBEG,NSV_CHEMEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CNAMES(JSV-NSV_CHEMBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV) * 1.E9
   END DO
@@ -489,7 +489,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = NSV_LNOXBEG,NSV_LNOXEND
     JPROC = JPROC+1
     WRITE (YTITLE(JPROC),FMT='(A5)') 'LiNOx'
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV) * 1.E9
   END DO
@@ -497,7 +497,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = NSV_AERBEG,NSV_AEREND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CAERONAMES(JSV-NSV_AERBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV) * 1.E9
   END DO
@@ -536,7 +536,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'AERRGA',JSV
       YUNIT    (JPROC) = 'um'
-      WRITE(YCOMMENT(JPROC),'(A18,I1,A5)')'RG (nb) AERO MODE ',JSV,' (um)'
+      WRITE(YCOMMENT(JPROC),'(A18,I1)')'RG (nb) AERO MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZRG(1,1,:,JSV)
       ! standard deviation
       JPROC = JPROC+1
@@ -547,113 +547,113 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
       ! particles number
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'AERN0A',JSV
-      YUNIT    (JPROC) = '  '
-      WRITE(YCOMMENT(JPROC),'(A13,I1,A6)')'N0 AERO MODE ',JSV,' (1/m3)'
+      YUNIT    (JPROC) = 'm-3'
+      WRITE(YCOMMENT(JPROC),'(A13,I1)')'N0 AERO MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZN0(1,1,:,JSV)
       ! mass concentration in microg/m3
       ! sulfate
       JPROC = JPROC + 1
       WRITE(YTITLE(JPROC),'(A4,I1)')'MSO4',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SO4 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SO4 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SO4,JSV)
       ! nitrate
       JPROC = JPROC + 1
       WRITE(YTITLE(JPROC),'(A4,I1)')'MNO3',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS NO3 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS NO3 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_NO3,JSV)
       ! amoniac
       JPROC = JPROC + 1
       WRITE(YTITLE(JPROC),'(A4,I1)')'MNH3',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS NH3 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS NH3 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_NH3,JSV)
       ! water
       JPROC = JPROC + 1
       WRITE(YTITLE(JPROC),'(A4,I1)')'MH2O',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS H2O AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS H2O AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_H2O,JSV)
       IF (NSOA .EQ. 10) THEN
         ! SOA1
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA1',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA1 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA1 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA1,JSV)
         ! SOA2
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA2',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA2 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA2 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA2,JSV)
         ! SOA3
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA3',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA3 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA3 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA3,JSV)
         ! SOA4
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA4',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA4 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA4 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA4,JSV)
         ! SOA5
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA5',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA5 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA5 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA5,JSV)
         ! SOA6
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA6',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA6 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA6 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA6,JSV)
         ! SOA7
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA7',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA7 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA7 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA7,JSV)
         ! SOA8
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA8',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA8 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA8 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA8,JSV)
         ! SOA9
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA9',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA9 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA9 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA9,JSV)
         ! SOA10
         JPROC = JPROC + 1
         WRITE(YTITLE(JPROC),'(A4,I1)')'MSOA10',JSV
-        YUNIT    (JPROC) = 'ug/m3'
-        WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS SOA10 AEROSOL MODE ',JSV,'(ug/m3)'
+        YUNIT    (JPROC) = 'ug m-3'
+        WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS SOA10 AEROSOL MODE ',JSV
         ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_SOA10,JSV)
       ENDIF
       ! OC
       JPROC = JPROC + 1
       WRITE(YTITLE(JPROC),'(A4,I1)')'MOC',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS OC AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS OC AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_OC,JSV)
       ! BC
       JPROC = JPROC + 1
       WRITE(YTITLE(JPROC),'(A4,I1)')'MBC',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS BC AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS BC AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_BC,JSV)
       ! dust
       JPROC = JPROC + 1
       WRITE(YTITLE(JPROC),'(A4,I1)')'MDUST',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT(JPROC),'(A22,I1,A5)')'MASS DUST AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT(JPROC),'(A22,I1)')'MASS DUST AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC) = ZPTOTA(1,1,:,JP_AER_DST,JSV)      
     ENDDO
     DEALLOCATE (ZSV,ZRHO) 
@@ -663,7 +663,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = NSV_DSTBEG,NSV_DSTEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CDUSTNAMES(JSV-NSV_DSTBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV) * 1.E9
   END DO
@@ -692,7 +692,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'DSTRGA',JSV
       YUNIT    (JPROC) = 'um'
-      WRITE(YCOMMENT(JPROC),'(A18,I1,A5)')'RG (nb) DUST MODE ',JSV,' (um)'
+      WRITE(YCOMMENT(JPROC),'(A18,I1)')'RG (nb) DUST MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZRG(1,1,:,JSV)
       ! standard deviation
       JPROC = JPROC+1
@@ -703,8 +703,8 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
       ! particles number
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'DSTN0A',JSV
-      YUNIT    (JPROC) = '  '
-      WRITE(YCOMMENT(JPROC),'(A13,I1,A6)')'N0 DUST MODE ',JSV,' (1/m3)'
+      YUNIT    (JPROC) = 'm-3'
+      WRITE(YCOMMENT(JPROC),'(A13,I1)')'N0 DUST MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZN0(1,1,:,JSV)
     ENDDO
     DEALLOCATE (ZSV,ZRHO) 
@@ -714,7 +714,7 @@ IF (SIZE(TPFLYER%SV,2)>=1) THEN
   DO JSV = NSV_SLTBEG,NSV_SLTEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CSALTNAMES(JSV-NSV_SLTBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TPFLYER%SV(:,JSV) * 1.E9
   END DO
@@ -734,13 +734,13 @@ DO IK=1, IKU
 !
   JPROCZ = JPROCZ + 1
   YTITLEZ  (JPROCZ) = 'Rt'
-  YUNITZ   (JPROCZ) = 'kg/kg'
+  YUNITZ   (JPROCZ) = 'kg kg-1'
   YCOMMENTZ(JPROCZ) = '1D Total hydrometeor mixing ratio'
   ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%RTZ(:,IK)
 !
   DO JRR=1,SIZE(TPFLYER%RZ,3)
     JPROCZ = JPROCZ+1
-    YUNITZ    (JPROCZ) = 'kg/kg'
+    YUNITZ    (JPROCZ) = 'kg kg-1'
     ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%RZ(:,IK,JRR)
     IF (JRR==1) THEN
       YTITLEZ   (JPROCZ) = 'Rv'
@@ -768,52 +768,52 @@ DO IK=1, IKU
 !
   JPROCZ = JPROCZ + 1
   YTITLEZ  (JPROCZ) = 'FF'
-  YUNITZ   (JPROCZ) = 'm/s'         
-  YCOMMENTZ(JPROCZ) = 'Horizontal wind'                     
+  YUNITZ   (JPROCZ) = 'm s-1'
+  YCOMMENTZ(JPROCZ) = 'Horizontal wind'
   ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%FFZ(:,IK)
 !
   JPROCZ = JPROCZ + 1
   YTITLEZ  (JPROCZ) = 'IWC'
-  YUNITZ   (JPROCZ) = 'kg/m3'         
-  YCOMMENTZ(JPROCZ) = 'Ice water content'                   
+  YUNITZ   (JPROCZ) = 'kg m-3'
+  YCOMMENTZ(JPROCZ) = 'Ice water content'
   ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%IWCZ(:,IK)
 !
   JPROCZ = JPROCZ + 1
   YTITLEZ  (JPROCZ) = 'LWC'
-  YUNITZ   (JPROCZ) = 'kg/m3'         
-  YCOMMENTZ(JPROCZ) = 'Liquid water content'                
+  YUNITZ   (JPROCZ) = 'kg m-3'
+  YCOMMENTZ(JPROCZ) = 'Liquid water content'
   ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%LWCZ(:,IK)
 !
   IF (NSV_LIMA_BEG/=NSV_LIMA_END) THEN
     JPROCZ = JPROCZ + 1
     YTITLEZ  (JPROCZ) = 'CIT'
-    YUNITZ   (JPROCZ) = '/m3'         
-    YCOMMENTZ(JPROCZ) = 'Ice concentration'                   
+    YUNITZ   (JPROCZ) = 'm-3'
+    YCOMMENTZ(JPROCZ) = 'Ice concentration'
     ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%CIZ(:,IK)
   ELSE
     JPROCZ = JPROCZ + 1
     YTITLEZ  (JPROCZ) = 'CCLOUDT'
-    YUNITZ   (JPROCZ) = '/kg'         
-    YCOMMENTZ(JPROCZ) = 'liquid cloud concentration'                   
+    YUNITZ   (JPROCZ) = 'kg-1'
+    YCOMMENTZ(JPROCZ) = 'liquid cloud concentration'
     ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%CCZ(:,IK)
 !
     JPROCZ = JPROCZ + 1
     YTITLEZ  (JPROCZ) = 'CRAINT'
-    YUNITZ   (JPROCZ) = '/kg'         
-    YCOMMENTZ(JPROCZ) = 'Rain concentration'                   
+    YUNITZ   (JPROCZ) = 'kg-1'
+    YCOMMENTZ(JPROCZ) = 'Rain concentration'
     ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%CRZ(:,IK)
 !
     JPROCZ = JPROCZ + 1
     YTITLEZ  (JPROCZ) = 'CICET'
-    YUNITZ   (JPROCZ) = '/kg'         
-    YCOMMENTZ(JPROCZ) = 'Ice concentration'                   
+    YUNITZ   (JPROCZ) = 'kg-1'
+    YCOMMENTZ(JPROCZ) = 'Ice concentration'
     ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%CIZ(:,IK)
  ENDIF
 !
   JPROCZ = JPROCZ + 1
   YTITLEZ  (JPROCZ) = 'RARE'
   YUNITZ   (JPROCZ) = 'dBZ'
-  YCOMMENTZ(JPROCZ) = '1D cloud radar reflectivity' 
+  YCOMMENTZ(JPROCZ) = '1D cloud radar reflectivity'
   ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%CRARE(:,IK)
   JPROCZ = JPROCZ + 1
   YTITLEZ  (JPROCZ) = 'RAREatt'
@@ -822,7 +822,7 @@ DO IK=1, IKU
   ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%CRARE_ATT(:,IK)
   JPROCZ = JPROCZ + 1
   YTITLEZ  (JPROCZ) = 'W'
-  YUNITZ   (JPROCZ) = 'm/s'
+  YUNITZ   (JPROCZ) = 'm s-1'
   YCOMMENTZ(JPROCZ) = '1D vertical velocity' 
   ZWORKZ6 (1,1,IK,:,1,JPROCZ) = TPFLYER%WZ(:,IK)
   JPROCZ = JPROCZ + 1
diff --git a/src/MNH/write_budget.f90 b/src/MNH/write_budget.f90
index 15eb87a89ad207a9bd4c21069b126c7b901233fd..c70ee075f93e523eaf2f078906ac0b58a0c41b3e 100644
--- a/src/MNH/write_budget.f90
+++ b/src/MNH/write_budget.f90
@@ -590,7 +590,7 @@ SELECT CASE (CBUTYPE)
       ALLOCATE(YWORKCOMMENT(NBUPROCNBR(IP)))
       ALLOCATE(IWORKGRID(NBUPROCNBR(IP)))
 !
-      YWORKUNIT(:)       = 'm^2 s-3' ; YWORKUNIT(1:3) = 'm^2 s-1'
+      YWORKUNIT(:)       = 'm2 s-3' ; YWORKUNIT(1:3) = 'm2 s-1'
       YWORKCOMMENT(:)    = 'Budget of turbulent kinetic energy'
       IWORKGRID(:)       = 1
       WRITE(YGROUP_NAME,FMT="('TK___',I4.4)") NBUTSHIFT 
@@ -1284,7 +1284,7 @@ SELECT CASE (CBUTYPE)
       END DO
       DEALLOCATE(ZCONVERT)
 !
-      YWORKUNIT(:)       = 'm^2 s-3' ; YWORKUNIT(1:3) = 'm^2 s-2'
+      YWORKUNIT(:)       = 'm2 s-3' ; YWORKUNIT(1:3) = 'm2 s-2'
       YWORKCOMMENT(:)    = 'Budget of turbulent kinetic energy'
       IWORKGRID(:)       = 1
       WRITE(YGROUP_NAME,FMT="('TK___',I4.4)") NBUTSHIFT
diff --git a/src/MNH/write_les_budgetn.f90 b/src/MNH/write_les_budgetn.f90
index 5d99d63c724f9b0299116e40b394f8d4d6524ee4..628ba7d6fcfd5fda8907b31c0c306e2e838e3a34 100644
--- a/src/MNH/write_les_budgetn.f90
+++ b/src/MNH/write_les_budgetn.f90
@@ -409,7 +409,7 @@ END DO
 !       -------
 !
 !
-CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"resolved KE budget"//YSUBTITLE(:ILES),"m2/s3", &
+CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"resolved KE budget"//YSUBTITLE(:ILES),"m2 s-3", &
                        ZLES_BUDGET(:,:,:ILES),HLES_AVG)
 !
 !-------------------------------------------------------------------------------
@@ -656,7 +656,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES)
 !       -------
 !
 !
-CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"thetal variance budget"//YSUBTITLE(:ILES),"K2/s", &
+CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"thetal variance budget"//YSUBTITLE(:ILES),"K2 s-1", &
                        ZLES_BUDGET(:,:,:ILES),HLES_AVG)
 !
 !-------------------------------------------------------------------------------
@@ -966,7 +966,7 @@ ZLES_BUDGET(:,:,ILES)=-XLES_RES_ddxa_Thl_SBG_UaW(:,:,1)       &
 !       -------
 !
 !
-CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"thetal flux budget"//YSUBTITLE(:ILES),"mK/s2", &
+CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"thetal flux budget"//YSUBTITLE(:ILES),"m K s-2", &
                        ZLES_BUDGET(:,:,:ILES),HLES_AVG)
 !
 !
diff --git a/src/MNH/write_les_rt_budgetn.f90 b/src/MNH/write_les_rt_budgetn.f90
index 3d030617031bbab212ba5e7413f6a6f8c6c86fb4..558f7df3a9fa0edecd7edcdecdd3dd5dfac557d5 100644
--- a/src/MNH/write_les_rt_budgetn.f90
+++ b/src/MNH/write_les_rt_budgetn.f90
@@ -339,7 +339,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES)
 !       -------
 !
 !
-CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"Rt variance budget"//YSUBTITLE(:ILES),"kg2/kg2/s", &
+CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"Rt variance budget"//YSUBTITLE(:ILES),"kg2 kg-2 s-1", &
                        ZLES_BUDGET(:,:,:ILES),HLES_AVG)
 !
 !
@@ -646,7 +646,7 @@ ZLES_BUDGET(:,:,ILES)=-XLES_RES_ddxa_Rt_SBG_UaW(:,:,1)       &
 !       -------
 !
 !
-CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"Rt flux budget"//YSUBTITLE(:ILES),"mkg/kg/s2", &
+CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"Rt flux budget"//YSUBTITLE(:ILES),"m kg kg-1 s-2", &
                        ZLES_BUDGET(:,:,:ILES),HLES_AVG)
 !
 !
@@ -894,7 +894,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES)
 !
 !
 CALL LES_DIACHRO_MASKS(TPDIAFILE,YGROUP,YSUBTITLE(:ILES),"Thl-Rt covariance budget"//YSUBTITLE(:ILES), &
-                                              "Kkg/kg/s",ZLES_BUDGET(:,:,:ILES),HLES_AVG)
+                                              "K kg kg-1 s-1",ZLES_BUDGET(:,:,:ILES),HLES_AVG)
 !
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/write_lesn.f90 b/src/MNH/write_lesn.f90
index abe5b0c9d67c36e9985ce5a9ad9f13c12f1682a5..260b53bf076d5fb42893d7942e2185ce608c3501 100644
--- a/src/MNH/write_lesn.f90
+++ b/src/MNH/write_lesn.f90
@@ -278,13 +278,13 @@ IF (HLES_AVG==' ' .OR. HLES_AVG=='A') THEN
   ZCART_PTS_ll       = (NLESn_ISUP(IMI)-NLESn_IINF(IMI)+1) * (NLESn_JSUP(IMI)-NLESn_JINF(IMI)+1)
   !
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"AVG_PTS  ",YSUBTITLE(:), &
-  "number of points used for averaging"//YSUBTITLE(:),"-",ZAVG_PTS_ll,HLES_AVG)
+  "number of points used for averaging"//YSUBTITLE(:),"1",ZAVG_PTS_ll,HLES_AVG)
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"AVG_PTSF",YSUBTITLE(:), &
-  "fraction of points used for averaging"//YSUBTITLE(:),"-",ZAVG_PTS_ll/ZCART_PTS_ll,HLES_AVG)
+  "fraction of points used for averaging"//YSUBTITLE(:),"1",ZAVG_PTS_ll/ZCART_PTS_ll,HLES_AVG)
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"UND_PTS  ",YSUBTITLE(:), &
-  "number of points below orography"//YSUBTITLE(:),"-",ZUND_PTS_ll,HLES_AVG)
+  "number of points below orography"//YSUBTITLE(:),"1",ZUND_PTS_ll,HLES_AVG)
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"UND_PTSF",YSUBTITLE(:), &
-  "fraction of points below orography"//YSUBTITLE(:),"-",ZUND_PTS_ll/ZCART_PTS_ll,HLES_AVG)
+  "fraction of points below orography"//YSUBTITLE(:),"1",ZUND_PTS_ll/ZCART_PTS_ll,HLES_AVG)
   !
   DEALLOCATE(ZAVG_PTS_ll)
   DEALLOCATE(ZUND_PTS_ll)
@@ -295,157 +295,157 @@ END IF
 !            ---------------
 !
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_U  ",YSUBTITLE(:), &
-  "Mean U Profile"//YSUBTITLE(:)," m/s",XLES_MEAN_U,HLES_AVG)
+  "Mean U Profile"//YSUBTITLE(:),"m s-1",XLES_MEAN_U,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_V  ",YSUBTITLE(:), &
-  "Mean V Profile"//YSUBTITLE(:)," m/s",XLES_MEAN_V,HLES_AVG)
+  "Mean V Profile"//YSUBTITLE(:),"m s-1",XLES_MEAN_V,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_W  ",YSUBTITLE(:), &
-  "Mean W Profile"//YSUBTITLE(:)," m/s",XLES_MEAN_W,HLES_AVG)
+  "Mean W Profile"//YSUBTITLE(:),"m s-1",XLES_MEAN_W,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_PRE",YSUBTITLE(:), &
-  "Mean pressure Profile"//YSUBTITLE(:)," Pa",XLES_MEAN_P,HLES_AVG)
+  "Mean pressure Profile"//YSUBTITLE(:),"Pa",XLES_MEAN_P,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_DP",YSUBTITLE(:), &
-  "Mean Dyn production TKE Profile"//YSUBTITLE(:)," m2/s3",XLES_MEAN_DP,HLES_AVG)
+  "Mean Dyn production TKE Profile"//YSUBTITLE(:),"m2 s-3",XLES_MEAN_DP,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_TP",YSUBTITLE(:), &
-  "Mean Thermal  production TKE Profile "//YSUBTITLE(:)," m2/s3",XLES_MEAN_TP,HLES_AVG)
+  "Mean Thermal  production TKE Profile "//YSUBTITLE(:),"m2 s-3",XLES_MEAN_TP,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_TR",YSUBTITLE(:), &
-  "Mean transport production TKE Profile"//YSUBTITLE(:)," m2/s3",XLES_MEAN_TR,HLES_AVG)
+  "Mean transport production TKE Profile"//YSUBTITLE(:),"m2 s-3",XLES_MEAN_TR,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_DISS",YSUBTITLE(:), &
-  "Mean Dissipation TKE Profile"//YSUBTITLE(:)," m2/s3",XLES_MEAN_DISS,HLES_AVG)
+  "Mean Dissipation TKE Profile"//YSUBTITLE(:),"m2 s-3",XLES_MEAN_DISS,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_LM",YSUBTITLE(:), &
-  "Mean mixing length Profile"//YSUBTITLE(:)," m",XLES_MEAN_LM,HLES_AVG)
+  "Mean mixing length Profile"//YSUBTITLE(:),"m",XLES_MEAN_LM,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RHO",YSUBTITLE(:), &
-  "Mean density Profile"//YSUBTITLE(:)," kg/m3",XLES_MEAN_RHO,HLES_AVG)
+  "Mean density Profile"//YSUBTITLE(:),"kg m-3",XLES_MEAN_RHO,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_TH ",YSUBTITLE(:),&
-  "Mean potential temperature Profile"//YSUBTITLE(:)," K",XLES_MEAN_Th,HLES_AVG)
+  "Mean potential temperature Profile"//YSUBTITLE(:),"K",XLES_MEAN_Th,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_MF ",YSUBTITLE(:),&
-  "Mass-flux Profile"//YSUBTITLE(:)," m s-1",XLES_MEAN_Mf,HLES_AVG)
+  "Mass-flux Profile"//YSUBTITLE(:),"m s-1",XLES_MEAN_Mf,HLES_AVG)
 
 IF (LUSERC) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_THL",YSUBTITLE(:), &
-   "Mean liquid potential temperature Profile"//YSUBTITLE(:)," K",XLES_MEAN_Thl,HLES_AVG)
+   "Mean liquid potential temperature Profile"//YSUBTITLE(:),"K",XLES_MEAN_Thl,HLES_AVG)
 
 IF (LUSERV) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_THV",YSUBTITLE(:), &
-   "Mean virtual potential temperature Profile"//YSUBTITLE(:)," K",XLES_MEAN_Thv,HLES_AVG)
+   "Mean virtual potential temperature Profile"//YSUBTITLE(:),"K",XLES_MEAN_Thv,HLES_AVG)
 
 IF (LUSERC) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RT ",YSUBTITLE(:), &
-  "Mean Rt Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Rt,HLES_AVG)
+  "Mean Rt Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Rt,HLES_AVG)
 
 IF (LUSERV) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RV ",YSUBTITLE(:), &
-  "Mean Rv Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Rv,HLES_AVG)
+  "Mean Rv Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Rv,HLES_AVG)
 
 IF (LUSERV) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_REHU ",YSUBTITLE(:), &
-  "Mean Rh Profile"//YSUBTITLE(:)," %",XLES_MEAN_Rehu,HLES_AVG)
+  "Mean Rh Profile"//YSUBTITLE(:),"percent",XLES_MEAN_Rehu,HLES_AVG)
 
 IF (LUSERV) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_QS ",YSUBTITLE(:), &
-  "Mean Qs Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Qs,HLES_AVG)
+  "Mean Qs Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Qs,HLES_AVG)
 
 IF (LUSERC) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_KHT ",YSUBTITLE(:),&
-  "Eddy-diffusivity (temperature) Profile"//YSUBTITLE(:)," m2 s-1",XLES_MEAN_KHt,HLES_AVG)
+  "Eddy-diffusivity (temperature) Profile"//YSUBTITLE(:),"m2 s-1",XLES_MEAN_KHt,HLES_AVG)
 
 IF (LUSERC) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_KHR ",YSUBTITLE(:),&
-  "Eddy-diffusivity (wvapor) Profile"//YSUBTITLE(:)," m2 s-1",XLES_MEAN_KHr,HLES_AVG)  
+  "Eddy-diffusivity (wvapor) Profile"//YSUBTITLE(:),"m2 s-1",XLES_MEAN_KHr,HLES_AVG)
 
 IF (LUSERC) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RC ",YSUBTITLE(:), &
-  "Mean Rc Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Rc,HLES_AVG)
+  "Mean Rc Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Rc,HLES_AVG)
 
 IF (LUSERC) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_CF ",YSUBTITLE(:), &
-  "Mean Cf Profile"//YSUBTITLE(:)," ",XLES_MEAN_Cf,HLES_AVG)
+  "Mean Cf Profile"//YSUBTITLE(:),"1",XLES_MEAN_Cf,HLES_AVG)
 
 IF (LUSERC) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_INDCF ",YSUBTITLE(:), &
-  "Mean Cf>1-6 Profile (0 ou 1)"//YSUBTITLE(:)," ",XLES_MEAN_INDCf,HLES_AVG)
+  "Mean Cf>1-6 Profile (0 ou 1)"//YSUBTITLE(:),"1",XLES_MEAN_INDCf,HLES_AVG)
 
 IF (LUSERC) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_INDCF2 ",YSUBTITLE(:), &
-  "Mean Cf>1-5 Profile (0 ou 1)"//YSUBTITLE(:)," ",XLES_MEAN_INDCf2,HLES_AVG)
+  "Mean Cf>1-5 Profile (0 ou 1)"//YSUBTITLE(:),"1",XLES_MEAN_INDCf2,HLES_AVG)
 
 IF (LUSERR) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RR ",YSUBTITLE(:), &
-  "Mean Rr Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Rr,HLES_AVG)
+  "Mean Rr Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Rr,HLES_AVG)
 
 IF (LUSERI) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RI ",YSUBTITLE(:), &
-  "Mean Ri Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Ri,HLES_AVG)
+  "Mean Ri Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Ri,HLES_AVG)
 
 IF (LUSERS) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RS ",YSUBTITLE(:), &
-  "Mean Rs Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Rs,HLES_AVG)
+  "Mean Rs Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Rs,HLES_AVG)
 
 IF (LUSERG) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RG ",YSUBTITLE(:), &
-  "Mean Rg Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Rg,HLES_AVG)
+  "Mean Rg Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Rg,HLES_AVG)
 
 IF (LUSERH) &
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEAN_RH ",YSUBTITLE(:), &
-  "Mean Rh Profile"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Rh,HLES_AVG)
+  "Mean Rh Profile"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Rh,HLES_AVG)
 
 IF (NSV>0) &
 CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"MEAN_SV ",YSUBTITLE(:), &
-  "Mean Sv Profiles"//YSUBTITLE(:)," kg/kg",XLES_MEAN_Sv,HLES_AVG)
+  "Mean Sv Profiles"//YSUBTITLE(:),"kg kg-1",XLES_MEAN_Sv,HLES_AVG)
 
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEANWIND",YSUBTITLE(:), &
-  "Profile of Mean Modulus of Wind"//YSUBTITLE(:)," m/s",XLES_MEAN_WIND,HLES_AVG)
+  "Profile of Mean Modulus of Wind"//YSUBTITLE(:),"m s-1",XLES_MEAN_WIND,HLES_AVG)
 !
 CALL LES_DIACHRO_MASKS(TPDIAFILE,"MEANMSFX",YSUBTITLE(:),  &
-     "Total updraft mass flux"//YSUBTITLE(:)," kg/m2/s",XLES_RESOLVED_MASSFX   ,HLES_AVG)
+     "Total updraft mass flux"//YSUBTITLE(:),"kg m-2 s-1",XLES_RESOLVED_MASSFX   ,HLES_AVG)
 !
 IF (LLES_PDF) THEN
   CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_TH ",YSUBTITLE(:), &
-  "Pdf potential temperature Profiles"//YSUBTITLE(:)," ",XLES_PDF_TH,HLES_AVG)
+  "Pdf potential temperature Profiles"//YSUBTITLE(:),"1",XLES_PDF_TH,HLES_AVG)
   CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_W ",YSUBTITLE(:), &
-  "Pdf vertical velocity Profiles"//YSUBTITLE(:)," ",XLES_PDF_W,HLES_AVG)
+  "Pdf vertical velocity Profiles"//YSUBTITLE(:),"1",XLES_PDF_W,HLES_AVG)
   CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_THV ",YSUBTITLE(:), &
-  "Pdf virtual pot. temp. Profiles"//YSUBTITLE(:)," ",XLES_PDF_THV,HLES_AVG)
+  "Pdf virtual pot. temp. Profiles"//YSUBTITLE(:),"1",XLES_PDF_THV,HLES_AVG)
     
   IF (LUSERV) THEN
    CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_RV ",YSUBTITLE(:), &
-     "Pdf Rv Profiles"//YSUBTITLE(:)," ",XLES_PDF_RV,HLES_AVG)
+     "Pdf Rv Profiles"//YSUBTITLE(:),"1",XLES_PDF_RV,HLES_AVG)
   END IF
 
   IF (LUSERC) THEN
    CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_RC ",YSUBTITLE(:), &
-   "Pdf Rc Profiles"//YSUBTITLE(:)," ",XLES_PDF_RC,HLES_AVG)
+   "Pdf Rc Profiles"//YSUBTITLE(:),"1",XLES_PDF_RC,HLES_AVG)
 
    CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_RT ",YSUBTITLE(:), &
-   "Pdf Rt Profiles"//YSUBTITLE(:)," ",XLES_PDF_RT,HLES_AVG)
+   "Pdf Rt Profiles"//YSUBTITLE(:),"1",XLES_PDF_RT,HLES_AVG)
 
    CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_THL ",YSUBTITLE(:), &
-   "Pdf Thl Profiles"//YSUBTITLE(:)," ",XLES_PDF_THL,HLES_AVG)
+   "Pdf Thl Profiles"//YSUBTITLE(:),"1",XLES_PDF_THL,HLES_AVG)
   END IF
   IF (LUSERR) &
   CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_RR ",YSUBTITLE(:), &
-  "Pdf Rr Profiles"//YSUBTITLE(:)," ",XLES_PDF_RR,HLES_AVG)
+  "Pdf Rr Profiles"//YSUBTITLE(:),"1",XLES_PDF_RR,HLES_AVG)
 
   IF (LUSERI) &
   CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_RI ",YSUBTITLE(:), &
-  "Pdf Ri Profiles"//YSUBTITLE(:)," ",XLES_PDF_RI,HLES_AVG)
+  "Pdf Ri Profiles"//YSUBTITLE(:),"1",XLES_PDF_RI,HLES_AVG)
 
   IF (LUSERS) &
   CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_RS ",YSUBTITLE(:), &
-  "Pdf Rs Profiles"//YSUBTITLE(:)," ",XLES_PDF_RS,HLES_AVG)
+  "Pdf Rs Profiles"//YSUBTITLE(:),"1",XLES_PDF_RS,HLES_AVG)
 
   IF (LUSERG) &
   CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"PDF_RG ",YSUBTITLE(:), &
-  "Pdf Rg Profiles"//YSUBTITLE(:)," ",XLES_PDF_RG,HLES_AVG)
+  "Pdf Rg Profiles"//YSUBTITLE(:),"1",XLES_PDF_RG,HLES_AVG)
 
 END IF
 !
@@ -454,37 +454,37 @@ END IF
 !
 IF (LLES_RESOLVED) THEN
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_U2  ",YSUBTITLE(:), &
-     "Resolved <u2> variance "//YSUBTITLE(:),"m2/s2",XLES_RESOLVED_U2,HLES_AVG)
+     "Resolved <u2> variance "//YSUBTITLE(:),"m2 s-2",XLES_RESOLVED_U2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_V2  ",YSUBTITLE(:), &
-     "Resolved <v2> variance"//YSUBTITLE(:),"m2/s2",XLES_RESOLVED_V2,HLES_AVG)
+     "Resolved <v2> variance"//YSUBTITLE(:),"m2 s-2",XLES_RESOLVED_V2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_W2  ",YSUBTITLE(:), &
-     "Resolved <w2> variance"//YSUBTITLE(:),"m2/s2",XLES_RESOLVED_W2,HLES_AVG)
+     "Resolved <w2> variance"//YSUBTITLE(:),"m2 s-2",XLES_RESOLVED_W2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_UV  ",YSUBTITLE(:), &
-     "Resolved <uv> Flux"//YSUBTITLE(:),"m2/s2",XLES_RESOLVED_UV,HLES_AVG)
+     "Resolved <uv> Flux"//YSUBTITLE(:),"m2 s-2",XLES_RESOLVED_UV,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WU  ",YSUBTITLE(:), &
-   "Resolved <wu> Flux"//YSUBTITLE(:),"m2/s2",XLES_RESOLVED_WU,HLES_AVG)
+   "Resolved <wu> Flux"//YSUBTITLE(:),"m2 s-2",XLES_RESOLVED_WU,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WV  ",YSUBTITLE(:), &
-     "Resolved <wv> Flux"//YSUBTITLE(:),"m2/s2",XLES_RESOLVED_WV,HLES_AVG)
+     "Resolved <wv> Flux"//YSUBTITLE(:),"m2 s-2",XLES_RESOLVED_WV,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_KE  ",YSUBTITLE(:), &
-     "Resolved TKE Profile"//YSUBTITLE(:),"m2/s2",XLES_RESOLVED_Ke,HLES_AVG)
+     "Resolved TKE Profile"//YSUBTITLE(:),"m2 s-2",XLES_RESOLVED_Ke,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_P2  ",YSUBTITLE(:), &
      "Resolved pressure variance"//YSUBTITLE(:),"Pa2",XLES_RESOLVED_P2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_UPZ ",YSUBTITLE(:), &
-     "Resolved <up> horizontal Flux"//YSUBTITLE(:),"Pa/s",XLES_RESOLVED_UP,HLES_AVG)
+     "Resolved <up> horizontal Flux"//YSUBTITLE(:),"Pa s-1",XLES_RESOLVED_UP,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_VPZ ",YSUBTITLE(:), &
-     "Resolved <vp> horizontal Flux"//YSUBTITLE(:),"Pa/s",XLES_RESOLVED_VP,HLES_AVG)
+     "Resolved <vp> horizontal Flux"//YSUBTITLE(:),"Pa s-1",XLES_RESOLVED_VP,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WPZ ",YSUBTITLE(:), &
-     "Resolved <wp> vertical Flux"//YSUBTITLE(:),"Pa/s",XLES_RESOLVED_WP,HLES_AVG)
+     "Resolved <wp> vertical Flux"//YSUBTITLE(:),"Pa s-1",XLES_RESOLVED_WP,HLES_AVG)
 
   IF (LUSERV) &
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_THTV ",YSUBTITLE(:), &
@@ -504,266 +504,266 @@ IF (LLES_RESOLVED) THEN
      "Resolved liquid potential temperature variance"//YSUBTITLE(:),"K2",XLES_RESOLVED_Thl2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_UTH ",YSUBTITLE(:), &
-     "Resolved <uth> horizontal Flux"//YSUBTITLE(:),"mK/s",XLES_RESOLVED_UTh,HLES_AVG)
+     "Resolved <uth> horizontal Flux"//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_UTh,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_VTH ",YSUBTITLE(:), &
-     "Resolved <vth> horizontal Flux"//YSUBTITLE(:),"mK/s",XLES_RESOLVED_VTh,HLES_AVG)
+     "Resolved <vth> horizontal Flux"//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_VTh,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WTH ",YSUBTITLE(:), &
-     "Resolved <wth> vertical Flux"//YSUBTITLE(:),"mK/s",XLES_RESOLVED_WTh,HLES_AVG)
+     "Resolved <wth> vertical Flux"//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_WTh,HLES_AVG)
 
   IF (LUSERC) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_UTHL",YSUBTITLE(:), &
-       "Resolved <uthl> horizontal Flux"//YSUBTITLE(:),"mK/s",XLES_RESOLVED_UThl,HLES_AVG)
+       "Resolved <uthl> horizontal Flux"//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_UThl,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_VTHL",YSUBTITLE(:), &
-       "Resolved <vthl> horizontal Flux"//YSUBTITLE(:),"mK/s",XLES_RESOLVED_VThl,HLES_AVG)
+       "Resolved <vthl> horizontal Flux"//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_VThl,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WTHL",YSUBTITLE(:), &
-       "Resolved <wthl> vertical Flux "//YSUBTITLE(:),"mK/s",XLES_RESOLVED_WThl,HLES_AVG)
+       "Resolved <wthl> vertical Flux "//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_WThl,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_RT2 ",YSUBTITLE(:), &
-     "Resolved total water variance"//YSUBTITLE(:),"kg2/kg2",XLES_RESOLVED_Rt2,HLES_AVG)
+     "Resolved total water variance"//YSUBTITLE(:),"kg2 kg-2",XLES_RESOLVED_Rt2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRT ",YSUBTITLE(:), &
-       "Resolved <wrt> vertical Flux "//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_WRt,HLES_AVG)
+       "Resolved <wrt> vertical Flux "//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_WRt,HLES_AVG)
   END IF
 
   IF (LUSERV) THEN
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_UTHV",YSUBTITLE(:), &
-       "Resolved <uthv> horizontal Flux"//YSUBTITLE(:),"mK/s",XLES_RESOLVED_UThv,HLES_AVG)
+       "Resolved <uthv> horizontal Flux"//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_UThv,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_VTHV",YSUBTITLE(:), &
-       "Resolved <vthl> horizontal Flux"//YSUBTITLE(:),"mK/s",XLES_RESOLVED_VThv,HLES_AVG)
+       "Resolved <vthl> horizontal Flux"//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_VThv,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WTHV",YSUBTITLE(:), &
-       "Resolved <wthv> vertical Flux "//YSUBTITLE(:),"mK/s",XLES_RESOLVED_WThv,HLES_AVG)
+       "Resolved <wthv> vertical Flux "//YSUBTITLE(:),"m K s-1",XLES_RESOLVED_WThv,HLES_AVG)
   END IF
 !
   IF (LUSERV) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_RV2 ",YSUBTITLE(:), &
-       "Resolved water vapor variance"//YSUBTITLE(:),"kg2/kg2",XLES_RESOLVED_Rv2,HLES_AVG)
+       "Resolved water vapor variance"//YSUBTITLE(:),"kg2 kg-2",XLES_RESOLVED_Rv2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_THRV",YSUBTITLE(:), &
-       "Resolved <thrv> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThRv,HLES_AVG)
+       "Resolved <thrv> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThRv,HLES_AVG)
 
     IF (LUSERC) &
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_TLRV",YSUBTITLE(:), &
-       "Resolved <thlrv> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThlRv,HLES_AVG)
+       "Resolved <thlrv> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThlRv,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_TVRV",YSUBTITLE(:), &
-       "Resolved <thvrv> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThvRv,HLES_AVG)
+       "Resolved <thvrv> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThvRv,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_URV ", YSUBTITLE(:), &
-       "Resolved <urv> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_URv,HLES_AVG)
+       "Resolved <urv> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_URv,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_VRV ", YSUBTITLE(:), &
-       "Resolved <vrv> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_VRv,HLES_AVG)
+       "Resolved <vrv> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_VRv,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRV ", YSUBTITLE(:), &
-       "Resolved <wrv> vertical flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_WRv,HLES_AVG)
+       "Resolved <wrv> vertical flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_WRv,HLES_AVG)
   END IF
 
   IF (LUSERC) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_RC2 ", YSUBTITLE(:), &
-       "Resolved cloud water variance"//YSUBTITLE(:),"kg2/kg2",XLES_RESOLVED_Rc2,HLES_AVG)
+       "Resolved cloud water variance"//YSUBTITLE(:),"kg2 kg-2",XLES_RESOLVED_Rc2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_THRC", YSUBTITLE(:), &
-       "Resolved <thrc> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThRc,HLES_AVG)
+       "Resolved <thrc> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThRc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_TLRC", YSUBTITLE(:), &
-       "Resolved <thlrc> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThlRc,HLES_AVG)
+       "Resolved <thlrc> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThlRc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_TVRC", YSUBTITLE(:), &
-       "Resolved <thvrc> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThvRc,HLES_AVG)
+       "Resolved <thvrc> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThvRc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_URC ", YSUBTITLE(:), &
-       "Resolved <urc> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_URc,HLES_AVG)
+       "Resolved <urc> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_URc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_VRC ", YSUBTITLE(:), &
-       "Resolved <vrc> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_VRc,HLES_AVG)
+       "Resolved <vrc> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_VRc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRC ", YSUBTITLE(:), &
-       "Resolved <wrc> vertical flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_WRc,HLES_AVG)
+       "Resolved <wrc> vertical flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_WRc,HLES_AVG)
   END IF
 
   IF (LUSERI) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_RI2 ", YSUBTITLE(:), &
-       "Resolved cloud ice variance"//YSUBTITLE(:),"kg2/kg2",XLES_RESOLVED_Ri2,HLES_AVG)
+       "Resolved cloud ice variance"//YSUBTITLE(:),"kg2 kg-2",XLES_RESOLVED_Ri2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_THRI", YSUBTITLE(:), &
-       "Resolved <thri> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThRi,HLES_AVG)
+       "Resolved <thri> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThRi,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_TLRI", YSUBTITLE(:), &
-       "Resolved <thlri> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThlRi,HLES_AVG)
+       "Resolved <thlri> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThlRi,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_TVRI", YSUBTITLE(:), &
-       "Resolved <thvri> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThvRi,HLES_AVG)
+       "Resolved <thvri> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThvRi,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_URI ", YSUBTITLE(:), &
-       "Resolved <uri> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_URi,HLES_AVG)
+       "Resolved <uri> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_URi,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_VRI ", YSUBTITLE(:), &
-       "Resolved <vri> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_VRi,HLES_AVG)
+       "Resolved <vri> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_VRi,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRI ", YSUBTITLE(:), &
-       "Resolved <wri> vertical flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_WRi,HLES_AVG)
+       "Resolved <wri> vertical flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_WRi,HLES_AVG)
   END IF
 
   IF (LUSERR) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRR ", YSUBTITLE(:), &
-       "Resolved <wrr> vertical flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_WRr,HLES_AVG)
+       "Resolved <wrr> vertical flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_WRr,HLES_AVG)
     
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"INPRR3D ", YSUBTITLE(:), &
-       "Precipitation flux"//YSUBTITLE(:),"m/s",XLES_INPRR3D,HLES_AVG)   
+       "Precipitation flux"//YSUBTITLE(:),"m s-1",XLES_INPRR3D,HLES_AVG)
         
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"MAXINPR3D ", YSUBTITLE(:), &
-       "Max Precip flux"//YSUBTITLE(:),"m/s",XLES_MAX_INPRR3D,HLES_AVG)   
+       "Max Precip flux"//YSUBTITLE(:),"m s-1",XLES_MAX_INPRR3D,HLES_AVG)
         
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"EVAP3D ", YSUBTITLE(:), &
-       "Evaporation profile"//YSUBTITLE(:),"kg/kg/s",XLES_EVAP3D,HLES_AVG)
+       "Evaporation profile"//YSUBTITLE(:),"kg kg-1 s-1",XLES_EVAP3D,HLES_AVG)
   ENDIF
   IF (NSV>0) THEN
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_SV2 ", YSUBTITLE(:), &
-       "Resolved scalar variables variances"//YSUBTITLE(:),"kg2/kg2",XLES_RESOLVED_Sv2,HLES_AVG)
+       "Resolved scalar variables variances"//YSUBTITLE(:),"kg2 kg-2",XLES_RESOLVED_Sv2,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_THSV", YSUBTITLE(:), &
-       "Resolved <ThSv> variance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThSv,HLES_AVG)
+       "Resolved <ThSv> variance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThSv,HLES_AVG)
 
     IF (LUSERC) &
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_TLSV", YSUBTITLE(:), &
-       "Resolved <ThlSv> variance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThlSv,HLES_AVG)
+       "Resolved <ThlSv> variance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThlSv,HLES_AVG)
 
     IF (LUSERV) &
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_TVSV", YSUBTITLE(:), &
-       "Resolved <ThvSv> variance"//YSUBTITLE(:),"Kkg/kg",XLES_RESOLVED_ThvSv,HLES_AVG)
+       "Resolved <ThvSv> variance"//YSUBTITLE(:),"K kg kg-1",XLES_RESOLVED_ThvSv,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_USV ", YSUBTITLE(:), &
-       "Resolved <uSv> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_USv,HLES_AVG)
+       "Resolved <uSv> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_USv,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_VSV ", YSUBTITLE(:), &
-       "Resolved <vSv> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_VSv,HLES_AVG)
+       "Resolved <vSv> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_VSv,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_WSV ", YSUBTITLE(:), &
-       "Resolved <wSv> vertical flux"//YSUBTITLE(:),"mkg/kg/s",XLES_RESOLVED_WSv,HLES_AVG)
+       "Resolved <wSv> vertical flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_RESOLVED_WSv,HLES_AVG)
   END IF
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_U3  ",YSUBTITLE(:),  &
-       "Resolved <w3>"//YSUBTITLE(:),"m3/s3",XLES_RESOLVED_U3,HLES_AVG)
+       "Resolved <w3>"//YSUBTITLE(:),"m3 s-3",XLES_RESOLVED_U3,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_V3  ",YSUBTITLE(:),  &
-       "Resolved <w3>"//YSUBTITLE(:),"m3/s3",XLES_RESOLVED_V3,HLES_AVG)
+       "Resolved <w3>"//YSUBTITLE(:),"m3 s-3",XLES_RESOLVED_V3,HLES_AVG)
     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_W3  ",YSUBTITLE(:),  &
-       "Resolved <w3>"//YSUBTITLE(:),"m3/s3",XLES_RESOLVED_W3,HLES_AVG)
+       "Resolved <w3>"//YSUBTITLE(:),"m3 s-3",XLES_RESOLVED_W3,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_U4  ",YSUBTITLE(:),  &
-       "Resolved <w3>"//YSUBTITLE(:),"m4/s4",XLES_RESOLVED_U4,HLES_AVG)
+       "Resolved <w3>"//YSUBTITLE(:),"m4 s-4",XLES_RESOLVED_U4,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_V4  ",YSUBTITLE(:),  &
-       "Resolved <w3>"//YSUBTITLE(:),"m4/s4",XLES_RESOLVED_V4,HLES_AVG)
+       "Resolved <w3>"//YSUBTITLE(:),"m4 s-4",XLES_RESOLVED_V4,HLES_AVG)
     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_W4  ",YSUBTITLE(:),  &
-       "Resolved <w3>"//YSUBTITLE(:),"m4/s4",XLES_RESOLVED_W4,HLES_AVG)
+       "Resolved <w3>"//YSUBTITLE(:),"m4 s-4",XLES_RESOLVED_W4,HLES_AVG)
 
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WTL2",YSUBTITLE(:),  &
-       "Resolved <wThl2>"//YSUBTITLE(:),"mK2/s",XLES_RESOLVED_WThl2,HLES_AVG)
+       "Resolved <wThl2>"//YSUBTITLE(:),"m K2 s-1",XLES_RESOLVED_WThl2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_W2TL",YSUBTITLE(:),  &
-       "Resolved <w2Thl>"//YSUBTITLE(:),"m2K/s2",XLES_RESOLVED_W2Thl,HLES_AVG)
+       "Resolved <w2Thl>"//YSUBTITLE(:),"m2 K s-2",XLES_RESOLVED_W2Thl,HLES_AVG)
 
   IF (LUSERV) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRV2",YSUBTITLE(:),  &
-         "Resolved <wRv2>"//YSUBTITLE(:),"mkg2/kg2/s",XLES_RESOLVED_WRv2,HLES_AVG)
+         "Resolved <wRv2>"//YSUBTITLE(:),"m kg2 kg-2 s-1",XLES_RESOLVED_WRv2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_W2RV",YSUBTITLE(:),  &
-         "Resolved <w2Rv>"//YSUBTITLE(:),"m2kg/kg/s2",XLES_RESOLVED_W2Rv,HLES_AVG)
+         "Resolved <w2Rv>"//YSUBTITLE(:),"m2 kg kg-1 s-2",XLES_RESOLVED_W2Rv,HLES_AVG)
      
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRT2",YSUBTITLE(:),  &
-         "Resolved <wRt2>"//YSUBTITLE(:),"mkg2/kg2/s",XLES_RESOLVED_WRt2,HLES_AVG)
+         "Resolved <wRt2>"//YSUBTITLE(:),"m kg2 kg-2 s-1",XLES_RESOLVED_WRt2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_W2RT",YSUBTITLE(:),  &
-         "Resolved <w2Rt>"//YSUBTITLE(:),"m2kg/kg/s2",XLES_RESOLVED_W2Rt,HLES_AVG)
+         "Resolved <w2Rt>"//YSUBTITLE(:),"m2 kg kg-1 s-2",XLES_RESOLVED_W2Rt,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RE_WTLRV",YSUBTITLE(:),  &
-         "Resolved <wThlRv>"//YSUBTITLE(:),"mKkg/kg/s",XLES_RESOLVED_WThlRv,HLES_AVG)
+         "Resolved <wThlRv>"//YSUBTITLE(:),"m K kg kg-1 s-1",XLES_RESOLVED_WThlRv,HLES_AVG)
    
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RE_WTLRT",YSUBTITLE(:),  &
-         "Resolved <wThlRt>"//YSUBTITLE(:),"mKkg/kg/s",XLES_RESOLVED_WThlRt,HLES_AVG)  
+         "Resolved <wThlRt>"//YSUBTITLE(:),"m K kg kg-1 s-1",XLES_RESOLVED_WThlRt,HLES_AVG)
   END IF
 
   IF (LUSERC) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRC2",YSUBTITLE(:),  &
-         "Resolved <wRc2>"//YSUBTITLE(:),"mkg2/kg2/s",XLES_RESOLVED_WRc2,HLES_AVG)
+         "Resolved <wRc2>"//YSUBTITLE(:),"m kg2 kg-2 s-1",XLES_RESOLVED_WRc2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_W2RC",YSUBTITLE(:),  &
-         "Resolved <w2Rc>"//YSUBTITLE(:),"m2kg/kg/s2",XLES_RESOLVED_W2Rc,HLES_AVG)
+         "Resolved <w2Rc>"//YSUBTITLE(:),"m2 kg kg-1 s-2",XLES_RESOLVED_W2Rc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RE_WTLRC",YSUBTITLE(:),  &
-         "Resolved <wThlRc>"//YSUBTITLE(:),"mKkg/kg/s",XLES_RESOLVED_WThlRc,HLES_AVG)
+         "Resolved <wThlRc>"//YSUBTITLE(:),"m K kg kg-1 s-1",XLES_RESOLVED_WThlRc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RE_WRVRC",YSUBTITLE(:),  &
-         "Resolved <wRvRc>"//YSUBTITLE(:),"mkg2/kg2/s",XLES_RESOLVED_WRvRc,HLES_AVG)
+         "Resolved <wRvRc>"//YSUBTITLE(:),"m kg2 kg-2 s-1",XLES_RESOLVED_WRvRc,HLES_AVG)
   END IF
 
   IF (LUSERI) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WRI2",YSUBTITLE(:),  &
-         "Resolved <wRi2>"//YSUBTITLE(:),"mkg2/kg2/s",XLES_RESOLVED_WRi2,HLES_AVG)
+         "Resolved <wRi2>"//YSUBTITLE(:),"m kg2 kg-2 s-1",XLES_RESOLVED_WRi2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_W2RI",YSUBTITLE(:),  &
-         "Resolved <w2Ri>"//YSUBTITLE(:),"m2kg/kg/s2",XLES_RESOLVED_W2Ri,HLES_AVG)
+         "Resolved <w2Ri>"//YSUBTITLE(:),"m2 kg kg-1 s-2",XLES_RESOLVED_W2Ri,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RE_WTLRI",YSUBTITLE(:),  &
-         "Resolved <wThlRi>"//YSUBTITLE(:),"mKkg/kg/s",XLES_RESOLVED_WThlRi,HLES_AVG)
+         "Resolved <wThlRi>"//YSUBTITLE(:),"m K kg kg-1 s-1",XLES_RESOLVED_WThlRi,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"RE_WRVRI",YSUBTITLE(:),  &
-         "Resolved <wRvRi>"//YSUBTITLE(:),"mkg2/kg2/s",XLES_RESOLVED_WRvRi,HLES_AVG)
+         "Resolved <wRvRi>"//YSUBTITLE(:),"m kg2 kg-2 s-1",XLES_RESOLVED_WRvRi,HLES_AVG)
   END IF
 
   IF (NSV>0) THEN
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_WSV2",YSUBTITLE(:),  &
-         "Resolved <wSv2>"//YSUBTITLE(:),"mkg2/kg2/s",XLES_RESOLVED_WSv2,HLES_AVG)
+         "Resolved <wSv2>"//YSUBTITLE(:),"m kg2 kg-2 s-1",XLES_RESOLVED_WSv2,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_W2SV",YSUBTITLE(:),  &
-         "Resolved <w2Sv>"//YSUBTITLE(:),"m2kg/kg/s2",XLES_RESOLVED_W2Sv,HLES_AVG)
+         "Resolved <w2Sv>"//YSUBTITLE(:),"m2 kg kg-1 s-2",XLES_RESOLVED_W2Sv,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RE_WTLSV",YSUBTITLE(:),  &
-         "Resolved <wThlSv>"//YSUBTITLE(:),"mKkg/kg/s",XLES_RESOLVED_WThlSv,HLES_AVG)
+         "Resolved <wThlSv>"//YSUBTITLE(:),"m K kg kg-1 s-1",XLES_RESOLVED_WThlSv,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RE_WRVSV",YSUBTITLE(:),  &
-         "Resolved <wRvSv>"//YSUBTITLE(:),"mkg2/kg2/s",XLES_RESOLVED_WRvSv,HLES_AVG)
+         "Resolved <wRvSv>"//YSUBTITLE(:),"m kg2 kg-2 s-1",XLES_RESOLVED_WRvSv,HLES_AVG)
   END IF
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_TLPZ",YSUBTITLE(:),  &
-       "Resolved <Thldp/dz>"//YSUBTITLE(:),"KPa/m",XLES_RESOLVED_ThlPz,HLES_AVG)
+       "Resolved <Thldp/dz>"//YSUBTITLE(:),"K Pa m-1",XLES_RESOLVED_ThlPz,HLES_AVG)
 
   IF (LUSERV) &
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_RVPZ",YSUBTITLE(:),  &
-       "Resolved <Rvdp/dz>"//YSUBTITLE(:),"kg2/kg2Pa/m",XLES_RESOLVED_RvPz,HLES_AVG)
+       "Resolved <Rvdp/dz>"//YSUBTITLE(:),"kg2 kg-2 Pa m-1",XLES_RESOLVED_RvPz,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_RCPZ",YSUBTITLE(:),  &
-       "Resolved <Rcdp/dz>"//YSUBTITLE(:),"kg2/kg2Pa/m",XLES_RESOLVED_RcPz,HLES_AVG)
+       "Resolved <Rcdp/dz>"//YSUBTITLE(:),"kg2 kg-2 Pa m-1",XLES_RESOLVED_RcPz,HLES_AVG)
 
   IF (LUSERI) &
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_RIPZ",YSUBTITLE(:),  &
-       "Resolved <Ridp/dz>"//YSUBTITLE(:),"kg2/kg2Pa/m",XLES_RESOLVED_RiPz,HLES_AVG)
+       "Resolved <Ridp/dz>"//YSUBTITLE(:),"kg2 kg-2 Pa m-1",XLES_RESOLVED_RiPz,HLES_AVG)
 
   IF (NSV>0) THEN
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"RES_SVPZ",YSUBTITLE(:),  &
-         "Resolved <Svdp/dz>"//YSUBTITLE(:),"kg2/kg2Pa/m",XLES_RESOLVED_SvPz,HLES_AVG)
+         "Resolved <Svdp/dz>"//YSUBTITLE(:),"kg2 kg-2 Pa m-1",XLES_RESOLVED_SvPz,HLES_AVG)
   END IF
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_UKE ", YSUBTITLE(:), &
-       "Resolved flux of resolved kinetic energy"//YSUBTITLE(:),"m3/s3",XLES_RESOLVED_UKe,HLES_AVG)
+       "Resolved flux of resolved kinetic energy"//YSUBTITLE(:),"m3 s-3",XLES_RESOLVED_UKe,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_VKE ", YSUBTITLE(:), &
-       "Resolved flux of resolved kinetic energy"//YSUBTITLE(:),"m3/s3",XLES_RESOLVED_VKe,HLES_AVG)
+       "Resolved flux of resolved kinetic energy"//YSUBTITLE(:),"m3 s-3",XLES_RESOLVED_VKe,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RES_WKE ", YSUBTITLE(:), &
-       "Resolved flux of resolved kinetic energy"//YSUBTITLE(:),"m3/s3",XLES_RESOLVED_WKe,HLES_AVG)
+       "Resolved flux of resolved kinetic energy"//YSUBTITLE(:),"m3 s-3",XLES_RESOLVED_WKe,HLES_AVG)
 
 END IF
 !
@@ -774,37 +774,37 @@ END IF
 IF (LLES_SUBGRID) THEN
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_TKE ",YSUBTITLE(:), &
-       "Subgrid TKE"//YSUBTITLE(:),"m2/s2",XLES_SUBGRID_Tke,HLES_AVG)
+       "Subgrid TKE"//YSUBTITLE(:),"m2 s-2",XLES_SUBGRID_Tke,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_U2  ", YSUBTITLE(:), &
-       "Subgrid <u2> variance"//YSUBTITLE(:),"m2/s2",XLES_SUBGRID_U2,HLES_AVG)
+       "Subgrid <u2> variance"//YSUBTITLE(:),"m2 s-2",XLES_SUBGRID_U2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_V2  ", YSUBTITLE(:), &
-       "Subgrid <v2> variance"//YSUBTITLE(:),"m2/s2",XLES_SUBGRID_V2,HLES_AVG)
+       "Subgrid <v2> variance"//YSUBTITLE(:),"m2 s-2",XLES_SUBGRID_V2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_W2  ", YSUBTITLE(:), &
-       "Subgrid <w2> variance"//YSUBTITLE(:),"m2/s2",XLES_SUBGRID_W2,HLES_AVG)
+       "Subgrid <w2> variance"//YSUBTITLE(:),"m2 s-2",XLES_SUBGRID_W2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_UV  ", YSUBTITLE(:), &
-       "Subgrid <uv> flux"//YSUBTITLE(:),"m2/s2",XLES_SUBGRID_UV,HLES_AVG)
+       "Subgrid <uv> flux"//YSUBTITLE(:),"m2 s-2",XLES_SUBGRID_UV,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WU  ", YSUBTITLE(:), &
-       "Subgrid <wu> flux"//YSUBTITLE(:),"m2/s2",XLES_SUBGRID_WU,HLES_AVG)
+       "Subgrid <wu> flux"//YSUBTITLE(:),"m2 s-2",XLES_SUBGRID_WU,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WV  ", YSUBTITLE(:), &
-       "Subgrid <wv> flux"//YSUBTITLE(:),"m2/s2",XLES_SUBGRID_WV,HLES_AVG)
+       "Subgrid <wv> flux"//YSUBTITLE(:),"m2 s-2",XLES_SUBGRID_WV,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_THL2", YSUBTITLE(:), &
        "Subgrid liquid potential temperature variance"//YSUBTITLE(:),"K2",XLES_SUBGRID_Thl2,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_UTHL", YSUBTITLE(:), &
-       "Subgrid hor. flux of liquid potential temperature"//YSUBTITLE(:),"mK/s",XLES_SUBGRID_UThl,HLES_AVG)
+       "Subgrid hor. flux of liquid potential temperature"//YSUBTITLE(:),"m K s-1",XLES_SUBGRID_UThl,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_VTHL", YSUBTITLE(:), &
-       "Subgrid hor. flux of liquid potential temperature"//YSUBTITLE(:),"mK/s",XLES_SUBGRID_VThl,HLES_AVG)
+       "Subgrid hor. flux of liquid potential temperature"//YSUBTITLE(:),"m K s-1",XLES_SUBGRID_VThl,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WTHL", YSUBTITLE(:), &
-       "Subgrid vert. flux of liquid potential temperature"//YSUBTITLE(:),"mK/s",XLES_SUBGRID_WThl,HLES_AVG)
+       "Subgrid vert. flux of liquid potential temperature"//YSUBTITLE(:),"m K s-1",XLES_SUBGRID_WThl,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WP  ",YSUBTITLE(:), &
      "Subgrid <wp> vertical Flux"//YSUBTITLE(:),"mPa/s",XLES_SUBGRID_WP,HLES_AVG)
@@ -814,133 +814,133 @@ IF (LLES_SUBGRID) THEN
      "Subgrid <thl> of updraft"//YSUBTITLE(:),"K",XLES_SUBGRID_THLUP_MF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RTUP_MF ",YSUBTITLE(:), &
-     "Subgrid <rt> of updraft"//YSUBTITLE(:),"kg/kg",XLES_SUBGRID_RTUP_MF,HLES_AVG)
+     "Subgrid <rt> of updraft"//YSUBTITLE(:),"kg kg-1",XLES_SUBGRID_RTUP_MF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RVUP_MF ",YSUBTITLE(:), &
-     "Subgrid <rv> of updraft"//YSUBTITLE(:),"kg/kg",XLES_SUBGRID_RVUP_MF,HLES_AVG)
+     "Subgrid <rv> of updraft"//YSUBTITLE(:),"kg kg-1",XLES_SUBGRID_RVUP_MF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RCUP_MF ",YSUBTITLE(:), &
-     "Subgrid <rc> of updraft"//YSUBTITLE(:),"kg/kg",XLES_SUBGRID_RCUP_MF,HLES_AVG) 
+     "Subgrid <rc> of updraft"//YSUBTITLE(:),"kg kg-1",XLES_SUBGRID_RCUP_MF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"RIUP_MF ",YSUBTITLE(:), &
-     "Subgrid <ri> of updraft"//YSUBTITLE(:),"kg/kg",XLES_SUBGRID_RIUP_MF,HLES_AVG) 
+     "Subgrid <ri> of updraft"//YSUBTITLE(:),"kg kg-1",XLES_SUBGRID_RIUP_MF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"WUP_MF  ",YSUBTITLE(:), &
-     "Subgrid <w> of updraft"//YSUBTITLE(:),"m/s",XLES_SUBGRID_WUP_MF,HLES_AVG)  
+     "Subgrid <w> of updraft"//YSUBTITLE(:),"m s-1",XLES_SUBGRID_WUP_MF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"MAFLX_MF",YSUBTITLE(:), &
-     "Subgrid <MF> of updraft"//YSUBTITLE(:),"kg/m2/s",XLES_SUBGRID_MASSFLUX,HLES_AVG) 
+     "Subgrid <MF> of updraft"//YSUBTITLE(:),"kg m-2 s-1",XLES_SUBGRID_MASSFLUX,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"DETR_MF ",YSUBTITLE(:), &
-     "Subgrid <detr> of updraft"//YSUBTITLE(:),"kg/m3/s",XLES_SUBGRID_DETR,HLES_AVG) 
+     "Subgrid <detr> of updraft"//YSUBTITLE(:),"kg m-3 s-1",XLES_SUBGRID_DETR,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"ENTR_MF ",YSUBTITLE(:), &
-     "Subgrid <entr> of updraft"//YSUBTITLE(:),"kg/m3/s",XLES_SUBGRID_ENTR,HLES_AVG)  
+     "Subgrid <entr> of updraft"//YSUBTITLE(:),"kg m-3 s-1",XLES_SUBGRID_ENTR,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"FRCUP_MF",YSUBTITLE(:), &
-     "Subgrid <FracUp> of updraft"//YSUBTITLE(:),"-",XLES_SUBGRID_FRACUP,HLES_AVG)   
+     "Subgrid <FracUp> of updraft"//YSUBTITLE(:),"1",XLES_SUBGRID_FRACUP,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"THVUP_MF",YSUBTITLE(:), &
      "Subgrid <thv> of updraft"//YSUBTITLE(:),"K",&
-                                XLES_SUBGRID_THVUP_MF,HLES_AVG) 
+                                XLES_SUBGRID_THVUP_MF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"WTHL_MF ",YSUBTITLE(:), &
-     "Subgrid <wthl> of mass flux convection scheme"//YSUBTITLE(:),"mk/s",&
-                                XLES_SUBGRID_WTHLMF,HLES_AVG)  
+     "Subgrid <wthl> of mass flux convection scheme"//YSUBTITLE(:),"m K s-1",&
+                                XLES_SUBGRID_WTHLMF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"WRT_MF  ",YSUBTITLE(:), &
-     "Subgrid <wrt> of mass flux convection scheme"//YSUBTITLE(:),"mkg/kg/s",&
-                                XLES_SUBGRID_WRTMF,HLES_AVG)   
+     "Subgrid <wrt> of mass flux convection scheme"//YSUBTITLE(:),"m kg kg-1 s-1",&
+                                XLES_SUBGRID_WRTMF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"WTHV_MF ",YSUBTITLE(:), &
-     "Subgrid <wthv> of mass flux convection scheme"//YSUBTITLE(:),"mK/s",&
-                                XLES_SUBGRID_WTHVMF,HLES_AVG)  
+     "Subgrid <wthv> of mass flux convection scheme"//YSUBTITLE(:),"m K s-1",&
+                                XLES_SUBGRID_WTHVMF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"WU_MF   ",YSUBTITLE(:), &
-     "Subgrid <wu> of mass flux convection scheme"//YSUBTITLE(:),"m2/s2",&
-                                XLES_SUBGRID_WUMF,HLES_AVG)   
+     "Subgrid <wu> of mass flux convection scheme"//YSUBTITLE(:),"m2 s-2",&
+                                XLES_SUBGRID_WUMF,HLES_AVG)
 !     
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"WV_MF   ",YSUBTITLE(:), &
-     "Subgrid <wv> of mass flux convection scheme"//YSUBTITLE(:),"m2/s2",&
-                                XLES_SUBGRID_WVMF,HLES_AVG)   
+     "Subgrid <wv> of mass flux convection scheme"//YSUBTITLE(:),"m2 s-2",&
+                                XLES_SUBGRID_WVMF,HLES_AVG)
 !!     
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_PHI3",YSUBTITLE(:), &
-     "Subgrid Phi3 function"//YSUBTITLE(:),"-",XLES_SUBGRID_PHI3,HLES_AVG)
+     "Subgrid Phi3 function"//YSUBTITLE(:),"1",XLES_SUBGRID_PHI3,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_LMIX",YSUBTITLE(:), &
-     "Subgrid Mixing Length"//YSUBTITLE(:),"-",XLES_SUBGRID_LMix,HLES_AVG)
+     "Subgrid Mixing Length"//YSUBTITLE(:),"1",XLES_SUBGRID_LMix,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_LDIS",YSUBTITLE(:), &
-     "Subgrid Dissipation Length"//YSUBTITLE(:),"-",XLES_SUBGRID_LDiss,HLES_AVG)
+     "Subgrid Dissipation Length"//YSUBTITLE(:),"1",XLES_SUBGRID_LDiss,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_KM  ",YSUBTITLE(:), &
-     "Eddy diffusivity for momentum"//YSUBTITLE(:),"m2/s",XLES_SUBGRID_Km,HLES_AVG)
+     "Eddy diffusivity for momentum"//YSUBTITLE(:),"m2 s-1",XLES_SUBGRID_Km,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_KH  ",YSUBTITLE(:), &
-     "Eddy diffusivity for heat"//YSUBTITLE(:),"m2/s",XLES_SUBGRID_Kh,HLES_AVG)
+     "Eddy diffusivity for heat"//YSUBTITLE(:),"m2 s-1",XLES_SUBGRID_Kh,HLES_AVG)
 !
   IF (LUSERV) THEN
      CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WTHV", YSUBTITLE(:), &
-       "Subgrid vert. flux of liquid potential temperature"//YSUBTITLE(:),"mK/s",XLES_SUBGRID_WThv,HLES_AVG)
+       "Subgrid vert. flux of liquid potential temperature"//YSUBTITLE(:),"m K s-1",XLES_SUBGRID_WThv,HLES_AVG)
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_RT2 ", YSUBTITLE(:), &
-       "Subgrid total water variance"//YSUBTITLE(:),"kg2/kg2",XLES_SUBGRID_Rt2,HLES_AVG)
+       "Subgrid total water variance"//YSUBTITLE(:),"kg2 kg-2",XLES_SUBGRID_Rt2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_TLRT", YSUBTITLE(:), &
-       "Subgrid <thlrt> covariance"//YSUBTITLE(:),"Kkg/kg",XLES_SUBGRID_ThlRt,HLES_AVG)
+       "Subgrid <thlrt> covariance"//YSUBTITLE(:),"K kg kg-1",XLES_SUBGRID_ThlRt,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_URT ", YSUBTITLE(:), &
-       "Subgrid total water horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_URt,HLES_AVG)
+       "Subgrid total water horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_URt,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_VRT ", YSUBTITLE(:), &
-       "Subgrid total water horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_VRt,HLES_AVG)
+       "Subgrid total water horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_VRt,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WRT ", YSUBTITLE(:), &
-       "Subgrid total water vertical flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_WRt,HLES_AVG)
+       "Subgrid total water vertical flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_WRt,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_PSI3",YSUBTITLE(:), &
-       "Subgrid Psi3 function"//YSUBTITLE(:),"-",XLES_SUBGRID_PSI3,HLES_AVG)  
+       "Subgrid Psi3 function"//YSUBTITLE(:),"1",XLES_SUBGRID_PSI3,HLES_AVG)
   END IF
 
   IF (LUSERC) THEN
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_RC2 ", YSUBTITLE(:), &
-       "Subgrid cloud water variance"//YSUBTITLE(:),"kg2/kg2",XLES_SUBGRID_Rc2,HLES_AVG)
+       "Subgrid cloud water variance"//YSUBTITLE(:),"kg2 kg-2",XLES_SUBGRID_Rc2,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_URC ", YSUBTITLE(:), &
-       "Subgrid cloud water horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_URc,HLES_AVG)
+       "Subgrid cloud water horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_URc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_VRC ", YSUBTITLE(:), &
-       "Subgrid cloud water horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_VRc,HLES_AVG)
+       "Subgrid cloud water horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_VRc,HLES_AVG)
 
     CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WRC ", YSUBTITLE(:), &
-       "Subgrid cloud water vertical flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_WRc,HLES_AVG)
+       "Subgrid cloud water vertical flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_WRc,HLES_AVG)
   END IF
 
   IF (NSV>0) THEN
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"SBG_USV ", YSUBTITLE(:), &
-       "Subgrid <uSv> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_USv,HLES_AVG)
+       "Subgrid <uSv> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_USv,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"SBG_VSV ", YSUBTITLE(:), &
-       "Subgrid <vSv> horizontal flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_VSv,HLES_AVG)
+       "Subgrid <vSv> horizontal flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_VSv,HLES_AVG)
 
     CALL LES_DIACHRO_SV_MASKS(TPDIAFILE,"SBG_WSV ", YSUBTITLE(:), &
-       "Subgrid <wSv> vertical flux"//YSUBTITLE(:),"mkg/kg/s",XLES_SUBGRID_WSv,HLES_AVG)
+       "Subgrid <wSv> vertical flux"//YSUBTITLE(:),"m kg kg-1 s-1",XLES_SUBGRID_WSv,HLES_AVG)
   END IF
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_UTKE", YSUBTITLE(:), &
-     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m3/s3",XLES_SUBGRID_UTke,HLES_AVG)
+     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m3 s-3",XLES_SUBGRID_UTke,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_VTKE", YSUBTITLE(:), &
-     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m3/s3",XLES_SUBGRID_VTke,HLES_AVG)
+     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m3 s-3",XLES_SUBGRID_VTke,HLES_AVG)
 
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WTKE",YSUBTITLE(:),  &
-     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m3/s3",XLES_SUBGRID_WTke,HLES_AVG)
+     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m3 s-3",XLES_SUBGRID_WTke,HLES_AVG)
 !
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_W2TL",YSUBTITLE(:),  &
-     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m2K/s2",XLES_SUBGRID_W2Thl,HLES_AVG)
+     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m2 K s-2",XLES_SUBGRID_W2Thl,HLES_AVG)
 !
   CALL LES_DIACHRO_MASKS(TPDIAFILE,"SBG_WTL2",YSUBTITLE(:),  &
-     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"mK2/s",XLES_SUBGRID_WThl2,HLES_AVG)
+     "Subgrid flux of subgrid kinetic energy"//YSUBTITLE(:),"m K2 s-1",XLES_SUBGRID_WThl2,HLES_AVG)
 !
 END IF
 !
@@ -949,10 +949,10 @@ END IF
 !
 IF (LLES_UPDRAFT) THEN
   CALL LES_DIACHRO(TPDIAFILE,"UP_FRAC ",  &
-       "Updraft fraction","-",XLES_UPDRAFT,HLES_AVG)
+       "Updraft fraction","1",XLES_UPDRAFT,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"UP_W    ",  &
-       "Updraft W mean value","m/s",XLES_UPDRAFT_W,HLES_AVG)
+       "Updraft W mean value","m s-1",XLES_UPDRAFT_W,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"UP_TH   ",  &
        "Updraft potential temperature mean value","K",XLES_UPDRAFT_Th,HLES_AVG)
@@ -966,42 +966,42 @@ IF (LLES_UPDRAFT) THEN
        "Updraft virutal potential temperature mean value","K",XLES_UPDRAFT_Thv,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"UP_KE   ",  &
-       "Updraft resolved TKE mean value","m2/s2",XLES_UPDRAFT_Ke,HLES_AVG)
+       "Updraft resolved TKE mean value","m2 s-2",XLES_UPDRAFT_Ke,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"UP_TKE  ",  &
-       "Updraft subgrid TKE mean value","m2/s2",XLES_UPDRAFT_Tke,HLES_AVG)
+       "Updraft subgrid TKE mean value","m2 s-2",XLES_UPDRAFT_Tke,HLES_AVG)
 
   IF (LUSERV) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_RV   ",  &
-       "Updraft water vapor mean value","kg/kg",XLES_UPDRAFT_Rv,HLES_AVG)
+       "Updraft water vapor mean value","kg kg-1",XLES_UPDRAFT_Rv,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_RC   ",  &
-       "Updraft cloud water mean value","kg/kg",XLES_UPDRAFT_Rc,HLES_AVG)
+       "Updraft cloud water mean value","kg kg-1",XLES_UPDRAFT_Rc,HLES_AVG)
 
   IF (LUSERR) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_RR   ",  &
-       "Updraft rain mean value","kg/kg",XLES_UPDRAFT_Rr,HLES_AVG)
+       "Updraft rain mean value","kg kg-1",XLES_UPDRAFT_Rr,HLES_AVG)
 
   IF (LUSERI) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_RI   ",  &
-       "Updraft ice mean value","kg/kg",XLES_UPDRAFT_Ri,HLES_AVG)
+       "Updraft ice mean value","kg kg-1",XLES_UPDRAFT_Ri,HLES_AVG)
 
   IF (LUSERS) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_RS   ",  &
-       "Updraft snow mean value","kg/kg",XLES_UPDRAFT_Rs,HLES_AVG)
+       "Updraft snow mean value","kg kg-1",XLES_UPDRAFT_Rs,HLES_AVG)
 
   IF (LUSERG) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_RG   ",  &
-       "Updraft graupel mean value","kg/kg",XLES_UPDRAFT_Rg,HLES_AVG)
+       "Updraft graupel mean value","kg kg-1",XLES_UPDRAFT_Rg,HLES_AVG)
 
   IF (LUSERH) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_RH   ",  &
-       "Updraft hail mean value","kg/kg",XLES_UPDRAFT_Rh,HLES_AVG)
+       "Updraft hail mean value","kg kg-1",XLES_UPDRAFT_Rh,HLES_AVG)
 
   IF (NSV>0) &
   CALL LES_DIACHRO_SV(TPDIAFILE,"UP_SV   ",  &
-       "Updraft scalar variables mean values","kg/kg",XLES_UPDRAFT_Sv,HLES_AVG)
+       "Updraft scalar variables mean values","kg kg-1",XLES_UPDRAFT_Sv,HLES_AVG)
   !
   CALL LES_DIACHRO(TPDIAFILE,"UP_TH2 ",  &
        "Updraft resolved Theta variance ","K2",XLES_UPDRAFT_Th2,HLES_AVG)
@@ -1019,85 +1019,85 @@ IF (LLES_UPDRAFT) THEN
        "Updraft resolved Theta_l Theta_v covariance ","K2",XLES_UPDRAFT_ThlThv,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"UP_WTH  ",  &
-       "Updraft resolved WTh flux","mK/s",XLES_UPDRAFT_WTh,HLES_AVG)
+       "Updraft resolved WTh flux","m K s-1",XLES_UPDRAFT_WTh,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_WTHL ",  &
-       "Updraft resolved WThl flux","mK/s",XLES_UPDRAFT_WThl,HLES_AVG)
+       "Updraft resolved WThl flux","m K s-1",XLES_UPDRAFT_WThl,HLES_AVG)
 
   IF (LUSERV) &
   CALL LES_DIACHRO(TPDIAFILE,"UP_WTHV ",  &
-       "Updraft resolved WThv flux","mK/s",XLES_UPDRAFT_WThv,HLES_AVG)
+       "Updraft resolved WThv flux","m K s-1",XLES_UPDRAFT_WThv,HLES_AVG)
   !
   IF (LUSERV) THEN
     CALL LES_DIACHRO(TPDIAFILE,"UP_RV2  ",  &
-       "Updraft resolved water vapor variance","kg2/kg2",XLES_UPDRAFT_Rv2,HLES_AVG)
+       "Updraft resolved water vapor variance","kg2 kg-2",XLES_UPDRAFT_Rv2,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_THRV ",  &
-       "Updraft resolved <thrv> covariance","Kkg/kg",XLES_UPDRAFT_ThRv,HLES_AVG)
+       "Updraft resolved <thrv> covariance","K kg kg-1",XLES_UPDRAFT_ThRv,HLES_AVG)
 
     IF (LUSERC) &
     CALL LES_DIACHRO(TPDIAFILE,"UP_THLRV",  &
-     "Updraft resolved <thlrv> covariance","Kkg/kg",XLES_UPDRAFT_ThlRv,HLES_AVG)
+     "Updraft resolved <thlrv> covariance","K kg kg-1",XLES_UPDRAFT_ThlRv,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_THVRV",  &
-       "Updraft resolved <thvrv> covariance","Kkg/kg",XLES_UPDRAFT_ThvRv,HLES_AVG)
+       "Updraft resolved <thvrv> covariance","K kg kg-1",XLES_UPDRAFT_ThvRv,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_WRV  ",  &
-       "Updraft resolved <wrv> vertical flux","mkg/kg/s",XLES_UPDRAFT_WRv,HLES_AVG)
+       "Updraft resolved <wrv> vertical flux","m kg kg-1 s-1",XLES_UPDRAFT_WRv,HLES_AVG)
   END IF
 
   IF (LUSERC) THEN
     CALL LES_DIACHRO(TPDIAFILE,"UP_RC2  ",  &
-       "Updraft resolved cloud water variance","kg2/kg2",XLES_UPDRAFT_Rc2,HLES_AVG)
+       "Updraft resolved cloud water variance","kg2 kg-2",XLES_UPDRAFT_Rc2,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_THRC ",  &
-       "Updraft resolved <thrc> covariance","Kkg/kg",XLES_UPDRAFT_ThRc,HLES_AVG)
+       "Updraft resolved <thrc> covariance","K kg kg-1",XLES_UPDRAFT_ThRc,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_THLRC", &
-       "Updraft resolved <thlrc> covariance","Kkg/kg",XLES_UPDRAFT_ThlRc,HLES_AVG)
+       "Updraft resolved <thlrc> covariance","K kg kg-1",XLES_UPDRAFT_ThlRc,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_THVRC", &
-       "Updraft resolved <thvrc> covariance","Kkg/kg",XLES_UPDRAFT_ThvRc,HLES_AVG)
+       "Updraft resolved <thvrc> covariance","K kg kg-1",XLES_UPDRAFT_ThvRc,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_WRC  ",  &
-       "Updraft resolved <wrc> vertical flux","mkg/kg/s",XLES_UPDRAFT_WRc,HLES_AVG)
+       "Updraft resolved <wrc> vertical flux","m kg kg-1 s-1",XLES_UPDRAFT_WRc,HLES_AVG)
   END IF
 
   IF (LUSERI) THEN
     CALL LES_DIACHRO(TPDIAFILE,"UP_RI2  ", &
-       "Updraft resolved cloud ice variance","kg2/kg2",XLES_UPDRAFT_Ri2,HLES_AVG)
+       "Updraft resolved cloud ice variance","kg2 kg-2",XLES_UPDRAFT_Ri2,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_THRI ",  &
-       "Updraft resolved <thri> covariance","Kkg/kg",XLES_UPDRAFT_ThRi,HLES_AVG)
+       "Updraft resolved <thri> covariance","K kg kg-1",XLES_UPDRAFT_ThRi,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_THLRI",  &
-       "Updraft resolved <thlri> covariance","Kkg/kg",XLES_UPDRAFT_ThlRi,HLES_AVG)
+       "Updraft resolved <thlri> covariance","K kg kg-1",XLES_UPDRAFT_ThlRi,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_THVRI",  &
-       "Updraft resolved <thvri> covariance","Kkg/kg",XLES_UPDRAFT_ThvRi,HLES_AVG)
+       "Updraft resolved <thvri> covariance","K kg kg-1",XLES_UPDRAFT_ThvRi,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"UP_WRI  ",  &
-       "Updraft resolved <wri> vertical flux","mkg/kg/s",XLES_UPDRAFT_WRi,HLES_AVG)
+       "Updraft resolved <wri> vertical flux","m kg kg-1 s-1",XLES_UPDRAFT_WRi,HLES_AVG)
   END IF
 
   IF (NSV>0) THEN
     CALL LES_DIACHRO_SV(TPDIAFILE,"UP_SV2  ",  &
-       "Updraft resolved scalar variables variances","kg2/kg2",XLES_UPDRAFT_Sv2,HLES_AVG)
+       "Updraft resolved scalar variables variances","kg2 kg-2",XLES_UPDRAFT_Sv2,HLES_AVG)
 
     CALL LES_DIACHRO_SV(TPDIAFILE,"UP_THSV ", &
-       "Updraft resolved <ThSv> variance","Kkg/kg",XLES_UPDRAFT_ThSv,HLES_AVG)
+       "Updraft resolved <ThSv> variance","K kg kg-1",XLES_UPDRAFT_ThSv,HLES_AVG)
 
     IF (LUSERC) &
     CALL LES_DIACHRO_SV(TPDIAFILE,"UP_THLSV",  &
-       "Updraft resolved <ThlSv> variance","Kkg/kg",XLES_UPDRAFT_ThlSv,HLES_AVG)
+       "Updraft resolved <ThlSv> variance","K kg kg-1",XLES_UPDRAFT_ThlSv,HLES_AVG)
 
     IF (LUSERV) &
     CALL LES_DIACHRO_SV(TPDIAFILE,"UP_THVSV",  &
-       "Updraft resolved <ThvSv> variance","Kkg/kg",XLES_UPDRAFT_ThvSv,HLES_AVG)
+       "Updraft resolved <ThvSv> variance","K kg kg-1",XLES_UPDRAFT_ThvSv,HLES_AVG)
 
     CALL LES_DIACHRO_SV(TPDIAFILE,"UP_WSV  ",  &
-       "Updraft resolved <wSv> vertical flux","mkg/kg/s",XLES_UPDRAFT_WSv,HLES_AVG)
+       "Updraft resolved <wSv> vertical flux","m kg kg-1 s-1",XLES_UPDRAFT_WSv,HLES_AVG)
   END IF
 END IF
 !                
@@ -1107,10 +1107,10 @@ END IF
 !
 IF (LLES_DOWNDRAFT) THEN
    CALL LES_DIACHRO(TPDIAFILE,"DW_FRAC ",  &
-       "Downdraft fraction","-",XLES_DOWNDRAFT,HLES_AVG)
+       "Downdraft fraction","1",XLES_DOWNDRAFT,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"DW_W    ", &
-       "Downdraft W mean value","m/s",XLES_DOWNDRAFT_W,HLES_AVG)
+       "Downdraft W mean value","m s-1",XLES_DOWNDRAFT_W,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"DW_TH   ",  &
        "Downdraft potential temperature mean value","K",XLES_DOWNDRAFT_Th,HLES_AVG)
@@ -1125,42 +1125,42 @@ IF (LLES_DOWNDRAFT) THEN
 
 
   CALL LES_DIACHRO(TPDIAFILE,"DW_KE   ", &
-       "Downdraft resolved TKE mean value","m2/s2",XLES_DOWNDRAFT_Ke,HLES_AVG)
+       "Downdraft resolved TKE mean value","m2 s-2",XLES_DOWNDRAFT_Ke,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"DW_TKE  ",  &
-       "Downdraft subgrid TKE mean value","m2/s2",XLES_DOWNDRAFT_Tke,HLES_AVG)
+       "Downdraft subgrid TKE mean value","m2 s-2",XLES_DOWNDRAFT_Tke,HLES_AVG)
 
   IF (LUSERV) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_RV   ",  &
-       "Downdraft water vapor mean value","kg/kg",XLES_DOWNDRAFT_Rv,HLES_AVG)
+       "Downdraft water vapor mean value","kg kg-1",XLES_DOWNDRAFT_Rv,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_RC   ",  &
-       "Downdraft cloud water mean value","kg/kg",XLES_DOWNDRAFT_Rc,HLES_AVG)
+       "Downdraft cloud water mean value","kg kg-1",XLES_DOWNDRAFT_Rc,HLES_AVG)
 
   IF (LUSERR) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_RR   ",  &
-       "Downdraft rain mean value","kg/kg",XLES_DOWNDRAFT_Rr,HLES_AVG)
+       "Downdraft rain mean value","kg kg-1",XLES_DOWNDRAFT_Rr,HLES_AVG)
 
   IF (LUSERI) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_RI   ",  &
-       "Downdraft ice mean value","kg/kg",XLES_DOWNDRAFT_Ri,HLES_AVG)
+       "Downdraft ice mean value","kg kg-1",XLES_DOWNDRAFT_Ri,HLES_AVG)
 
   IF (LUSERS) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_RS   ",  &
-       "Downdraft snow mean value","kg/kg",XLES_DOWNDRAFT_Rs,HLES_AVG)
+       "Downdraft snow mean value","kg kg-1",XLES_DOWNDRAFT_Rs,HLES_AVG)
 
   IF (LUSERG) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_RG   ",  &
-       "Downdraft graupel mean value","kg/kg",XLES_DOWNDRAFT_Rg,HLES_AVG)
+       "Downdraft graupel mean value","kg kg-1",XLES_DOWNDRAFT_Rg,HLES_AVG)
 
   IF (LUSERH) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_RH   ",  &
-       "Downdraft hail mean value","kg/kg",XLES_DOWNDRAFT_Rh,HLES_AVG)
+       "Downdraft hail mean value","kg kg-1",XLES_DOWNDRAFT_Rh,HLES_AVG)
 
   IF (NSV>0) &
   CALL LES_DIACHRO_SV(TPDIAFILE,"DW_SV   ", &
-       "Downdraft scalar variables mean values","kg/kg",XLES_DOWNDRAFT_Sv,HLES_AVG)
+       "Downdraft scalar variables mean values","kg kg-1",XLES_DOWNDRAFT_Sv,HLES_AVG)
   !
   CALL LES_DIACHRO(TPDIAFILE,"DW_TH2 ",  &
        "Downdraft resolved Theta variance ","K2",XLES_DOWNDRAFT_Th2,HLES_AVG)
@@ -1178,85 +1178,85 @@ IF (LLES_DOWNDRAFT) THEN
        "Downdraft resolved Theta_l Theta_v covariance ","K2",XLES_DOWNDRAFT_ThlThv,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"DW_WTH  ",  &
-       "Downdraft resolved WTh flux","mK/s",XLES_DOWNDRAFT_WTh,HLES_AVG)
+       "Downdraft resolved WTh flux","m K s-1",XLES_DOWNDRAFT_WTh,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_WTHL ",  &
-       "Downdraft resolved WThl flux","mK/s",XLES_DOWNDRAFT_WThl,HLES_AVG)
+       "Downdraft resolved WThl flux","m K s-1",XLES_DOWNDRAFT_WThl,HLES_AVG)
 
   IF (LUSERV) &
   CALL LES_DIACHRO(TPDIAFILE,"DW_WTHV ",  &
-       "Downdraft resolved WThv flux","mK/s",XLES_DOWNDRAFT_WThv,HLES_AVG)
+       "Downdraft resolved WThv flux","m K s-1",XLES_DOWNDRAFT_WThv,HLES_AVG)
   !
   IF (LUSERV) THEN
     CALL LES_DIACHRO(TPDIAFILE,"DW_RV2  ",  &
-       "Downdraft resolved water vapor variance","kg2/kg2",XLES_DOWNDRAFT_Rv2,HLES_AVG)
+       "Downdraft resolved water vapor variance","kg2 kg-2",XLES_DOWNDRAFT_Rv2,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_THRV ",  &
-       "Downdraft resolved <thrv> covariance","Kkg/kg",XLES_DOWNDRAFT_ThRv,HLES_AVG)
+       "Downdraft resolved <thrv> covariance","K kg kg-1",XLES_DOWNDRAFT_ThRv,HLES_AVG)
 
     IF (LUSERC) &
     CALL LES_DIACHRO(TPDIAFILE,"DW_THLRV",  &
-       "Downdraft resolved <thlrv> covariance","Kkg/kg",XLES_DOWNDRAFT_ThlRv,HLES_AVG)
+       "Downdraft resolved <thlrv> covariance","K kg kg-1",XLES_DOWNDRAFT_ThlRv,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_THVRV",  &
-       "Downdraft resolved <thvrv> covariance","Kkg/kg",XLES_DOWNDRAFT_ThvRv,HLES_AVG)
+       "Downdraft resolved <thvrv> covariance","K kg kg-1",XLES_DOWNDRAFT_ThvRv,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_WRV  ",  &
-       "Downdraft resolved <wrv> vertical flux","mkg/kg/s",XLES_DOWNDRAFT_WRv,HLES_AVG)
+       "Downdraft resolved <wrv> vertical flux","m kg kg-1 s-1",XLES_DOWNDRAFT_WRv,HLES_AVG)
   END IF
 
   IF (LUSERC) THEN
     CALL LES_DIACHRO(TPDIAFILE,"DW_RC2  ",  &
-       "Downdraft resolved cloud water variance","kg2/kg2",XLES_DOWNDRAFT_Rc2,HLES_AVG)
+       "Downdraft resolved cloud water variance","kg2 kg-2",XLES_DOWNDRAFT_Rc2,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_THRC ",  &
-       "Downdraft resolved <thrc> covariance","Kkg/kg",XLES_DOWNDRAFT_ThRc,HLES_AVG)
+       "Downdraft resolved <thrc> covariance","K kg kg-1",XLES_DOWNDRAFT_ThRc,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_THLRC",  &
-       "Downdraft resolved <thlrc> covariance","Kkg/kg",XLES_DOWNDRAFT_ThlRc,HLES_AVG)
+       "Downdraft resolved <thlrc> covariance","K kg kg-1",XLES_DOWNDRAFT_ThlRc,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_THVRC",  &
-       "Downdraft resolved <thvrc> covariance","Kkg/kg",XLES_DOWNDRAFT_ThvRc,HLES_AVG)
+       "Downdraft resolved <thvrc> covariance","K kg kg-1",XLES_DOWNDRAFT_ThvRc,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_WRC  ",  &
-       "Downdraft resolved <wrc> vertical flux","mkg/kg/s",XLES_DOWNDRAFT_WRc,HLES_AVG)
+       "Downdraft resolved <wrc> vertical flux","m kg kg-1 s-1",XLES_DOWNDRAFT_WRc,HLES_AVG)
   END IF
 
   IF (LUSERI) THEN
     CALL LES_DIACHRO(TPDIAFILE,"DW_RI2  ",  &
-       "Downdraft resolved cloud ice variance","kg2/kg2",XLES_DOWNDRAFT_Ri2,HLES_AVG)
+       "Downdraft resolved cloud ice variance","kg2 kg-2",XLES_DOWNDRAFT_Ri2,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_THRI ",  &
-       "Downdraft resolved <thri> covariance","Kkg/kg",XLES_DOWNDRAFT_ThRi,HLES_AVG)
+       "Downdraft resolved <thri> covariance","K kg kg-1",XLES_DOWNDRAFT_ThRi,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_THLRI", &
-       "Downdraft resolved <thlri> covariance","Kkg/kg",XLES_DOWNDRAFT_ThlRi,HLES_AVG)
+       "Downdraft resolved <thlri> covariance","K kg kg-1",XLES_DOWNDRAFT_ThlRi,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_THVRI",  &
-       "Downdraft resolved <thvri> covariance","Kkg/kg",XLES_DOWNDRAFT_ThvRi,HLES_AVG)
+       "Downdraft resolved <thvri> covariance","K kg kg-1",XLES_DOWNDRAFT_ThvRi,HLES_AVG)
 
     CALL LES_DIACHRO(TPDIAFILE,"DW_WRI  ", &
-       "Downdraft resolved <wri> vertical flux","mkg/kg/s",XLES_DOWNDRAFT_WRi,HLES_AVG)
+       "Downdraft resolved <wri> vertical flux","m kg kg-1 s-1",XLES_DOWNDRAFT_WRi,HLES_AVG)
   END IF
 
   IF (NSV>0) THEN
     CALL LES_DIACHRO_SV(TPDIAFILE,"DW_SV2  ", &
-       "Downdraft resolved scalar variables variances","kg2/kg2",XLES_DOWNDRAFT_Sv2,HLES_AVG)
+       "Downdraft resolved scalar variables variances","kg2 kg-2",XLES_DOWNDRAFT_Sv2,HLES_AVG)
 
    CALL LES_DIACHRO_SV(TPDIAFILE,"DW_THSV ",  &
-       "Downdraft resolved <ThSv> variance","Kkg/kg",XLES_DOWNDRAFT_ThSv,HLES_AVG)
+       "Downdraft resolved <ThSv> variance","K kg kg-1",XLES_DOWNDRAFT_ThSv,HLES_AVG)
 
     IF (LUSERC) &
     CALL LES_DIACHRO_SV(TPDIAFILE,"DW_THLSV",  &
-       "Downdraft resolved <ThlSv> variance","Kkg/kg",XLES_DOWNDRAFT_ThlSv,HLES_AVG)
+       "Downdraft resolved <ThlSv> variance","K kg kg-1",XLES_DOWNDRAFT_ThlSv,HLES_AVG)
 
     IF (LUSERV) &
     CALL LES_DIACHRO_SV(TPDIAFILE,"DW_THVSV",  &
-       "Downdraft resolved <ThvSv> variance","Kkg/kg",XLES_DOWNDRAFT_ThvSv,HLES_AVG)
+       "Downdraft resolved <ThvSv> variance","K kg kg-1",XLES_DOWNDRAFT_ThvSv,HLES_AVG)
 
     CALL LES_DIACHRO_SV(TPDIAFILE,"DW_WSV  ", &
-       "Downdraft resolved <wSv> vertical flux","mkg/kg/s",XLES_DOWNDRAFT_WSv,HLES_AVG)
+       "Downdraft resolved <wSv> vertical flux","m kg kg-1 s-1",XLES_DOWNDRAFT_WSv,HLES_AVG)
   END IF
 END IF
 !
@@ -1268,42 +1268,42 @@ END IF
 IF (HLES_AVG==' ' .OR. HLES_AVG=='A') THEN
 
   CALL LES_DIACHRO_SURF(TPDIAFILE,"Q0      ",  &
-     "Sensible heat flux at the surface","mK/s",XLES_Q0,HLES_AVG)
+     "Sensible heat flux at the surface","m K s-1",XLES_Q0,HLES_AVG)
 
   IF (LUSERV) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"E0      ",  &
-     "Latent heat flux at the surface","kg/kgm/s",XLES_E0,HLES_AVG)
+     "Latent heat flux at the surface","kg kg-1 m s-1",XLES_E0,HLES_AVG)
      !writes  sw and lw flux and dthrad at all levels
   CALL LES_DIACHRO(TPDIAFILE,"SWU      ",  &
-     "sw_up ","W/m2 ",XLES_SWU,HLES_AVG)
+     "sw_up ","W m-2 ",XLES_SWU,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"SWD      ",  &
-     "sw_down ","W/m2 ",XLES_SWD,HLES_AVG)
+     "sw_down ","W m-2 ",XLES_SWD,HLES_AVG)
      
   CALL LES_DIACHRO(TPDIAFILE,"LWU      ",  &
-     "lw_up ","W/m2 ",XLES_LWU,HLES_AVG)
+     "lw_up ","W m-2 ",XLES_LWU,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"LWD      ",  &
-     "lw_down ","W/m2 ",XLES_LWD,HLES_AVG)
+     "lw_down ","W m-2 ",XLES_LWD,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"DTHRADSW      ",  &
-     "dthrad_sw ","K/s ",XLES_DTHRADSW,HLES_AVG)
+     "dthrad_sw ","K s-1 ",XLES_DTHRADSW,HLES_AVG)
 
   CALL LES_DIACHRO(TPDIAFILE,"DTHRADLW      ",  &
-     "dthrad_lw ","K/s ",XLES_DTHRADLW,HLES_AVG)
+     "dthrad_lw ","K s-1 ",XLES_DTHRADLW,HLES_AVG)
 !writes mean_effective radius at all levels
   CALL LES_DIACHRO(TPDIAFILE,"RADEFF      ",  &
      "mean effective radius ","microm ",XLES_RADEFF,HLES_AVG)
 
   IF (NSV>0) &
   CALL LES_DIACHRO_SURF_SV(TPDIAFILE,"SV0     ",  &
-     "Scalar variable fluxes at the surface","kg/kgm/s",XLES_SV0,HLES_AVG)
+     "Scalar variable fluxes at the surface","kg kg-1 m s-1",XLES_SV0,HLES_AVG)
 
   CALL LES_DIACHRO_SURF(TPDIAFILE,"U*      ",  &
-     "Friction velocity","m/s",XLES_USTAR,HLES_AVG)
+     "Friction velocity","m s-1",XLES_USTAR,HLES_AVG)
 
   CALL LES_DIACHRO_SURF(TPDIAFILE,"W*      ",  &
-     "Convective velocity","m/s",XLES_WSTAR,HLES_AVG)
+     "Convective velocity","m s-1",XLES_WSTAR,HLES_AVG)
 
   CALL LES_DIACHRO_SURF(TPDIAFILE,"BL_H    ",  &
      "Boundary Layer Height","m",XLES_BL_HEIGHT,HLES_AVG)
@@ -1320,39 +1320,39 @@ IF (HLES_AVG==' ' .OR. HLES_AVG=='A') THEN
 
   IF (LUSERC) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"ZCFTOT    ",  &
-     "Total Cloud cover"," ",XLES_CFtot,HLES_AVG)   
+     "Total Cloud cover","1",XLES_CFtot,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"ZCF2TOT    ",  &
-     "Total Cloud cove 2r"," ",XLES_CF2tot,HLES_AVG)   
+     "Total Cloud cove 2r","1",XLES_CF2tot,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"LWP    ",  &
-     "Liquid Water path","kg/m²",XLES_LWP,HLES_AVG)   
+     "Liquid Water path","kg m-2",XLES_LWP,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"LWPVAR ",  &
-     "Liquid Water path variance","kg/m4",XLES_LWPVAR,HLES_AVG)   
+     "Liquid Water path variance","kg m-4",XLES_LWPVAR,HLES_AVG)
 
   IF (LUSERR) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"RWP    ",  &
-     "Rain Water path","kg/m2",XLES_RWP,HLES_AVG)   
+     "Rain Water path","kg m-2",XLES_RWP,HLES_AVG)
 
   IF (LUSERI) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"IWP    ",  &
-     "Ice Water path","kg/m2",XLES_IWP,HLES_AVG)   
+     "Ice Water path","kg m-2",XLES_IWP,HLES_AVG)
 
   IF (LUSERS) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"SWP    ",  &
-     "Snow Water path","kg/m2",XLES_SWP,HLES_AVG)   
+     "Snow Water path","kg m-2",XLES_SWP,HLES_AVG)
 
   IF (LUSERG) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"GWP    ",  &
-     "Graupel Water path","kg/m2",XLES_GWP,HLES_AVG)   
+     "Graupel Water path","kg m-2",XLES_GWP,HLES_AVG)
 
   IF (LUSERH) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"HWP    ",  &
-     "Hail Water path","kg/m2",XLES_HWP,HLES_AVG)   
+     "Hail Water path","kg m-2",XLES_HWP,HLES_AVG)
 
   IF (LUSERR) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"PREC_FRAC    ",  &
@@ -1360,19 +1360,19 @@ IF (HLES_AVG==' ' .OR. HLES_AVG=='A') THEN
 
   IF (LUSERR) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"INST_PREC    ",  &
-     "Inst precip rate","mm/day",XLES_INPRR,HLES_AVG)
+     "Inst precip rate","mm day-1",XLES_INPRR,HLES_AVG)
 
   IF (LUSERC) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"INST_SEDIM   ",  &
-     "Inst cloud precip rate","mm/day",XLES_INPRC,HLES_AVG)
+     "Inst cloud precip rate","mm day-1",XLES_INPRC,HLES_AVG)
 
   IF (LUSERC .AND. (LDEPOSC .OR. LDEPOC)) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"INST_DEPOS   ",  &
-     "Inst cloud deposi rate","mm/day",XLES_INDEP,HLES_AVG)
+     "Inst cloud deposi rate","mm day-1",XLES_INDEP,HLES_AVG)
 
   IF (LUSERR) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"RAIN_PREC    ",  &
-     "inst pr. rate over rainy grid cells","mm/day",XLES_RAIN_INPRR,HLES_AVG)   
+     "inst pr. rate over rainy grid cells","mm day-1",XLES_RAIN_INPRR,HLES_AVG)
      
   IF (LUSERR) &
   CALL LES_DIACHRO_SURF(TPDIAFILE,"ACCU_PREC    ",  &
@@ -1405,68 +1405,68 @@ IF (NSV>0)  CALL WRITE_LES_SV_BUDGET_n(TPDIAFILE,HLES_AVG)
 IF (HLES_AVG==' ' .OR. HLES_AVG=='A') THEN
   IF (NSPECTRA_K>0) THEN
     CALL LES_DIACHRO_2PT(TPDIAFILE,"UU   ","U*U     2 points correlations", &
-  "m2/s2",XCORRi_UU,    XCORRj_UU,HLES_AVG)
+  "m2 s-2",XCORRi_UU,    XCORRj_UU,HLES_AVG)
     CALL LES_DIACHRO_2PT(TPDIAFILE,"VV   ","V*V     2 points correlations", &
-  "m2/s2",XCORRi_VV,    XCORRj_VV,HLES_AVG)
+  "m2 s-2",XCORRi_VV,    XCORRj_VV,HLES_AVG)
     CALL LES_DIACHRO_2PT(TPDIAFILE,"WW   ","W*W     2 points correlations", &
-  "m2/s2",XCORRi_WW,    XCORRj_WW,HLES_AVG)
+  "m2 s-2",XCORRi_WW,    XCORRj_WW,HLES_AVG)
     CALL LES_DIACHRO_2PT(TPDIAFILE,"UV   ","U*V     2 points correlations", &
-  "m2/s2",XCORRi_UV,    XCORRj_UV,HLES_AVG)
+  "m2 s-2",XCORRi_UV,    XCORRj_UV,HLES_AVG)
     CALL LES_DIACHRO_2PT(TPDIAFILE,"WU   ","W*U     2 points correlations", &
-  "m2/s2",XCORRi_WU,    XCORRj_WU,HLES_AVG)
+  "m2 s-2",XCORRi_WU,    XCORRj_WU,HLES_AVG)
     CALL LES_DIACHRO_2PT(TPDIAFILE,"WV   ","W*V     2 points correlations", &
-  "m2/s2",XCORRi_WV,    XCORRj_WV,HLES_AVG)
+  "m2 s-2",XCORRi_WV,    XCORRj_WV,HLES_AVG)
     CALL LES_DIACHRO_2PT(TPDIAFILE,"THTH ","Th*Th   2 points correlations", &
   "K2   ",XCORRi_ThTh,  XCORRj_ThTh,HLES_AVG)
     IF (LUSERC) &
     CALL LES_DIACHRO_2PT(TPDIAFILE,"TLTL ","Thl*Thl 2 points correlations", &
   "K2   ",XCORRi_ThlThl,XCORRj_ThlThl,HLES_AVG)
     CALL LES_DIACHRO_2PT(TPDIAFILE,"WTH  ","W*Th    2 points correlations", &
-  "mK/s ",XCORRi_WTh,   XCORRj_WTh,HLES_AVG)
+  "m K s-1 ",XCORRi_WTh,   XCORRj_WTh,HLES_AVG)
     IF (LUSERC) &
     CALL LES_DIACHRO_2PT(TPDIAFILE,"WTHL ","W*Thl   2 points correlations", &
-  "mK/s ",XCORRi_WThl,  XCORRj_WThl,HLES_AVG)
+  "m K s-1 ",XCORRi_WThl,  XCORRj_WThl,HLES_AVG)
     !
     IF (LUSERV) THEN
       CALL LES_DIACHRO_2PT(TPDIAFILE,"RVRV ","rv*rv   2 points correlations", &
-  "kg2/kg2 ",XCORRi_RvRv,  XCORRj_RvRv,HLES_AVG)
+  "kg2 kg-2 ",XCORRi_RvRv,  XCORRj_RvRv,HLES_AVG)
       CALL LES_DIACHRO_2PT(TPDIAFILE,"THRV ","th*rv   2 points correlations", &
-  "Kkg/kg  ",XCORRi_ThRv,  XCORRj_ThRv,HLES_AVG)
+  "K kg kg-1  ",XCORRi_ThRv,  XCORRj_ThRv,HLES_AVG)
       IF (LUSERC) &
       CALL LES_DIACHRO_2PT(TPDIAFILE,"TLRV ","thl*rv  2 points correlations", &
-  "Kkg/kg  ",XCORRi_ThlRv, XCORRj_ThlRv,HLES_AVG)
+  "K kg kg-1  ",XCORRi_ThlRv, XCORRj_ThlRv,HLES_AVG)
       CALL LES_DIACHRO_2PT(TPDIAFILE,"WRV  ","W*rv    2 points correlations", &
-  "mkg/s/kg",XCORRi_WRv,   XCORRj_WRv,HLES_AVG)
+  "m kg s-1 kg-1",XCORRi_WRv,   XCORRj_WRv,HLES_AVG)
     END IF
     IF (LUSERC) THEN
       CALL LES_DIACHRO_2PT(TPDIAFILE,"RCRC ","rc*rc   2 points correlations", &
-  "kg2/kg2 ",XCORRi_RcRc,  XCORRj_RcRc,HLES_AVG)
+  "kg2 kg-2 ",XCORRi_RcRc,  XCORRj_RcRc,HLES_AVG)
       CALL LES_DIACHRO_2PT(TPDIAFILE,"THRC ","th*rc   2 points correlations", &
-  "Kkg/kg  ",XCORRi_ThRc,  XCORRj_ThRc,HLES_AVG)
+  "K kg kg-1  ",XCORRi_ThRc,  XCORRj_ThRc,HLES_AVG)
       CALL LES_DIACHRO_2PT(TPDIAFILE,"TLRC ","thl*rc  2 points correlations", &
-  "Kkg/kg  ",XCORRi_ThlRc, XCORRj_ThlRc,HLES_AVG)
+  "K kg kg-1  ",XCORRi_ThlRc, XCORRj_ThlRc,HLES_AVG)
       CALL LES_DIACHRO_2PT(TPDIAFILE,"WRC  ","W*rc    2 points correlations", &
-  "mkg/s/kg",XCORRi_WRc,   XCORRj_WRc,HLES_AVG)
+  "m kg s-1 kg-1",XCORRi_WRc,   XCORRj_WRc,HLES_AVG)
     END IF
     IF (LUSERI) THEN
       CALL LES_DIACHRO_2PT(TPDIAFILE,"RCRC ","ri*ri   2 points correlations", &
-  "kg2/kg2 ",XCORRi_RiRi,  XCORRj_RiRi,HLES_AVG)
+  "kg2 kg-2 ",XCORRi_RiRi,  XCORRj_RiRi,HLES_AVG)
       CALL LES_DIACHRO_2PT(TPDIAFILE,"THRC ","th*ri   2 points correlations", &
-  "Kkg/kg  ",XCORRi_ThRi,  XCORRj_ThRi,HLES_AVG)
+  "K kg kg-1  ",XCORRi_ThRi,  XCORRj_ThRi,HLES_AVG)
       CALL LES_DIACHRO_2PT(TPDIAFILE,"TLRC ","thl*ri  2 points correlations", &
-  "Kkg/kg  ",XCORRi_ThlRi, XCORRj_ThlRi,HLES_AVG)
+  "K kg kg-1  ",XCORRi_ThlRi, XCORRj_ThlRi,HLES_AVG)
       CALL LES_DIACHRO_2PT(TPDIAFILE,"WRC  ","W*ri    2 points correlations", &
-  "mkg/s/kg",XCORRi_WRi,   XCORRj_WRi,HLES_AVG)
+  "m kg s-1 kg-1",XCORRi_WRi,   XCORRj_WRi,HLES_AVG)
     END IF
     DO JSV=1,NSV
       WRITE (YGROUP,FMT="(A2,I3.3)") "SS",JSV
       CALL LES_DIACHRO_2PT(TPDIAFILE,YGROUP,"Sv*Sv   2 points correlations", &
-  "kg2/kg2 ",XCORRi_SvSv(:,:,:,JSV),  XCORRj_SvSv(:,:,:,JSV),HLES_AVG)
+  "kg2 kg-2 ",XCORRi_SvSv(:,:,:,JSV),  XCORRj_SvSv(:,:,:,JSV),HLES_AVG)
     END DO
     DO JSV=1,NSV
       WRITE (YGROUP,FMT="(A2,I3.3)") "WS",JSV
       CALL LES_DIACHRO_2PT(TPDIAFILE,YGROUP,"W*Sv    2 points correlations", &
- "mkg/s/kg",XCORRi_WSv(:,:,:,JSV),   XCORRj_WSv(:,:,:,JSV),HLES_AVG)
+ "m kg s-1 kg-1",XCORRi_WSv(:,:,:,JSV),   XCORRj_WSv(:,:,:,JSV),HLES_AVG)
     END DO
   END IF
 END IF
diff --git a/src/MNH/write_lfifm1_for_diag.f90 b/src/MNH/write_lfifm1_for_diag.f90
index 283b24a5721034793468455ef6b35ecf1e2c6fc9..150421cb6a5e824e9d822c7cbb22f1e9d435d141 100644
--- a/src/MNH/write_lfifm1_for_diag.f90
+++ b/src/MNH/write_lfifm1_for_diag.f90
@@ -975,7 +975,7 @@ IF (LVAR_MRW .OR. LLIMA_DIAG) THEN
 !
       TZFIELD%CMNHNAME   = 'VRC'
       TZFIELD%CLONGNAME  = 'VRC'
-      TZFIELD%CUNITS     = '' !vol/vol
+      TZFIELD%CUNITS     = '1' !vol/vol
       TZFIELD%CCOMMENT   = 'X_Y_Z_VRC (vol/vol)'
       CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RCT)*XRHODREF(:,:,:)/1.E3)
     END IF
@@ -988,7 +988,7 @@ IF (LVAR_MRW .OR. LLIMA_DIAG) THEN
 !
       TZFIELD%CMNHNAME   = 'VRR'
       TZFIELD%CLONGNAME  = 'VRR'
-      TZFIELD%CUNITS     = '' !vol/vol
+      TZFIELD%CUNITS     = '1' !vol/vol
       TZFIELD%CCOMMENT   = 'X_Y_Z_VRR (vol/vol)'
       CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RRT)*XRHODREF(:,:,:)/1.E3)
     END IF
@@ -1484,7 +1484,7 @@ IF (LELECDIAG .AND. CELEC .NE. "NONE") THEN
     TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
     IF (JSV .GT. NSV_ELECBEG .AND. JSV .LT. NSV_ELECEND) THEN 
       TZFIELD%CUNITS     = 'C m-3'
-      WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (C/m3)'
+      WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
     ELSE
       TZFIELD%CUNITS     = 'm-3'
       WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (nb ions/m3)'
@@ -2493,7 +2493,7 @@ IF ( LMOIST_L .OR. LMOIST_S1 .OR. LMOIST_S2 ) THEN
     TZFIELD%CLONGNAME  = 'THETAL'
     TZFIELD%CUNITS     = 'K'
     TZFIELD%CDIR       = 'XY'
-    TZFIELD%CCOMMENT   = 'X_Y_Z_Liquid water potential temperature (K)'
+    TZFIELD%CCOMMENT   = 'X_Y_Z_Liquid water potential temperature'
     TZFIELD%NGRID      = 1
     TZFIELD%NTYPE      = TYPEREAL
     TZFIELD%NDIMS      = 3
@@ -2548,7 +2548,7 @@ IF ( LMOIST_S1 .OR. LMOIST_S2 ) THEN
     TZFIELD%CLONGNAME  = 'THETAS1'
     TZFIELD%CUNITS     = 'K'
     TZFIELD%CDIR       = 'XY'
-    TZFIELD%CCOMMENT   = 'X_Y_Z_Moist air Entropy (1st order) potential temperature (K)'
+    TZFIELD%CCOMMENT   = 'X_Y_Z_Moist air Entropy (1st order) potential temperature'
     TZFIELD%NGRID      = 1
     TZFIELD%NTYPE      = TYPEREAL
     TZFIELD%NDIMS      = 3
@@ -2562,7 +2562,7 @@ IF ( LMOIST_S1 .OR. LMOIST_S2 ) THEN
     TZFIELD%CLONGNAME  = 'THETAS2'
     TZFIELD%CUNITS     = 'K'
     TZFIELD%CDIR       = 'XY'
-    TZFIELD%CCOMMENT   = 'X_Y_Z_Moist air Entropy (2nd order) potential temperature (K)'
+    TZFIELD%CCOMMENT   = 'X_Y_Z_Moist air Entropy (2nd order) potential temperature'
     TZFIELD%NGRID      = 1
     TZFIELD%NTYPE      = TYPEREAL
     TZFIELD%NDIMS      = 3
diff --git a/src/MNH/write_lfifm1_for_diag_supp.f90 b/src/MNH/write_lfifm1_for_diag_supp.f90
index b153f6707057caef77fa860ce34b13d33f7be10a..270d4eb756a8736b155108c6351d5d2827a99001 100644
--- a/src/MNH/write_lfifm1_for_diag_supp.f90
+++ b/src/MNH/write_lfifm1_for_diag_supp.f90
@@ -327,7 +327,7 @@ IF (NCONV_KF >= 1) THEN
       DO JSV = NSV_C2R2BEG, NSV_C2R2END
         TZFIELD%CMNHNAME   = 'DSVCONV_'//TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1))
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1))//' CONVective tendency (1/s)'
+        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1))//' CONVective tendency'
         CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV))
       END DO
     END IF
@@ -344,7 +344,7 @@ IF (NCONV_KF >= 1) THEN
       DO JSV = NSV_C1R3BEG,NSV_C1R3END
         TZFIELD%CMNHNAME   = 'DSVCONV_'//TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))//' CONVective tendency (1/s)'
+        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))//' CONVective tendency'
         CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV))
       END DO
     END IF
@@ -361,7 +361,7 @@ IF (NCONV_KF >= 1) THEN
       DO JSV = NSV_ELECBEG,NSV_ELECEND
         TZFIELD%CMNHNAME   = 'DSVCONV_'//TRIM(CELECNAMES(JSV-NSV_ELECBEG+1))
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(CELECNAMES(JSV-NSV_ELECBEG+1))//' CONVective tendency (1/s)'
+        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(CELECNAMES(JSV-NSV_ELECBEG+1))//' CONVective tendency'
         CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV))
       END DO
     END IF
@@ -378,7 +378,7 @@ IF (NCONV_KF >= 1) THEN
       DO JSV = NSV_CHEMBEG, NSV_CHEMEND
         TZFIELD%CMNHNAME   = 'DSVCONV_'//TRIM(CNAMES(JSV-NSV_CHEMBEG+1))
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(CNAMES(JSV-NSV_CHEMBEG+1))//' CONVective tendency (1/s)'
+        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(CNAMES(JSV-NSV_CHEMBEG+1))//' CONVective tendency'
         CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV))
       END DO
     END IF
@@ -395,7 +395,7 @@ IF (NCONV_KF >= 1) THEN
       DO JSV = NSV_LGBEG,NSV_LGEND
         TZFIELD%CMNHNAME   = 'DSVCONV_'//TRIM(CLGNAMES(JSV-NSV_LGBEG+1))
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(CLGNAMES(JSV-NSV_LGBEG+1))//' CONVective tendency (1/s)'
+        TZFIELD%CCOMMENT   = 'X_Y_Z_'//TRIM(CLGNAMES(JSV-NSV_LGBEG+1))//' CONVective tendency'
         CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV))
       END DO
     END IF
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index 0ebe23290d17e148ff3a9b1fc61dfa636df46bf1..fcae9c875169586af676f9714423085e8bc7f10d 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -814,7 +814,7 @@ IF (NSV >=1) THEN
       TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
       IF (JSV .GT. NSV_ELECBEG .AND. JSV .LT. NSV_ELECEND) THEN 
         TZFIELD%CUNITS     = 'C m-3'
-        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (C/m3)'
+        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
       ELSE
         TZFIELD%CUNITS     = 'm-3'
         WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (nb ions/m3)'
@@ -1027,7 +1027,8 @@ IF (NSV >=1) THEN
     DO JSV = NSV_CHEMBEG,NSV_CHEMEND
       TZFIELD%CMNHNAME   = TRIM(UPCASE(CNAMES(JSV-NSV_CHEMBEG+1)))//'T'
       TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-      WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (ppp)'
+      TZFIELD%CUNITS     = 'ppp'
+      WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
       CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV))
       !
       YCHNAMES(JSV-JSA)=TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) ! without T
@@ -1037,7 +1038,8 @@ IF (NSV >=1) THEN
       DO JSV = NSV_CHICBEG,NSV_CHICEND
         TZFIELD%CMNHNAME   = TRIM(UPCASE(CICNAMES(JSV-NSV_CHICBEG+1)))//'T'
         TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (ppp)'
+        TZFIELD%CUNITS     = 'ppp'
+        WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV
         CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV))
         !
         YCHNAMES(JSV-JSA)=TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) ! without M
diff --git a/src/MNH/write_profilern.f90 b/src/MNH/write_profilern.f90
index 57dd9fa90f8adf4c93f135e78a62176bf3bbd3bd..0a87d0a6eabbe1c3466980f05e5b5f634cabc695 100644
--- a/src/MNH/write_profilern.f90
+++ b/src/MNH/write_profilern.f90
@@ -203,7 +203,7 @@ ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%VISIKUN(:,IK,II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'RARE'
-YUNIT    (JPROC) = 'dBz'
+YUNIT    (JPROC) = 'dBZ'
 YCOMMENT (JPROC) = 'Radar reflectivity'       
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%RARE(:,IK,II)
 !
@@ -221,31 +221,31 @@ ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%ZZ(:,IK,II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'LON'
-YUNIT    (JPROC) = 'decimal degree'
+YUNIT    (JPROC) = 'degree'
 YCOMMENT (JPROC) = 'Longitude'
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%LON(II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'LAT'
-YUNIT    (JPROC) = 'decimal degree'
+YUNIT    (JPROC) = 'degree'
 YCOMMENT (JPROC) = 'Latitude'
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%LAT(II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'ZON_WIND'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'Zonal wind'
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%ZON(:,IK,II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'MER_WIND'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'Meridional wind'
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%MER(:,IK,II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'FF'           
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'Wind intensity'
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%FF(:,IK,II)
 !
@@ -257,7 +257,7 @@ ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%DD(:,IK,II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'W'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'Air vertical speed' 
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%W(:,IK,II)
 !
@@ -271,86 +271,86 @@ IF (LDIAG_IN_RUN) THEN
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'Q2m'
-  YUNIT    (JPROC) = 'kg/kg'
+  YUNIT    (JPROC) = 'kg kg-1'
   YCOMMENT (JPROC) = '2-m humidity' 
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%Q2M(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'HU2m'
-  YUNIT    (JPROC) = '%'
+  YUNIT    (JPROC) = 'percent'
   YCOMMENT (JPROC) = '2-m relative humidity' 
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%HU2M(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'zon10m'
-  YUNIT    (JPROC) = 'm/s'
+  YUNIT    (JPROC) = 'm s-1'
   YCOMMENT (JPROC) = '10-m zonal wind' 
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%ZON10M(:,II)
   !       
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'mer10m'
-  YUNIT    (JPROC) = 'm/s'
+  YUNIT    (JPROC) = 'm s-1'
   YCOMMENT (JPROC) = '10-m meridian wind' 
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%MER10M(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'RN' 
-  YUNIT    (JPROC) = 'W/m²'          
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Net radiation'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%RN(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'H' 
-  YUNIT    (JPROC) = 'W/m²'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Sensible heat flux'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%H(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LE' 
-  YUNIT    (JPROC) = 'W/m²'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Total Latent heat flux'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%LE(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'G' 
-  YUNIT    (JPROC) = 'W/m²'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Storage heat flux'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%GFLUX(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'SWD'
-  YUNIT    (JPROC) = 'W/m²'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Downward short-wave radiation'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SWD(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'SWU'
-  YUNIT    (JPROC) = 'W/m²'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Upward short-wave radiation'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SWU(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LWD'
-  YUNIT    (JPROC) = 'W/m²'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Downward long-wave radiation'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%LWD(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LWU'
-  YUNIT    (JPROC) = 'W/m²'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Upward long-wave radiation'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%LWU(:,II)
   !
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'TKE_DISS'
-  YUNIT    (JPROC) = 'm2/s2'
+  YUNIT    (JPROC) = 'm2 s-2'
   YCOMMENT (JPROC) = 'TKE dissipation rate'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%TKE_DISS(:,IK,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LEI' 
-  YUNIT    (JPROC) = 'W/m²'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Solid Latent heat flux'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%LEI(:,II)  
 !
@@ -358,7 +358,7 @@ ENDIF
 !
 DO JRR=1,SIZE(TPROFILER%R,4)
   JPROC = JPROC+1
-  YUNIT    (JPROC) = 'kg/kg'
+  YUNIT    (JPROC) = 'kg kg-1'
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%R(:,IK,II,JRR)
   IF (JRR==1) THEN
     YTITLE   (JPROC) = 'Rv'
@@ -385,21 +385,21 @@ DO JRR=1,SIZE(TPROFILER%R,4)
 END DO
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'Rhod'
-YUNIT    (JPROC) = 'kg/m3'
+YUNIT    (JPROC) = 'kg m-3'
 YCOMMENT (JPROC) = 'Density of dry air in moist' 
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%RHOD(:,IK,II)
 !
 IF (SIZE(TPROFILER%TKE,1)>0) THEN
   JPROC = JPROC+1
   YTITLE   (JPROC) = 'Tke'
-  YUNIT    (JPROC) = 'm2/s2'
+  YUNIT    (JPROC) = 'm2 s-2'
   YCOMMENT (JPROC) = 'Turbulent kinetic energy' 
   ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%TKE(:,IK,II)
 END IF
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'IWV'
-YUNIT    (JPROC) = 'kg/m2'
+YUNIT    (JPROC) = 'kg m-2'
 YCOMMENT (JPROC) = 'Integrated Water Vapour' 
 ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%IWV(:,II)
 !
@@ -426,7 +426,7 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
   DO JSV = 1,NSV_USER
     JPROC = JPROC+1
     WRITE (YTITLE(JPROC),FMT='(A2,I3.3)')   'Sv',JSV
-    YUNIT    (JPROC) = 'kg/kg'
+    YUNIT    (JPROC) = 'kg kg-1'
     YCOMMENT (JPROC) = ' ' 
     ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SV(:,IK,II,JSV)
   END DO
@@ -442,7 +442,7 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
   DO JSV = NSV_C2R2BEG,NSV_C2R2END
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1))
-    YUNIT    (JPROC) = '/M3'
+    YUNIT    (JPROC) = 'm-3'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SV(:,IK,II,JSV)
   END DO
@@ -450,14 +450,14 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
   DO JSV = NSV_C1R3BEG,NSV_C1R3END
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))
-    YUNIT    (JPROC) = '/M3'
+    YUNIT    (JPROC) = 'm-3'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SV(:,IK,II,JSV)
   END DO
   ! LIMA variables
   DO JSV=NSV_LIMA_BEG,NSV_LIMA_END
     JPROC = JPROC+1
-    YUNIT    (JPROC) = '/kg'
+    YUNIT    (JPROC) = 'kg-1'
     YCOMMENT (JPROC) = ' '
     IF (JSV==NSV_LIMA_NC) YTITLE(JPROC)=TRIM(CLIMA_WARM_NAMES(1))//'T' 
     IF (JSV==NSV_LIMA_NR) YTITLE(JPROC)=TRIM(CLIMA_WARM_NAMES(2))//'T' 
@@ -493,7 +493,7 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
   DO JSV = NSV_ELECBEG,NSV_ELECEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CELECNAMES(JSV-NSV_ELECBEG+1))
-    YUNIT    (JPROC) = 'Cb'
+    YUNIT    (JPROC) = 'C'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SV(:,IK,II,JSV)
   END DO
@@ -501,8 +501,8 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
   DO JSV=NSV_CHEMBEG,NSV_CHEMEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CNAMES(JSV))
-    YUNIT    (JPROC) = 'PPB'
-    WRITE(YCOMMENT (JPROC),'(A5,A3,I3.3,A)') 'T(s) ','SVT',JSV,' (ppb)'
+    YUNIT    (JPROC) = 'ppb'
+    WRITE(YCOMMENT (JPROC),'(A5,A3,I3.3)') 'T(s) ','SVT',JSV
     ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SV(:,IK,II,JSV) * 1.E9
   END DO
   IF ((LORILAM).AND. .NOT.(ANY(TPROFILER%P(:,IK,II) == 0.))) THEN
@@ -530,7 +530,7 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'AERRGA',JSV
       YUNIT    (JPROC) = 'um'
-      WRITE(YCOMMENT(JPROC),'(A18,I1,A5)')'RG (nb) AERO MODE ',JSV,' (um)'
+      WRITE(YCOMMENT(JPROC),'(A18,I1)')'RG (nb) AERO MODE ',JSV
       ZWORK6 (1,1,IK,:,1,JPROC) = ZRG(1,1,:,JSV)
       ! standard deviation
       JPROC = JPROC+1
@@ -541,8 +541,8 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
       ! particles number
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'AERN0A',JSV
-      YUNIT    (JPROC) = '  '
-      WRITE(YCOMMENT(JPROC),'(A13,I1,A6)')'N0 AERO MODE ',JSV,' (1/m3)'
+      YUNIT    (JPROC) = 'm-3'
+      WRITE(YCOMMENT(JPROC),'(A13,I1)')'N0 AERO MODE ',JSV
       ZWORK6 (1,1,IK,:,1,JPROC) = ZN0(1,1,:,JSV)
     ENDDO
     DEALLOCATE (ZSV,ZRHO) 
@@ -552,7 +552,7 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
   DO JSV = NSV_DSTBEG,NSV_DSTEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CDUSTNAMES(JSV-NSV_DSTBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SV(:,IK,II,JSV) * 1.E9
   END DO
@@ -581,7 +581,7 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'DSTRGA',JSV
       YUNIT    (JPROC) = 'um'
-      WRITE(YCOMMENT(JPROC),'(A18,I1,A5)')'RG (nb) DUST MODE ',JSV,' (um)'
+      WRITE(YCOMMENT(JPROC),'(A18,I1)')'RG (nb) DUST MODE ',JSV
       ZWORK6 (1,1,IK,:,1,JPROC) = ZRG(1,1,:,JSV)
       ! standard deviation
       JPROC = JPROC+1
@@ -592,8 +592,8 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
       ! particles number
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'DSTN0A',JSV
-      YUNIT    (JPROC) = '  '
-      WRITE(YCOMMENT(JPROC),'(A13,I1,A6)')'N0 DUST MODE ',JSV,' (1/m3)'
+      YUNIT    (JPROC) = 'm-3'
+      WRITE(YCOMMENT(JPROC),'(A13,I1)')'N0 DUST MODE ',JSV
       ZWORK6 (1,1,IK,:,1,JPROC) = ZN0(1,1,:,JSV)
     ENDDO
     DEALLOCATE (ZSV,ZRHO) 
@@ -603,7 +603,7 @@ IF (SIZE(TPROFILER%SV,4)>=1) THEN
   DO JSV = NSV_SLTBEG,NSV_SLTEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CSALTNAMES(JSV-NSV_SLTBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,IK,:,1,JPROC) = TPROFILER%SV(:,IK,II,JSV) * 1.E9
   END DO
diff --git a/src/MNH/write_stationn.f90 b/src/MNH/write_stationn.f90
index 150e01f789e45ea0e3c8ebfe01ce26b17986027b..2a67c0fa17ab93dbc644751da8d13850fb9a607e 100644
--- a/src/MNH/write_stationn.f90
+++ b/src/MNH/write_stationn.f90
@@ -189,31 +189,31 @@ ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%P(:,II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'LON'
-YUNIT    (JPROC) = 'decimal degree'
+YUNIT    (JPROC) = 'degree'
 YCOMMENT (JPROC) = 'Longitude'
 ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%LON(II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'LAT'
-YUNIT    (JPROC) = 'decimal degree'
+YUNIT    (JPROC) = 'degree'
 YCOMMENT (JPROC) = 'Latitude'
 ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%LAT(II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'ZON_WIND'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'Zonal wind'
 ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%ZON(:,II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'MER_WIND'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'Meridional wind'
 ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%MER(:,II)
 !
 JPROC = JPROC + 1
 YTITLE   (JPROC) = 'W'
-YUNIT    (JPROC) = 'm/s'
+YUNIT    (JPROC) = 'm s-1'
 YCOMMENT (JPROC) = 'Air vertical speed' 
 ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%W(:,II)
 !
@@ -232,104 +232,104 @@ IF (LDIAG_IN_RUN) THEN
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'Q2m'
-  YUNIT    (JPROC) = 'kg/kg'
+  YUNIT    (JPROC) = 'kg kg-1'
   YCOMMENT (JPROC) = '2-m humidity' 
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%Q2M(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'HU2m'
-  YUNIT    (JPROC) = '%'
+  YUNIT    (JPROC) = 'percent'
   YCOMMENT (JPROC) = '2-m relative humidity' 
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%HU2M(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'zon10m'
-  YUNIT    (JPROC) = 'm/s'
+  YUNIT    (JPROC) = 'm s-1'
   YCOMMENT (JPROC) = '10-m zonal wind' 
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%ZON10M(:,II)
   !       
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'mer10m'
-  YUNIT    (JPROC) = 'm/s'
+  YUNIT    (JPROC) = 'm s-1'
   YCOMMENT (JPROC) = '10-m meridian wind' 
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%MER10M(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'RN'  
-  YUNIT    (JPROC) = 'W/m2'
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Net radiation'         
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%RN(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'H'   
-  YUNIT    (JPROC) = 'W/m2' 
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Sensible heat flux'
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%H(:,II)
   !       
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LE'  
-  YUNIT    (JPROC) = 'W/m2' 
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Total Latent heat flux'   
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%LE(:,II)
 !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'G'    
-  YUNIT    (JPROC) = 'W/m2' 
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Storage heat flux'     
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%GFLUX(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'SWD'   
-  YUNIT    (JPROC) = 'W/m2'  
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Downward short-wave radiation' 
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SWD(:,II)
   !       
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'SWU'   
-  YUNIT    (JPROC) = 'W/m2'  
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Upward short-wave radiation' 
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SWU(:,II)
   !       
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LWD'  
-  YUNIT    (JPROC) = 'W/m2' 
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Downward long-wave radiation'
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%LWD(:,II)
   !       
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LWU'  
-  YUNIT    (JPROC) = 'W/m2' 
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Upward long-wave radiation'
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%LWU(:,II)
   JPROC = JPROC + 1
   !
   YTITLE   (JPROC) = 'SWDIR'   
-  YUNIT    (JPROC) = 'W/m2'  
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Downward direct short-wave radiation' 
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SWDIR(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'SWDIFF'   
-  YUNIT    (JPROC) = 'W/m2'  
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Downward diffuse short-wave radiation' 
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SWDIFF(:,II)  
   !       
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'DSTAOD'  
-  YUNIT    (JPROC) = 'm' 
+  YUNIT    (JPROC) = 'm'
   YCOMMENT (JPROC) = 'Dust aerosol optical depth'
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%DSTAOD(:,II)
   !
   JPROC = JPROC + 1
   YTITLE   (JPROC) = 'LEI'  
-  YUNIT    (JPROC) = 'W/m2' 
+  YUNIT    (JPROC) = 'W m-2'
   YCOMMENT (JPROC) = 'Solid Latent heat flux'   
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%LEI(:,II)
 ENDIF
 !
 DO JRR=1,SIZE(TSTATION%R,3)
   JPROC = JPROC+1
-  YUNIT    (JPROC) = 'kg/kg'
+  YUNIT    (JPROC) = 'kg kg-1'
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%R(:,II,JRR)
   IF (JRR==1) THEN
     YTITLE   (JPROC) = 'Rv'
@@ -358,7 +358,7 @@ END DO
 IF (SIZE(TSTATION%TKE,1)>0) THEN
   JPROC = JPROC+1
   YTITLE   (JPROC) = 'Tke'
-  YUNIT    (JPROC) = 'm2/s2'
+  YUNIT    (JPROC) = 'm2 s-2'
   YCOMMENT (JPROC) = 'Turbulent kinetic energy'
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%TKE(:,II)
 END IF
@@ -369,7 +369,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
   DO JSV = 1,NSV_USER
     JPROC = JPROC+1
     WRITE (YTITLE(JPROC),FMT='(A2,I3.3)')   'Sv',JSV
-    YUNIT    (JPROC) = 'kg/kg'
+    YUNIT    (JPROC) = 'kg kg-1'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV)
   END DO
@@ -377,7 +377,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
   DO JSV = NSV_C2R2BEG,NSV_C2R2END
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1))
-    YUNIT    (JPROC) = '/M3'
+    YUNIT    (JPROC) = 'm-3'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV)
   END DO
@@ -385,7 +385,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
   DO JSV = NSV_C1R3BEG,NSV_C1R3END
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))
-    YUNIT    (JPROC) = '/M3'
+    YUNIT    (JPROC) = 'm-3'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV)
   END DO
@@ -393,7 +393,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
   DO JSV = NSV_ELECBEG,NSV_ELECEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CELECNAMES(JSV-NSV_ELECBEG+1))
-    YUNIT    (JPROC) = 'Cb'
+    YUNIT    (JPROC) = 'C'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV)
   END DO
@@ -401,15 +401,15 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
   DO JSV = NSV_CHEMBEG,NSV_CHEMEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CNAMES(JSV-NSV_CHEMBEG+1))
-    YUNIT    (JPROC) = 'PPB'
-    WRITE(YCOMMENT (JPROC),'(A5,A3,I3.3,A)') 'T(s) ','SVT',JSV,' (ppb)'
+    YUNIT    (JPROC) = 'ppb'
+    WRITE(YCOMMENT (JPROC),'(A5,A3,I3.3)') 'T(s) ','SVT',JSV
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV) * 1.E9
   END DO
   ! LiNOX passive tracer
   DO JSV = NSV_LNOXBEG,NSV_LNOXEND
     JPROC = JPROC+1
     WRITE (YTITLE(JPROC),FMT='(A5)') 'LiNOx'
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV) * 1.E9
   END DO
@@ -417,7 +417,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
   DO JSV = NSV_AERBEG,NSV_AEREND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CAERONAMES(JSV-NSV_AERBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV) *1.E9
   END DO
@@ -451,7 +451,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'AERRGA',JSV
       YUNIT    (JPROC) = 'um'
-      WRITE(YCOMMENT(JPROC),'(A18,I1,A5)')'RG (nb) AERO MODE ',JSV,' (um)'
+      WRITE(YCOMMENT(JPROC),'(A18,I1)')'RG (nb) AERO MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZRG(1,1,:,JSV)
       ! standard deviation
       JPROC = JPROC+1
@@ -462,99 +462,99 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
       ! particles number
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'AERN0A',JSV
-      YUNIT    (JPROC) = '  '
-      WRITE(YCOMMENT(JPROC),'(A13,I1,A6)')'N0 AERO MODE ',JSV,' (1/m3)'
+      YUNIT    (JPROC) = 'm-3'
+      WRITE(YCOMMENT(JPROC),'(A13,I1)')'N0 AERO MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZN0(1,1,:,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MOC  ',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS OC   AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS OC   AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_OC,JSV)
 
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MBC  ',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS BC   AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS BC   AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_BC,JSV)
 
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MDST  ',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS DST   AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS DST   AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_DST,JSV)
 
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSO4 ',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SO4  AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SO4  AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SO4,JSV)
 
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MNO3 ',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS NO3  AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS NO3  AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_NO3,JSV)
 
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MH2O ',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS H2O  AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS H2O  AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_H2O,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MNH3 ',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS NH3  AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS NH3  AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_NH3,JSV)
       JPROC = JPROC+1
       IF (NSOA == 10) THEN
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA1',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA1 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA1 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA1,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA2',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA2 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA2 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA2,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA3',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA3 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA3 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA3,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA4',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA4 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA4 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA4,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA5',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA5 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA5 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA5,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA6',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA6 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA6 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA6,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA7',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA7 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA7 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA7,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA8',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA8 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA8 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA8,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A5,I1)')'MSOA9',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A23,I1,A7)')'MASS SOA9 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A23,I1)')'MASS SOA9 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA9,JSV)
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'MSOA10',JSV
-      YUNIT    (JPROC) = 'ug/m3'
-      WRITE(YCOMMENT,'(A24,I1,A7)')'MASS SOA10 AEROSOL MODE ',JSV,'(ug/m3)'
+      YUNIT    (JPROC) = 'ug m-3'
+      WRITE(YCOMMENT,'(A24,I1)')'MASS SOA10 AEROSOL MODE ',JSV
       ZWORK6(1,1,1,:,1,JPROC)=ZPTOTA(1,1,:,JP_AER_SOA10,JSV)
       END IF
       ENDDO
@@ -566,7 +566,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
   DO JSV = NSV_DSTBEG,NSV_DSTEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CDUSTNAMES(JSV-NSV_DSTBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV) *1.E9
   END DO
@@ -595,7 +595,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'DSTRGA',JSV
       YUNIT    (JPROC) = 'um'
-      WRITE(YCOMMENT(JPROC),'(A18,I1,A5)')'RG (nb) DUST MODE ',JSV,' (um)'
+      WRITE(YCOMMENT(JPROC),'(A18,I1)')'RG (nb) DUST MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZRG(1,1,:,JSV)
       ! standard deviation
       JPROC = JPROC+1
@@ -606,8 +606,8 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
       ! particles number
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'DSTN0A',JSV
-      YUNIT    (JPROC) = '  '
-      WRITE(YCOMMENT(JPROC),'(A13,I1,A6)')'N0 DUST MODE ',JSV,' (1/m3)'
+      YUNIT    (JPROC) = 'm-3'
+      WRITE(YCOMMENT(JPROC),'(A13,I1)')'N0 DUST MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZN0(1,1,:,JSV)
     ENDDO
     DEALLOCATE (ZSV,ZRHO) 
@@ -617,7 +617,7 @@ IF (SIZE(TSTATION%SV,3)>=1) THEN
   DO JSV = NSV_SLTBEG,NSV_SLTEND
     JPROC = JPROC+1
     YTITLE(JPROC)= TRIM(CSALTNAMES(JSV-NSV_SLTBEG+1))
-    YUNIT    (JPROC) = 'PPB'
+    YUNIT    (JPROC) = 'ppb'
     YCOMMENT (JPROC) = ' '
     ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SV(:,II,JSV) *1.E9
   END DO
@@ -648,7 +648,7 @@ ENDIF
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'SLTRGA',JSV
       YUNIT    (JPROC) = 'um'
-      WRITE(YCOMMENT(JPROC),'(A18,I1,A5)')'RG (nb) SALT MODE ',JSV,' (um)'
+      WRITE(YCOMMENT(JPROC),'(A18,I1)')'RG (nb) SALT MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZRG(1,1,:,JSV)
       ! standard deviation
       JPROC = JPROC+1
@@ -659,8 +659,8 @@ ENDIF
       ! particles number
       JPROC = JPROC+1
       WRITE(YTITLE(JPROC),'(A6,I1)')'SLTN0A',JSV
-      YUNIT    (JPROC) = '  '
-      WRITE(YCOMMENT(JPROC),'(A13,I1,A6)')'N0 DUST MODE ',JSV,' (1/m3)'
+      YUNIT    (JPROC) = 'm-3'
+      WRITE(YCOMMENT(JPROC),'(A13,I1)')'N0 DUST MODE ',JSV
       ZWORK6 (1,1,1,:,1,JPROC) = ZN0(1,1,:,JSV)
     ENDDO
     DEALLOCATE (ZSV,ZRHO) 
@@ -678,7 +678,7 @@ END IF
 IF (SIZE(TSTATION%SFCO2,1)>0) THEN
   JPROC = JPROC+1
   YTITLE   (JPROC) = 'SFCO2'
-  YUNIT    (JPROC) = 'mgCO2/m/s'
+  YUNIT    (JPROC) = 'mg m-2 s-1'
   YCOMMENT (JPROC) = 'CO2 Surface Flux'
   ZWORK6 (1,1,1,:,1,JPROC) = TSTATION%SFCO2(:,II)
 END IF
diff --git a/src/MNH/write_surf_mnh.f90 b/src/MNH/write_surf_mnh.f90
index 926cb739c0cc16d7ed9e5647bd7821ee37cfc9d1..2216f1f8693213b5b2052d64db2c0e9792afac91 100644
--- a/src/MNH/write_surf_mnh.f90
+++ b/src/MNH/write_surf_mnh.f90
@@ -34,13 +34,13 @@ IF (IRESP==0) THEN
   IF (TRIM(TPFIELD%CLONGNAME)/=TRIM(HREC)) THEN
     CALL PRINT_MSG(NVERB_WARNING,'IO',TRIM(HSUBR),'CLONGNAME different ('//TRIM(TPFIELD%CLONGNAME) &
                    //'/'//TRIM(HREC)//') than expected for article '//TRIM(HREC))
-!     TPFIELD%CLONGNAME = TRIM(HREC)
+    TPFIELD%CLONGNAME = TRIM(HREC)
   END IF
   !Modify and check CDIR
   IF (TPFIELD%CDIR/=HDIR) THEN
     CALL PRINT_MSG(NVERB_WARNING,'IO',TRIM(HSUBR),'CDIR different ('//TRIM(TPFIELD%CDIR) &
                    //'/'//TRIM(HDIR)//') than expected for article '//TRIM(HREC))
-!     TPFIELD%CDIR = HDIR
+    TPFIELD%CDIR = HDIR
   END IF
   !Modify and check CCOMMENT
   IF (LEN_TRIM(HCOMMENT)/=0) THEN
@@ -60,7 +60,7 @@ IF (IRESP==0) THEN
       IF (GWARN) THEN
         CALL PRINT_MSG(NVERB_INFO,'IO',TRIM(HSUBR),'CCOMMENT different ('//TRIM(TPFIELD%CCOMMENT) &
                        //'/'//TRIM(HCOMMENT)//') than expected for article '//TRIM(HREC))
-!         TPFIELD%CCOMMENT = TRIM(HCOMMENT)
+        TPFIELD%CCOMMENT = TRIM(HCOMMENT)
       END IF
     END IF
   ELSE
@@ -72,21 +72,21 @@ IF (IRESP==0) THEN
     WRITE(YTXT,'( I0,"/",I0 )') TPFIELD%NGRID,KGRID
     CALL PRINT_MSG(NVERB_WARNING,'IO',TRIM(HSUBR),'NGRID different ('//TRIM(YTXT) &
                     //') than expected for article '//TRIM(HREC))
-!     TPFIELD%NGRID = KGRID
+    TPFIELD%NGRID = KGRID
   END IF
   !Modify and check NTYPE
   IF (TPFIELD%NTYPE/=KTYPE) THEN
     WRITE(YTXT,'( I0,"/",I0 )') TPFIELD%NTYPE,KTYPE
     CALL PRINT_MSG(NVERB_WARNING,'IO',TRIM(HSUBR),'NTYPE different ('//TRIM(YTXT) &
                     //') than expected for article '//TRIM(HREC))
-!     TPFIELD%NTYPE = KTYPE
+    TPFIELD%NTYPE = KTYPE
   END IF
   !Modify and check NDIMS
   IF (TPFIELD%NDIMS/=KDIMS) THEN
     WRITE(YTXT,'( I0,"/",I0 )') TPFIELD%NDIMS,KDIMS
     CALL PRINT_MSG(NVERB_WARNING,'IO',TRIM(HSUBR),'NDIMS different ('//TRIM(YTXT) &
                     //') than expected for article '//TRIM(HREC))
-!     TPFIELD%NDIMS = KDIMS
+    TPFIELD%NDIMS = KDIMS
   END IF
 ELSE
   CALL PRINT_MSG(NVERB_DEBUG,'IO',TRIM(HSUBR),TRIM(HREC)//' not found in FIELDLIST. Generating default metadata')