Changeset 2675 for LMDZ5/branches

Timestamp:

Oct 20, 2016, 10:23:23 PM (8 years ago)

Author:

oboucher

Message:

Dealing with initialisation of swaero_diag in the case of XIOS outputs.

File:

• LMDZ5/branches/testing/libf/phylmd/physiq_mod.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/phylmd/physiq_mod.F90

@@ -219 +219 @@
 #ifdef CPP_XIOS
     USE wxios, ONLY: missing_val, missing_val_omp
-    USE xios, ONLY: xios_get_field_attr
+    USE xios, ONLY: xios_get_field_attr, xios_field_is_active
 #endif
 #ifdef REPROBUS
@@ -1523 +1523 @@
        !   Initialisation des sorties
        !=============================================================
+
+#ifdef CPP_XIOS
+    !--setting up swaero_diag to TRUE in XIOS case
+    IF (xios_field_is_active("topswad").OR.xios_field_is_active("topswad0").OR. &
+        xios_field_is_active("solswad").OR.xios_field_is_active("solswad0").OR. &
+        xios_field_is_active("topswai").OR.xios_field_is_active("solswai").OR.  &
+           (iflag_rrtm==1.AND.(xios_field_is_active("toplwad").OR.xios_field_is_active("toplwad0").OR. &
+                               xios_field_is_active("sollwad").OR.xios_field_is_active("sollwad0"))))  &
+        !!!--for now these fields are not in the XML files so they are omitted
+        !!!  xios_field_is_active("toplwai").OR.xios_field_is_active("sollwai") !))) &
+        swaero_diag=.TRUE.
+#endif
 
 #ifdef CPP_IOIPSL
@@ -3693 +3705 @@
                ZSWFT0_i, ZFSDN0, ZFSUP0)
 
-          !--OB 30/05/2016
+#ifndef CPP_XIOS
+          !--OB 30/05/2016 modified 20/10/2016
           !--here we return swaero_diag to FALSE
           !--and histdef will switch it back to TRUE if necessary
           !--this is necessary to get the right swaero at first step
+          !--but only in the case of no XIOS as XIOS is covered elsewhere
           IF (debut) swaero_diag = .FALSE.
+#endif
           !
           !IM 2eme calcul radiatif pour le cas perturbe ou au moins un