Changeset 2056 for LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

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/leapfrog_loc.F (modified) (7 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

@@ -31 +31 @@
        USE call_calfis_mod, ONLY : call_calfis
        USE leapfrog_mod
+       use exner_hyb_loc_m, only: exner_hyb_loc
+       use exner_milieu_loc_m, only: exner_milieu_loc
       IMPLICIT NONE
 
@@ -156 +158 @@
       character*10 string10
 
-!      REAL,SAVE,ALLOCATABLE :: alpha(:,:),beta(:,:)
 !      REAL,SAVE,ALLOCATABLE :: flxw(:,:) ! flux de masse verticale
 
@@ -213 +214 @@
       lafin=.false.
       
-      itaufin   = nday*day_step
+      if (nday>=0) then
+         itaufin   = nday*day_step
+      else
+         itaufin   = -nday
+      endif
+
       itaufinp1 = itaufin +1
 
@@ -261 +267 @@
 !      ALLOCATE(dqfi_tmp(iip1,llm,nqtot))
 !      ALLOCATE(finvmaold(ijb_u:ije_u,llm))
-!      ALLOCATE(alpha(ijb_u:ije_u,llm),beta(ijb_u:ije_u,llm))
 !      ALLOCATE(flxw(ijb_u:ije_u,llm))
 !      ALLOCATE(ecin(ijb_u:ije_u,llm),ecin0(ijb_u:ije_u,llm))
@@ -284 +289 @@
 c$OMP END MASTER
       if (pressure_exner) then
-      CALL exner_hyb_loc( ijnb_u, ps, p,alpha,beta, pks, pk, pkf)
+      CALL exner_hyb_loc( ijnb_u, ps, p, pks, pk, pkf)
       else 
-        CALL exner_milieu_loc( ijnb_u, ps, p, beta, pks, pk, pkf )
+        CALL exner_milieu_loc( ijnb_u, ps, p, pks, pk, pkf )
       endif
 c-----------------------------------------------------------------------
@@ -780 +785 @@
 
 ! c$OMP BARRIER
-!          CALL exner_hyb_loc(  ip1jmp1, ps, p,alpha,beta,pks, pk, pkf )
+!          CALL exner_hyb_loc(  ip1jmp1, ps, p,pks, pk, pkf )
 ! c$OMP BARRIER
 !            jD_cur = jD_ref + day_ini - day_ref
@@ -1135 +1140 @@
 c$OMP BARRIER
         if (pressure_exner) then
-        CALL exner_hyb_loc( ijnb_u, ps, p,alpha,beta, pks, pk, pkf )
+        CALL exner_hyb_loc( ijnb_u, ps, p, pks, pk, pkf )
         else 
-          CALL exner_milieu_loc( ijnb_u, ps, p, beta, pks, pk, pkf )
+          CALL exner_milieu_loc( ijnb_u, ps, p, pks, pk, pkf )
         endif
 c$OMP BARRIER