Changeset 4662 for LMDZ6/branches

Timestamp:

Sep 1, 2023, 1:46:55 PM (9 months ago)

Author:

Laurent Fairhead

Message:

Debugging stuff

Location:

LMDZ6/branches/LMDZ_cdrag_LSCE/libf/phylmd

Files:

• cdrag_mod.F90 (modified) (15 diffs)
• pbl_surface_mod.F90 (modified) (2 diffs)

LMDZ6/branches/LMDZ_cdrag_LSCE/libf/phylmd/cdrag_mod.F90

@@ -122 +122 @@
   REAL                   MU, CM, CH, B, CMstar, CHstar
   REAL                   PM, PH, BPRIME
-  REAL                   C
   INTEGER                ng_q1                      ! Number of grids that q1 < 0.0
   INTEGER                ng_qsurf                   ! Number of grids that qsurf < 0.0
@@ -129 +128 @@
   REAL                   ztvd, zscf
   REAL                   zucf, zcr
-  REAL                   friv, frih
   REAL, DIMENSION(klon) :: FM, FH                   ! stability functions
   REAL, DIMENSION(klon) :: cdmn, cdhn               ! Drag coefficient in neutral conditions
@@ -148 +146 @@
   REAL, DIMENSION(klon)   :: cdhh
 
-!--------- rajout pour verification --------------------
-
-  REAL, DIMENSION(klon) :: zcdn_h2 
-
-
 !------------------RAJOUT POUR ECUME -------------------
 
@@ -215 +208 @@
 
 ! Consistent with atke scheme
-cn=(1./sqrt(cepsilon))**(2/3)
-ri0=2./rpi*(cinf - cn)*ric/cn
-ri1=-2./rpi * (pr_asym - pr_neut)/pr_slope
+  cn=(1./sqrt(cepsilon))**(2./3.)
+  ri0=2./rpi*(cinf - cn)*ric/cn
+  ri1=-2./rpi * (pr_asym - pr_neut)/pr_slope
 
 
@@ -304 +297 @@
          ENDIF
          call clc_core_cp ( sqrt(zdu2),t1(i)-tsurf(i),q1(i)-qsurf(i),t1(i),q1(i),&
-             zgeop1(i)/RG, zgeop1(i)/RG,  zgeop1(i)/RG,&
-             psol(i),nit_bulk,mixte,&
-             coeffs,z_0m,z_0h)
+             zgeop1(i)/RG, zgeop1(i)/RG,  zgeop1(i)/RG,&
+             psol(i),nit_bulk,mixte,&
+             coeffs,z_0m,z_0h)
          cdmm(i) = coeffs(1)
          cdhh(i) = coeffs(2)
@@ -313 +306 @@
          write(*,*) "clc_core cd ch",cdmm(i),cdhh(i)
 
-!------------------                 Pour ECUME                 --------------------     
+!------------------                 Pour ECUME                 --------------------
        ELSE IF ((choix_bulk .eq. 4) .and. (nsrf .eq. is_oce)) THEN
          OPRECIP = .false.
@@ -328 +321 @@
              PCH,PCE,PRI,PRESA,prain,&
              z_0h,OPERTFLUX,coeffs)
-        
+
          cdmm(i) = coeffs(1)
          cdhh(i) = coeffs(2)
          cdm(i)=cdmm(i)
-         cdh(i)=cdhh(i) 
+         cdh(i)=cdhh(i)
    
          write(*,*) "ecume cd ch",cdmm(i),cdhh(i)
-        
+
 !------------------                 Pour COARE CNRM                 --------------------
        ELSE IF ((choix_bulk .eq. 5) .and. (nsrf .eq. is_oce)) THEN
@@ -356 +349 @@
            pblh(i) = 1500.
          ENDIF
-         write(*,*) "debug size",size(coeffs)
+         write(*,*) "debug size",size(coeffs)
          call coare_cp(sqrt(zdu2),t1(i)-tsurf(i),q1(i)-qsurf(i),&
-                 t1(i),q1(i),&
-                 zgeop1(i)/RG,zgeop1(i)/RG,zgeop1(i)/RG,&
-                 psol(i), pblh(i),&
-                 nit_bulk,&
-                 coeffs,z_0m,z_0h)
+               t1(i),q1(i),&
+               zgeop1(i)/RG,zgeop1(i)/RG,zgeop1(i)/RG,&
+               psol(i), pblh(i),&
+               nit_bulk,&
+               coeffs,z_0m,z_0h)
          cdmm(i) = coeffs(1)
          cdhh(i) = coeffs(3)
@@ -375 +368 @@
          ENDIF
        ENDIF
+     
 
 !----------------------- Rajout des itérations --------------
@@ -414 +408 @@
                   sm(i) = 2./rpi * (cinf - cn) * atan(-zri(i)/ri0) + cn
                   prandtl(i) = -2./rpi * (pr_asym - pr_neut) * atan(zri(i)/ri1) + pr_neut
