Changeset 1852

Timestamp:

Aug 30, 2013, 10:47:10 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Implémentation des sorties XIOS dans LMDZ. Activation via -cpp CPP_XIOS.
ATTENTION: un problème de raccord subsiste en mode MPI !
UG
................................
Adding XIOS output to LMDZ. Activated by the CPP_XIOS key.
WARNING: buggy for now in MPI mode.
UG

Location:

LMDZ5/trunk/libf

Files:

• bibio/wxios.F90 (modified) (18 diffs)
• dyn3dpar/abort_gcm.F (modified) (2 diffs)
• dyn3dpar/gcm.F (modified) (3 diffs)
• dyn3dpar/leapfrog_p.F (modified) (2 diffs)
• dyn3dpar/mod_const_mpi.F90 (modified) (2 diffs)
• dyn3dpar/parallel_lmdz.F90 (modified) (2 diffs)
• phydev/physiq.F90 (modified) (4 diffs)
• phylmd/iophy.F90 (modified) (20 diffs)
• phylmd/mod_phys_lmdz_para.F90 (modified) (1 diff)
• phylmd/phys_output_ctrlout_mod.F90 (modified) (12 diffs)
• phylmd/phys_output_mod.F90 (modified) (5 diffs)
• phylmd/phys_output_write_mod.F90 (modified) (5 diffs)
• phylmd/radlwsw_m.F90 (modified) (1 diff)

LMDZ5/trunk/libf/bibio/wxios.F90

@@ -18 +18 @@
     TYPE(xios_context), SAVE :: g_ctx
 !$OMP THREADPRIVATE(g_comm,g_cts_name,g_ctx)
+    LOGICAL, SAVE :: g_flag_xml = .FALSE.
+    CHARACTER(len=100) :: g_field_name = "nofield"
+!$OMP THREADPRIVATE(g_flag_xml,g_field_name)
+
 
     CONTAINS
