Changeset 110 for trunk/libf/dyn3d

Timestamp:

Apr 15, 2011, 3:44:44 PM (14 years ago)

Author:

slebonnois

Message:

SL: corrections de bugs suite a compilations venus et titan de la version 109.

Location:

trunk/libf/dyn3d

Files:

• disvert_noterre.F (modified) (1 diff)
• disvert_terre.F90 (modified) (1 diff)
• inidissip.F (modified) (1 diff)
• leapfrog.F (modified) (2 diffs)
• top_bound.F (modified) (3 diffs)

trunk/libf/dyn3d/disvert_noterre.F

@@ -199 +199 @@
 c     Specifique.  Ce choix est spécifié ici ET dans exner_hyb.F
 
-      DO l = 1, llm
+      DO l = 1, llm-1
        aps(l) =  0.5 *( ap(l) +ap(l+1)) 
        bps(l) =  0.5 *( bp(l) +bp(l+1)) 
       ENDDO
      
-      if (hybrid) then
+c     if (hybrid) then
          aps(llm) = aps(llm-1)**2 / aps(llm-2) 
          bps(llm) = 0.5*(bp(llm) + bp(llm+1))
-      else
-         bps(llm) = bps(llm-1)**2 / bps(llm-2) 
-         aps(llm) = 0.
-      end if
+c     else
+c        bps(llm) = bps(llm-1)**2 / bps(llm-2) 
+c        aps(llm) = 0.
+c     end if
 
       PRINT *,' BPs '

trunk/libf/dyn3d/disvert_terre.F90

@@ -140 +140 @@
   write(lunout, *) presnivs
 
-END SUBROUTINE disvert
+END SUBROUTINE disvert_terre

trunk/libf/dyn3d/inidissip.F

@@ -185 +185 @@
 
          write(*,*) 'Dissipation : '
-         write(*,*) 'Multiplication de la dissipation en altitude :',
+         write(*,*) 'Multiplication de la dissipation en altitude :'
          write(*,*) '  dissip_fac_mid =', dissip_fac_mid
 

trunk/libf/dyn3d/leapfrog.F

@@ -470 +470 @@
 c      -------------------
          IF (ok_strato) THEN
-           CALL top_bound( vcov,ucov,teta,masse,dutop,dvtop,dtetatop)
+           CALL top_bound( vcov,ucov,teta,phi,masse,
+     $                     dutop,dvtop,dtetatop)
 c dqtop=0, dptop=0
            CALL addfi( dtphys, leapf, forward   ,
@@ -516 +517 @@
         ! Sponge layer (if any)
         IF (ok_strato) THEN
-          CALL top_bound(vcov,ucov,teta,masse,dutop,dvtop,dtetatop)
+          CALL top_bound(vcov,ucov,teta,phi,
+     $                   masse,dutop,dvtop,dtetatop)
 c dqtop=0, dptop=0
           CALL addfi( dtvr, leapf, forward   ,

trunk/libf/dyn3d/top_bound.F

@@ -1 @@
-      SUBROUTINE top_bound( vcov,ucov,teta,masse, du,dv,dh )
+      SUBROUTINE top_bound( vcov,ucov,teta,phi,masse, du,dv,dh )
       IMPLICIT NONE
 c
@@ -35 +35 @@
 
       REAL ucov(iip1,jjp1,llm),vcov(iip1,jjm,llm),teta(iip1,jjp1,llm)
+      REAL phi(iip1,jjp1,llm)                  ! geopotentiel
       REAL masse(iip1,jjp1,llm)
       REAL dv(iip1,jjm,llm),du(iip1,jjp1,llm),dh(iip1,jjp1,llm)
@@ -77 +78 @@
          print*,'TOP_BOUND mode',mode_top_bound
          print*,'Coeffs pour la couche eponge a l equateur'
-         print*,'p (Pa)  z(km)  tau (s)   dt*rdamp'
+         print*,'p (Pa)  z(km)  tau (s)'
          do l=1,llm
            if (rdamp(l).ne.0.) then
             zkm        = phi(iip1/2,jjp1/2,l)/(1000*g)
-          print*,presnivs(l),zkm,
-     .          1./rdamp(l),
-     .          dt*rdamp(l)
+          print*,presnivs(l),zkm,1./rdamp(l)
            endif
          enddo