Changeset 3258

Timestamp:

Mar 13, 2018, 2:44:57 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Forgot the definition of the new diagnostics
XIOS/OMP problem resolved

Location:

LMDZ6/trunk

Files:

• DefLists/field_def_lmdz.xml (modified) (1 diff)
• libf/phylmd/physiq_mod.F90 (modified) (4 diffs)

LMDZ6/trunk/DefLists/field_def_lmdz.xml

@@ -235 +235 @@
         <field id="uq"    long_name="Zonal humidity transport"    unit="-" />
         <field id="vq"    long_name="Merid humidity transport"    unit="-" />
+        <field id="uwat"    long_name="Zonal total water transport"    unit="-" />
+        <field id="vwat"    long_name="Merid total water transport"    unit="-" />
         <field id="cape"    long_name="Conv avlbl pot ener"    unit="J/kg" />
         <field id="pbase"    long_name="Cld base pressure"    unit="Pa" />

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -4826 +4826 @@
       dryaod_diag=.FALSE.
       ok_4xCO2atm= .FALSE.
-      if (is_master) write (lunout,*)'ok_4xCO2atm= ',swaero_diag, swaerofree_diag, dryaod_diag, ok_4xCO2atm
-
-       !--setting up swaero_diag to TRUE in XIOS case 
-       IF (xios_field_is_active("topswad").OR.xios_field_is_active("topswad0").OR. & 
+!      write (lunout,*)'ok_4xCO2atm= ',swaero_diag, swaerofree_diag, dryaod_diag, ok_4xCO2atm
+
+      IF (is_master) then
+        !--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.  & 
@@ -4838 +4839 @@
            swaero_diag=.TRUE. 
 
-       !--setting up swaerofree_diag to TRUE in XIOS case 
-       IF (xios_field_is_active("SWdnSFCcleanclr").OR.xios_field_is_active("SWupSFCcleanclr").OR. &
+        !--setting up swaerofree_diag to TRUE in XIOS case 
+        IF (xios_field_is_active("SWdnSFCcleanclr").OR.xios_field_is_active("SWupSFCcleanclr").OR. &
            xios_field_is_active("SWupTOAcleanclr").OR.xios_field_is_active("rsucsaf").OR.   &
            xios_field_is_active("rsdcsaf") .OR. xios_field_is_active("LWdnSFCcleanclr").OR. &
@@ -4845 +4846 @@
            swaerofree_diag=.TRUE. 
 
-       !--setting up dryaod_diag to TRUE in XIOS case 
-       DO naero = 1, naero_tot-1
+        !--setting up dryaod_diag to TRUE in XIOS case 
+        DO naero = 1, naero_tot-1
          IF (xios_field_is_active("dryod550_"//name_aero_tau(naero))) dryaod_diag=.TRUE. 
-       ENDDO
-       !
-       !--setting up ok_4xCO2atm to TRUE in XIOS case 
-       IF (xios_field_is_active("rsut4co2").OR.xios_field_is_active("rlut4co2").OR. & 
+        ENDDO
+        !
+        !--setting up ok_4xCO2atm to TRUE in XIOS case 
+        IF (xios_field_is_active("rsut4co2").OR.xios_field_is_active("rlut4co2").OR. & 
            xios_field_is_active("rsutcs4co2").OR.xios_field_is_active("rlutcs4co2").OR. &
            xios_field_is_active("rsu4co2").OR.xios_field_is_active("rsucs4co2").OR. &
@@ -4858 +4859 @@
            xios_field_is_active("rld4co2").OR.xios_field_is_active("rldcs4co2")) &
            ok_4xCO2atm=.TRUE. 
-      if (is_master) write (lunout,*)'ok_4xCO2atm= ',swaero_diag, swaerofree_diag, dryaod_diag, ok_4xCO2atm
+      endif
+      !$OMP BARRIER
+      call bcast(swaero_diag)
+      call bcast(swaerofree_diag)
+      call bcast(dryaod_diag)
+      call bcast(ok_4xCO2atm)
+!      write (lunout,*)'ok_4xCO2atm= ',swaero_diag, swaerofree_diag, dryaod_diag, ok_4xCO2atm
 #endif
     endif