@@ -25 +29 @@
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     
-    SUBROUTINE concat(str, i, str_i) !MAX i = 99
-        CHARACTER(len=*), INTENT(IN) :: str
-        INTEGER, INTENT(IN) :: i
-        CHARACTER(len=100), INTENT(OUT) :: str_i
-        
-        
-        !INT -> CHAR:
-        CHARACTER(len=10) :: num
-        WRITE(num, "(I5)") i
-        str_i = TRIM(ADJUSTL(str//"_"//TRIM(ADJUSTL(num))))
-        
+    SUBROUTINE concat(str, str2, str_str2)
+        CHARACTER(len=*), INTENT(IN) :: str, str2
+        CHARACTER(len=20), INTENT(OUT) :: str_str2
+        
+        
+        str_str2 = TRIM(ADJUSTL(str//"_"//TRIM(ADJUSTL(str2))))
+        !IF (prt_level >= 10) WRITE(lunout,*) "Xios. ",str,"+",str2,"=",str_str2
     END SUBROUTINE concat
     
@@ -47 +47 @@
         
         INTEGER :: i = 0
-        
+         !!!!!!!!!!!!!!!!!!
+         ! Pour XIOS:
+         !  year : y
+         !  month : mo
+         !  day : d
+         !  hour : h
+         !  minute : mi
+         !  second : s
+         !!!!!!!!!!!!!!!!!!
+
         i = INDEX(odate, "day")
         IF (i > 0) THEN
             ndate = odate(1:i-1)//"d"
-        ELSE
-            i = INDEX(odate, "hr")
-            IF (i > 0) THEN
-                ndate = odate(1:i-1)//"h"
-            ELSE
-                ndate = odate
-            END IF
-        END IF
-        
-        !WRITE(*,*) "Xios. ", odate, " => ", ndate
+        END IF
+
+        i = INDEX(odate, "hr")
+        IF (i > 0) THEN
+            ndate = odate(1:i-1)//"h"
+        END IF
+
+        i = INDEX(odate, "mth")
+        IF (i > 0) THEN
+            ndate = odate(1:i-1)//"mo"
+        END IF
+        
+        !IF (prt_level >= 10) WRITE(lunout,*) "Xios. ", odate, " => ", ndate
     END SUBROUTINE reformadate
     
@@ -89 +101 @@
         END IF
         
-        !WRITE(*,*) "Xios. ", op, " => ", reformaop
+        !IF (prt_level >= 10) WRITE(lunout,*) "Xios. ", op, " => ", reformaop
     END FUNCTION reformaop
 
@@ -97 +109 @@
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-    SUBROUTINE wxios_init(xios_ctx_name)
+    SUBROUTINE wxios_init(xios_ctx_name, locom, outcom)
+        IMPLICIT NONE
+        INCLUDE 'iniprint.h'
+
       CHARACTER(len=*), INTENT(IN) :: xios_ctx_name
-        
-      INTEGER :: xios_comm
+      INTEGER, INTENT(IN), OPTIONAL :: locom
+      INTEGER, INTENT(OUT), OPTIONAL :: outcom
+
+    
         TYPE(xios_context) :: xios_ctx
-      
-        WRITE(*,*) "Xios. Initialization"
-
-        !Lancement de xios:
-        CALL xios_initialize(xios_ctx_name, return_comm = xios_comm )
-        
-        !Initialisation du contexte:
-        CALL xios_context_initialize(xios_ctx_name, xios_comm)
-        CALL xios_get_handle(xios_ctx_name, xios_ctx)    !Récupération
-        CALL xios_set_current_context(xios_ctx)            !Activation
+        INTEGER :: xios_comm
+
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. Initialization"
+
+
+
+        IF (PRESENT(locom)) THEN
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. ctx=",xios_ctx_name,"local_comm=",locom,",return_comm=",xios_comm
+            CALL xios_initialize(xios_ctx_name, local_comm = locom, return_comm = xios_comm )
+        ELSE
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. ctx=",xios_ctx_name,"return_comm=",outcom
+            CALL xios_initialize(xios_ctx_name, return_comm = xios_comm )
+        END IF
+        
+        IF (PRESENT(outcom)) THEN
+             outcom = xios_comm
+        END IF
         
         !Enregistrement des variables globales:
         g_comm = xios_comm
         g_ctx_name = xios_ctx_name
+        
+        CALL wxios_context_init()
+        
+    END SUBROUTINE wxios_init
+
+    SUBROUTINE wxios_context_init()
+        IMPLICIT NONE
+        INCLUDE 'iniprint.h'
+
+        TYPE(xios_context) :: xios_ctx
+
+        !Initialisation du contexte:
+        CALL xios_context_initialize(g_ctx_name, g_comm)
+        CALL xios_get_handle(g_ctx_name, xios_ctx)    !Récupération
+        CALL xios_set_current_context(xios_ctx)            !Activation
         g_ctx = xios_ctx
-        
-        WRITE(*,*) "Xios. Current context is ", xios_ctx_name
-    END SUBROUTINE wxios_init
+
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. Current context is ", g_ctx_name
+
+        !Une première analyse des héritages:
+        CALL xios_solve_inheritance()
+    END SUBROUTINE wxios_context_init
 
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -126 +168 @@
 
     SUBROUTINE wxios_set_cal(pasdetemps, calendrier, annee, mois, jour, heure)
+        IMPLICIT NONE
+        INCLUDE 'iniprint.h'
+
      !Paramètres:
      CHARACTER(len=*), INTENT(IN) :: calendrier
@@ -146 +191 @@
             CASE('earth_360d')
                 CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "D360")
-                WRITE(*,*) 'Xios. Calendrier terrestre a 360 jours/an'
+                IF (prt_level >= 10) WRITE(lunout,*) 'Xios. Calendrier terrestre a 360 jours/an'
             CASE('earth_365d')
                 CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "NoLeap")
-                WRITE(*,*) 'Xios. Calendrier terrestre a 365 jours/an'
+                IF (prt_level >= 10) WRITE(lunout,*) 'Xios. Calendrier terrestre a 365 jours/an'
             CASE('earth_366d')
                 CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "Gregorian")
-                WRITE(*,*) 'Xios. Calendrier gregorien'
+                IF (prt_level >= 10) WRITE(lunout,*) 'Xios. Calendrier gregorien'
             CASE DEFAULT
                 abort_message = 'Xios. Mauvais choix de calendrier'
@@ -161 +206 @@
         WRITE(date, "(i4.4,'-',i2.2,'-',i2.2,' 00:00:00')") annee, mois, jour
         
-        WRITE(*,*) "Xios. Initial time: ", date
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. Initial time: ", date
         
         CALL xios_set_context_attr_hdl(g_ctx, start_date= date)
@@ -167 +212 @@
         !Et enfin,le pas de temps:
         CALL xios_set_timestep(mdtime)
-        WRITE(*,*) "Xios. ts=",mdtime
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. ts=",mdtime
     END SUBROUTINE wxios_set_cal
+
+    SUBROUTINE wxios_set_timestep(ts)
+        REAL, INTENT(IN) :: ts
+        TYPE(xios_time) :: mdtime     
+
+        mdtime = xios_time(0, 0, 0, 0, 0, ts)
+
+        CALL xios_set_timestep(mdtime)
+    END SUBROUTINE wxios_set_timestep
 
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     ! Pour initialiser un domaine !!!!!!!!!!!!!!!!!!!!
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    SUBROUTINE wxios_domain_param(dom_id, is_sequential, iim, jjm, io_lat, io_lon)
+    SUBROUTINE wxios_domain_param(dom_id, is_sequential, ni, nj, ni_glo, nj_glo,        &
+                                    ibegin, iend, ii_begin, ii_end, jbegin, jend,       &
+                                    data_ni, data_ibegin, data_iend,                    &
+                                    io_lat, io_lon)
          
+        IMPLICIT NONE
+        INCLUDE 'iniprint.h'
+
         CHARACTER (len=*), INTENT(IN) :: dom_id
         LOGICAL, INTENT(IN) :: is_sequential
-        INTEGER, INTENT(IN) :: iim, jjm
+        INTEGER, INTENT(IN) :: ni, nj, ni_glo, nj_glo, ibegin, iend, ii_begin, ii_end, jbegin, jend
+        INTEGER, INTENT(IN) :: data_ni, data_ibegin, data_iend
         REAL, DIMENSION(:) :: io_lat, io_lon
         
         
         TYPE(xios_domain) :: dom
-        INTEGER :: ni, nj, ni_glo, nj_glo, ibegin, iend, jbegin, jend
-        LOGICAl :: boool
-        
-        ni_glo = iim
-        nj_glo = jjm
-        ni = iim
-        nj = jjm
-        ibegin = 1
-        jbegin = 1
-        iend = ibegin + ni - 1
-        jend = jbegin + nj - 1
+        LOGICAL :: boool
+        
+        !Masque pour les problèmes de recouvrement MPI:
+        LOGICAL :: mask(ni,nj)
         
         !On récupère le handle:
         CALL xios_get_domain_handle(dom_id, dom)
         
-        WRITE(*,*) "Xios. ni:",iim," ni_glo:", iim, " nj:", jjm, " nj_glo:", jjm
-        WRITE(*,*) "Xios. Size lon:", SIZE(io_lon), " lat:", SIZE(io_lat)
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. ni:",ni," ni_glo:", ni_glo, " nj:", nj, " nj_glo:", nj_glo
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. ibegin:",ibegin," iend:", iend, " jbegin:", jbegin, " jend:", jend
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. Size lon:", SIZE(io_lon(ibegin:iend)), " lat:", SIZE(io_lat(jbegin:jend))
         
         !On parametrise le domaine:
-        !IF (is_sequential) THEN
-            CALL xios_set_domain_attr_hdl(dom, ni_glo=iim, ibegin=1, ni=iim,&
-            & nj_glo=jjm, jbegin=1,nj=jjm,&
-            & lonvalue=io_lon(ibegin:iend), latvalue=io_lat(jbegin:jend))
-        !END IF
+        CALL xios_set_domain_attr_hdl(dom, ni_glo=ni_glo, ibegin=ibegin, ni=ni)
+        CALL xios_set_domain_attr_hdl(dom, nj_glo=nj_glo, jbegin=jbegin, nj=nj, data_dim=2)
+        CALL xios_set_domain_attr_hdl(dom, lonvalue=io_lon(ibegin:iend), latvalue=io_lat(jbegin:jend))
+
+        IF (.NOT.is_sequential) THEN
+            mask(:,:)=.TRUE.
+            mask(1:ii_begin-1,1) = .FALSE.
+            mask(ii_end+1:ni,nj) = .FALSE.
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. mask"
+            !CALL xios_set_domain_attr_hdl(dom, mask=mask)
+        END IF
+
          CALL xios_is_defined_domain_attr_hdl(dom,ni_glo=boool)
         !Vérification:
         IF (xios_is_valid_domain(dom_id)) THEN
-            WRITE(*,*) "Xios. Domain initialized: ", dom_id, boool
-        ELSE
-            WRITE(*,*) "Xios. Invalid domain: ", dom_id
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. Domain initialized: ", dom_id, boool
+        ELSE
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. Invalid domain: ", dom_id
         END IF
     END SUBROUTINE wxios_domain_param
@@ -218 +280 @@
     ! Pour déclarer un axe vertical !!!!!!!!!!!!!!!
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    SUBROUTINE wxios_add_vaxis(axisgroup_id, axis_file_id, axis_size, axis_value)
-        CHARACTER (len=*), INTENT(IN) :: axisgroup_id
-        INTEGER, INTENT(IN) :: axis_file_id, axis_size
+    SUBROUTINE wxios_add_vaxis(axisgroup_id, axis_file, axis_size, axis_value)
+        IMPLICIT NONE
+        INCLUDE 'iniprint.h'
+
+        CHARACTER (len=*), INTENT(IN) :: axisgroup_id, axis_file
+        INTEGER, INTENT(IN) :: axis_size
         REAL, DIMENSION(axis_size), INTENT(IN) :: axis_value
         
         TYPE(xios_axisgroup) :: axgroup
         TYPE(xios_axis) :: ax
-        CHARACTER(len=100) :: axis_id
+        CHARACTER(len=20) :: axis_id
         
         
         !Préparation du nom de l'axe:
-        CALL concat(axisgroup_id, axis_file_id, axis_id)
+        CALL concat(axisgroup_id, axis_file, axis_id)
         
         !On récupère le groupe d'axes qui va bien:
@@ -235 +300 @@
         
         !On ajoute l'axe correspondant à ce fichier:
-        CALL xios_add_axis(axgroup, ax, axis_id)
+        CALL xios_add_axis(axgroup, ax, TRIM(ADJUSTL(axis_id)))
         
         !Et on le parametrise:
@@ -241 +306 @@
         
         !Vérification:
-        IF (xios_is_valid_axis(axis_id)) THEN
-            WRITE(*,*) "Xios. Axis created: ", axis_id
-        ELSE
-            WRITE(*,*) "Xios. Invalid axis: ", axis_id
+        IF (xios_is_valid_axis(TRIM(ADJUSTL(axis_id)))) THEN
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. Axis created: ", TRIM(ADJUSTL(axis_id))
+        ELSE
+            WRITE(*,*) "Xios. Invalid axis: ", TRIM(ADJUSTL(axis_id))
         END IF
 
@@ -254 +319 @@
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     SUBROUTINE wxios_add_file(fname, ffreq, flvl)
+        IMPLICIT NONE
+        INCLUDE 'iniprint.h'
+
         CHARACTER(len=*), INTENT(IN) :: fname
         CHARACTER(len=*), INTENT(IN) :: ffreq
@@ -262 +330 @@
         CHARACTER(len=100) :: nffreq
         
-        !On créé le noeud:
-        CALL xios_get_filegroup_handle("defile", x_fg)
-        CALL xios_add_file(x_fg, x_file, "X"//fname)
-        
-        !On reformate la fréquence:
-        CALL reformadate(ffreq, nffreq)
-        
-        !On configure:
-        CALL xios_set_file_attr_hdl(x_file, name="X"//fname,&
+        !On regarde si le fichier n'est pas défini par XML:
+        IF (.NOT.xios_is_valid_file(fname)) THEN
+            !On créé le noeud:
+            CALL xios_get_filegroup_handle("defile", x_fg)
+            CALL xios_add_file(x_fg, x_file, fname)
+        
+            !On reformate la fréquence:
+            CALL reformadate(ffreq, nffreq)
+        
+            !On configure:
+            CALL xios_set_file_attr_hdl(x_file, name="X"//fname,&
                 output_freq=TRIM(ADJUSTL(nffreq)), output_level=flvl, enabled=.TRUE.)
         
-        IF (xios_is_valid_file("X"//fname)) THEN
-            WRITE(*,*) "Xios. New file: ", "X"//fname
-            WRITE(*,*) "Xios. output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl
-        ELSE
-            WRITE(*,*) "Xios. Error, invalid file: ", "X"//fname
-            WRITE(*,*) "Xios. output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl
+            IF (xios_is_valid_file("X"//fname)) THEN
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. New file: ", "X"//fname
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl
+            ELSE
+                WRITE(*,*) "Xios. Error, invalid file: ", "X"//fname
+                WRITE(*,*) "Xios. output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl
+            END IF
+        ELSE
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. Fichier ", fname, " défini par XML."
+                CALL xios_set_file_attr(fname, enabled=.TRUE.)
         END IF
     END SUBROUTINE wxios_add_file
     
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    ! Pour créer un champ      !!!!!!!!!!!!!!!
+    ! Pour créer un champ      !!!!!!!!!!!!!!!!!!!!
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     SUBROUTINE wxios_add_field(fieldname, fieldgroup, fieldlongname, fieldunit)
         USE netcdf
+
+        IMPLICIT NONE
+        INCLUDE 'iniprint.h'
         
         CHARACTER(len=*), INTENT(IN) :: fieldname
@@ -308 +385 @@
         !On ajoute le champ:
         CALL xios_add_field(fieldgroup, field, fieldname)
-        !WRITE(*,*) "Xios. ",fieldname,fieldgroup, fieldlongname, fieldunit
+        !IF (prt_level >= 10) WRITE(lunout,*) "Xios. ",fieldname,fieldgroup, fieldlongname, fieldunit
         
         !On rentre ses paramètres:
         CALL xios_set_field_attr_hdl(field, standard_name=fieldlongname, unit=newunit, default_value=def)
-        WRITE(*,*) "Xios. Champ ", fieldname, "cree:"
-        WRITE(*,*) "Xios. long_name=",fieldlongname,"; unit=",newunit,";  default_value=",nf90_fill_real
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. Champ ", fieldname, "cree:"
+        IF (prt_level >= 10) WRITE(lunout,*) "Xios. long_name=",fieldlongname,"; unit=",newunit,";  default_value=",nf90_fill_real
 
     END SUBROUTINE wxios_add_field
     
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    ! Pour déclarer un champ      !!!!!!!!!!!!!!!
+    ! Pour déclarer un champ      !!!!!!!!!!!!!!!!!
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     SUBROUTINE wxios_add_field_to_file(fieldname, fdim, fid, fname, fieldlongname, fieldunit, field_level, op)
+        IMPLICIT NONE
+        INCLUDE 'iniprint.h'
+
         CHARACTER(len=*), INTENT(IN) :: fieldname
         INTEGER, INTENT(IN)          :: fdim, fid
@@ -329 +409 @@
         CHARACTER(len=*), INTENT(IN) :: op
         
-        CHARACTER(len=100) :: axis_id
+        CHARACTER(len=20) :: axis_id
         CHARACTER(len=100) :: operation
         TYPE(xios_file) :: f
         TYPE(xios_field) :: field
         TYPE(xios_fieldgroup) :: fieldgroup
+        LOGICAL :: bool=.FALSE.
+        INTEGER :: lvl =0
         
         
         !Préparation du nom de l'axe:
-        CALL concat("presnivs", fid, axis_id)
+        CALL concat("presnivs", fname, axis_id)
         
         !on prépare le nom de l'opération:
@@ -352 +434 @@
         
         !On regarde si le champ à déjà été créé ou non:
-        IF (xios_is_valid_field(fieldname)) THEN
-            WRITE(*,*) "Xios. Champ ", fieldname, "existe"
-        ELSE
-            WRITE(*,*) "Xios. Champ ", fieldname, "nexiste pas"
+        IF (xios_is_valid_field(fieldname) .AND. .NOT. g_field_name == fieldname) THEN
+            !Si ce champ existe via XML (ie, dès le premier passage, ie g_field_name != fieldname) alors rien d'autre à faire
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. Champ ", fieldname, "existe via XML"
+            g_flag_xml = .TRUE.
+            g_field_name = fieldname
+
+        ELSE IF (.NOT. g_field_name == fieldname) THEN
+            !Si premier pssage et champ indéfini, alors on le créé
+
+            IF (prt_level >= 10) WRITE(lunout,*) "Xios. Champ ", fieldname, "nexiste pas"
             
             !On le créé:
             CALL wxios_add_field(fieldname,  fieldgroup, fieldlongname, fieldunit)
             IF (xios_is_valid_field(fieldname)) THEN
-                WRITE(*,*) "Xios. Champ ", fieldname, "cree"
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. Champ ", fieldname, "cree"
             ENDIF
-        ENDIF
-        
-        !On ajoute le champ:
-        CALL xios_get_file_handle("X"//fname, f)
-        CALL xios_add_fieldtofile(f, field)
-        
-        
-        !L'operation, sa frequence:
-        CALL xios_set_field_attr_hdl(field, field_ref=fieldname, operation=TRIM(ADJUSTL(operation)), freq_op="1ts", prec=4)
-
-        
-        !On rentre ses paramètres:
-        CALL xios_set_field_attr_hdl(field, level=field_level, enabled=.TRUE.)
-        
-        IF (fdim.EQ.2) THEN
-            !Si c'est un champ 2D:
-            WRITE(*,*) "Xios. Champ 2D ", fieldname, " de ", "X"//fname ," configure:"
-            WRITE (*,*) "Xios. op=", TRIM(ADJUSTL(operation))
-            WRITE(*,*) "Xios. freq_op=1ts","; lvl=",field_level
-        ELSE
-            !Si 3D :
-            !On ajoute l'axe vertical qui va bien:
-            CALL xios_set_field_attr_hdl(field, axis_ref=axis_id)
+
+            g_flag_xml = .FALSE.
+            g_field_name = fieldname
+
+        END IF
+
+        IF (.NOT. g_flag_xml) THEN
+            !Champ existe déjà, mais pas XML, alors on l'ajoute
+            !On ajoute le champ:
+            CALL xios_get_file_handle(fname, f)
+            CALL xios_add_fieldtofile(f, field)
             
-            WRITE(*,*) "Xios. Champ 3D ", fieldname, " de ", "X"//fname, "configure:"
-            WRITE(*,*) "Xios. freq_op=1ts","; lvl=",field_level
-            WRITE(*,*) "Xios. axe=",axis_id
-        END IF
+            
+            !L'operation, sa frequence:
+            CALL xios_set_field_attr_hdl(field, field_ref=fieldname, operation=TRIM(ADJUSTL(operation)), freq_op="1ts", prec=4)
+
+            
+            !On rentre ses paramètres:
+            CALL xios_set_field_attr_hdl(field, level=field_level, enabled=.TRUE.)
+            
+            IF (fdim.EQ.2) THEN
+                !Si c'est un champ 2D:
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. Champ 2D ", fieldname, " de ", "X"//fname ," configure:"
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. op=", TRIM(ADJUSTL(operation))
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. freq_op=1ts","; lvl=",field_level
+            ELSE
+                !Si 3D :
+                !On ajoute l'axe vertical qui va bien:
+                CALL xios_set_field_attr_hdl(field, axis_ref=TRIM(ADJUSTL(axis_id)))
+                
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. Champ 3D ", fieldname, " de ", "X"//fname, "configure:"
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. freq_op=1ts","; lvl=",field_level
+                IF (prt_level >= 10) WRITE(lunout,*) "Xios. axe=",TRIM(ADJUSTL(axis_id))
+            END IF
+        
+        ELSE
+            !Sinon on se contente de l'activer:
+            CALL xios_set_field_attr(fieldname, enabled=.TRUE.)
+        ENDIF       
         
     END SUBROUTINE wxios_add_field_to_file
@@ -401 +500 @@
         CHARACTER(len=*), INTENT(IN) :: fieldname
         REAL, DIMENSION(:,:), INTENT(IN) :: fdata
-        
+
         CALL xios_send_field(fieldname, fdata)
     END SUBROUTINE wxios_write_2D

LMDZ5/trunk/libf/dyn3dpar/abort_gcm.F

@@ -13 +13 @@
 #endif
       USE parallel_lmdz
+
+
+
+
 #include "iniprint.h"
  
@@ -37 +41 @@
 c$OMP END MASTER
 #endif
+
+
+
 c     call histclo(2)
 c     call histclo(3)

LMDZ5/trunk/libf/dyn3dpar/gcm.F

@@ -10 +10 @@
 #endif
 
-
-#ifdef CPP_XIOS
-    ! ug Pour les sorties XIOS
-        USE wxios
-#endif
 
       USE mod_const_mpi, ONLY: init_const_mpi
@@ -192 +187 @@
 c   Initialisation partie parallele
 c------------------------------------
+
       CALL init_const_mpi
-
       call init_parallel
       call ini_getparam("out.def")
@@ -224 +219 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#ifdef CPP_XIOS
-        CALL wxios_init("LMDZ")
-#endif
 
 c-----------------------------------------------------------------------

LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -22 +22 @@
        USE control_mod
 
-#ifdef CPP_XIOS
-    ! ug Pour les sorties XIOS
-        USE wxios
-#endif
       IMPLICIT NONE
 
@@ -1380 +1376 @@
 
 c$OMP MASTER
-
-#ifdef CPP_XIOS
-    !Fermeture propre de XIOS
-      CALL wxios_close()
-#endif
               call fin_getparam
               call finalize_parallel

LMDZ5/trunk/libf/dyn3dpar/mod_const_mpi.F90

@@ -51 +51 @@
   
   SUBROUTINE Init_mpi
+#ifdef CPP_XIOS
+    USE wxios
+#endif
   IMPLICIT NONE
 #ifdef CPP_MPI
@@ -70 +73 @@
       COMM_LMDZ=MPI_COMM_WORLD
       MPI_REAL_LMDZ=MPI_REAL8
+
+    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    ! Initialisation de XIOS
+    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#ifdef CPP_XIOS
+      CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
+#endif
 !$OMP END MASTER
+#else
+#ifdef CPP_XIOS
+      CALL wxios_init("LMDZ")
 #endif
-
+#endif
    END SUBROUTINE Init_mpi
     

LMDZ5/trunk/libf/dyn3dpar/parallel_lmdz.F90

@@ -199 +199 @@
     
     subroutine Finalize_parallel
+#ifdef CPP_XIOS
+    ! ug Pour les sorties XIOS
+        USE wxios
+#endif
 #ifdef CPP_COUPLE
     use mod_prism_proto
@@ -232 +236 @@
 #endif 
       else
+#ifdef CPP_XIOS
+    !Fermeture propre de XIOS
+      CALL wxios_close()
+#endif
 #ifdef CPP_MPI
          IF (using_mpi) call MPI_FINALIZE(ierr)

LMDZ5/trunk/libf/phydev/physiq.F90

@@ -19 +19 @@
       USE mod_phys_lmdz_para, only : jj_nb
       USE phys_state_var_mod, only : phys_state_var_init
+
+#ifdef CPP_XIOS
+      USE wxios
+#endif
 
       IMPLICIT none
@@ -101 +105 @@
   dtime=pdtphys
   call histbeg_phy("histins.nc",itau0,zjulian,dtime,nhori,nid_hist)
+
+
+
 !$OMP MASTER
+
+
+
   ! define vertical coordinate
   call histvert(nid_hist,"presnivs","Vertical levels","Pa",klev, &
@@ -120 +130 @@
   ! end definition sequence
   call histend(nid_hist)
+
+!XIOS
+#ifdef CPP_XIOS
+    ! Déclaration de l'axe vertical du fichier:    
+    !CALL wxios_add_vaxis("presnivs", "histins", klev, presnivs)
+
+    !Déclaration du pas de temps:
+    !CALL wxios_set_timestep(dtime)
+
+    !Finalisation du contexte:
+    !CALL wxios_closedef()
+#endif
 !$OMP END MASTER
 endif ! of if (debut)
@@ -154 +176 @@
 endif
 
+!XIOS
+#ifdef CPP_XIOS
+!$OMP MASTER
+    !On incrémente le pas de temps XIOS
+    !CALL wxios_update_calendar(itau)
+
+    !Et on écrit, avec la routine histwrite dédiée:
+    !CALL histwrite_phy("temperature",t)
+    !CALL histwrite_phy("u",u)
+    !CALL histwrite_phy("v",v)
+    !CALL histwrite_phy("ps",paprs(:,1))
+!$OMP END MASTER
+#endif
+
 ! if lastcall, then it is time to write "restartphy.nc" file
 if (lafin) then

LMDZ5/trunk/libf/phylmd/iophy.F90

@@ -5 +5 @@
 
   USE phys_output_var_mod
+#ifdef CPP_XIOS
+  USE wxios
+#endif
 
 #ifdef CPP_XIOS
@@ -20 +23 @@
 
 !$OMP THREADPRIVATE(itau_iophy)
-  
+
+#ifdef CPP_XIOS
+  INTERFACE histwrite_phy
+    MODULE PROCEDURE histwrite2d_phy,histwrite3d_phy,histwrite2d_phy_old,histwrite3d_phy_old,histwrite2d_xios,histwrite3d_xios
+  END INTERFACE
+#else
   INTERFACE histwrite_phy
     MODULE PROCEDURE histwrite2d_phy,histwrite3d_phy,histwrite2d_phy_old,histwrite3d_phy_old
   END INTERFACE
+#endif
 
   INTERFACE histbeg_phy_all
@@ -44 +53 @@
   USE mod_grid_phy_lmdz
   USE ioipsl
-  
+
   IMPLICIT NONE
   INCLUDE 'dimensions.h'   
@@ -61 +70 @@
     INTEGER,DIMENSION(2) :: dhe 
     INTEGER :: i    
+    INTEGER :: data_ibegin, data_iend
 
     CALL gather(rlat,rlat_glo)
@@ -79 +89 @@
     ALLOCATE(io_lon(iim))
     io_lon(:)=rlon_glo(2-1/(iim*jjm):iim+1-1/(iim*jjm))
+!! (I) dtnb   : total number of domains
+!! (I) dnb    : domain number
+!! (I) did(:) : distributed dimensions identifiers
+!!              (up to 5 dimensions are supported)
+!! (I) dsg(:) : total number of points for each dimension
+!! (I) dsl(:) : local number of points for each dimension
+!! (I) dpf(:) : position of first local point for each dimension
+!! (I) dpl(:) : position of last local point for each dimension
+!! (I) dhs(:) : start halo size for each dimension
+!! (I) dhe(:) : end halo size for each dimension
+!! (C) cdnm   : Model domain definition name.
+!!              The names actually supported are :
+!!              "BOX", "APPLE", "ORANGE".
+!!              These names are case insensitive.
 
     ddid=(/ 1,2 /)
@@ -91 +115 @@
       dhe=(/ iim-ii_end,0 /)  
     ENDIF
-    
+
+#ifndef CPP_NO_IOIPSL    
     CALL flio_dom_set(mpi_size,mpi_rank,ddid,dsg,dsl,dpf,dpl,dhs,dhe, &
                       'APPLE',phys_domain_id)
+#endif
 #ifdef CPP_XIOS
+    !Pour els soucis en MPI, réglage du masque:
+    IF (mpi_rank == 0) THEN
+        data_ibegin = 0
+    ELSE 
+        data_ibegin = ii_begin - 1
+    END IF
+
+    IF (mpi_rank == mpi_size-1) THEN
+        data_iend = nbp_lon
+    ELSE
+        data_iend = ii_end + 1
+    END IF
+
+    WRITE(*,*) "TOTO mpirank=",mpi_rank,"iibeg=",ii_begin , "jjbeg=",jj_begin,"jjnb=",jj_nb,"jjend=",jj_end
+
     !On initialise le domaine xios, maintenant que tout est connu:
-    CALL wxios_domain_param("dom_glo", is_sequential, iim, jjm+1, io_lat, io_lon)
+    !SUBROUTINE wxios_domain_param(dom_id, is_sequential, ni, nj, ni_glo, nj_glo,        &
+    !                                ibegin, iend, jbegin, jend,                         &
+    !                                data_ni, data_ibegin,                               &
+    !                                io_lat, io_lon)
+    CALL wxios_domain_param("dom_glo", is_sequential, nbp_lon, jj_nb, nbp_lon, nbp_lat, &
+                            1, nbp_lon, ii_begin, ii_end, jj_begin, jj_end,             &
+                            klon_mpi+2*(nbp_lon-1), data_ibegin, data_iend,             &
+                            io_lat, io_lon)
 #endif
 !$OMP END MASTER
@@ -137 +185 @@
     endif
     
+#ifndef CPP_NO_IOIPSL 
     call flio_dom_set(mpi_size,mpi_rank,ddid,dsg,dsl,dpf,dpl,dhs,dhe, &
                       'APPLE',phys_domain_id)
-
+#endif
 !$OMP END MASTER
       
@@ -197 +246 @@
 
 !$OMP MASTER    
+#ifndef CPP_NO_IOIPSL 
     if (is_sequential) then
       call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
@@ -204 +254 @@
                    1,iim,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day,phys_domain_id)
     endif
-
+#endif
 !$OMP END MASTER
   
@@ -334 +384 @@
     ENDDO
 !    print*,'iophy is_sequential nname, nnhori, nnid_day=',trim(nname),nnhori,nnid_day
+#ifndef CPP_NO_IOIPSL 
      call histbeg(nname,pim,plon,plon_bounds, & 
                            plat,plat_bounds, &
                            itau0, zjulian, dtime, nnhori, nnid_day)
+#endif
     else
      npproc=0
@@ -373 +425 @@
       ENDIF
      ENDDO
+#ifndef CPP_NO_IOIPSL 
      call histbeg(nname,npstn,npplon,npplon_bounds, &
                             npplat,npplat_bounds, &
                             itau0,zjulian,dtime,nnhori,nnid_day,phys_domain_id)
+#endif
     endif
 !$OMP END MASTER
@@ -534 +588 @@
 
     IF(.NOT.clef_stations(iff)) THEN  
+
 #ifdef CPP_XIOS
-        CALL wxios_add_field_to_file(var%name, 2, nid_files(iff), phys_out_filenames(iff), &
+        CALL wxios_add_field_to_file(var%name, 2, iff, phys_out_filenames(iff), &
         var%description, var%unit, var%flag(iff), typeecrit)
 #endif
+#ifndef CPP_NO_IOIPSL 
 
        IF ( var%flag(iff)<=lev_files(iff) ) THEN
@@ -550 +606 @@
                typeecrit, zstophym,zoutm(iff))                
        ENDIF
+#endif
     ENDIF
 
@@ -602 +659 @@
 
     IF(.NOT.clef_stations(iff)) THEN
+
 #ifdef CPP_XIOS
-        CALL wxios_add_field_to_file(var%name, 3, nid_files(iff), phys_out_filenames(iff), &
+        CALL wxios_add_field_to_file(var%name, 3, iff, phys_out_filenames(iff), &
         var%description, var%unit, var%flag(iff), typeecrit)
 #endif
+#ifndef CPP_NO_IOIPSL 
 
        IF ( var%flag(iff)<=lev_files(iff) ) THEN
@@ -620 +679 @@
                typeecrit, zstophym,zoutm(iff))
        ENDIF
+#endif
     ENDIF
   END SUBROUTINE histdef3d
@@ -849 +909 @@
                         ALLOCATE(index2d(iim*jj_nb))
                         ALLOCATE(fieldok(iim*jj_nb))
-     
+#ifndef CPP_NO_IOIPSL 
                         CALL histwrite(nid_files(iff),var%name,itau_iophy,Field2d,iim*jj_nb,index2d)
+#endif
 #ifdef CPP_XIOS
                         IF (iff == iff_beg) THEN
@@ -873 +934 @@
                               ENDDO
                        ENDIF
-     
+#ifndef CPP_NO_IOIPSL 
                        CALL histwrite(nid_files(iff),var%name,itau_iophy,fieldok,npstn,index2d)
+#endif
                   ENDIF
                   
@@ -953 +1015 @@
                         ALLOCATE(index3d(iim*jj_nb*nlev))
                         ALLOCATE(fieldok(iim*jj_nb,nlev))
+
+#ifndef CPP_NO_IOIPSL 
                         CALL histwrite(nid_files(iff),var%name,itau_iophy,Field3d,iim*jj_nb*nlev,index3d)
+#endif
 
 #ifdef CPP_XIOS
@@ -982 +1047 @@
                               ENDDO
                         ENDIF
+#ifndef CPP_NO_IOIPSL 
                         CALL histwrite(nid_files(iff),var%name,itau_iophy,fieldok,npstn*nlev,index3d)
+#endif
                   ENDIF 
                   deallocate(index3d)
@@ -993 +1060 @@
   END SUBROUTINE histwrite3d_phy
   
+
+! VERSION DES HISTWRITE DEDIEES AU TOUT-XIOS-XML DEJA UTILISEE DANS PHYDEV
+#ifdef CPP_XIOS
+  SUBROUTINE histwrite2d_xios(field_name,field)
+  USE dimphy
+  USE mod_phys_lmdz_para
+  USE wxios
+
+
+  IMPLICIT NONE
+  INCLUDE 'dimensions.h'
+  INCLUDE 'iniprint.h'
+
+    CHARACTER(LEN=*), INTENT(IN) :: field_name
+    REAL, DIMENSION(:), INTENT(IN) :: field
+      
+    REAL,DIMENSION(klon_mpi) :: buffer_omp
+    INTEGER, allocatable, DIMENSION(:) :: index2d
+    REAL :: Field2d(iim,jj_nb)
+
+    INTEGER :: ip
+    REAL, ALLOCATABLE, DIMENSION(:) :: fieldok
+
+    IF (prt_level >= 9) WRITE(lunout,*)'Begin histrwrite2d_xios ',field_name
+
+    !Et sinon on.... écrit
+    IF (SIZE(field)/=klon) CALL abort_gcm('iophy::histwrite2d_xios','Field first DIMENSION not equal to klon',1)
+    
+    CALL Gather_omp(field,buffer_omp)    
+!$OMP MASTER
+    CALL grid1Dto2D_mpi(buffer_omp,Field2d)
+    
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!ATTENTION, STATIONS PAS GEREES !
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    !IF(.NOT.clef_stations(iff)) THEN
+    IF (.TRUE.) THEN
+        ALLOCATE(index2d(iim*jj_nb))
+        ALLOCATE(fieldok(iim*jj_nb))
+
+
+        CALL wxios_write_2D(field_name, Field2d)
+
+    ELSE 
+        ALLOCATE(fieldok(npstn))
+        ALLOCATE(index2d(npstn))
+
+        IF (is_sequential) THEN
+            DO ip=1, npstn
+                fieldok(ip)=buffer_omp(nptabij(ip))
+            ENDDO
+        ELSE
+            DO ip=1, npstn
+                PRINT*,'histwrite2d_xios is_sequential npstn ip namenptabij',npstn,ip,field_name,nptabij(ip)
+                IF(nptabij(ip).GE.klon_mpi_begin.AND. &
+                nptabij(ip).LE.klon_mpi_end) THEN
+                    fieldok(ip)=buffer_omp(nptabij(ip)-klon_mpi_begin+1)
+                ENDIF
+            ENDDO
+        ENDIF
+
+    ENDIF
+                  
+    deallocate(index2d)
+    deallocate(fieldok)
+!$OMP END MASTER   
+
+  IF (prt_level >= 9) WRITE(lunout,*)'End histrwrite2d_xios ',field_name
+  END SUBROUTINE histwrite2d_xios
+
+
+! ug NOUVELLE VERSION DES WRITE AVEC LA BOUCLE DO RENTREE
+  SUBROUTINE histwrite3d_xios(field_name, field)
+  USE dimphy
+  USE mod_phys_lmdz_para
+  USE wxios
+
+
+  IMPLICIT NONE
+  INCLUDE 'dimensions.h'
+  INCLUDE 'iniprint.h'
+
+    CHARACTER(LEN=*), INTENT(IN) :: field_name
+    REAL, DIMENSION(:,:), INTENT(IN) :: field ! --> field(klon,:)
+
+    REAL,DIMENSION(klon_mpi,SIZE(field,2)) :: buffer_omp
+    REAL :: Field3d(iim,jj_nb,SIZE(field,2))
+    INTEGER :: ip, n, nlev
+    INTEGER, ALLOCATABLE, DIMENSION(:) :: index3d
+    REAL,ALLOCATABLE, DIMENSION(:,:) :: fieldok
+
+  IF (prt_level >= 9) write(lunout,*)'Begin histrwrite3d_xios ',field_name
+
+    !Et on.... écrit
+    IF (SIZE(field,1)/=klon) CALL abort_gcm('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)
+    nlev=SIZE(field,2)
+
+
+    CALL Gather_omp(field,buffer_omp)
+!$OMP MASTER
+    CALL grid1Dto2D_mpi(buffer_omp,field3d)
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!ATTENTION, STATIONS PAS GEREES !
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    !IF (.NOT.clef_stations(iff)) THEN
+    IF(.TRUE.)THEN
+        ALLOCATE(index3d(iim*jj_nb*nlev))
+        ALLOCATE(fieldok(iim*jj_nb,nlev))
+        CALL wxios_write_3D(field_name, Field3d(:,:,1:klev))
+                        
+    ELSE 
+        nlev=size(field,2)
+        ALLOCATE(index3d(npstn*nlev))
+        ALLOCATE(fieldok(npstn,nlev))
+
+        IF (is_sequential) THEN
+            DO n=1, nlev
+                DO ip=1, npstn
+                    fieldok(ip,n)=buffer_omp(nptabij(ip),n)
+                ENDDO
+            ENDDO
+        ELSE
+            DO n=1, nlev
+                DO ip=1, npstn
+                    IF(nptabij(ip).GE.klon_mpi_begin.AND. &
+                    nptabij(ip).LE.klon_mpi_end) THEN
+                        fieldok(ip,n)=buffer_omp(nptabij(ip)-klon_mpi_begin+1,n)
+                    ENDIF
+                ENDDO
+            ENDDO
+        ENDIF
+    ENDIF 
+    deallocate(index3d)
+    deallocate(fieldok)
+!$OMP END MASTER   
+
+  IF (prt_level >= 9) write(lunout,*)'End histrwrite3d_xios ',field_name
+  END SUBROUTINE histwrite3d_xios
+#endif
 end module iophy

LMDZ5/trunk/libf/phylmd/mod_phys_lmdz_para.F90

@@ -32 +32 @@
        is_master=.FALSE.
      ENDIF
-    CALL Test_transfert
+     CALL Test_transfert
 !$OMP END PARALLEL    
      IF (is_using_mpi .OR. is_using_omp) THEN

LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -20 +20 @@
 !!! Ap et Bp
   TYPE(ctrl_out), SAVE :: o_Ahyb = ctrl_out((/ 1, 1, 1, 1, 1, 1, 11, 11, 11 /), &
-        'Ap', '', '', (/ ('', i=1, 9) /))
+    'Ap', '', '', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_Bhyb = ctrl_out((/ 1, 1, 1, 1, 1, 1, 11, 11, 11 /), &
-        'Bp', '', '', (/ ('', i=1, 9) /))
+    'Bp', '', '', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_Alt = ctrl_out((/ 1, 1, 1, 1, 1, 1, 11, 11, 11 /), &
-        'Alt', '', '', (/ ('', i=1, 9) /))
+    'Alt', '', '', (/ ('', i=1, 9) /))
 
 !!! 1D
   TYPE(ctrl_out), SAVE :: o_phis = ctrl_out((/ 1, 1, 10, 5, 1, 1, 11, 11, 11 /), &
-        'phis', 'Surface geop.height', 'm2/s2', (/ ('', i=1, 9) /))
+    'phis', 'Surface geop.height', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_aire = ctrl_out((/ 1, 1, 10,  10, 1, 1, 11, 11, 11 /), &
-        'aire', 'Grid area', '-', (/ 'once', 'once', 'once', 'once', 'once', 'once', &
+    'aire', 'Grid area', '-', (/ 'once', 'once', 'once', 'once', 'once', 'once', &
                                      'once', 'once', 'once' /))
   TYPE(ctrl_out), SAVE :: o_contfracATM = ctrl_out((/ 10, 1,  1, 10, 10, 10, 11, 11, 11 /), &
-        'contfracATM', '% sfce ter+lic', '-', &
+    'contfracATM', '% sfce ter+lic', '-', &
        (/ 'once', 'once', 'once', 'once', 'once', 'once', 'once', 'once', 'once' /)) 
   TYPE(ctrl_out), SAVE :: o_contfracOR = ctrl_out((/ 10, 1,  10, 10, 10, 10, 11, 11, 11 /), &
-        'contfracOR', '% sfce terre OR', '-', (/ ('', i=1, 9) /))
+    'contfracOR', '% sfce terre OR', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_aireTER = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'aireTER', 'Grid area CONT', '-', (/ ('', i=1, 9) /))
+    'aireTER', 'Grid area CONT', '-', (/ ('', i=1, 9) /))
 
 !!! 2D
   TYPE(ctrl_out), SAVE :: o_flat = ctrl_out((/ 5, 1, 10, 10, 5, 10, 11, 11, 11 /), &
-        'flat', 'Latent heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'flat', 'Latent heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_slp = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'slp', 'Sea Level Pressure', 'Pa', (/ ('', i=1, 9) /))
+    'slp', 'Sea Level Pressure', 'Pa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tsol = ctrl_out((/ 1, 1, 1, 5, 10, 10, 11, 11, 11 /), &
-        'tsol', 'Surface Temperature', 'K', (/ ('', i=1, 9) /))
+    'tsol', 'Surface Temperature', 'K', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_t2m = ctrl_out((/ 1, 1, 1, 5, 10, 10, 11, 11, 11 /), &
-        't2m', 'Temperature 2m', 'K', (/ ('', i=1, 9) /))
+    't2m', 'Temperature 2m', 'K', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_t2m_min = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        't2m_min', 'Temp 2m min', 'K', &
+    't2m_min', 'Temp 2m min', 'K', &
       (/ "t_min(X)", "t_min(X)", "t_min(X)", "t_min(X)", "t_min(X)", "t_min(X)", "t_min(X)", "t_min(X)", "t_min(X)" /))
   TYPE(ctrl_out), SAVE :: o_t2m_max = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        't2m_max', 'Temp 2m max', 'K', &
+    't2m_max', 'Temp 2m max', 'K', &
       (/ "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)", &
          "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)" /))
@@ -59 +59 @@
   TYPE(ctrl_out), SAVE, DIMENSION(4) :: o_t2m_srf = (/ &
       ctrl_out((/ 10, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        't2m_ter', "Temp 2m "//clnsurf(1), "K", (/ ('', i=1, 9) /)), &
+    't2m_ter', "Temp 2m "//clnsurf(1), "K", (/ ('', i=1, 9) /)), &
       ctrl_out((/ 10, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        't2m_lic', "Temp 2m "//clnsurf(2), "K", (/ ('', i=1, 9) /)), &
+    't2m_lic', "Temp 2m "//clnsurf(2), "K", (/ ('', i=1, 9) /)), &
       ctrl_out((/ 10, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        't2m_oce', "Temp 2m "//clnsurf(3), "K", (/ ('', i=1, 9) /)), &
+    't2m_oce', "Temp 2m "//clnsurf(3), "K", (/ ('', i=1, 9) /)), &
       ctrl_out((/ 10, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        't2m_sic', "Temp 2m "//clnsurf(4), "K", (/ ('', i=1, 9) /)) /)
+    't2m_sic', "Temp 2m "//clnsurf(4), "K", (/ ('', i=1, 9) /)) /)
 
   TYPE(ctrl_out), SAVE :: o_wind10m = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'wind10m', '10-m wind speed', 'm/s', (/ ('', i=1, 9) /))
+    'wind10m', '10-m wind speed', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wind10max = ctrl_out((/ 10, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'wind10max', '10m wind speed max', 'm/s', (/ ('', i=1, 9) /))
+    'wind10max', '10m wind speed max', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sicf = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'sicf', 'Sea-ice fraction', '-', (/ ('', i=1, 9) /))
+    'sicf', 'Sea-ice fraction', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_q2m = ctrl_out((/ 1, 1, 1, 5, 10, 10, 11, 11, 11 /), &
-        'q2m', 'Specific humidity 2m', 'kg/kg', (/ ('', i=1, 9) /))
+    'q2m', 'Specific humidity 2m', 'kg/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ustar = ctrl_out((/ 1, 1, 10, 5, 10, 10, 11, 11, 11 /), &
-        'ustar', 'Friction velocity', 'm/s', (/ ('', i=1, 9) /))
+    'ustar', 'Friction velocity', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_u10m = ctrl_out((/ 1, 1, 1, 5, 10, 10, 11, 11, 11 /), &
-        'u10m', 'Vent zonal 10m', 'm/s', (/ ('', i=1, 9) /))
+    'u10m', 'Vent zonal 10m', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_v10m = ctrl_out((/ 1, 1, 1, 5, 10, 10, 11, 11, 11 /), &
-        'v10m', 'Vent meridien 10m', 'm/s', (/ ('', i=1, 9) /))
+    'v10m', 'Vent meridien 10m', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_psol = ctrl_out((/ 1, 1, 1, 5, 10, 10, 11, 11, 11 /), &
-        'psol', 'Surface Pressure', 'Pa', (/ ('', i=1, 9) /))
+    'psol', 'Surface Pressure', 'Pa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_qsurf = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'qsurf', 'Surface Air humidity', 'kg/kg', (/ ('', i=1, 9) /))
+    'qsurf', 'Surface Air humidity', 'kg/kg', (/ ('', i=1, 9) /))
 
   TYPE(ctrl_out), SAVE, DIMENSION(4) :: o_ustar_srf     = (/ &
@@ -129 +129 @@
 
   TYPE(ctrl_out), SAVE :: o_qsol = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'qsol', 'Soil watter content', 'mm', (/ ('', i=1, 9) /))
+    'qsol', 'Soil watter content', 'mm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ndayrain = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ndayrain', 'Number of dayrain(liq+sol)', '-', &
+    'ndayrain', 'Number of dayrain(liq+sol)', '-', &
       (/ "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)" /))
   TYPE(ctrl_out), SAVE :: o_precip = ctrl_out((/ 1, 1, 1, 10, 5, 10, 11, 11, 11 /), &
-        'precip', 'Precip Totale liq+sol', 'kg/(s*m2)', (/ ('', i=1, 9) /))
+    'precip', 'Precip Totale liq+sol', 'kg/(s*m2)', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_plul = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'plul', 'Large-scale Precip.', 'kg/(s*m2)', (/ ('', i=1, 9) /))
+    'plul', 'Large-scale Precip.', 'kg/(s*m2)', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_pluc = ctrl_out((/ 1, 1, 1, 10, 5, 10, 11, 11, 11 /), &
-        'pluc', 'Convective Precip.', 'kg/(s*m2)', (/ ('', i=1, 9) /))
+    'pluc', 'Convective Precip.', 'kg/(s*m2)', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_snow = ctrl_out((/ 1, 1, 10, 10, 5, 10, 11, 11, 11 /), &
-        'snow', 'Snow fall', 'kg/(s*m2)', (/ ('', i=1, 9) /))
+    'snow', 'Snow fall', 'kg/(s*m2)', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_evap = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'evap', 'Evaporat', 'kg/(s*m2)', (/ ('', i=1, 9) /))
+    'evap', 'Evaporat', 'kg/(s*m2)', (/ ('', i=1, 9) /))
 
   TYPE(ctrl_out), SAVE, DIMENSION(4) :: o_evap_srf     = (/ &
@@ -155 +155 @@
 
   TYPE(ctrl_out), SAVE :: o_msnow = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'msnow', 'Surface snow amount', 'kg/m2', (/ ('', i=1, 9) /))
+    'msnow', 'Surface snow amount', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_fsnow = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'fsnow', 'Surface snow area fraction', '-', (/ ('', i=1, 9) /))
+    'fsnow', 'Surface snow area fraction', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tops = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tops', 'Solar rad. at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'tops', 'Solar rad. at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tops0 = ctrl_out((/ 1, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tops0', 'CS Solar rad. at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'tops0', 'CS Solar rad. at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_topl = ctrl_out((/ 1, 1, 10, 5, 10, 10, 11, 11, 11 /), &
-        'topl', 'IR rad. at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'topl', 'IR rad. at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_topl0 = ctrl_out((/ 1, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'topl0', 'IR rad. at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'topl0', 'IR rad. at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWupTOA = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWupTOA', 'SWup at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'SWupTOA', 'SWup at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWupTOAclr = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWupTOAclr', 'SWup clear sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'SWupTOAclr', 'SWup clear sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWdnTOA = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWdnTOA', 'SWdn at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'SWdnTOA', 'SWdn at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWdnTOAclr = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWdnTOAclr', 'SWdn clear sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'SWdnTOAclr', 'SWdn clear sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_nettop = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /), &
-        'nettop', 'Net dn radiatif flux at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'nettop', 'Net dn radiatif flux at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWup200 = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWup200', 'SWup at 200mb', 'W/m2', (/ ('', i=1, 9) /))
+    'SWup200', 'SWup at 200mb', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWup200clr = ctrl_out((/ 10, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWup200clr', 'SWup clear sky at 200mb', 'W/m2', (/ ('', i=1, 9) /))
+    'SWup200clr', 'SWup clear sky at 200mb', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWdn200 = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWdn200', 'SWdn at 200mb', 'W/m2', (/ ('', i=1, 9) /))
+    'SWdn200', 'SWdn at 200mb', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWdn200clr = ctrl_out((/ 10, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWdn200clr', 'SWdn clear sky at 200mb', 'W/m2', (/ ('', i=1, 9) /))
+    'SWdn200clr', 'SWdn clear sky at 200mb', 'W/m2', (/ ('', i=1, 9) /))
 
   ! arajouter
   !  type(ctrl_out),save :: o_LWupTOA     = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /),'LWupTOA', &
-  !     (/ ('', i=1, 9) /))
+  !    (/ ('', i=1, 9) /))
   !  type(ctrl_out),save :: o_LWupTOAclr  = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /),'LWupTOAclr', &
-  !     (/ ('', i=1, 9) /))
+  !    (/ ('', i=1, 9) /))
   !  type(ctrl_out),save :: o_LWdnTOA     = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /),'LWdnTOA', &
-  !     (/ ('', i=1, 9) /))
+  !    (/ ('', i=1, 9) /))
   !  type(ctrl_out),save :: o_LWdnTOAclr  = ctrl_out((/ 1, 4, 10, 10, 10, 10, 11, 11, 11 /),'LWdnTOAclr', &
-  !     (/ ('', i=1, 9) /))
+  !    (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWup200 = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'LWup200', 'LWup at 200mb', 'W/m2', (/ ('', i=1, 9) /))
+    'LWup200', 'LWup at 200mb', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWup200clr = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'LWup200clr', 'LWup clear sky at 200mb', 'W/m2', (/ ('', i=1, 9) /))
+    'LWup200clr', 'LWup clear sky at 200mb', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWdn200 = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'LWdn200', 'LWdn at 200mb', 'W/m2', (/ ('', i=1, 9) /))
+    'LWdn200', 'LWdn at 200mb', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWdn200clr = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'LWdn200clr', 'LWdn clear sky at 200mb', 'W/m2', (/ ('', i=1, 9) /))
+    'LWdn200clr', 'LWdn clear sky at 200mb', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sols = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'sols', 'Solar rad. at surf.', 'W/m2', (/ ('', i=1, 9) /))
+    'sols', 'Solar rad. at surf.', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sols0 = ctrl_out((/ 1, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'sols0', 'Solar rad. at surf.', 'W/m2', (/ ('', i=1, 9) /))
+    'sols0', 'Solar rad. at surf.', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_soll = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'soll', 'IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'soll', 'IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_soll0 = ctrl_out((/ 1, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'soll0', 'IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'soll0', 'IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_radsol = ctrl_out((/ 1, 7, 10, 10, 10, 10, 11, 11, 11 /), &
-        'radsol', 'Rayonnement au sol', 'W/m2', (/ ('', i=1, 9) /))
+    'radsol', 'Rayonnement au sol', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWupSFC = ctrl_out((/ 1, 4, 10, 10, 5, 10, 11, 11, 11 /), &
-        'SWupSFC', 'SWup at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'SWupSFC', 'SWup at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWupSFCclr = ctrl_out((/ 1, 4, 10, 10, 5, 10, 11, 11, 11 /), &
-        'SWupSFCclr', 'SWup clear sky at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'SWupSFCclr', 'SWup clear sky at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWdnSFC = ctrl_out((/ 1, 1, 10, 10, 5, 10, 11, 11, 11 /), &
-        'SWdnSFC', 'SWdn at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'SWdnSFC', 'SWdn at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWdnSFCclr = ctrl_out((/ 1, 4, 10, 10, 5, 10, 11, 11, 11 /), &
-        'SWdnSFCclr', 'SWdn clear sky at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'SWdnSFCclr', 'SWdn clear sky at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWupSFC = ctrl_out((/ 1, 4, 10, 10, 5, 10, 11, 11, 11 /), &
-        'LWupSFC', 'Upwd. IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'LWupSFC', 'Upwd. IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWupSFCclr = ctrl_out((/ 1, 4, 10, 10, 5, 10, 11, 11, 11 /), &
-        'LWupSFCclr', 'CS Upwd. IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'LWupSFCclr', 'CS Upwd. IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWdnSFC = ctrl_out((/ 1, 4, 10, 10, 5, 10, 11, 11, 11 /), &
-        'LWdnSFC', 'Down. IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'LWdnSFC', 'Down. IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWdnSFCclr = ctrl_out((/ 1, 4, 10, 10, 5, 10, 11, 11, 11 /), &
-        'LWdnSFCclr', 'Down. CS IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'LWdnSFCclr', 'Down. CS IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_bils = ctrl_out((/ 1, 2, 10, 5, 10, 10, 11, 11, 11 /), &
-        'bils', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'bils', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_bils_tke = ctrl_out((/ 1, 2, 10, 5, 10, 10, 11, 11, 11 /), &
-        'bils_tke', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'bils_tke', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_bils_diss = ctrl_out((/ 1, 2, 10, 5, 10, 10, 11, 11, 11 /), &
-        'bils_diss', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'bils_diss', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_bils_ec = ctrl_out((/ 1, 2, 10, 5, 10, 10, 11, 11, 11 /), &
-        'bils_ec', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'bils_ec', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_bils_kinetic = ctrl_out((/ 1, 2, 10, 5, 10, 10, 11, 11, 11 /), &
-        'bils_kinetic', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'bils_kinetic', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_bils_enthalp = ctrl_out((/ 1, 2, 10, 5, 10, 10, 11, 11, 11 /), &
-        'bils_enthalp', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'bils_enthalp', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_bils_latent = ctrl_out((/ 1, 2, 10, 5, 10, 10, 11, 11, 11 /), &
-        'bils_latent', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'bils_latent', 'Surf. total heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sens = ctrl_out((/ 1, 1, 10, 10, 5, 10, 11, 11, 11 /), &
-        'sens', 'Sensible heat flux', 'W/m2', (/ ('', i=1, 9) /))
+    'sens', 'Sensible heat flux', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_fder = ctrl_out((/ 1, 2, 10, 10, 10, 10, 11, 11, 11 /), &
-        'fder', 'Heat flux derivation', 'W/m2', (/ ('', i=1, 9) /))
+    'fder', 'Heat flux derivation', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ffonte = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ffonte', 'Thermal flux for snow melting', 'W/m2', (/ ('', i=1, 9) /))
+    'ffonte', 'Thermal flux for snow melting', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_fqcalving = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'fqcalving', 'Ice Calving', 'kg/m2/s', (/ ('', i=1, 9) /))
+    'fqcalving', 'Ice Calving', 'kg/m2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_fqfonte = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'fqfonte', 'Land ice melt', 'kg/m2/s', (/ ('', i=1, 9) /))
+    'fqfonte', 'Land ice melt', 'kg/m2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_taux = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'taux', 'Zonal wind stress', 'Pa', (/ ('', i=1, 9) /))
+    'taux', 'Zonal wind stress', 'Pa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tauy = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tauy', 'Meridional wind stress', 'Pa', (/ ('', i=1, 9) /))
+    'tauy', 'Meridional wind stress', 'Pa', (/ ('', i=1, 9) /))
 
   TYPE(ctrl_out), SAVE, DIMENSION(4) :: o_taux_srf = (/           &
@@ -378 +378 @@
 
   TYPE(ctrl_out), SAVE :: o_cdrm = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cdrm', 'Momentum drag coef.', '-', (/ ('', i=1, 9) /))
+    'cdrm', 'Momentum drag coef.', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cdrh = ctrl_out((/ 1, 10, 10, 7, 10, 10, 11, 11, 11 /), &
-        'cdrh', 'Heat drag coef.', '-', (/ ('', i=1, 9) /))
+    'cdrh', 'Heat drag coef.', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cldl = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cldl', 'Low-level cloudiness', '-', (/ ('', i=1, 9) /))
+    'cldl', 'Low-level cloudiness', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cldm = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cldm', 'Mid-level cloudiness', '-', (/ ('', i=1, 9) /))
+    'cldm', 'Mid-level cloudiness', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cldh = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cldh', 'High-level cloudiness', '-', (/ ('', i=1, 9) /))
+    'cldh', 'High-level cloudiness', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cldt = ctrl_out((/ 1, 1, 2, 10, 5, 10, 11, 11, 11 /), &
-        'cldt', 'Total cloudiness', '-', (/ ('', i=1, 9) /))
+    'cldt', 'Total cloudiness', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cldq = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cldq', 'Cloud liquid water path', 'kg/m2', (/ ('', i=1, 9) /))
+    'cldq', 'Cloud liquid water path', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_lwp = ctrl_out((/ 1, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'lwp', 'Cloud water path', 'kg/m2', (/ ('', i=1, 9) /))
+    'lwp', 'Cloud water path', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_iwp = ctrl_out((/ 1, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'iwp', 'Cloud ice water path', 'kg/m2', (/ ('', i=1, 9) /))
+    'iwp', 'Cloud ice water path', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ue = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ue', 'Zonal energy transport', '-', (/ ('', i=1, 9) /))
+    'ue', 'Zonal energy transport', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ve = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        've', 'Merid energy transport', '-', (/ ('', i=1, 9) /))
+    've', 'Merid energy transport', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_uq = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'uq', 'Zonal humidity transport', '-', (/ ('', i=1, 9) /))
+    'uq', 'Zonal humidity transport', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_vq = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'vq', 'Merid humidity transport', '-', (/ ('', i=1, 9) /))
+    'vq', 'Merid humidity transport', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cape = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cape', 'Conv avlbl pot ener', 'J/kg', (/ ('', i=1, 9) /))
+    'cape', 'Conv avlbl pot ener', 'J/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_pbase = ctrl_out((/ 1, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'pbase', 'Cld base pressure', 'Pa', (/ ('', i=1, 9) /))
+    'pbase', 'Cld base pressure', 'Pa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ptop = ctrl_out((/ 1, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ptop', 'Cld top pressure', 'Pa', (/ ('', i=1, 9) /))
+    'ptop', 'Cld top pressure', 'Pa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_fbase = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'fbase', 'Cld base mass flux', 'kg/m2/s', (/ ('', i=1, 9) /))
+    'fbase', 'Cld base mass flux', 'kg/m2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_plcl = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'plcl', 'Lifting Condensation Level', 'hPa', (/ ('', i=1, 9) /))
+    'plcl', 'Lifting Condensation Level', 'hPa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_plfc = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'plfc', 'Level of Free Convection', 'hPa', (/ ('', i=1, 9) /))
+    'plfc', 'Level of Free Convection', 'hPa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wbeff = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'wbeff', 'Conv. updraft velocity at LFC (<100)', 'm/s', (/ ('', i=1, 9) /))
+    'wbeff', 'Conv. updraft velocity at LFC (<100)', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_prw = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'prw', 'Precipitable water', 'kg/m2', (/ ('', i=1, 9) /))
+    'prw', 'Precipitable water', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_s_pblh = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        's_pblh', 'Boundary Layer Height', 'm', (/ ('', i=1, 9) /))
+    's_pblh', 'Boundary Layer Height', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_s_pblt = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        's_pblt', 't at Boundary Layer Height', 'K', (/ ('', i=1, 9) /))
+    's_pblt', 't at Boundary Layer Height', 'K', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_s_lcl = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        's_lcl', 'Condensation level', 'm', (/ ('', i=1, 9) /))
+    's_lcl', 'Condensation level', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_s_therm = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        's_therm', 'Exces du thermique', 'K', (/ ('', i=1, 9) /))
+    's_therm', 'Exces du thermique', 'K', (/ ('', i=1, 9) /))
   !IM : Les champs suivants (s_capCL, s_oliqCL, s_cteiCL, s_trmb1, s_trmb2, s_trmb3) ne sont pas definis dans HBTM.F
   ! type(ctrl_out),save :: o_s_capCL      = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /),'s_capCL', &
-!       (/ ('', i=1, 9) /))
+!    (/ ('', i=1, 9) /))
   ! type(ctrl_out),save :: o_s_oliqCL     = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /),'s_oliqCL', &
-!       (/ ('', i=1, 9) /))
+!    (/ ('', i=1, 9) /))
   ! type(ctrl_out),save :: o_s_cteiCL     = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /),'s_cteiCL', &
