Changeset 5645

Timestamp:

May 7, 2025, 11:42:57 AM (8 weeks ago)

Author:

evignon

Message:

Le nom du parametre new_oliq est tres trompeur. Je le change en liqice_in_radocond

Location:

LMDZ6/trunk/libf

Files:

• phylmd/clesphys_mod_h.f90 (modified) (3 diffs)
• phylmd/conf_phys_m.f90 (modified) (4 diffs)
• phylmd/phyaqua_mod.f90 (modified) (1 diff)
• phylmd/phyetat0_mod.f90 (modified) (1 diff)
• phylmd/phyredem.f90 (modified) (1 diff)
• phylmd/physiq_mod.F90 (modified) (2 diffs)
• phylmd/printflag.f90 (modified) (7 diffs)
• phylmdiso/phyaqua_mod.F90 (modified) (1 diff)
• phylmdiso/phyetat0_mod.F90 (modified) (1 diff)
• phylmdiso/phyredem.F90 (modified) (1 diff)
• phylmdiso/physiq_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/clesphys_mod_h.f90

@@ -27 +27 @@
           , ecrit_mth, ecrit_tra, ecrit_reg                            &
           , top_height                                                 &
-          , iflag_cycle_diurne, soil_model, new_oliq                   &
+          , iflag_cycle_diurne, soil_model, liqice_in_radocond         &
           , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
           , iflag_con, nbapp_cv, nbapp_wk                              &
@@ -58 +58 @@
   REAL nm_oro_t, zpmm_orodr_t, zpmm_orolf_t, zstd_orodr_t
   INTEGER iflag_cycle_diurne
-  LOGICAL soil_model, new_oliq, ok_orodr, ok_orolf
+  LOGICAL soil_model, liqice_in_radocond, ok_orodr, ok_orolf
   LOGICAL ok_limitvrai
   LOGICAL ok_all_xml
@@ -188 +188 @@
   !$OMP      , ecrit_mth, ecrit_tra, ecrit_reg                            &
   !$OMP      , top_height                                                 &
-  !$OMP      , iflag_cycle_diurne, soil_model, new_oliq                   &
+  !$OMP      , iflag_cycle_diurne, soil_model, liqice_in_radocond         &
   !$OMP      , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
   !$OMP      , iflag_con, nbapp_cv, nbapp_wk                              &

LMDZ6/trunk/libf/phylmd/conf_phys_m.f90

@@ -218 +218 @@
     REAL, SAVE    :: zpmm_orodr_t_omp, zpmm_orolf_t_omp
     INTEGER, SAVE :: iflag_cycle_diurne_omp
-    LOGICAL, SAVE :: soil_model_omp,new_oliq_omp
+    LOGICAL, SAVE :: soil_model_omp,liqice_in_radocond_omp
     LOGICAL, SAVE :: ok_orodr_omp, ok_orolf_omp, ok_limitvrai_omp
     INTEGER, SAVE :: nbapp_rad_omp, iflag_con_omp
@@ -871 +871 @@
     CALL getin('soil_model',soil_model_omp)
 
-    !Config  Key  = new_oliq
-    !Config  Desc = Nouvelle eau liquide
+    !Config  Key  = liqice_in_radocond
+    !Config  Desc = liquid + ice seen by radiation
     !Config  Def  = y
-    !Config  Help = Permet de mettre en route la
-    !Config         nouvelle parametrisation de l'eau liquide !
-    new_oliq_omp = .TRUE.
-    CALL getin('new_oliq',new_oliq_omp)
+    liqice_in_radocond_omp = .TRUE.
+    ! old name of the flag (new_oliq)
+    CALL getin('new_oliq',liqice_in_radocond_omp)
+    CALL getin('liqice_in_radocond',liqice_in_radocond_omp)
 
     !Config  Key  = ok_orodr
@@ -2343 +2343 @@
     iflag_cycle_diurne = iflag_cycle_diurne_omp
     soil_model = soil_model_omp
-    new_oliq = new_oliq_omp
+    liqice_in_radocond = liqice_in_radocond_omp
     ok_orodr = ok_orodr_omp
     ok_orolf = ok_orolf_omp
@@ -2767 +2767 @@
     WRITE(lunout,*) ' iflag_cycle_diurne=',iflag_cycle_diurne
     WRITE(lunout,*) ' soil_model=',soil_model
