Changeset 119 for trunk/libf/phytitan

Timestamp:

May 17, 2011, 10:56:57 AM (14 years ago)

Author:

slebonnois

Message:

Sebastien Lebonnois: apres validation des versions Venus et Titan,
correction d'un certain nombre de bugs.

Location:

trunk/libf/phytitan

Files:

• clcdrag.F90 (modified) (2 diffs)
• init_phys_lmdz.F90 (modified) (1 diff)
• optci.F (modified) (4 diffs)
• optcv.F (modified) (2 diffs)
• suphec.F (modified) (1 diff)
• write_histmth.h (modified) (8 diffs)
• zenang.F (modified) (1 diff)

trunk/libf/phytitan/clcdrag.F90

@@ -39 +39 @@
 ! Variables locales :
       INTEGER :: i
-      REAL :: zdu2, ztsolv, ztvd, zscf
-      REAL :: zucf, zcr
-      REAL :: friv, frih
+      REAL :: zscf
+      REAL :: zucf
+      REAL :: FRIV,FRIH
       REAL, dimension(klon) :: zcfm1, zcfm2
       REAL, dimension(klon) :: zcfh1, zcfh2
@@ -93 +93 @@
             pcfh(i) = zcdn(i)* fins(zri(i))
           ENDIF
-          zcr = (0.0016/(zcdn(i)*SQRT(zdu2)))*ABS(ztvd-ztsolv)**(1./3.)
         ENDIF
       END DO

trunk/libf/phytitan/init_phys_lmdz.F90

@@ -15 +15 @@
 
     CALL init_grid_phy_lmdz(iim,jjp1,llm)
-    CALL init_dimphy(klon,nbp_lev)
+    CALL init_dimphy(klon_glo,nbp_lev)
  
 END SUBROUTINE init_phys_lmdz  

trunk/libf/phytitan/optci.F

@@ -1 +1 @@
       SUBROUTINE OPTCI(ykim,qaer,nmicro,IPRINT)
       use dimphy
+      use infotrac
 #include "dimensions.h"
 #include "microtab.h"
@@ -9 +10 @@
 c   ---------
       REAL    ykim(klon,klev,nqtot)
-      real    qaer(klon,nlayer,nqtot)
+      real    qaer(klon,klev,nqtot)
       integer nmicro
 c   ---------
@@ -198 +199 @@
         if (microfi.eq.1) then
            do iq=1,nrad
-              do j=1,NLAYER
-                 zqaer_1pt(j,iq)=qaer(ig,j,iq)
-              enddo
-           enddo
+             do j=1,NLAYER
+                 zqaer_1pt(j,iq)=qaer(ig,j,iq)
+             enddo
+           enddo
         else
          if (ig.eq.1)  then
@@ -260 +261 @@
       RETURN
       END
+

trunk/libf/phytitan/optcv.F

@@ -1 +1 @@
       SUBROUTINE OPTCV(qaer,nmicro,IPRINT)
 
-
       use dimphy
+      use infotrac
 #include "dimensions.h"
 #include "microtab.h"
@@ -9 +9 @@
 c   Argument:
 c   ---------
-      REAL    qaer(klon,nlayer,nqtot)
+      REAL    qaer(klon,klev,nqtot)
       integer nmicro
 c   ---------

trunk/libf/phytitan/suphec.F

@@ -58 +58 @@
 c     RSIDAY=1.37889e6   ! 15.96 j
       RDAY=1.37889e6   ! 15.96 j
-      ROMEGA=2.*RPI/RSIDAY
 c 1/(duree du jour) = 1/(periode rotation) - 1/(periode revolution)
 c     RDAY=RSIDAY/(1.-RSIDAY/RSIYEA) 
       RSIDAY=RDAY/(1.+RDAY/RSIYEA)
+      ROMEGA=2.*RPI/RSIDAY
       REA=1.5e12
       REPSM=0.  ! 0. veut dire qu'on commence au point vernal

trunk/libf/phytitan/write_histmth.h

@@ -156 +156 @@
       zx_tmp_fi3d(1:klon,1:klev)=t_tauhvd(1:klon,1:klev)
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1,zx_tmp_fi3d,zx_tmp_3d)
-      CALL histwrite(nid_day,"thv"//str1,itau_w,zx_tmp_3d,
+      CALL histwrite(nid_mth,"thv"//str1,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
        enddo      ! fin boucle NSPECV 
@@ -176 +176 @@
       zx_tmp_fi3d(1:klon,1:klev)=t_khvd(1:klon,1:klev)
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1,zx_tmp_fi3d,zx_tmp_3d)
-      CALL histwrite(nid_day,"khv"//str1,itau_w,zx_tmp_3d,
+      CALL histwrite(nid_mth,"khv"//str1,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
        enddo      ! fin boucle NSPECV 
@@ -189 +189 @@
       zx_tmp_fi3d(1:klon,1:klev)=t_tauhvd(1:klon,1:klev)
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1,zx_tmp_fi3d,zx_tmp_3d)
-      CALL histwrite(nid_day,"tgv"//str1,itau_w,zx_tmp_3d,
+      CALL histwrite(nid_mth,"tgv"//str1,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
        enddo      ! fin boucle NSPECV 
@@ -209 +209 @@
       zx_tmp_fi3d(1:klon,1:klev)=t_khvd(1:klon,1:klev)
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1,zx_tmp_fi3d,zx_tmp_3d)
-      CALL histwrite(nid_day,"kgv"//str1,itau_w,zx_tmp_3d,
+      CALL histwrite(nid_mth,"kgv"//str1,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
        enddo      ! fin boucle NSPECV 
@@ -222 +222 @@
       zx_tmp_fi3d(1:klon,1:klev)=t_tauhvd(1:klon,1:klev)
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1,zx_tmp_fi3d,zx_tmp_3d)
-      CALL histwrite(nid_day,"thi"//str1,itau_w,zx_tmp_3d,
+      CALL histwrite(nid_mth,"thi"//str1,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
        enddo      ! fin boucle NSPECI 
@@ -242 +242 @@
       zx_tmp_fi3d(1:klon,1:klev)=t_khvd(1:klon,1:klev)
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1,zx_tmp_fi3d,zx_tmp_3d)
-      CALL histwrite(nid_day,"khi"//str1,itau_w,zx_tmp_3d,
+      CALL histwrite(nid_mth,"khi"//str1,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
        enddo      ! fin boucle NSPECI 
@@ -255 +255 @@
       zx_tmp_fi3d(1:klon,1:klev)=t_tauhvd(1:klon,1:klev)
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1,zx_tmp_fi3d,zx_tmp_3d)
-      CALL histwrite(nid_day,"tgi"//str1,itau_w,zx_tmp_3d,
+      CALL histwrite(nid_mth,"tgi"//str1,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
        enddo      ! fin boucle NSPECI 
@@ -275 +275 @@
       zx_tmp_fi3d(1:klon,1:klev)=t_khvd(1:klon,1:klev)
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1,zx_tmp_fi3d,zx_tmp_3d)
-      CALL histwrite(nid_day,"kgi"//str1,itau_w,zx_tmp_3d,
+      CALL histwrite(nid_mth,"kgi"//str1,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
        enddo      ! fin boucle NSPECI 

trunk/libf/phytitan/zenang.F

@@ -150 +150 @@
       ENDIF   !---comparaison omega1 et omega2
 c
+c Petit test rajoute pour les cas pathologiques aux poles
+      if (pmu0(i).lt.0.) pmu0(i) = -1.*pmu0(i)
+
       ENDDO
 c