-!       (/ ('', i=1, 9) /))
+!    (/ ('', i=1, 9) /))
   ! type(ctrl_out),save :: o_s_trmb1      = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /),'s_trmb1', &
-!       (/ ('', i=1, 9) /))
+!    (/ ('', i=1, 9) /))
   ! type(ctrl_out),save :: o_s_trmb2      = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /),'s_trmb2', &
-!       (/ ('', i=1, 9) /))
+!    (/ ('', i=1, 9) /))
   ! type(ctrl_out),save :: o_s_trmb3      = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /),'s_trmb3', &
-        !(/ ('', i=1, 9) /))
+    !(/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_slab_bils = ctrl_out((/ 1, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'slab_bils_oce', 'Bilan au sol sur ocean slab', 'W/m2', (/ ('', i=1, 9) /))
+    'slab_bils_oce', 'Bilan au sol sur ocean slab', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ale_bl = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'ale_bl', 'ALE BL', 'm2/s2', (/ ('', i=1, 9) /))
+    'ale_bl', 'ALE BL', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_alp_bl = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'alp_bl', 'ALP BL', 'm2/s2', (/ ('', i=1, 9) /))
+    'alp_bl', 'ALP BL', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ale_wk = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'ale_wk', 'ALE WK', 'm2/s2', (/ ('', i=1, 9) /))
+    'ale_wk', 'ALE WK', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_alp_wk = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'alp_wk', 'ALP WK', 'm2/s2', (/ ('', i=1, 9) /))
+    'alp_wk', 'ALP WK', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ale = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'ale', 'ALE', 'm2/s2', (/ ('', i=1, 9) /))
+    'ale', 'ALE', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_alp = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'alp', 'ALP', 'W/m2', (/ ('', i=1, 9) /))
+    'alp', 'ALP', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cin = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'cin', 'Convective INhibition', 'm2/s2', (/ ('', i=1, 9) /))
+    'cin', 'Convective INhibition', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wape = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'wape', '', '', (/ ('', i=1, 9) /))
+    'wape', '', '', (/ ('', i=1, 9) /))
 
 !!! nrlmd le 10/04/2012
