Changeset 295 for LMDZ.3.3/branches/rel-LF/libf/phylmd

Timestamp:

Nov 26, 2001, 2:47:57 PM (23 years ago)

Author:

lmdzadmin

Message:

Tag version 0 qui marche en couple/force
LF

Location:

LMDZ.3.3/branches/rel-LF/libf/phylmd

Files:

• clmain.F (modified) (4 diffs)
• interface_surf.F90 (modified) (11 diffs)
• physiq.F (modified) (8 diffs)
• phytrac.F (modified) (1 diff)

LMDZ.3.3/branches/rel-LF/libf/phylmd/clmain.F

@@ -197 +197 @@
       LOGICAL first_appel
       SAVE first_appel
-      DATA first_appel/.true./
+      DATA first_appel/.false./
       LOGICAL debugindex
       SAVE debugindex
-      DATA debugindex/.true./
+      DATA debugindex/.false./
 #include "temps.h"
       
@@ -354 +354 @@
       ENDDO
 c
-      write(*,*)'CLMAIN, nsrf, knon =',nsrf, knon
+c      write(*,*)'CLMAIN, nsrf, knon =',nsrf, knon
 c
 c variables pour avoir une sortie IOIPSL des INDEX
@@ -434 +434 @@
       CALL coefkz2(nsrf, knon, ypaprs, ypplay,yt,
      .                  ycoefm0, ycoefh0)
-      write(*,*)'Cdrag maximal = ',maxval(ycoefh(:,1)),
-     .                               maxval(ycoefh0(:,1))
       DO k = 1, klev
       DO i = 1, knon
@@ -443 +441 @@
       ENDDO
 
-      write(*,*)'Cdrag maximal = ',maxloc(ycoefh(:,1)),
-     .                             maxval(ycoefh(:,1))
 c
 c

LMDZ.3.3/branches/rel-LF/libf/phylmd/interface_surf.F90

@@ -188 +188 @@
   integer, save        :: error
   integer              :: ii, index
-  logical,save              :: check = .true.
+  logical,save              :: check = .false.
   real, dimension(klon):: cal, beta, dif_grnd, capsol
 !!$PB  real, parameter      :: calice=1.0/(5.1444e+06*0.15), tau_gl=86400.*5.
@@ -332 +332 @@
      call albsno(klon,knon,dtime,agesno(:),alb_neig(:), precip_snow(:))  
      where (snow(1 : knon) .LT. 0.0001) agesno(1 : knon) = 0.
-     zfra(1:knon) = max(0.0,min(1.0,snow/(snow+10.0)))
+     zfra(1:knon) = max(0.0,min(1.0,snow(1:knon)/(snow(1:knon)+10.0)))
      alb_new(1 : knon)  = alb_neig(1 : knon) *zfra(1:knon) + &
     &                     alb_new(1 : knon)*(1.0-zfra(1:knon))
@@ -519 +519 @@
       CALL albsno(klon,knon,dtime,agesno(:),alb_neig(:), precip_snow(:))  
       WHERE (snow(1 : knon) .LT. 0.0001) agesno(1 : knon) = 0.
-      zfra(1:knon) = MAX(0.0,MIN(1.0,snow/(snow+10.0)))
+      zfra(1:knon) = MAX(0.0,MIN(1.0,snow(1:knon)/(snow(1:knon)+10.0)))
       alb_new(1 : knon) = alb_neig(1 : knon) *zfra(1:knon) + & 
      &                    0.6 * (1.0-zfra(1:knon))
@@ -589 +589 @@
      CALL albsno(klon,knon,dtime,agesno(:),alb_neig(:), precip_snow(:))  
      WHERE (snow(1 : knon) .LT. 0.0001) agesno(1 : knon) = 0.
-     zfra(1:knon) = MAX(0.0,MIN(1.0,snow/(snow+10.0)))
+     zfra(1:knon) = MAX(0.0,MIN(1.0,snow(1:knon)/(snow(1:knon)+10.0)))
      alb_new(1 : knon)  = alb_neig(1 : knon)*zfra(1:knon) + &
     &                     0.6 * (1.0-zfra(1:knon))
@@ -744 +744 @@
   character (len = 20) :: modname = 'interfsol'
   character (len = 80) :: abort_message
-  logical,save              :: check = .TRUE.
+  logical,save              :: check = .FALSE.
   real, dimension(klon) :: cal, beta, dif_grnd, capsol
 ! type de couplage dans sechiba
@@ -1045 +1045 @@
   cdrag(1:knon) = tq_cdrag(1:knon)
 
-!  where(cdrag > 0.01) 
-!    cdrag = 0.01
-!  endwhere
+   where(cdrag > 0.01) 
+     cdrag = 0.01
+   endwhere
 !  write(*,*)'Cdrag = ',minval(cdrag),maxval(cdrag)
 
@@ -1186 +1186 @@
   character (len = 20) :: modname = 'interfoce_cpl'
   character (len = 80) :: abort_message
-  logical,save              :: check = .true.
+  logical,save              :: check = .FALSE.
 ! variables pour moyenner les variables de couplage
   real, allocatable, dimension(:,:),save :: cpl_sols, cpl_nsol, cpl_rain