-    WRITE(lunout,*) ' new_oliq=',new_oliq
+    WRITE(lunout,*) ' liqice_in_radocond=',liqice_in_radocond
     WRITE(lunout,*) ' ok_orodr=',ok_orodr
     WRITE(lunout,*) ' ok_orolf=',ok_orolf

LMDZ6/trunk/libf/phylmd/phyaqua_mod.f90

@@ -279 +279 @@
     clesphy0(3) = 1. ! cycle_diurne
     clesphy0(4) = 1. ! soil_model
-    clesphy0(5) = 1. ! new_oliq
+    clesphy0(5) = 1. ! liqice_in_radocond
     clesphy0(6) = 0. ! ok_orodr
     clesphy0(7) = 0. ! ok_orolf

LMDZ6/trunk/libf/phylmd/phyetat0_mod.f90

@@ -158 +158 @@
   IF (iflag_cycle_diurne.GE.1) tab_cntrl( 7) = iflag_cycle_diurne
   IF (soil_model) tab_cntrl( 8) =1.
-  IF (new_oliq) tab_cntrl( 9) =1.
+  IF (liqice_in_radocond) tab_cntrl( 9) =1.
   IF (ok_orodr) tab_cntrl(10) =1.
   IF (ok_orolf) tab_cntrl(11) =1.

LMDZ6/trunk/libf/phylmd/phyredem.f90

@@ -106 +106 @@
   IF( iflag_cycle_diurne.GE.1 ) tab_cntrl( 7 ) = iflag_cycle_diurne
   IF(   soil_model ) tab_cntrl( 8 ) = 1.
-  IF(     new_oliq ) tab_cntrl( 9 ) = 1.
+  IF(     liqice_in_radocond ) tab_cntrl( 9 ) = 1.
   IF(     ok_orodr ) tab_cntrl(10 ) = 1.
   IF(     ok_orolf ) tab_cntrl(11 ) = 1.

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -462 +462 @@
     !cc      PARAMETER (soil_model=.FALSE.)
     !======================================================================
-    ! Dans les versions precedentes, l'eau liquide nuageuse utilisee dans
-    ! le calcul du rayonnement est celle apres la precipitation des nuages.
-    ! Si cette cle new_oliq est activee, ce sera une valeur moyenne entre
-    ! la condensation et la precipitation. Cette cle augmente les impacts
-    ! radiatifs des nuages.
-    !cc      LOGICAL new_oliq
-    !cc      PARAMETER (new_oliq=.FALSE.)
-    !======================================================================
     ! Clefs controlant deux parametrisations de l'orographie:
     !c      LOGICAL ok_orodr
@@ -3988 +3980 @@
        DO i = 1, klon
           cldfra(i,k) = rneb(i,k)
-          !CR: a quoi ca sert? Faut-il ajouter qs_seri?
-          !EV: en effet etrange, j'ajouterais aussi qs_seri
-          !    plus largement, je nettoierais (enleverrais) ces lignes
-          IF (.NOT.new_oliq) radocond(i,k) = ql_seri(i,k)
+          ! keep only liquid droplets in radocond if not liqice_in_radocond
+          IF (.NOT.liqice_in_radocond) radocond(i,k) = ql_seri(i,k)
        ENDDO
     ENDDO

LMDZ6/trunk/libf/phylmd/printflag.f90

@@ -12 +12 @@
 
   REAL tabcntr0(100)
-  LOGICAL cycle_diurn0, soil_model0, new_oliq0, ok_orodr0
+  LOGICAL cycle_diurn0, soil_model0, liqice_in_radocond0, ok_orodr0
   LOGICAL ok_orolf0, ok_limitvr0
   LOGICAL ok_journe, ok_instan, ok_region
@@ -48 +48 @@
   PRINT 100
 
-  PRINT 11, new_oliq, ok_orodr, ok_orolf
+  PRINT 11, liqice_in_radocond, ok_orodr, ok_orolf
   PRINT 100
 
@@ -67 +67 @@
   cycle_diurn0 = .FALSE.
   soil_model0 = .FALSE.
-  new_oliq0 = .FALSE.
+  liqice_in_radocond0 = .FALSE.
   ok_orodr0 = .FALSE.
   ok_orolf0 = .FALSE.
@@ -74 +74 @@
   IF (tabcntr0(7)==1.) cycle_diurn0 = .TRUE.
   IF (tabcntr0(8)==1.) soil_model0 = .TRUE.