@@ -463 +463 @@
 !-------Spectre de thermiques de type 2 au LCL
   TYPE(ctrl_out), SAVE :: o_n2 = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
-        'n2', 'Nombre de panaches de type 2', ' ', (/ ('', i=1, 9) /))
+    'n2', 'Nombre de panaches de type 2', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_s2 = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
-        's2', 'Surface moyenne des panaches de type 2', 'm2', (/ ('', i=1, 9) /))
+    's2', 'Surface moyenne des panaches de type 2', 'm2', (/ ('', i=1, 9) /))
                                                                              
 !-------Déclenchement stochastique                                           
   TYPE(ctrl_out), SAVE :: o_proba_notrig = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
-        'proba_notrig', &
+    'proba_notrig', &
                          'Probabilité de non-déclenchement', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_random_notrig = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
-        'random_notrig', &
+    'random_notrig', &
                          'Tirage aléatoire de non-déclenchement', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ale_bl_stat = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
-        'ale_bl_stat', &
+    'ale_bl_stat', &
        'ALE_BL_STAT', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ale_bl_trig = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
-        'ale_bl_trig', &
+    'ale_bl_trig', &
        'ALE_BL_STAT + Condition P>Pseuil', 'm2/s2', (/ ('', i=1, 9) /))
 
 !-------Fermeture statistique
   TYPE(ctrl_out), SAVE :: o_alp_bl_det = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'alp_bl_det', 'ALP_BL_DET', 'W/m2', (/ ('', i=1, 9) /))
