Changeset 3134 for LMDZ6/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Dec 16, 2017, 11:57:23 AM (6 years ago)

Author:

jyg

Message:

Bug fix: some communication variables between the
convective scheme and phytrac were set to zero at
the beginning of physiq (and others were not
saved) which led to an erroneous behaviour when
convection was not called at every time step. Now
all theses variables are in phys_local_var_mod and
are no longer reset to zero at the beginning of
physiq provided ok_bug_cv_trac=n .

If ok_bug_cv_trac=y, then the reset to zero is
still performed.

File:

• LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (modified) (9 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -165 +165 @@
        proba_notrig, random_notrig,  &
        !
-       dnwd, dnwd0,  &
-       upwd, omega,  &
+       dnwd0,  &
+       omega,  &
        epmax_diag,  &
+
+       !    Deep convective variables used in phytrac
+       pmflxr, pmflxs,  &
+       wdtrainA, wdtrainM,  &
+       upwd, dnwd, &
        ep,  &
+       da, mp, &
+       phi, &
+       wght_cvfd, &
+       phi2, &
+       d1a, dam, &
+       ev, &
+       elij, &
+       clw, &
+       epmlmMm, eplaMm, &
+       sij, &
+
        cldemi,  &
        cldfra, cldtau, fiwc,  &
@@ -181 +197 @@
        fsolsw, wfbils, wfbilo,  &
        wfevap, wfrain, wfsnow,  &  
-       pmflxr, pmflxs, prfl,  &
-       psfl, fraca, Vprecip,  &
+       prfl, psfl, fraca, Vprecip,  &
        zw2,  &
        
@@ -192 +207 @@
        qwriteSTD, twriteSTD, rhwriteSTD, &    !pour calcul_STDlev.h
        
-       wdtrainA, wdtrainM,  &
        beta_prec,  &
        rneb,  &
@@ -440 +454 @@
     REAL dtadd(klon,klev)
 
-    ! Variables pour le transport convectif
-    real da(klon,klev),phi(klon,klev,klev),mp(klon,klev)
-    real wght_cvfd(klon,klev)
 #ifndef CPP_XIOS
     REAL, SAVE :: missing_val=nf90_fill_real
 #endif
-    ! Variables pour le lessivage convectif
-    ! RomP >>> 
-    real phi2(klon,klev,klev)
-    real d1a(klon,klev),dam(klon,klev)
-    real ev(klon,klev)
-    real clw(klon,klev),elij(klon,klev,klev)
-    real epmlmMm(klon,klev,klev),eplaMm(klon,klev)
-    ! RomP <<<
+!!   Variables moved to phys_local_var_mod
+!!    ! Variables pour le transport convectif
+!!    real da(klon,klev),phi(klon,klev,klev),mp(klon,klev)
+!!    real wght_cvfd(klon,klev)
+!!    ! Variables pour le lessivage convectif
+!!    ! RomP >>> 
+!!    real phi2(klon,klev,klev)
+!!    real d1a(klon,klev),dam(klon,klev)
+!!    real ev(klon,klev)
+!!    real clw(klon,klev),elij(klon,klev,klev)
+!!    real epmlmMm(klon,klev,klev),eplaMm(klon,klev)
+!!    ! RomP <<<
     !IM definition dynamique o_trac dans phys_output_open
     !      type(ctrl_out) :: o_trac(nqtot)
@@ -543 +558 @@
     ! variables supplementaires de concvl
     REAL Tconv(klon,klev)
-    REAL sij(klon,klev,klev)
+!!    variable moved to phys_local_var_mod
+!!    REAL sij(klon,klev,klev)
 !!    !
 !!    ! variables pour tester la conservation de l'energie dans concvl
@@ -868 +884 @@
     INTEGER :: flag_inhib_tend = 0 !  0 is the default value
 !!    INTEGER :: flag_inhib_tend = 2
+    !
+    ! Logical switch to a bug : reseting to 0 convective variables at the 
+    ! begining of physiq.
+    LOGICAL, SAVE :: ok_bug_cv_trac = .TRUE.
+    !$OMP THREADPRIVATE(ok_bug_cv_trac)
 
     !
@@ -1249 +1270 @@
                                   ! in rrtm/suphec.F90 (and rvtmp2 is set to 0).
        CALL getin_p('ok_bad_ecmwf_thermo',ok_bad_ecmwf_thermo)
+       CALL getin_p('ok_bug_cv_trac',ok_bug_cv_trac)
        fl_ebil = 0 ! by default, conservation diagnostics are desactivated
        CALL getin_p('fl_ebil',fl_ebil)
@@ -1886 +1908 @@
        ENDDO
     ENDDO
-    da(:,:)=0.
-    mp(:,:)=0.
-    phi(:,:,:)=0.
-    ! RomP >>>
-    phi2(:,:,:)=0.
     beta_prec_fisrt(:,:)=0.
     beta_prec(:,:)=0.
-    epmlmMm(:,:,:)=0.
-    eplaMm(:,:)=0.
-    d1a(:,:)=0.
-    dam(:,:)=0.
-    pmflxr=0.
-    pmflxs=0.
-    ! RomP <<<
+    !
+    !   Output variables from the convective scheme should not be set to 0 
+    !   since convection is not always called at every time step.
+    IF (ok_bug_cv_trac) THEN
+      da(:,:)=0.
+      mp(:,:)=0.
+      phi(:,:,:)=0.
+      ! RomP >>>
+      phi2(:,:,:)=0.
+      epmlmMm(:,:,:)=0.
+      eplaMm(:,:)=0.
+      d1a(:,:)=0.
+      dam(:,:)=0.
+      pmflxr(:,:)=0.
+      pmflxs(:,:)=0.
+      ! RomP <<<
+    ENDIF
 
     !
@@ -2462 +2489 @@
     IF (MOD(itapcv,cvpas).EQ.0) THEN
 
+    !
+    ! Mettre a zero des variables de sortie (pour securite)
+    !
+    pmflxr(:,:) = 0.
+    pmflxs(:,:) = 0.
+    wdtrainA(:,:) = 0.
+    wdtrainM(:,:) = 0.
+    upwd(:,:) = 0.
+    dnwd(:,:) = 0.
+    ep(:,:) = 0.
+    da(:,:)=0.
+    mp(:,:)=0.
+    wght_cvfd(:,:)=0.
+    phi(:,:,:)=0.
+    phi2(:,:,:)=0.
+    epmlmMm(:,:,:)=0.
+    eplaMm(:,:)=0.
+    d1a(:,:)=0.
+    dam(:,:)=0.
+    elij(:,:,:)=0.
+    ev(:,:)=0.
+    clw(:,:)=0.
+    sij(:,:,:)=0.
+    !
     IF (iflag_con.EQ.1) THEN
        abort_message ='reactiver le call conlmd dans physiq.F'