Changeset 1999 for LMDZ5/branches/testing/libf/dyn3dmem/call_calfis_mod.F90

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/call_calfis_mod.F90 (modified) (3 diffs)

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

@@ -91 +91 @@
     INCLUDE "iniprint.h"
 
-    REAL    :: clesphy0( : )    
-    INTEGER :: itau
-    LOGICAL :: lafin 
-    REAL :: ucov_dyn(ijb_u:ije_u,llm)
-    REAL :: vcov_dyn(ijb_v:ije_v,llm) 
-    REAL :: teta_dyn(ijb_u:ije_u,llm) 
-    REAL :: masse_dyn(ijb_u:ije_u,llm) 
-    REAL :: ps_dyn(ijb_u:ije_u) 
-    REAL :: phis_dyn(ijb_u:ije_u) 
-    REAL :: q_dyn(ijb_u:ije_u,llm,nqtot) 
-    REAL :: flxw_dyn(ijb_u:ije_u,llm) 
+    INTEGER,INTENT(IN) :: itau ! (time) iteration step number
+    LOGICAL,INTENT(IN) :: lafin ! .true. if final time step
+    REAL,INTENT(IN) :: clesphy0( : ) ! not used    
+    REAL,INTENT(INOUT) :: ucov_dyn(ijb_u:ije_u,llm) ! covariant zonal wind
+    REAL,INTENT(INOUT) :: vcov_dyn(ijb_v:ije_v,llm) ! covariant meridional wind
+    REAL,INTENT(INOUT) :: teta_dyn(ijb_u:ije_u,llm) ! potential temperature
+    REAL,INTENT(INOUT) :: masse_dyn(ijb_u:ije_u,llm) ! air mass
+    REAL,INTENT(INOUT) :: ps_dyn(ijb_u:ije_u) ! surface pressure
+    REAL,INTENT(INOUT) :: phis_dyn(ijb_u:ije_u) ! surface geopotential
+    REAL,INTENT(INOUT) :: q_dyn(ijb_u:ije_u,llm,nqtot) ! advected tracers
+    REAL,INTENT(INOUT) :: flxw_dyn(ijb_u:ije_u,llm) ! vertical mass flux
 
     REAL :: dufi_tmp(iip1,llm)    
@@ -134 +134 @@
   !$OMP MASTER
     CALL suspend_timer(timer_caldyn)
-    WRITE(lunout,*) 'leapfrog_p: Entree dans la physique : Iteration No ',itau
+    IF (prt_level >= 10) THEN
+      WRITE(lunout,*) 'leapfrog_p: Entree dans la physique : Iteration No ',itau
+    ENDIF
   !$OMP END MASTER
    
@@ -335 +337 @@
                     ucov, vcov, teta , q   ,ps ,            &
                     dufi, dvfi, dtetafi , dqfi ,dpfi  )
+    ! since addfi updates ps(), also update p(), masse() and pk()
+    CALL pression_loc(ip1jmp1,ap,bp,ps,p)
+!$OMP BARRIER
+    CALL massdair_loc(p,masse)
+!$OMP BARRIER
+    if (pressure_exner) then
+      CALL exner_hyb_loc(ijnb_u,ps,p,alpha,beta,pks,pk,pkf)
+    else 
+      CALL exner_milieu_loc(ijnb_u,ps,p,beta,pks,pk,pkf)
+    endif
+!$OMP BARRIER
 
 #ifdef DEBUG_IO