+    'alp_bl_det', 'ALP_BL_DET', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_alp_bl_fluct_m = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'alp_bl_fluct_m', 'ALP_BL_FLUCT_M', 'W/m2', (/ ('', i=1, 9) /))
+    'alp_bl_fluct_m', 'ALP_BL_FLUCT_M', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_alp_bl_fluct_tke = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'alp_bl_fluct_tke', 'ALP_BL_FLUCT_TKE', 'W/m2', (/ ('', i=1, 9) /))
+    'alp_bl_fluct_tke', 'ALP_BL_FLUCT_TKE', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_alp_bl_conv = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'alp_bl_conv', 'ALP_BL_CONV', 'W/m2', (/ ('', i=1, 9) /))
+    'alp_bl_conv', 'ALP_BL_CONV', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_alp_bl_stat = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
-        'alp_bl_stat', 'ALP_BL_STAT', 'W/m2', (/ ('', i=1, 9) /))
+    'alp_bl_stat', 'ALP_BL_STAT', 'W/m2', (/ ('', i=1, 9) /))
 
 !!! fin nrlmd le 10/04/2012
@@ -594 +594 @@
 
   TYPE(ctrl_out), SAVE :: o_t_oce_sic = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        't_oce_sic', 'Temp mixte oce-sic', 'K', (/ ('', i=1, 9) /))
