Changeset 2707 for LMDZ5/trunk

Timestamp:

Nov 21, 2016, 5:44:17 PM (8 years ago)

Author:

jyg

Message:

New input parameter: nbapp_cv = number of calls to
convection (and wake) routines per day. If =0,
call at every physic time step.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• conf_phys_m.F90 (modified) (4 diffs)
• phys_state_var_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (7 diffs)

LMDZ5/trunk/libf/phylmd/clesphys.h

@@ -13 +13 @@
        LOGICAL ok_limitvrai
        LOGICAL ok_all_xml
-       INTEGER nbapp_rad, iflag_con,iflag_ener_conserv
+       INTEGER nbapp_rad, iflag_con, nbapp_cv, iflag_ener_conserv
        REAL co2_ppm, co2_ppm0, solaire
        LOGICAL ok_suntime_rrtm
@@ -113 +113 @@
      &     , top_height                                                 &
      &     , cycle_diurne, soil_model, new_oliq                         &
-     &     , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad, iflag_con     &
+     &     , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
+     &     , iflag_con, nbapp_cv                                        &
      &     , iflag_ener_conserv                                         &
      &     , ok_4xCO2atm                                                & 

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -207 +207 @@
     LOGICAL,SAVE  :: ok_orodr_omp, ok_orolf_omp, ok_limitvrai_omp
     INTEGER, SAVE :: nbapp_rad_omp, iflag_con_omp
+    INTEGER, SAVE :: nbapp_cv_omp
     INTEGER, SAVE :: iflag_ener_conserv_omp
     LOGICAL, SAVE :: ok_conserv_q_omp
@@ -776 +777 @@
     iflag_con_omp = 2
     CALL getin('iflag_con',iflag_con_omp)
+
+    !Config  Key  = nbapp_cv
+    !Config  Desc = Frequence d'appel a la convection
+    !Config  Def  = 0
+    !Config  Help = Nombre  d'appels des routines de convection
+    !Config         par jour. Si =0, appel a chaque pas de temps physique.
+    nbapp_cv_omp = 0
+    CALL getin('nbapp_cv',nbapp_cv_omp)
 
     !Config  Key  = iflag_ener_conserv
@@ -2052 +2061 @@
     nbapp_rad = nbapp_rad_omp
     iflag_con = iflag_con_omp
+    nbapp_cv = nbapp_cv_omp
     iflag_ener_conserv = iflag_ener_conserv_omp
     ok_conserv_q = ok_conserv_q_omp
@@ -2385 +2395 @@
     write(lunout,*)'nbapp_rad=',nbapp_rad
     write(lunout,*)'iflag_con=',iflag_con
+    write(lunout,*)'nbapp_cv=',nbapp_cv
     write(lunout,*)'iflag_ener_conserv=',iflag_ener_conserv
     write(lunout,*)'ok_conserv_q=',ok_conserv_q

LMDZ5/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -17 +17 @@
       INTEGER, PARAMETER :: napisccp=1
       INTEGER, SAVE :: radpas
+      INTEGER, SAVE :: cvpas
       REAL, PARAMETER :: missing_val_nf90=nf90_fill_real
 !$OMP THREADPRIVATE(radpas)
+!$OMP THREADPRIVATE(cvpas)
       REAL, SAVE :: dtime, solaire_etat0
 !$OMP THREADPRIVATE(dtime, solaire_etat0)

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -775 +775 @@
     REAL s_trmb1(klon), s_trmb2(klon)
     REAL s_trmb3(klon)
+
+    ! La convection n'est pas calculee tous les pas, il faut donc
+    !                      sauvegarder les sorties de la convection
+    !ym      SAVE  
+    !ym      SAVE  
+    !ym      SAVE  
+    !
+    INTEGER itapcv
+    SAVE itapcv
+    !$OMP THREADPRIVATE(itapcv)
+
     !KE43
     ! Variables locales pour la convection de K. Emanuel (sb):
@@ -1273 +1284 @@
        itap    = 0
        itaprad = 0
+       itapcv = 0
 
        ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1299 +1311 @@
                // 'de nbapp_rad'
           CALL abort_physic(modname,abort_message,1)
+       ENDIF
+       IF (nbapp_cv .EQ. 0) nbapp_cv=86400./dtime
+       print *,'physiq, nbapp_cv ',nbapp_cv
+       IF (MOD(INT(86400./dtime),nbapp_cv).EQ.0) THEN
+          cvpas = NINT( 86400./dtime/nbapp_cv)
+       print *,'physiq, cvpas ',cvpas
+       ELSE 
+          WRITE(lunout,*) 'le nombre de pas de temps physique doit etre un ', &
+               'multiple de nbapp_cv'
+          WRITE(lunout,*) 'changer nbapp_cv ou alors commenter ce test ', &
+               'mais 1+1<>2'
+          abort_message='nbre de pas de temps physique n est pas multiple ' &
+               // 'de nbapp_cv'
+          call abort_physic(modname,abort_message,1)
        ENDIF
        ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -2335 +2361 @@
          omega(igout, :)
 
+    !
+    ! Appel de la convection tous les "cvpas"
+    !
+    IF (MOD(itapcv,cvpas).EQ.0) THEN
+
     IF (iflag_con.EQ.1) THEN
        abort_message ='reactiver le call conlmd dans physiq.F'
@@ -2586 +2617 @@
     !    .              d_u_con, d_v_con)
 
+    itapcv = 0
+    ENDIF !  (MOD(itapcv,cvpas).EQ.0)
+    itapcv = itapcv+1
+
     CALL add_phys_tend(d_u_con, d_v_con, d_t_con, d_q_con, dql0, dqi0, paprs, &
          'convection',abortphy,flag_inhib_tend)
@@ -2660 +2695 @@
     !
     IF (iflag_wake>=1) THEN
+       !
+       !  Call wakes only when convection has been called
+       IF (itapcv .EQ. 1) THEN
+       !
        DO k=1,klev
           DO i=1,klon
@@ -2713 +2752 @@
             wake_spread, wake_Cstar, d_deltat_wk_gw,  &
             d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_wk)
+         !
+       ENDIF  ! (mod(itapcv,cvpas) .EQ. 1)
        !
        !-----------------------------------------------------------------------