Changeset 3784

Timestamp:

Nov 9, 2020, 3:09:22 PM (4 years ago)

Author:

evignon

Message:

correction v3783 pour convergence et compilation ancienne physique, Etienne aide par Ehouarn

Location:

LMDZ6/trunk/libf/phylmd

Files:

• ocean_forced_mod.F90 (modified) (6 diffs)
• pbl_surface_mod.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (1 diff)
• yamada4.F90 (modified) (8 diffs)

LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90

@@ -76 +76 @@
     REAL, DIMENSION(klon)       :: u1_lay, v1_lay
     LOGICAL                     :: check=.FALSE.
-    REAL, DIMENSION(klon)       :: sens_prec_liq, sens_prec_sol    
-    REAL, DIMENSION(klon)       :: lat_prec_liq, lat_prec_sol    
+    REAL, DIMENSION(klon) :: sens_prec_liq, sens_prec_sol    
+    REAL, DIMENSION(klon) :: lat_prec_liq, lat_prec_sol    
 
 !****************************************************************************************
@@ -112 +112 @@
     !beta = 1.
     !dif_grnd = 0.
+    
+    
     ! EV: use calbeta to calculate beta
-    
-    CALL calbeta(dtime, is_oce, knon, snow, beta*0., beta, cal, dif_grnd)
+    ! Need to initialize qsurf for calbeta but it is not modified by this routine
+    qsurf(:)=0.
+    CALL calbeta(dtime, is_oce, knon, snow, qsurf, beta, cal, dif_grnd)
 
 
@@ -178 +181 @@
     USE phys_output_var_mod, ONLY : sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o
 
-!    INCLUDE "indicesol.h"
+!   INCLUDE "indicesol.h"
     INCLUDE "dimsoil.h"
     INCLUDE "YOMCST.h"
@@ -245 +248 @@
 
 ! calculate the parameters cal, beta, capsol and dif_grnd and then recalculate cal
-    CALL calbeta(dtime, is_sic, knon, snow, qsol, beta, cal, dif_grnd)
+    CALL calbeta(dtime, is_sic, knon, snow, qsol, beta, capsol, dif_grnd)
 
     
@@ -260 +263 @@
     ENDIF
 
-    !beta = 1.0
+!    beta = 1.0
     sens_prec_liq = 0.; sens_prec_sol = 0.; lat_prec_liq = 0.; lat_prec_sol = 0.
 
@@ -315 +318 @@
   END SUBROUTINE ocean_forced_ice
 
-!
 !************************************************************************
-!
+! 1D case
+!************************************************************************
+!  SUBROUTINE read_tsurf1d(knon,sst_out)
+!
+! This subroutine specifies the surface temperature to be used in 1D simulations
+!
+!      USE dimphy, ONLY : klon
+!
+!      INTEGER, INTENT(IN)                  :: knon     ! nomber of points on compressed grid
+!      REAL, DIMENSION(klon), INTENT(OUT)   :: sst_out  ! tsurf used to force the single-column model
+!
+!       INTEGER :: i
+! COMMON defined in lmdz1d.F:
+!       real ts_cur
+!       common /sst_forcing/ts_cur
+!
+!       DO i = 1, knon
+!        sst_out(i) = ts_cur
+!       ENDDO
+!
+!      END SUBROUTINE read_tsurf1d
+!
+!
+!************************************************************************
 END MODULE ocean_forced_mod
 

LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -504 +504 @@
     CHARACTER(len=8), DIMENSION(nbsrf), SAVE :: cl_surf
 !$OMP THREADPRIVATE(cl_surf)
- ! EV Ne sert plus:
- !   REAL, SAVE                               :: beta_land         ! beta for wx_dts
-!!$OMP THREADPRIVATE(beta_land)
+    REAL, SAVE                               :: beta_land         ! beta for wx_dts
+!$OMP THREADPRIVATE(beta_land)
 
 ! Other local variables
@@ -848 +847 @@
        if (klon_glo>1) ok_forc_tsurf=.FALSE.
 
-
        ! intialize beta_land