+    't_oce_sic', 'Temp mixte oce-sic', 'K', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_weakinv = ctrl_out((/ 10, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'weakinv', 'Weak inversion', '-', (/ ('', i=1, 9) /))
+    'weakinv', 'Weak inversion', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dthmin = ctrl_out((/ 10, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dthmin', 'dTheta mini', 'K/m', (/ ('', i=1, 9) /))
+    'dthmin', 'dTheta mini', 'K/m', (/ ('', i=1, 9) /))
 
   TYPE(ctrl_out), SAVE, DIMENSION(4) :: o_u10_srf      = (/ &
@@ -613 +613 @@
 
   TYPE(ctrl_out), SAVE :: o_cldtau = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cldtau', 'Cloud optical thickness', '1', (/ ('', i=1, 9) /))
+    'cldtau', 'Cloud optical thickness', '1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cldemi = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cldemi', 'Cloud optical emissivity', '1', (/ ('', i=1, 9) /))
+    'cldemi', 'Cloud optical emissivity', '1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rh2m = ctrl_out((/ 5, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rh2m', 'Relative humidity at 2m', '%', (/ ('', i=1, 9) /))
+    'rh2m', 'Relative humidity at 2m', '%', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rh2m_min = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rh2m_min', 'Min Relative humidity at 2m', '%',                        &
+    'rh2m_min', 'Min Relative humidity at 2m', '%',                        &
       (/ 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)', 't_min(X)' /))
   TYPE(ctrl_out), SAVE :: o_rh2m_max = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rh2m_max', 'Max Relative humidity at 2m', '%',                        &
+    'rh2m_max', 'Max Relative humidity at 2m', '%',                        &
       (/ 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', &
          't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)' /))
   TYPE(ctrl_out), SAVE :: o_qsat2m = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'qsat2m', 'Saturant humidity at 2m', '%', (/ ('', i=1, 9) /))
+    'qsat2m', 'Saturant humidity at 2m', '%', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tpot = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tpot', 'Surface air potential temperature', 'K', (/ ('', i=1, 9) /))
+    'tpot', 'Surface air potential temperature', 'K', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tpote = ctrl_out((/ 10, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tpote', &
+    'tpote', &
       'Surface air equivalent potential temperature', 'K', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tke = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tke ', 'TKE', 'm2/s2', (/ ('', i=1, 9) /))
+    'tke ', 'TKE', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tke_max = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tke_max', 'TKE max', 'm2/s2',                                        &
+    'tke_max', 'TKE max', 'm2/s2',                                        &
       (/ 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', &
          't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)' /))
@@ -668 +668 @@
 
   TYPE(ctrl_out), SAVE :: o_kz = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'kz', 'Kz melange', 'm2/s', (/ ('', i=1, 9) /))
+    'kz', 'Kz melange', 'm2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_kz_max = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'kz_max', 'Kz melange max', 'm2/s',                                  &
+    'kz_max', 'Kz melange max', 'm2/s',                                  &
       (/ 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', 't_max(X)', &
          't_max(X)', "t_max(X)", "t_max(X)", "t_max(X)" /))
   TYPE(ctrl_out), SAVE :: o_SWnetOR = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWnetOR', 'Sfce net SW radiation OR', 'W/m2', (/ ('', i=1, 9) /))
+    'SWnetOR', 'Sfce net SW radiation OR', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_SWdownOR = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'SWdownOR', 'Sfce incident SW radiation OR', 'W/m2', (/ ('', i=1, 9) /))
+    'SWdownOR', 'Sfce incident SW radiation OR', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_LWdownOR = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'LWdownOR', 'Sfce incident LW radiation OR', 'W/m2', (/ ('', i=1, 9) /))
+    'LWdownOR', 'Sfce incident LW radiation OR', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_snowl = ctrl_out((/ 10, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'snowl', 'Solid Large-scale Precip.', 'kg/(m2*s)', (/ ('', i=1, 9) /))
+    'snowl', 'Solid Large-scale Precip.', 'kg/(m2*s)', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cape_max = ctrl_out((/ 10, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cape_max', 'CAPE max.', 'J/kg',                                       &
+    'cape_max', 'CAPE max.', 'J/kg',                                       &
       (/ "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)", &
          "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)" /))
   TYPE(ctrl_out), SAVE :: o_solldown = ctrl_out((/ 10, 1, 10, 10, 10, 10, 11, 11, 11 /), &
-        'solldown', 'Down. IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
+    'solldown', 'Down. IR rad. at surface', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtsvdfo = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtsvdfo', 'Boundary-layer dTs(o)', 'K/s', (/ ('', i=1, 9) /))
+    'dtsvdfo', 'Boundary-layer dTs(o)', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtsvdft = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtsvdft', 'Boundary-layer dTs(t)', 'K/s', (/ ('', i=1, 9) /))
+    'dtsvdft', 'Boundary-layer dTs(t)', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtsvdfg = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtsvdfg', 'Boundary-layer dTs(g)', 'K/s', (/ ('', i=1, 9) /))
+    'dtsvdfg', 'Boundary-layer dTs(g)', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtsvdfi = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtsvdfi', 'Boundary-layer dTs(g)', 'K/s', (/ ('', i=1, 9) /))
+    'dtsvdfi', 'Boundary-layer dTs(g)', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rugs = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rugs', 'rugosity', '-', (/ ('', i=1, 9) /))
+    'rugs', 'rugosity', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_topswad = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'topswad', 'ADE at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'topswad', 'ADE at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_topswad0 = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'topswad0', 'ADE clear-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'topswad0', 'ADE clear-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_topswai = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'topswai', 'AIE at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'topswai', 'AIE at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_solswad = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'solswad', 'ADE at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'solswad', 'ADE at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_solswad0 = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'solswad0', 'ADE clear-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'solswad0', 'ADE clear-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_solswai = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'solswai', 'AIE at SFR', 'W/m2', (/ ('', i=1, 9) /))
+    'solswai', 'AIE at SFR', 'W/m2', (/ ('', i=1, 9) /))
 
 !  type(ctrl_out),save,dimension(10) :: o_tausumaero  = (/ ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_ASBCM', &
-!       (/ ('', i=1, 9) /)), &
+!    (/ ('', i=1, 9) /)), &
   type(ctrl_out),save,dimension(11) :: o_tausumaero  =                           & 
     (/ ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_ASBCM',                        &
@@ -736 +736 @@
       "Aerosol Optical depth at 550 nm "//name_aero(11),"1", (/ ('', i=1, 9) /)) /)
   TYPE(ctrl_out), SAVE :: o_od550aer = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'od550aer', 'Total aerosol optical depth at 550nm', '-', (/ ('', i=1, 9) /))
+    'od550aer', 'Total aerosol optical depth at 550nm', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_od865aer = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'od865aer', 'Total aerosol optical depth at 870nm', '-', (/ ('', i=1, 9) /))
+    'od865aer', 'Total aerosol optical depth at 870nm', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_absvisaer = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'absvisaer', 'Absorption aerosol visible optical depth', '-', (/ ('', i=1, 9) /))
+    'absvisaer', 'Absorption aerosol visible optical depth', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_od550lt1aer = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'od550lt1aer', 'Fine mode optical depth', '-', (/ ('', i=1, 9) /))
+    'od550lt1aer', 'Fine mode optical depth', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sconcso4 = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'sconcso4', 'Surface Concentration of Sulfate ', 'kg/m3', (/ ('', i=1, 9) /))
+    'sconcso4', 'Surface Concentration of Sulfate ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sconcoa = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'sconcoa', 'Surface Concentration of Organic Aerosol ', 'kg/m3', (/ ('', i=1, 9) /))
+    'sconcoa', 'Surface Concentration of Organic Aerosol ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sconcbc = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'sconcbc', 'Surface Concentration of Black Carbon ', 'kg/m3', (/ ('', i=1, 9) /))
+    'sconcbc', 'Surface Concentration of Black Carbon ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sconcss = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'sconcss', 'Surface Concentration of Sea Salt ', 'kg/m3', (/ ('', i=1, 9) /))
+    'sconcss', 'Surface Concentration of Sea Salt ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_sconcdust = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'sconcdust', 'Surface Concentration of Dust ', 'kg/m3', (/ ('', i=1, 9) /))
+    'sconcdust', 'Surface Concentration of Dust ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_concso4 = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'concso4', 'Concentration of Sulfate ', 'kg/m3', (/ ('', i=1, 9) /))
+    'concso4', 'Concentration of Sulfate ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_concoa = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'concoa', 'Concentration of Organic Aerosol ', 'kg/m3', (/ ('', i=1, 9) /))
+    'concoa', 'Concentration of Organic Aerosol ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_concbc = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'concbc', 'Concentration of Black Carbon ', 'kg/m3', (/ ('', i=1, 9) /))
+    'concbc', 'Concentration of Black Carbon ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_concss = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'concss', 'Concentration of Sea Salt ', 'kg/m3', (/ ('', i=1, 9) /))
+    'concss', 'Concentration of Sea Salt ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_concdust = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'concdust', 'Concentration of Dust ', 'kg/m3', (/ ('', i=1, 9) /))
+    'concdust', 'Concentration of Dust ', 'kg/m3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_loadso4 = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'loadso4', 'Column Load of Sulfate ', 'kg/m2', (/ ('', i=1, 9) /))
+    'loadso4', 'Column Load of Sulfate ', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_loadoa = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'loadoa', 'Column Load of Organic Aerosol ', 'kg/m2', (/ ('', i=1, 9) /))
+    'loadoa', 'Column Load of Organic Aerosol ', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_loadbc = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'loadbc', 'Column Load of Black Carbon ', 'kg/m2', (/ ('', i=1, 9) /))
+    'loadbc', 'Column Load of Black Carbon ', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_loadss = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'loadss', 'Column Load of Sea Salt ', 'kg/m2', (/ ('', i=1, 9) /))
+    'loadss', 'Column Load of Sea Salt ', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_loaddust = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'loaddust', 'Column Load of Dust ', 'kg/m2', (/ ('', i=1, 9) /))
+    'loaddust', 'Column Load of Dust ', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swtoaas_nat = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swtoaas_nat', 'Natural aerosol radiative forcing all-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'swtoaas_nat', 'Natural aerosol radiative forcing all-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swsrfas_nat = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swsrfas_nat', 'Natural aerosol radiative forcing all-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'swsrfas_nat', 'Natural aerosol radiative forcing all-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swtoacs_nat = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swtoacs_nat', 'Natural aerosol radiative forcing clear-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'swtoacs_nat', 'Natural aerosol radiative forcing clear-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swsrfcs_nat = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swsrfcs_nat', 'Natural aerosol radiative forcing clear-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'swsrfcs_nat', 'Natural aerosol radiative forcing clear-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swtoaas_ant = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swtoaas_ant', 'Anthropogenic aerosol radiative forcing all-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'swtoaas_ant', 'Anthropogenic aerosol radiative forcing all-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swsrfas_ant = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swsrfas_ant', 'Anthropogenic aerosol radiative forcing all-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'swsrfas_ant', 'Anthropogenic aerosol radiative forcing all-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swtoacs_ant = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swtoacs_ant', 'Anthropogenic aerosol radiative forcing clear-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'swtoacs_ant', 'Anthropogenic aerosol radiative forcing clear-sky at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swsrfcs_ant = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swsrfcs_ant', 'Anthropogenic aerosol radiative forcing clear-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'swsrfcs_ant', 'Anthropogenic aerosol radiative forcing clear-sky at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swtoacf_nat = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swtoacf_nat', 'Natural aerosol impact on cloud radiative forcing at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'swtoacf_nat', 'Natural aerosol impact on cloud radiative forcing at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swsrfcf_nat = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swsrfcf_nat', 'Natural aerosol impact on cloud radiative forcing  at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'swsrfcf_nat', 'Natural aerosol impact on cloud radiative forcing  at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swtoacf_ant = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swtoacf_ant', 'Anthropogenic aerosol impact on cloud radiative forcing at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'swtoacf_ant', 'Anthropogenic aerosol impact on cloud radiative forcing at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swsrfcf_ant = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swsrfcf_ant', 'Anthropogenic aerosol impact on cloud radiative forcing at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'swsrfcf_ant', 'Anthropogenic aerosol impact on cloud radiative forcing at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swtoacf_zero = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swtoacf_zero', 'Cloud radiative forcing (allsky-clearsky fluxes) at TOA', 'W/m2', (/ ('', i=1, 9) /))
+    'swtoacf_zero', 'Cloud radiative forcing (allsky-clearsky fluxes) at TOA', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_swsrfcf_zero = ctrl_out((/ 4, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'swsrfcf_zero', 'Cloud radiative forcing (allsky-clearsky fluxes) at SRF', 'W/m2', (/ ('', i=1, 9) /))
+    'swsrfcf_zero', 'Cloud radiative forcing (allsky-clearsky fluxes) at SRF', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cldncl = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cldncl', 'CDNC at top of liquid water cloud', 'm-3', (/ ('', i=1, 9) /))
+    'cldncl', 'CDNC at top of liquid water cloud', 'm-3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_reffclwtop = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'reffclwtop', 'Droplet effective radius at top of liquid water cloud', 'm', (/ ('', i=1, 9) /))
+    'reffclwtop', 'Droplet effective radius at top of liquid water cloud', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_cldnvi = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'cldnvi', 'Column Integrated Cloud Droplet Number', 'm-2', (/ ('', i=1, 9) /))
+    'cldnvi', 'Column Integrated Cloud Droplet Number', 'm-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_lcc = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'lcc', 'Cloud liquid fraction at top of cloud', '1', (/ ('', i=1, 9) /))
+    'lcc', 'Cloud liquid fraction at top of cloud', '1', (/ ('', i=1, 9) /))
 
 
 !!!!!!!!!!!!!!!!!!!!!! 3D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
   TYPE(ctrl_out), SAVE :: o_ec550aer = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ec550aer', 'Extinction at 550nm', 'm^-1', (/ ('', i=1, 9) /))