-                  FM(i) = MAX((sm(i)**(3/2) * sqrt(cepsilon) * (1 - zri(i) / prandtl(i))**(1/2)),f_ri_cd_min)
+                  FM(i) = MAX((sm(i)**(3./2.) * sqrt(cepsilon) * (1 - zri(i) / prandtl(i))**(1./2.)),f_ri_cd_min)
                   FH(i) = MAX((FM(i) / prandtl(i)), f_ri_cd_min)
              CASE default ! Louis 1982
@@ -435 +429 @@
              cdmm(i)=MIN(cdmm(i),cdmmax)
              cdhh(i)=MIN(cdhh(i),cdhmax)
-             write(*,*) "LMDZ cd ch",cdmm(i),cdhh(i)
+!             write(*,*) "LMDZ cd ch",cdmm(i),cdhh(i)
            END IF
          ELSE                          
@@ -473 +467 @@
                   sm(i) = MAX(0.,cn*(1.-zri(i)/ric))
                   prandtl(i) = pr_neut + zri(i) * pr_slope
-                  FM(i) = MAX((sm(i)**(3/2) * sqrt(cepsilon) * (1 - zri(i) / prandtl(i))**(1/2)),f_ri_cd_min)
+                  FM(i) = MAX((sm(i)**(3./2.) * sqrt(cepsilon) * (1 - zri(i) / prandtl(i))**(1./2.)),f_ri_cd_min)
                   FH(i) = MAX((FM(i) / prandtl(i)), f_ri_cd_min)
              CASE default ! Louis 1982
@@ -480 +474 @@
                   FH(i)= AMAX1(1./ (1.+3.*CB*zri(i)*zscf), f_ri_cd_min )
            END SELECT
+
 ! Calcul des drags
+           
            cdmm(i)=cdmn(i)*FM(i)
            cdhh(i)=f_cdrag_ter*cdhn(i)*FH(i)
+           IF (choix_bulk == 0) THEN
+             cdm(i)=cdmn(i)*FM(i)
+             cdh(i)=f_cdrag_ter*cdhn(i)*FH(i)
+           ENDIF
+
            IF (nsrf.EQ.is_oce) THEN
              cdhh(i)=f_cdrag_oce*cdhn(i)*FH(i)
@@ -554 +555 @@
                  sm(i) = 2./rpi * (cinf - cn) * atan(-zri(i)/ri0) + cn
                  prandtl(i) = -2./rpi * (pr_asym - pr_neut) * atan(zri(i)/ri1) + pr_neut
-                 FM(i) = MAX((sm(i)**(3/2) * sqrt(cepsilon) * (1 - zri(i) / prandtl(i))**(1/2)),f_ri_cd_min)
+                 FM(i) = MAX((sm(i)**(3./2.) * sqrt(cepsilon) * (1 - zri(i) / prandtl(i))**(1./2.)),f_ri_cd_min)
                  FH(i) = MAX((FM(i) / prandtl(i)), f_ri_cd_min)
            CASE default ! Louis 1982
@@ -600 +601 @@
                 sm(i) = MAX(0.,cn*(1.-zri(i)/ric))
                 prandtl(i) = pr_neut + zri(i) * pr_slope
-                FM(i) = MAX((sm(i)**(3/2) * sqrt(cepsilon) * (1 - zri(i) / prandtl(i))**(1/2)),f_ri_cd_min)
+                FM(i) = MAX((sm(i)**(3./2.) * sqrt(cepsilon) * (1 - zri(i) / prandtl(i))**(1./2.)),f_ri_cd_min)
                 FH(i) = MAX((FM(i) / prandtl(i)), f_ri_cd_min)
            CASE default ! Louis 1982

LMDZ6/branches/LMDZ_cdrag_LSCE/libf/phylmd/pbl_surface_mod.F90

@@ -1049 +1049 @@
 !albedo SB <<<
     yrain_f = 0.0 ; ysnow_f = 0.0    ; yfder = 0.0     ; ysolsw = 0.0
-    ysollw = 0.0  ; yz0m = 0.0 ; yz0h = 0.0    ; yu1 = 0.0    
+    ysollw = 0.0  ; yz0m = 0.0 ; yz0h = 0.0    ; yz0h_oupas = 0.0 ; yu1 = 0.0    
     yv1 = 0.0     ; ypaprs = 0.0     ; ypplay = 0.0
     ydelp = 0.0   ; yu = 0.0         ; yv = 0.0        ; yt = 0.0         
@@ -2988 +2988 @@
        IF (iflag_split .eq.0) THEN
         IF (iflag_new_t2mq2m==1) THEN
-         CALL stdlevvarn(klon, knon, nsrf, zxli, &
+           CALL stdlevvarn(klon, knon, nsrf, zxli, &
             uzon, vmer, tair1, qair1, zgeo1, &
             tairsol, qairsol, yz0m, yz0h_oupas, psfce, patm, &