Changeset 2255

Timestamp:

Apr 3, 2015, 3:51:31 PM (10 years ago)

Author:

jyg

Message:

Changes to pbl_surface and other routines concerning split/no-split.
+ pbl_surface_mod.F90: call cdrag for (w) region.
+ phyredem.F90: write wake_delta_pbl_TKE.
+ phys_output_write_mod.F90: control output of wake_delta_pbl_TKE by
IF(iflag_pbl_split>=1).
+ lmdz1d.F90: initialize wake_delta_pbl_TKE=0.
+ phys_output_ctrlout_mod.F90: suppression of accents in some variable
attributes.
+ cva_driver.F90: suppression of a print introduced in version 2253.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• cva_driver.F90 (modified) (2 diffs)
• dyn1d/lmdz1d.F90 (modified) (2 diffs)
• pbl_surface_mod.F90 (modified) (1 diff)
• phyredem.F90 (modified) (1 diff)
• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/cva_driver.F90

@@ -811 +811 @@
   ENDIF
 !
-  print *,' ncum, len, comp_threshold, compress ',ncum, len, comp_threshold, compress
 !>jyg
       CALL cv3a_compress(len, nloc, ncum, nd, ntra, compress, &
@@ -1116 +1115 @@
 
   IF (debut) THEN
-    PRINT *, ' cv_compress -> '
+    PRINT *, ' cv_uncompress -> '
     debut = .FALSE.
   END IF  !(debut) THEN

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -675 +675 @@
         t_ancien(1,:)=temp(:)
         q_ancien(1,:)=q(:,1)
-        pbl_tke=1.e-8
+        pbl_tke(:,:,:)=1.e-8
+        wake_delta_pbl_tke(:,:,:)=0.
 
         rain_fall=0.
@@ -705 +706 @@
 ! radsol,solsw,sollw,fder,rain_fall,snow_fall,frugs(:,nsrf)
 ! agesno(:,nsrf),zmea,zstd,zsig,zgam,zthe,zpic,zval,rugoro
-! t_ancien,q_ancien,frugs(:,is_oce),clwcon(:,1),rnebcon(:,1),ratqs(:,1)
-! run_off_lic_0,pbl_tke(:,1:klev,nsrf),zmax0,f0,sig1,w01
-! wake_deltat,wake_deltaq,wake_s,wake_cstar,wake_fip
+! t_ancien,q_ancien,,frugs(:,is_oce),clwcon(:,1),rnebcon(:,1),ratqs(:,1)
+! run_off_lic_0,pbl_tke(:,1:klev,nsrf), zmax0,f0,sig1,w01
+! wake_deltat,wake_deltaq,wake_s,wake_cstar,wake_fip,wake_delta_pbl_tke(:,1:klev,nsrf)
 !------------------------------------------------------------------------
 !Al1 =============== restart option ==========================

LMDZ5/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -1351 +1351 @@
         IF (prt_level >=10) print *,'clcdrag -> ycdragh_x ', ycdragh_x
 !
-        CALL clcdrag( knon, nsrf, ypaprs, ypplay, &
-            yu_w(:,1), yv_w(:,1), yt_w(:,1), yq_w(:,1), &
-            yts_w, yqsurf, yz0m, &
-            ycdragm_w, ycdragh_w )
+! Faire disparaitre les lignes commentees fin 2015 (le temps des tests)
+!        CALL clcdrag( knon, nsrf, ypaprs, ypplay, &
+!            yu_w(:,1), yv_w(:,1), yt_w(:,1), yq_w(:,1), &
+!            yts_w, yqsurf, yz0m, &
+!            ycdragm_w, ycdragh_w )
+! Fuxing WANG, 04/03/2015, replace the clcdrag by the merged version: cdrag
+        DO i = 1, knon
+           zgeo1_w(i) = RD * yt_w(i,1) / (0.5*(ypaprs(i,1)+ypplay(i,1))) &
+                * (ypaprs(i,1)-ypplay(i,1))
+           speed_w(i) = SQRT(yu_w(i,1)**2+yv_w(i,1)**2)
+        END DO
+        CALL cdrag(knon, nsrf, &
+            speed_w, yt_w(:,1), yq_w(:,1), zgeo1_w, ypaprs(:,1),&
+            yts_w, yqsurf, yz0m, yz0h, &
+            ycdragm_w, ycdragh_w, zri1_w, pref_w )
 
 ! --- special Dice. JYG+MPL 25112013

LMDZ5/trunk/libf/phylmd/phyredem.F90

@@ -285 +285 @@
            CALL put_field("TKE"//str2, "Energ. Cineti. Turb."//str2, &
                 pbl_tke(:, 1:klev+1, nsrf))
+           CALL put_field("DELTATKE"//str2, "Del TKE wk/env."//str2, &
+                wake_delta_pbl_tke(:, 1:klev+1, nsrf))
         ELSE
            PRINT*, "Trop de sous-mailles"

LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -544 +544 @@
   TYPE(ctrl_out), SAVE :: o_proba_notrig = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
     'proba_notrig', &
-                         'Probabilité de non-déclenchement', ' ', (/ ('', i=1, 9) /))
+                         'Probabilite de non-declenchement', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_random_notrig = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
     'random_notrig', &
-                         'Tirage aléatoire de non-déclenchement', ' ', (/ ('', i=1, 9) /))
+                         'Tirage aleatoire de non-declenchement', ' ', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_ale_bl_stat = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &
     'ale_bl_stat', &

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -569 +569 @@
           ENDIF
 !jyg<
-          IF (iflag_pbl > 1) THEN
+          IF (iflag_pbl > 1 .AND. iflag_wake>=1  .AND. iflag_pbl_split >=1) THEN
              CALL histwrite_phy(o_dltpbltke_srf(nsrf), wake_delta_pbl_TKE(:,1:klev,nsrf))
           ENDIF