Changeset 2682 for LMDZ5/branches/testing

Timestamp:

Oct 21, 2016, 10:02:02 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Roll back to 2669. 2675 and 2676 were not supposed to get on the testing branch just yet

Location:

LMDZ5/branches/testing

Files:

• DefLists/file_def_histmth_lmdz.xml (modified) (1 diff)
• libf/phylmd/physiq_mod.F90 (modified) (3 diffs)

LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

@@ -325 +325 @@
                 <field field_ref="z0m" level="10" />
                 <field field_ref="z0h" level="10" />
-                <field field_ref="topswad" level="5" />
-                <field field_ref="topswad0" level="5" />
-                <field field_ref="topswai" level="5" />
-                <field field_ref="solswad" level="5" />
-                <field field_ref="solswad0" level="5" />
-                <field field_ref="solswai" level="5" />
+                <field field_ref="topswad" level="2" />
+                <field field_ref="topswad0" level="2" />
+                <field field_ref="topswai" level="2" />
+                <field field_ref="solswad" level="2" />
+                <field field_ref="solswad0" level="2" />
+                <field field_ref="solswai" level="2" />
                 <field field_ref="OD550_ASBCM" level="2" />
                 <field field_ref="OD550_ASPOMM" level="2" />

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, xios_field_is_active
+    USE xios, ONLY: xios_get_field_attr
 #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
@@ -3705 +3693 @@
                ZSWFT0_i, ZFSDN0, ZFSUP0)
 
-#ifndef CPP_XIOS
-          !--OB 30/05/2016 modified 20/10/2016
+          !--OB 30/05/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