@@ -1715 +1715 @@
   character (len = 20),save :: fich ='limit.nc'
   logical, save     :: newlmt = .TRUE.
-  logical, save     :: check = .true.
+  logical, save     :: check = .FALSE.
 ! Champs lus dans le fichier de CL
   real, allocatable , save, dimension(:) :: sst_lu, rug_lu, nat_lu
@@ -1959 +1959 @@
   character (len = 20),save :: fich ='limit.nc'
   logical,save     :: newlmt = .false.
-  logical,save     :: check = .true.
+  logical,save     :: check = .FALSE.
 ! Champs lus dans le fichier de CL
   real, allocatable , save, dimension(:) :: alb_lu, rug_lu
@@ -2138 +2138 @@
   REAL, parameter :: chasno = 3.334E+05/(2.3867E+06*0.15)
 !
-  logical, save         :: check = .true.
+  logical, save         :: check = .FALSE.
   character (len = 20)  :: modname = 'calcul_fluxs'
   logical, save         :: fonte_neige = .false.
@@ -2495 +2495 @@
   REAL, parameter :: chasno = 3.334E+05/(2.3867E+06*0.15)
 !
-  logical, save         :: check = .true.
+  logical, save         :: check = .FALSE.
   character (len = 20)  :: modname = 'fonte_neige'
   logical, save         :: neige_fond = .false.

LMDZ.3.3/branches/rel-LF/libf/phylmd/physiq.F

@@ -371 +371 @@
       REAL albsollw(klon)
       SAVE albsollw                 ! albedo du sol total
+      REAL albsol1(klon)
+      SAVE albsol1                 ! albedo du sol total
+      REAL albsollw1(klon)
+      SAVE albsollw1                 ! albedo du sol total
 
       REAL wo(klon,klev)
@@ -576 +580 @@
 c
       INTEGER nhori, nvert
-      REAL zsto, zout, zjulian
+      REAL zsto, zout
+      real zjulian
+      save zjulian
 
       character*20 modname
@@ -728 +734 @@
 ccc         ecrit_ins = NINT(86400./dtime *0.25)  ! 4 fois par jour
          ecrit_ins = NINT(86400./dtime/48.)  ! a chaque pas de temps
+         ecrit_ins = NINT(86400./dtime/12.)  ! toutes les deux heures
          IF (ok_instan) THEN
          PRINT*, 'La frequence de sortie instant. est de ', ecrit_ins
@@ -750 +757 @@
       endif        
 c
+c
+c Gestion calendrier
+
+         CALL ymds2ju(anne_ini, 1, 1, 0.0, zjulian)
+         zjulian = zjulian + day_ini
+
 c
       IF (ok_journe) THEN
@@ -1807 +1820 @@
       fder = dlw
 
-      CALL clmain(dtime,itap,date0,pctsrf,
+      CALL clmain(dtime,itap,zjulian,pctsrf,
      e            t_seri,q_seri,u_seri,v_seri,
      e            julien, rmu0, 
@@ -1971 +1984 @@
 c$$$     .        ,bbase,dtvpdt1,dtvpdq1,dplcldt,dplcldr,
 c$$$     .        pori_con,plcl_con,dtma_con,dtlcl_con)
-          if (1.eq.1) then ! vectorise
+          if (0.eq.1) then ! vectorise
           CALL conemav (dtime,paprs,pplay,t_seri,q_seri,
      .        u_seri,v_seri,tr_seri,nbtr,
@@ -2197 +2210 @@
      .               + falblw(i,is_sic) * pctsrf(i,is_sic)
       ENDDO
+!      if (debut) then
+!        albsol1 = albsol
+!        albsollw1 = albsollw
+!      endif
+!      albsol = albsol1
+!      albsollw = albsollw1
       CALL radlwsw ! nouveau rayonnement (compatible Arpege-IFS)
      e            (dist, rmu0, fract, co2_ppm, solaire,
@@ -2331 +2350 @@
       IF (iflag_con.EQ.4) THEN
 c           on ajoute les tendances calculees par KE43
+c$$$ OM on onhibe la convection sur les traceurs
         DO iq=1, nqmax-2 ! Sandrine a -3 ???
-        DO k = 1, nlev
-        DO i = 1, klon
-          tr_seri(i,k,iq) = tr_seri(i,k,iq) + d_tr(i,k,iq)
-        ENDDO
-        ENDDO
+c$$$ OM on inhibe la convection sur les traceur
+c$$$        DO k = 1, nlev
+c$$$        DO i = 1, klon
+c$$$          tr_seri(i,k,iq) = tr_seri(i,k,iq) + d_tr(i,k,iq)
+c$$$        ENDDO
+c$$$        ENDDO
         WRITE(iqn,'(i2.2)') iq
         CALL minmaxqfi(tr_seri(1,1,iq),0.,1.e33,'couche lim iq='//iqn)

LMDZ.3.3/branches/rel-LF/libf/phylmd/phytrac.F

@@ -208 +208 @@
      s     inirnpb
       data first,couchelimite,convection,lessivage,sorties
-     s     /.true.,.true.,.true.,.true.,.true./
+c$$$ OM Test KE     s     /.true.,.true.,.true.,.true.,.true./
+     s     /.true.,.true.,.false.,.true.,.true./
 c
 c======================================================================