+    'ec550aer', 'Extinction at 550nm', 'm^-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_lwcon = ctrl_out((/ 2, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'lwcon', 'Cloud liquid water content', 'kg/kg', (/ ('', i=1, 9) /))
+    'lwcon', 'Cloud liquid water content', 'kg/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_iwcon = ctrl_out((/ 2, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'iwcon', 'Cloud ice water content', 'kg/kg', (/ ('', i=1, 9) /))
+    'iwcon', 'Cloud ice water content', 'kg/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_temp = ctrl_out((/ 2, 3, 4, 10, 10, 10, 11, 11, 11 /), &
-        'temp', 'Air temperature', 'K', (/ ('', i=1, 9) /))
+    'temp', 'Air temperature', 'K', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_theta = ctrl_out((/ 2, 3, 4, 10, 10, 10, 11, 11, 11 /), &
-        'theta', 'Potential air temperature', 'K', (/ ('', i=1, 9) /))
+    'theta', 'Potential air temperature', 'K', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ovap = ctrl_out((/ 2, 3, 4, 10, 10, 10, 11, 11, 11 /), &
-        'ovap', 'Specific humidity', 'kg/kg', (/ ('', i=1, 9) /))
+    'ovap', 'Specific humidity', 'kg/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ovapinit = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ovapinit', 'Specific humidity (begin of timestep)', 'kg/kg', (/ ('', i=1, 9) /))
+    'ovapinit', 'Specific humidity (begin of timestep)', 'kg/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_oliq = ctrl_out((/ 2, 3, 4, 10, 10, 10, 11, 11, 11 /), &
-        'oliq', 'Condensed water', 'kg/kg', (/ ('', i=1, 9) /))
+    'oliq', 'Condensed water', 'kg/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wvapp = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'wvapp', '', '', (/ ('', i=1, 9) /))
+    'wvapp', '', '', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_geop = ctrl_out((/ 2, 3, 10, 10, 10, 10, 11, 11, 11 /), &
-        'geop', 'Geopotential height', 'm2/s2', (/ ('', i=1, 9) /))
+    'geop', 'Geopotential height', 'm2/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_vitu = ctrl_out((/ 2, 3, 4, 6, 10, 10, 11, 11, 11 /), &
-        'vitu', 'Zonal wind', 'm/s', (/ ('', i=1, 9) /))
+    'vitu', 'Zonal wind', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_vitv = ctrl_out((/ 2, 3, 4, 6, 10, 10, 11, 11, 11 /), &
-        'vitv', 'Meridional wind', 'm/s', (/ ('', i=1, 9) /))
+    'vitv', 'Meridional wind', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_vitw = ctrl_out((/ 2, 3, 10, 6, 10, 10, 11, 11, 11 /), &
-        'vitw', 'Vertical wind', 'Pa/s', (/ ('', i=1, 9) /))
+    'vitw', 'Vertical wind', 'Pa/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_pres = ctrl_out((/ 2, 3, 10, 10, 10, 10, 11, 11, 11 /), &
-        'pres', 'Air pressure', 'Pa', (/ ('', i=1, 9) /))
+    'pres', 'Air pressure', 'Pa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_paprs = ctrl_out((/ 2, 3, 10, 10, 10, 10, 11, 11, 11 /), &
-        'paprs', 'Air pressure Inter-Couches', 'Pa', (/ ('', i=1, 9) /))
+    'paprs', 'Air pressure Inter-Couches', 'Pa', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_mass = ctrl_out((/ 2, 3, 10, 10, 10, 10, 11, 11, 11 /), &
-        'mass', 'Masse Couches', 'kg/m2', (/ ('', i=1, 9) /))
+    'mass', 'Masse Couches', 'kg/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_zfull = ctrl_out((/ 2, 3, 10, 10, 10, 10, 11, 11, 11 /), &
-        'zfull', 'Altitude of full pressure levels', 'm', (/ ('', i=1, 9) /))
+    'zfull', 'Altitude of full pressure levels', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_zhalf = ctrl_out((/ 2, 3, 10, 10, 10, 10, 11, 11, 11 /), &
-        'zhalf', 'Altitude of half pressure levels', 'm', (/ ('', i=1, 9) /))
+    'zhalf', 'Altitude of half pressure levels', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rneb = ctrl_out((/ 2, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rneb', 'Cloud fraction', '-', (/ ('', i=1, 9) /))
+    'rneb', 'Cloud fraction', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rnebcon = ctrl_out((/ 2, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rnebcon', 'Convective Cloud Fraction', '-', (/ ('', i=1, 9) /))
+    'rnebcon', 'Convective Cloud Fraction', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rnebls = ctrl_out((/ 2, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rnebls', 'LS Cloud fraction', '-', (/ ('', i=1, 9) /))
+    'rnebls', 'LS Cloud fraction', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rhum = ctrl_out((/ 2, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rhum', 'Relative humidity', '-', (/ ('', i=1, 9) /))
+    'rhum', 'Relative humidity', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ozone = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ozone', 'Ozone mole fraction', '-', (/ ('', i=1, 9) /))
+    'ozone', 'Ozone mole fraction', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ozone_light = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ozone_daylight', 'Daylight ozone mole fraction', '-', (/ ('', i=1, 9) /))
+    'ozone_daylight', 'Daylight ozone mole fraction', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_upwd = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'upwd', 'saturated updraft', 'kg/m2/s', (/ ('', i=1, 9) /))
+    'upwd', 'saturated updraft', 'kg/m2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtphy = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtphy', 'Physics dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtphy', 'Physics dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqphy = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqphy', 'Physics dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqphy', 'Physics dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_pr_con_l = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'pr_con_l', 'Convective precipitation lic', ' ', (/ ('', i=1, 9) /))
+    'pr_con_l', 'Convective precipitation lic', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_pr_con_i = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'pr_con_i', 'Convective precipitation ice', ' ', (/ ('', i=1, 9) /))
+    'pr_con_i', 'Convective precipitation ice', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_pr_lsc_l = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'pr_lsc_l', 'Large scale precipitation lic', ' ', (/ ('', i=1, 9) /))
+    'pr_lsc_l', 'Large scale precipitation lic', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_pr_lsc_i = ctrl_out((/ 2, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'pr_lsc_i', 'Large scale precipitation ice', ' ', (/ ('', i=1, 9) /))
+    'pr_lsc_i', 'Large scale precipitation ice', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_re = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        're', 'Cloud droplet effective radius', 'um', (/ ('', i=1, 9) /))
+    're', 'Cloud droplet effective radius', 'um', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_fl = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'fl', 'Denominator of Cloud droplet effective radius', ' ', (/ ('', i=1, 9) /))
+    'fl', 'Denominator of Cloud droplet effective radius', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_scdnc = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'scdnc', 'Cloud droplet number concentration', 'm-3', (/ ('', i=1, 9) /))
+    'scdnc', 'Cloud droplet number concentration', 'm-3', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_reffclws = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'reffclws', 'Stratiform Cloud Droplet Effective Radius (aerosol diags.)', 'm', (/ ('', i=1, 9) /))
+    'reffclws', 'Stratiform Cloud Droplet Effective Radius (aerosol diags.)', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_reffclwc = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'reffclwc', 'Convective Cloud Droplet Effective Radius (aerosol diags.)', 'm', (/ ('', i=1, 9) /))
+    'reffclwc', 'Convective Cloud Droplet Effective Radius (aerosol diags.)', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_lcc3d = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'lcc3d', 'Cloud liquid fraction', '1', (/ ('', i=1, 9) /))
+    'lcc3d', 'Cloud liquid fraction', '1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_lcc3dcon = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'lcc3dcon', 'Convective cloud liquid fraction', '1', (/ ('', i=1, 9) /))
+    'lcc3dcon', 'Convective cloud liquid fraction', '1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_lcc3dstra = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11 /), &
-        'lcc3dstra', 'Stratiform cloud liquid fraction', '1', (/ ('', i=1, 9) /))
+    'lcc3dstra', 'Stratiform cloud liquid fraction', '1', (/ ('', i=1, 9) /))
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -911 +911 @@
 
   TYPE(ctrl_out), SAVE :: o_alb1 = ctrl_out((/ 3, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'alb1', 'Surface VIS albedo', '-', (/ ('', i=1, 9) /))
+    'alb1', 'Surface VIS albedo', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_alb2 = ctrl_out((/ 3, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'alb2', 'Surface Near IR albedo', '-', (/ ('', i=1, 9) /))
+    'alb2', 'Surface Near IR albedo', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_clwcon = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'clwcon', 'Convective Cloud Liquid water content', 'kg/kg', (/ ('', i=1, 9) /))
+    'clwcon', 'Convective Cloud Liquid water content', 'kg/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_Ma = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'Ma', 'undilute adiab updraft', 'kg/m2/s', (/ ('', i=1, 9) /))
+    'Ma', 'undilute adiab updraft', 'kg/m2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dnwd = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dnwd', 'saturated downdraft', 'kg/m2/s', (/ ('', i=1, 9) /))
+    'dnwd', 'saturated downdraft', 'kg/m2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dnwd0 = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dnwd0', 'unsat. downdraft', 'kg/m2/s', (/ ('', i=1, 9) /))
+    'dnwd0', 'unsat. downdraft', 'kg/m2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_mc = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'mc', 'Convective mass flux', 'kg/m2/s', (/ ('', i=1, 9) /))
+    'mc', 'Convective mass flux', 'kg/m2/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ftime_con = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ftime_con', 'Fraction of time convection Occurs', ' ',                 &
+    'ftime_con', 'Fraction of time convection Occurs', ' ',                 &
       (/ 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)' /))
   TYPE(ctrl_out), SAVE :: o_dtdyn = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtdyn', 'Dynamics dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtdyn', 'Dynamics dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqdyn = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqdyn', 'Dynamics dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqdyn', 'Dynamics dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dudyn = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dudyn', 'Dynamics dU', 'm/s2', (/ ('', i=1, 9) /))
+    'dudyn', 'Dynamics dU', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dvdyn = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dvdyn', 'Dynamics dV', 'm/s2', (/ ('', i=1, 9) /))
+    'dvdyn', 'Dynamics dV', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtcon = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtcon', 'Convection dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtcon', 'Convection dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ducon = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ducon', 'Convection du', 'm/s2', (/ ('', i=1, 9) /))
+    'ducon', 'Convection du', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dvcon = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dvcon', 'Convection dv', 'm/s2', (/ ('', i=1, 9) /))
+    'dvcon', 'Convection dv', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqcon = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqcon', 'Convection dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqcon', 'Convection dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtwak = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtwak', 'Wake dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtwak', 'Wake dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqwak = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqwak', 'Wake dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqwak', 'Wake dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wake_h = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'wake_h', 'wake_h', '-', (/ ('', i=1, 9) /))
+    'wake_h', 'wake_h', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wake_s = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'wake_s', 'wake_s', '-', (/ ('', i=1, 9) /))
+    'wake_s', 'wake_s', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wake_deltat = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'wake_deltat', 'wake_deltat', ' ', (/ ('', i=1, 9) /))
+    'wake_deltat', 'wake_deltat', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wake_deltaq = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'wake_deltaq', 'wake_deltaq', ' ', (/ ('', i=1, 9) /))
+    'wake_deltaq', 'wake_deltaq', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wake_omg = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'wake_omg', 'wake_omg', ' ', (/ ('', i=1, 9) /))
+    'wake_omg', 'wake_omg', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wdtrainA = ctrl_out((/ 4, 1, 10,  4,  1, 10, 11, 11, 110 /), &
-        'wdtrainA', 'precipitation from AA', '-', (/ ('', i=1, 9) /))
+    'wdtrainA', 'precipitation from AA', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_wdtrainM = ctrl_out((/ 4, 1, 10,  4,  1, 10, 11, 11, 110 /), &
-        'wdtrainM', 'precipitation from mixture', '-', (/ ('', i=1, 9) /))
+    'wdtrainM', 'precipitation from mixture', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_Vprecip = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'Vprecip', 'precipitation vertical profile', '-', (/ ('', i=1, 9) /))
+    'Vprecip', 'precipitation vertical profile', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ftd = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ftd', 'tend temp due aux descentes precip', '-', (/ ('', i=1, 9) /))
+    'ftd', 'tend temp due aux descentes precip', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_fqd = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
-        'fqd', 'tend vap eau due aux descentes precip', '-', (/ ('', i=1, 9) /))
+    'fqd', 'tend vap eau due aux descentes precip', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtlsc = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtlsc', 'Condensation dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtlsc', 'Condensation dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtlschr = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtlschr', 'Large-scale condensational heating rate', 'K/s', (/ ('', i=1, 9) /))
+    'dtlschr', 'Large-scale condensational heating rate', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqlsc = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqlsc', 'Condensation dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqlsc', 'Condensation dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_beta_prec = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'beta_prec', 'LS Conversion rate to prec', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'beta_prec', 'LS Conversion rate to prec', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtvdf = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtvdf', 'Boundary-layer dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtvdf', 'Boundary-layer dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtdis = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtdis', 'TKE dissipation dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtdis', 'TKE dissipation dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqvdf = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqvdf', 'Boundary-layer dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqvdf', 'Boundary-layer dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dteva = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dteva', 'Reevaporation dT', 'K/s', (/ ('', i=1, 9) /))
+    'dteva', 'Reevaporation dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqeva = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqeva', 'Reevaporation dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqeva', 'Reevaporation dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
 
 !!!!!!!!!!!!!!!! Specifique thermiques
   TYPE(ctrl_out), SAVE :: o_dqlscth = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqlscth', 'dQ therm.', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqlscth', 'dQ therm.', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqlscst = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqlscst', 'dQ strat.', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqlscst', 'dQ strat.', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtlscth = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtlscth', 'dQ therm.', 'K/s', (/ ('', i=1, 9) /))
+    'dtlscth', 'dQ therm.', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtlscst = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtlscst', 'dQ strat.', 'K/s', (/ ('', i=1, 9) /))
+    'dtlscst', 'dQ strat.', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_plulth = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'plulth', 'Rainfall therm.', 'K/s', (/ ('', i=1, 9) /))
+    'plulth', 'Rainfall therm.', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_plulst = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'plulst', 'Rainfall strat.', 'K/s', (/ ('', i=1, 9) /))
+    'plulst', 'Rainfall strat.', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_lmaxth = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'lmaxth', "Upper level thermals", "", (/ ('', i=1, 9) /))
+    'lmaxth', "Upper level thermals", "", (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ptconvth = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ptconvth', 'POINTS CONVECTIFS therm.', ' ', (/ ('', i=1, 9) /))
+    'ptconvth', 'POINTS CONVECTIFS therm.', ' ', (/ ('', i=1, 9) /))
 !!!!!!!!!!!!!!!!!!!!!!!!
   TYPE(ctrl_out), SAVE :: o_ptconv = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ptconv', 'POINTS CONVECTIFS', ' ', (/ ('', i=1, 9) /))