-  IF (tabcntr0(9)==1.) new_oliq0 = .TRUE.
+  IF (tabcntr0(9)==1.) liqice_in_radocond0 = .TRUE.
   IF (tabcntr0(10)==1.) ok_orodr0 = .TRUE.
   IF (tabcntr0(11)==1.) ok_orolf0 = .TRUE.
@@ -109 +109 @@
   END IF
 
-  IF (new_oliq0 .AND. .NOT. new_oliq .OR. .NOT. new_oliq0 .AND. new_oliq) &
+  IF (liqice_in_radocond0 .AND. .NOT. liqice_in_radocond .OR. .NOT. liqice_in_radocond0 .AND. liqice_in_radocond) &
       THEN
-    PRINT 16, new_oliq0, new_oliq
+    PRINT 16, liqice_in_radocond0, liqice_in_radocond
     PRINT 100
   END IF
@@ -151 +151 @@
 
 
-11 FORMAT (2X, 5('*'), '  new_oliq = ', L3, 3X, ', Ok_orodr = ', L3, 3X, &
+11 FORMAT (2X, 5('*'), '  liqice_in_radocond = ', L3, 3X, ', Ok_orodr = ', L3, 3X, &
     ', Ok_orolf = ', L3, 3X, 5('*'))
 
@@ -167 +167 @@
     10X, ' startphy = ', L3, 2X, ' et  run.def = ', L3)
 
-16 FORMAT (2X, '$$$$$$$$   Attention !!      new_oliq  different  sur', /1X, &
+16 FORMAT (2X, '$$$$$$$$   Attention !!      liqice_in_radocond  different  sur', /1X, &
     10X, ' startphy = ', L3, 2X, ' et  run.def = ', L3)
 

LMDZ6/trunk/libf/phylmdiso/phyaqua_mod.F90

@@ -294 +294 @@
     clesphy0(3) = 1. ! cycle_diurne
     clesphy0(4) = 1. ! soil_model
-    clesphy0(5) = 1. ! new_oliq
+    clesphy0(5) = 1. ! liqice_in_radocond
     clesphy0(6) = 0. ! ok_orodr
     clesphy0(7) = 0. ! ok_orolf

LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90

@@ -175 +175 @@
   IF (iflag_cycle_diurne.GE.1) tab_cntrl( 7) = iflag_cycle_diurne
   IF (soil_model) tab_cntrl( 8) =1.
-  IF (new_oliq) tab_cntrl( 9) =1.
+  IF (liqice_in_radocond) tab_cntrl( 9) =1.
   IF (ok_orodr) tab_cntrl(10) =1.
   IF (ok_orolf) tab_cntrl(11) =1.

LMDZ6/trunk/libf/phylmdiso/phyredem.F90

@@ -121 +121 @@
   IF( iflag_cycle_diurne.GE.1 ) tab_cntrl( 7 ) = iflag_cycle_diurne
   IF(   soil_model ) tab_cntrl( 8 ) = 1.
-  IF(     new_oliq ) tab_cntrl( 9 ) = 1.
+  IF(     liqice_in_radocond ) tab_cntrl( 9 ) = 1.
   IF(     ok_orodr ) tab_cntrl(10 ) = 1.
   IF(     ok_orolf ) tab_cntrl(11 ) = 1.

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -528 +528 @@
     !cc      PARAMETER (soil_model=.FALSE.)
     !======================================================================
-    ! Dans les versions precedentes, l'eau liquide nuageuse utilisee dans
-    ! le calcul du rayonnement est celle apres la precipitation des nuages.
-    ! Si cette cle new_oliq est activee, ce sera une valeur moyenne entre
-    ! la condensation et la precipitation. Cette cle augmente les impacts
-    ! radiatifs des nuages.
-    !cc      LOGICAL new_oliq
-    !cc      PARAMETER (new_oliq=.FALSE.)
-    !======================================================================
     ! Clefs controlant deux parametrisations de l'orographie:
     !c      LOGICAL ok_orodr
@@ -5227 +5219 @@
        DO i = 1, klon
           cldfra(i,k) = rneb(i,k)
-          !CR: a quoi ca sert? Faut-il ajouter qs_seri?
-          !EV: en effet etrange, j'ajouterais aussi qs_seri
-          !    plus largement, je nettoierais (enleverrais) ces lignes
-          IF (.NOT.new_oliq) radocond(i,k) = ql_seri(i,k)
+          ! keep only liquid droplets in radocond if not liqice_in_radocond
+          IF (.NOT.liqice_in_radocond) radocond(i,k) = ql_seri(i,k)
        ENDDO
     ENDDO