-       !beta_land = 0.5
-       !call getin_p('beta_land', beta_land)
+       beta_land = 0.5
+       call getin_p('beta_land', beta_land)
        
        ! Initilize debug IO

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -3738 +3738 @@
           ENDIF
           zx_rh(i,k) = q_seri(i,k)/zx_qs
+            IF (iflag_ice_thermo .GT. 0) THEN
           zx_rhl(i,k) = q_seri(i,k)/(qsatl(zx_t)/pplay(i,k))
           zx_rhi(i,k) = q_seri(i,k)/(qsats(zx_t)/pplay(i,k))
+            ENDIF
           zqsat(i,k)=zx_qs
        ENDDO

LMDZ6/trunk/libf/phylmd/yamada4.F90

@@ -189 +189 @@
        viscom=1.46E-5
        viscoh=2.06E-5
+       !lmixmin=1.0E-3
        lmixmin=0.
        yamada4_num=5
@@ -432 +433 @@
       shear(ig,k)=km(ig, k)*m2(ig, k)
       buoy(ig,k)=km(ig, k)*m2(ig, k)*(-1.*rif(ig,k))
-      dissip(ig,k)=min(max(((sqrt(q2(ig,k)))**3)/(b1*l(ig,k)),1.E-12),1.E4)
+!      dissip(ig,k)=min(max(((sqrt(q2(ig,k)))**3)/(b1*l(ig,k)),1.E-12),1.E4)
+      dissip(ig,k)=((sqrt(q2(ig,k)))**3)/(b1*l(ig,k)) 
      ENDDO
     ENDDO
@@ -537 +539 @@
          tkeexp=exp(-dt*disseff/tkeprov)
          tkeprov= tkeprov*tkeexp
-         q2(ig,k)=tkeprov*ydeux        
+         q2(ig,k)=tkeprov*ydeux
          
         ENDDO
@@ -556 +558 @@
 !     q2(1:ngrid, k) = q2(1:ngrid, k) + dt*km(1:ngrid, k)*m2(1:ngrid, k)*(1.-rif(1:ngrid,k))
       q2(1:ngrid, k) = min(max(q2(1:ngrid,k),1.E-10), 1.E4)
-      q2(1:ngrid, k) = 1./(1./sqrt(q2(1:ngrid,k))+dt/(yun*l(1:ngrid,k)*b1))
+       q2(1:ngrid, k) = 1./(1./sqrt(q2(1:ngrid,k))+dt/(yun*l(1:ngrid,k)*b1))
 !     q2(1:ngrid, k) = 1./(1./sqrt(q2(1:ngrid,k))+dt/(2*l(1:ngrid,k)*b1))
       q2(1:ngrid, k) = q2(1:ngrid, k)*q2(1:ngrid, k)
@@ -753 +755 @@
 ! Diagnostics
  tke_dissip(1:ngrid,:,nsrf)=0.
- DO k=2,klev
-    DO ig=1,ngrid
-       jg=ni(ig)
-       tke_dissip(jg,k,nsrf)=dissip(ig,k)
-    ENDDO
- ENDDO
+! DO k=2,klev
+!    DO ig=1,ngrid
+!       jg=ni(ig)
+!       tke_dissip(jg,k,nsrf)=dissip(ig,k)
+!    ENDDO
+! ENDDO
  
 !=============================================================================
@@ -1105 +1107 @@
    l2(1:ngrid,:)=0.0
    l_mixmin(1:ngrid,:,nsrf)=0.
-   l_mix(1:ngrid,:,nsrf)=1.E-5
+   l_mix(1:ngrid,:,nsrf)=0.
 
    IF (nsrf .EQ. 1) THEN
@@ -1174 +1176 @@
     DO ig=1,ngrid
        lmix(ig,k)=MAX(MAX(l1(ig,k), l2(ig,k)),lmixmin)
-       lmix(ig,k)=MAX(lmix(ig,k),1.E-5)
    ENDDO
  ENDDO
@@ -1180 +1181 @@
 ! Diagnostics
 
- DO k=2,klev+1
+ DO k=2,klev
     DO ig=1,ngrid
        jg=ni(ig)