+    'ptconv', 'POINTS CONVECTIFS', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ratqs = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ratqs', 'RATQS', ' ', (/ ('', i=1, 9) /))
+    'ratqs', 'RATQS', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtthe = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtthe', 'Thermal dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtthe', 'Thermal dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_f_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'f_th', 'Thermal plume mass flux', 'kg/(m2*s)', (/ ('', i=1, 9) /))
+    'f_th', 'Thermal plume mass flux', 'kg/(m2*s)', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_e_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'e_th', 'Thermal plume entrainment', 'K/s', (/ ('', i=1, 9) /))
+    'e_th', 'Thermal plume entrainment', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_w_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'w_th', 'Thermal plume vertical velocity', 'm/s', (/ ('', i=1, 9) /))
+    'w_th', 'Thermal plume vertical velocity', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_lambda_th = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'lambda_th', 'Thermal plume vertical velocity', 'm/s', (/ ('', i=1, 9) /))
+    'lambda_th', 'Thermal plume vertical velocity', 'm/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ftime_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ftime_th', 'Fraction of time Shallow convection occurs', ' ', (/ ('', i=1, 9) /))
+    'ftime_th', 'Fraction of time Shallow convection occurs', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_q_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'q_th', 'Thermal plume total humidity', 'kg/kg', (/ ('', i=1, 9) /))
+    'q_th', 'Thermal plume total humidity', 'kg/kg', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_a_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'a_th', "Thermal plume fraction", "", (/ ('', i=1, 9) /))
+    'a_th', "Thermal plume fraction", "", (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_d_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'd_th', 'Thermal plume detrainment', 'K/s', (/ ('', i=1, 9) /))
+    'd_th', 'Thermal plume detrainment', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_f0_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'f0_th', 'Thermal closure mass flux', 'K/s', (/ ('', i=1, 9) /))
+    'f0_th', 'Thermal closure mass flux', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_zmax_th = ctrl_out((/ 4,  4,  4,  5, 10, 10, 11, 11, 11 /), &
-        'zmax_th', 'Thermal plume height', 'K/s', (/ ('', i=1, 9) /))
+    'zmax_th', 'Thermal plume height', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqthe = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqthe', 'Thermal dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqthe', 'Thermal dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtajs = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtajs', 'Dry adjust. dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtajs', 'Dry adjust. dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dqajs = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dqajs', 'Dry adjust. dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
+    'dqajs', 'Dry adjust. dQ', '(kg/kg)/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtswr = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtswr', 'SW radiation dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtswr', 'SW radiation dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtsw0 = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtsw0', 'CS SW radiation dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtsw0', 'CS SW radiation dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtlwr = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtlwr', 'LW radiation dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtlwr', 'LW radiation dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtlw0 = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtlw0', 'CS LW radiation dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtlw0', 'CS LW radiation dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtec = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtec', 'Cinetic dissip dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtec', 'Cinetic dissip dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_duvdf = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'duvdf', 'Boundary-layer dU', 'm/s2', (/ ('', i=1, 9) /))
+    'duvdf', 'Boundary-layer dU', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dvvdf = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dvvdf', 'Boundary-layer dV', 'm/s2', (/ ('', i=1, 9) /))
+    'dvvdf', 'Boundary-layer dV', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_duoro = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'duoro', 'Orography dU', 'm/s2', (/ ('', i=1, 9) /))
+    'duoro', 'Orography dU', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dvoro = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dvoro', 'Orography dV', 'm/s2', (/ ('', i=1, 9) /))
+    'dvoro', 'Orography dV', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dulif = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dulif', 'Orography dU', 'm/s2', (/ ('', i=1, 9) /))
+    'dulif', 'Orography dU', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dvlif = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dvlif', 'Orography dV', 'm/s2', (/ ('', i=1, 9) /))
+    'dvlif', 'Orography dV', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_duhin = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'duhin', 'Hines GWD dU', 'm/s2', (/ ('', i=1, 9) /))
+    'duhin', 'Hines GWD dU', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dvhin = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dvhin', 'Hines GWD dV', 'm/s2', (/ ('', i=1, 9) /))
+    'dvhin', 'Hines GWD dV', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtoro = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtoro', 'Orography dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtoro', 'Orography dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dtlif = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dtlif', 'Orography dT', 'K/s', (/ ('', i=1, 9) /))
+    'dtlif', 'Orography dT', 'K/s', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dthin = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dthin', 'Hines GWD dT', 'K/s', (/ ('', i=1, 9) /))
+    'dthin', 'Hines GWD dT', 'K/s', (/ ('', i=1, 9) /))
 
   TYPE(ctrl_out), SAVE, ALLOCATABLE :: o_trac(:)
@@ -1087 +1087 @@
 
   TYPE(ctrl_out), SAVE :: o_rsu = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsu', 'SW upward radiation', 'W m-2', (/ ('', i=1, 9) /))
+    'rsu', 'SW upward radiation', 'W m-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsd = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsd', 'SW downward radiation', 'W m-2', (/ ('', i=1, 9) /))
+    'rsd', 'SW downward radiation', 'W m-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rlu = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rlu', 'LW upward radiation', 'W m-2', (/ ('', i=1, 9) /))
+    'rlu', 'LW upward radiation', 'W m-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rld = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rld', 'LW downward radiation', 'W m-2', (/ ('', i=1, 9) /))
+    'rld', 'LW downward radiation', 'W m-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsucs = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsucs', 'SW CS upward radiation', 'W m-2', (/ ('', i=1, 9) /))
+    'rsucs', 'SW CS upward radiation', 'W m-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsdcs = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsdcs', 'SW CS downward radiation', 'W m-2', (/ ('', i=1, 9) /))
+    'rsdcs', 'SW CS downward radiation', 'W m-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rlucs = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rlucs', 'LW CS upward radiation', 'W m-2', (/ ('', i=1, 9) /))
+    'rlucs', 'LW CS upward radiation', 'W m-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rldcs = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rldcs', 'LW CS downward radiation', 'W m-2', (/ ('', i=1, 9) /))
+    'rldcs', 'LW CS downward radiation', 'W m-2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tnt = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tnt', 'Tendency of air temperature', 'K s-1', (/ ('', i=1, 9) /))
+    'tnt', 'Tendency of air temperature', 'K s-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tntc = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tntc', 'Tendency of air temperature due to Moist Convection', 'K s-1', (/ ('', i=1, 9) /))
+    'tntc', 'Tendency of air temperature due to Moist Convection', 'K s-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tntr = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tntr', 'Air temperature tendency due to Radiative heating', 'K s-1', (/ ('', i=1, 9) /))
+    'tntr', 'Air temperature tendency due to Radiative heating', 'K s-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tntscpbl = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /),                  &
-        'tntscpbl', 'Air temperature tendency due to St cloud and precipitation and BL mixing', &
+    'tntscpbl', 'Air temperature tendency due to St cloud and precipitation and BL mixing', &
       'K s-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tnhus = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tnhus', 'Tendency of specific humidity', 's-1', (/ ('', i=1, 9) /))
+    'tnhus', 'Tendency of specific humidity', 's-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tnhusc = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tnhusc', 'Tendency of specific humidity due to convection', 's-1', (/ ('', i=1, 9) /))
+    'tnhusc', 'Tendency of specific humidity due to convection', 's-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_tnhusscpbl = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'tnhusscpbl', 'Tendency of Specific humidity due to ST cl, precip and BL mixing', 's-1', (/ ('', i=1, 9) /))
+    'tnhusscpbl', 'Tendency of Specific humidity due to ST cl, precip and BL mixing', 's-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_evu = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'evu', 'Eddy viscosity coefficient for Momentum Variables', 'm2 s-1', (/ ('', i=1, 9) /))
+    'evu', 'Eddy viscosity coefficient for Momentum Variables', 'm2 s-1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_h2o = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'h2o', 'Mass Fraction of Water', '1', (/ ('', i=1, 9) /))
+    'h2o', 'Mass Fraction of Water', '1', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_mcd = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'mcd', 'Downdraft COnvective Mass Flux', 'kg/(m2*s)', (/ ('', i=1, 9) /))
+    'mcd', 'Downdraft COnvective Mass Flux', 'kg/(m2*s)', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_dmc = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'dmc', 'Deep COnvective Mass Flux', 'kg/(m2*s)', (/ ('', i=1, 9) /))
+    'dmc', 'Deep COnvective Mass Flux', 'kg/(m2*s)', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ref_liq = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ref_liq', 'Effective radius of convective cloud liquid water particle', 'm', (/ ('', i=1, 9) /))
+    'ref_liq', 'Effective radius of convective cloud liquid water particle', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ref_ice = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'ref_ice', 'Effective radius of startiform cloud ice particle', 'm', (/ ('', i=1, 9) /))
+    'ref_ice', 'Effective radius of startiform cloud ice particle', 'm', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsut4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsut4co2', 'TOA Out SW in 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rsut4co2', 'TOA Out SW in 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rlut4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rlut4co2', 'TOA Out LW in 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rlut4co2', 'TOA Out LW in 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsutcs4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsutcs4co2', 'TOA Out CS SW in 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rsutcs4co2', 'TOA Out CS SW in 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rlutcs4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rlutcs4co2', 'TOA Out CS LW in 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rlutcs4co2', 'TOA Out CS LW in 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsu4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsu4co2', 'Upwelling SW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rsu4co2', 'Upwelling SW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rlu4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rlu4co2', 'Upwelling LW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rlu4co2', 'Upwelling LW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsucs4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsucs4co2', 'Upwelling CS SW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rsucs4co2', 'Upwelling CS SW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rlucs4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rlucs4co2', 'Upwelling CS LW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rlucs4co2', 'Upwelling CS LW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsd4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsd4co2', 'Downwelling SW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rsd4co2', 'Downwelling SW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rld4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rld4co2', 'Downwelling LW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rld4co2', 'Downwelling LW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rsdcs4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rsdcs4co2', 'Downwelling CS SW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rsdcs4co2', 'Downwelling CS SW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_rldcs4co2 = ctrl_out((/ 5, 10, 10, 10, 10, 10, 11, 11, 11 /), &
-        'rldcs4co2', 'Downwelling CS LW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
+    'rldcs4co2', 'Downwelling CS LW 4xCO2 atmosphere', 'W/m2', (/ ('', i=1, 9) /))
 
 !!!!!!!!!!!!! Sorties niveaux standards de pression NMC 

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -282 +282 @@
        zoutm(iff) = ecrit_files(iff) ! Frequence ou l on ecrit en seconde
 
+
+#ifdef CPP_XIOS
+    ! ug déclaration des axes verticaux de chaque fichier:
+    CALL wxios_add_vaxis("presnivs", phys_out_filenames(iff), &
+            levmax(iff) - levmin(iff) + 1, presnivs(levmin(iff):levmax(iff)))
+    CALL wxios_add_vaxis("Ahyb", phys_out_filenames(iff), &
+            levmax(iff) - levmin(iff) + 1, Ahyb)
+    CALL wxios_add_vaxis("Bhyb", phys_out_filenames(iff), &
+            levmax(iff) - levmin(iff) + 1, Bhyb)
+    CALL wxios_add_vaxis("Ahyb", phys_out_filenames(iff), &
+            levmax(iff) - levmin(iff) + 1, Alt)
+
+    IF (clef_files(iff)) THEN
+         CALL wxios_add_file(phys_out_filenames(iff),chtimestep(iff),lev_files(iff))
+    END IF
+#endif 
+
        IF (clef_files(iff)) THEN
 
@@ -299 +316 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
           IF (phys_out_regfkey(iff)) then
-
              imin_ins=1
              imax_ins=iim
@@ -340 +356 @@
           else
              CALL histbeg_phy_all(phys_out_filenames(iff),itau_phy,zjulian,&
-                 dtime,chtimestep(iff),lev_files(iff),nhorim(iff),nid_files(iff))
+                 dtime,nhorim(iff),nid_files(iff))
           endif
 
+#ifndef CPP_NO_IOIPSL 
           if (iff.le.6) then
              CALL histvert(nid_files(iff), "presnivs", "Vertical levels", "Pa", &  
@@ -357 +374 @@
                levmax(iff) - levmin(iff) + 1,Alt,nvertAlt(iff))
 
-
           else
              CALL histvert(nid_files(iff), "plev", "pressure", "Pa", &
@@ -363 +379 @@
               rlevSTD(levmin(iff):levmax(iff)), nvertm(iff), "down")
           endif
-#ifdef CPP_XIOS
-    ! ug déclaration des axes verticaux de chaque fichier:
-    CALL wxios_add_vaxis("presnivs", nid_files(iff), levmax(iff) - levmin(iff) + 1, presnivs(levmin(iff):levmax(iff)))                                         
-    CALL wxios_add_vaxis("Ahyb", nid_files(iff), levmax(iff) - levmin(iff) + 1, Ahyb)                              
-    CALL wxios_add_vaxis("Bhyb", nid_files(iff), levmax(iff) - levmin(iff) + 1, Bhyb)          
-    CALL wxios_add_vaxis("Ahyb", nid_files(iff), levmax(iff) - levmin(iff) + 1, Alt)             
 #endif
 

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -90 +90 @@
      ! On le donne à iophy pour que les histwrite y aient accès:
      CALL set_itau_iophy(itau_w)
-
-    ! ug OMP en chantier...
-    !IF(is_using_mpi .AND. .NOT. is_mpi_root) THEN
-       ! vars_defined=.TRUE.
-    !END IF
-
+    
     IF(.NOT.vars_defined) THEN
         iinitend = 2
@@ -1066 +1061 @@
         IF(.NOT.vars_defined) THEN
 !$OMP MASTER
+#ifndef CPP_NO_IOIPSL 
             DO iff=1,nfiles
                 IF (clef_files(iff)) THEN
@@ -1074 +1070 @@
                 ENDIF ! clef_files
             ENDDO !  iff
+#endif
 #ifdef CPP_XIOS
             !On finalise l'initialisation:
             CALL wxios_closedef()
 #endif
+
 !$OMP END MASTER
 !$OMP BARRIER
@@ -1089 +1087 @@
     IF(vars_defined) THEN
 ! On synchronise les fichiers pour IOIPSL
+#ifndef CPP_NO_IOIPSL 
 !$OMP MASTER
       DO iff=1,nfiles
@@ -1096 +1095 @@
       END DO
 !$OMP END MASTER
+#endif
     ENDIF
 

LMDZ5/trunk/libf/phylmd/radlwsw_m.F90

@@ -334 +334 @@
 !===== iflag_rrtm ================================================
 !      
+    print*,'iflag_rrtm = ', iflag_rrtm
     IF (iflag_rrtm == 0) THEN
        ! Old radiation scheme, used for AR4 runs