Changeset 2056 for LMDZ5/branches/testing/libf/dyn3dmem/iniacademic_loc.F90

Timestamp:

Jun 11, 2014, 3:46:46 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/iniacademic_loc.F90 (modified) (6 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/iniacademic_loc.F90

@@ -4 +4 @@
 SUBROUTINE iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)
 
+  use exner_hyb_m, only: exner_hyb
+  use exner_milieu_m, only: exner_milieu
   USE filtreg_mod
   USE infotrac, ONLY : nqtot
@@ -58 +60 @@
   REAL pks(ip1jmp1)                      ! exner au  sol
   REAL pk(ip1jmp1,llm)                   ! exner au milieu des couches
-  REAL pkf(ip1jmp1,llm)                  ! exner filt.au milieu des couches
   REAL phi(ip1jmp1,llm)                  ! geopotentiel
   REAL ddsin,zsig,tetapv,w_pv  ! variables auxiliaires
@@ -75 +76 @@
 
   REAL zdtvr
-  real,allocatable :: alpha(:,:),beta(:,:)
   
   character(len=*),parameter :: modname="iniacademic"
@@ -219 +219 @@
        allocate(masse_glo(ip1jmp1,llm))
        allocate(phis_glo(ip1jmp1))
-       allocate(alpha(ip1jmp1,llm))
-       allocate(beta(ip1jmp1,llm))
 
         ! surface pressure
@@ -238 +236 @@
         CALL pression ( ip1jmp1, ap, bp, ps_glo, p       )
         if (pressure_exner) then
-          CALL exner_hyb( ip1jmp1, ps_glo, p,alpha,beta, pks, pk, pkf )
+          CALL exner_hyb( ip1jmp1, ps_glo, p, pks, pk )
         else
-          call exner_milieu(ip1jmp1,ps_glo,p,beta,pks,pk,pkf)
+          call exner_milieu(ip1jmp1,ps_glo,p,pks,pk)
         endif
         CALL massdair(p,masse_glo)
@@ -301 +299 @@
         deallocate(ps_glo)
         deallocate(phis_glo)
-        deallocate(alpha)
-        deallocate(beta)
      ENDIF ! of IF (.NOT. read_start)
   endif academic_case