Changeset 2812 for LMDZ5/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Mar 6, 2017, 2:56:26 PM (7 years ago)

Author:

jyg

Message:

Addition of a diagnostic mode for add_phys_tend,
with a new argument diag_mode (=0 for normal use;
=1 for diagnostic use).

File:

• LMDZ5/trunk/libf/phylmd/physiq_mod.F90 (modified) (16 diffs)

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -534 +534 @@
     REAL Tconv(klon,klev)
     REAL sij(klon,klev,klev)
+!!    !
+!!    ! variables pour tester la conservation de l'energie dans concvl
+!!    REAL, DIMENSION(klon,klev)     :: d_t_con_sat
+!!    REAL, DIMENSION(klon,klev)     :: d_q_con_sat
+!!    REAL, DIMENSION(klon,klev)     :: dql_sat
 
     real, save :: alp_bl_prescr=0.
@@ -821 +826 @@
     !
     ! tendance nulles
-    REAL, dimension(klon,klev)  :: du0, dv0, dt0, dq0, dql0, dqi0
-    REAL, dimension(klon)       :: dsig0, ddens0
-    INTEGER, dimension(klon)    :: wkoccur1
+    REAL, dimension(klon,klev):: du0, dv0, dt0, dq0, dql0, dqi0
+    REAL, dimension(klon)     :: dsig0, ddens0
+    INTEGER, dimension(klon)  :: wkoccur1
     ! tendance buffer pour appel de add_phys_tend
     REAL, DIMENSION(klon,klev)  :: d_q_ch4_dtime
@@ -1999 +2004 @@
      CALL add_phys_tend &
             (du0,dv0,d_t_eva,d_q_eva,d_ql_eva,d_qi_eva,paprs,&
-               'eva',abortphy,flag_inhib_tend,itap)
+               'eva',abortphy,flag_inhib_tend,itap,0)
     call prt_enerbil('eva',itap)
 
@@ -2226 +2231 @@
           CALL add_phys_tend &
                (d_u_vdf,d_v_vdf,d_t_vdf+d_t_diss,d_q_vdf,dql0,dqi0,paprs,&
-               'vdf',abortphy,flag_inhib_tend,itap)
+               'vdf',abortphy,flag_inhib_tend,itap,0)
        ENDIF
        call prt_enerbil('vdf',itap)
@@ -2608 +2613 @@
     itapcv = itapcv+1
 
+!!!jyg  Appel diagnostique a add_phys_tend pour tester la conservation de 
+!!!     l'energie dans les courants satures.
+!!    d_t_con_sat(:,:) = d_t_con(:,:) - ftd(:,:)*dtime
+!!    d_q_con_sat(:,:) = d_q_con(:,:) - fqd(:,:)*dtime
+!!    dql_sat(:,:) = (wdtrainA(:,:)+wdtrainM(:,:))*dtime/zmasse(:,:)
+!!    CALL add_phys_tend(d_u_con, d_v_con, d_t_con_sat, d_q_con_sat, dql_sat,   &
+!!                     dqi0, paprs, 'convection_sat', abortphy, flag_inhib_tend,&  
+!!                     itap, 1)
+!!    call prt_enerbil('convection_sat',itap)
+!!
+!!
     CALL add_phys_tend(d_u_con, d_v_con, d_t_con, d_q_con, dql0, dqi0, paprs, &
-         'convection',abortphy,flag_inhib_tend,itap)
+         'convection',abortphy,flag_inhib_tend,itap,0)
     call prt_enerbil('convection',itap)
 
@@ -2739 +2755 @@
        ! ajout des tendances des poches froides
        CALL add_phys_tend(du0,dv0,d_t_wake,d_q_wake,dql0,dqi0,paprs,'wake', &
-            abortphy,flag_inhib_tend,itap)
+            abortphy,flag_inhib_tend,itap,0)
        call prt_enerbil('wake',itap)
        !------------------------------------------------------------------------
@@ -2875 +2891 @@
           !
           CALL add_phys_tend(d_u_ajs,d_v_ajs,d_t_ajs,d_q_ajs,  &
-                             dql0,dqi0,paprs,'thermals', abortphy,flag_inhib_tend,itap)
+                             dql0,dqi0,paprs,'thermals', abortphy,flag_inhib_tend,itap,0)
           call prt_enerbil('thermals',itap)
           !
