Changeset 108 for trunk/libf/dyn3dpar/leapfrog_p.F

Timestamp:

Apr 12, 2011, 11:16:02 AM (14 years ago)

Author:

slebonnois

Message:

Sebastien Lebonnois: sponge layer et dissip horizontale.

File:

• trunk/libf/dyn3dpar/leapfrog_p.F (modified) (6 diffs)

trunk/libf/dyn3dpar/leapfrog_p.F

@@ -113 +113 @@
       REAL,DIMENSION(:,:,:),ALLOCATABLE,SAVE :: dqfi
 
-       !! Aymeric -- cp(T) comme dans leapfrog.F, SAVE OK ???
-      REAL,SAVE :: duspg(ip1jmp1,llm) ! for bilan_dyn
-
+c   tendances top_bound (sponge layer)
+      REAL,SAVE :: dvtop(ip1jm,llm),dutop(ip1jmp1,llm)
+      REAL,SAVE :: dtetatop(ip1jmp1,llm)
+      REAL,SAVE :: dptop(ip1jmp1)
+      REAL,DIMENSION(:,:,:),ALLOCATABLE,SAVE :: dqtop
 
 c   variables pour le fichier histoire
@@ -242 +244 @@
             ALLOCATE(dqfi(ip1jmp1,llm,nqtot))
             ALLOCATE(dqfi_tmp(iip1,llm,nqtot))
+            ALLOCATE(dqtop(ip1jmp1,llm,nqtot))
          END IF
 c$OMP END MASTER      
@@ -251 +254 @@
 
 c$OMP MASTER
+c INITIALISATIONS
+        dudis(:,:)   =0.
+        dvdis(:,:)   =0.
+        dtetadis(:,:)=0.
+        dutop(:,:)   =0.
+        dvtop(:,:)   =0.
+        dtetatop(:,:)=0.
+        dqtop(:,:,:) =0.
+        dptop(:)     =0.
+        dufi(:,:)   =0.
+        dvfi(:,:)   =0.
+        dtetafi(:,:)=0.
+        dqfi(:,:,:) =0.
+        dpfi(:)     =0.
       dq(:,:,:)=0.
+
       CALL pression ( ip1jmp1, ap, bp, ps, p       )
       CALL exner_hyb( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf )
@@ -914 +932 @@
 c      ajout des tendances physiques:
 c      ------------------------------
-         IF (ok_strato) THEN
-           CALL top_bound_p( vcov,ucov,teta,masse,dufi,dvfi,dtetafi)
-         ENDIF
-       
           CALL addfi_p( dtphys, leapf, forward   ,
      $                  ucov, vcov, teta , q   ,ps ,
      $                 dufi, dvfi, dtetafi , dqfi ,dpfi  )
 
+c      Couche superieure :
+c      -------------------
+         IF (ok_strato) THEN
+           CALL top_bound_p( vcov,ucov,teta,masse,dutop,dvtop,dtetatop)
+           CALL addfi_p( dtphys, leapf, forward   ,
+     $                  ucov, vcov, teta , q   ,ps ,
+     $                 dutop, dvtop, dtetatop , dqtop ,dptop  )
+
+         ENDIF
+       
 c$OMP BARRIER
 c$OMP MASTER
@@ -1444 +1468 @@
                  CALL bilan_dyn_p(dtvr*iperiod,dtvr*day_step*periodav,
      &                 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,
-     &                 du,dudis,duspg,dufi)
+     &                 du,dudis,dutop,dufi)
 c$OMP END MASTER
               ENDIF !ok_dynzon
@@ -1670 +1694 @@
                  CALL bilan_dyn_p(dtvr*iperiod,dtvr*day_step*periodav,
      &                 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,
-     &                 du,dudis,duspg,dufi)
+     &                 du,dudis,dutop,dufi)
 
 c$OMP END MASTER