Changeset 3180

Timestamp:

Feb 3, 2018, 12:02:21 PM (6 years ago)

Author:

jyg

Message:

Correction to commit 3178: the bug is corrected only if
ok_bug_split_th is "false". The default is "true".

File:

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

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -896 +896 @@
     LOGICAL, SAVE :: ok_bug_cv_trac = .TRUE.
     !$OMP THREADPRIVATE(ok_bug_cv_trac)
+    !
+    ! Logical switch to a bug : changing wake_deltat when thermals are active
+    ! even when there are no wakes.
+    LOGICAL, SAVE :: ok_bug_split_th = .TRUE.
+    !$OMP THREADPRIVATE(ok_bug_split_th)
 
     !
@@ -1280 +1285 @@
        CALL getin_p('ok_bad_ecmwf_thermo',ok_bad_ecmwf_thermo)
        CALL getin_p('ok_bug_cv_trac',ok_bug_cv_trac)
+       CALL getin_p('ok_bug_split_th',ok_bug_split_th)
        fl_ebil = 0 ! by default, conservation diagnostics are desactivated
        CALL getin_p('fl_ebil',fl_ebil)
@@ -3117 +3123 @@
              ENDDO
           !
-!!             CALL add_wake_tend &
-!!                 (d_deltat_the, d_deltaq_the, dsig0, ddens0, wkoccur1, 'the', abortphy) 
-             CALL add_wake_tend &
-                 (d_deltat_the, d_deltaq_the, dsig0, ddens0, wake_k, 'the', abortphy) 
+             IF (ok_bug_split_th) THEN
+               CALL add_wake_tend &
+                   (d_deltat_the, d_deltaq_the, dsig0, ddens0, wkoccur1, 'the', abortphy) 
+             ELSE
+               CALL add_wake_tend &
+                   (d_deltat_the, d_deltaq_the, dsig0, ddens0, wake_k, 'the', abortphy) 
+             ENDIF
              call prt_enerbil('the',itap)
           !