@@ -2938 +2954 @@
           ! ajout des tendances de l'ajustement sec ou des thermiques
           CALL add_phys_tend(du0,dv0,d_t_ajsb,d_q_ajsb,dql0,dqi0,paprs, &
-               'ajsb',abortphy,flag_inhib_tend,itap)
+               'ajsb',abortphy,flag_inhib_tend,itap,0)
           call prt_enerbil('ajsb',itap)
           d_t_ajs(:,:)=d_t_ajs(:,:)+d_t_ajsb(:,:)
@@ -2989 +3005 @@
 !-JLD 
     CALL add_phys_tend(du0,dv0,d_t_lsc,d_q_lsc,d_ql_lsc,d_qi_lsc,paprs, &
-         'lsc',abortphy,flag_inhib_tend,itap)
+         'lsc',abortphy,flag_inhib_tend,itap,0)
     call prt_enerbil('lsc',itap)
     rain_num(:)=0.
@@ -3769 +3785 @@
     ENDDO
 
-    CALL add_phys_tend(du0,dv0,d_t_swr,dq0,dql0,dqi0,paprs,'SW',abortphy,flag_inhib_tend,itap)
+    CALL add_phys_tend(du0,dv0,d_t_swr,dq0,dql0,dqi0,paprs,'SW',abortphy,flag_inhib_tend,itap,0)
     call prt_enerbil('SW',itap)
-    CALL add_phys_tend(du0,dv0,d_t_lwr,dq0,dql0,dqi0,paprs,'LW',abortphy,flag_inhib_tend,itap)
+    CALL add_phys_tend(du0,dv0,d_t_lwr,dq0,dql0,dqi0,paprs,'LW',abortphy,flag_inhib_tend,itap,0)
     call prt_enerbil('LW',itap)
 
@@ -3842 +3858 @@
        ! ajout des tendances de la trainee de l'orographie
        CALL add_phys_tend(d_u_oro,d_v_oro,d_t_oro,dq0,dql0,dqi0,paprs,'oro', &
-            abortphy,flag_inhib_tend,itap)
+            abortphy,flag_inhib_tend,itap,0)
        call prt_enerbil('oro',itap)
        !----------------------------------------------------------------------
@@ -3889 +3905 @@
        ! ajout des tendances de la portance de l'orographie
        CALL add_phys_tend(d_u_lif, d_v_lif, d_t_lif, dq0, dql0, dqi0, paprs, &
-            'lif', abortphy,flag_inhib_tend,itap)
+            'lif', abortphy,flag_inhib_tend,itap,0)
        call prt_enerbil('lif',itap)
     ENDIF ! fin de test sur ok_orolf
@@ -3913 +3929 @@
        d_t_hin(:, :)=0.
        CALL add_phys_tend(du_gwd_hines, dv_gwd_hines, d_t_hin, dq0, dql0, &
-            dqi0, paprs, 'hin', abortphy,flag_inhib_tend,itap)
+            dqi0, paprs, 'hin', abortphy,flag_inhib_tend,itap,0)
        call prt_enerbil('hin',itap)
     ENDIF
@@ -3931 +3947 @@
 
        CALL add_phys_tend(du_gwd_front, dv_gwd_front, dt0, dq0, dql0, dqi0, &
-            paprs, 'front_gwd_rando', abortphy,flag_inhib_tend,itap)
+            paprs, 'front_gwd_rando', abortphy,flag_inhib_tend,itap,0)
        call prt_enerbil('front_gwd_rando',itap)
     ENDIF
@@ -3940 +3956 @@
             du_gwd_rando, dv_gwd_rando, east_gwstress, west_gwstress)
        CALL add_phys_tend(du_gwd_rando, dv_gwd_rando, dt0, dq0, dql0, dqi0, &
-            paprs, 'flott_gwd_rando', abortphy,flag_inhib_tend,itap)
+            paprs, 'flott_gwd_rando', abortphy,flag_inhib_tend,itap,0)
        call prt_enerbil('flott_gwd_rando',itap)
        zustr_gwd_rando=0.
@@ -3992 +4008 @@
        d_q_ch4_dtime(:,:) = d_q_ch4(:,:)*dtime
        CALL add_phys_tend(du0, dv0, dt0, d_q_ch4_dtime, dql0, dqi0, paprs, &
-            'q_ch4', abortphy,flag_inhib_tend,itap)
+            'q_ch4', abortphy,flag_inhib_tend,itap,0)
        d_q_ch4(:,:) = d_q_ch4_dtime(:,:)/dtime
     ENDIF