Changeset 1999 for LMDZ5/branches/testing/libf/dyn3d/addfi.F

Timestamp:

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

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d/addfi.F (modified) (2 diffs)

LMDZ5/branches/testing/libf/dyn3d/addfi.F

@@ -55 +55 @@
 c    -----------
 c
-      REAL pdt
+      REAL,INTENT(IN) :: pdt ! time step for the integration (s)
 c
-      REAL pvcov(ip1jm,llm),pucov(ip1jmp1,llm)
-      REAL pteta(ip1jmp1,llm),pq(ip1jmp1,llm,nqtot),pps(ip1jmp1)
+      REAL,INTENT(INOUT) :: pvcov(ip1jm,llm) ! covariant meridional wind
+      REAL,INTENT(INOUT) :: pucov(ip1jmp1,llm) ! covariant zonal wind
+      REAL,INTENT(INOUT) :: pteta(ip1jmp1,llm) ! potential temperature
+      REAL,INTENT(INOUT) :: pq(ip1jmp1,llm,nqtot) ! tracers
+      REAL,INTENT(INOUT) :: pps(ip1jmp1) ! surface pressure (Pa)
+c respective tendencies (.../s) to add
+      REAL,INTENT(IN) :: pdvfi(ip1jm,llm)
+      REAL,INTENT(IN) :: pdufi(ip1jmp1,llm)
+      REAL,INTENT(IN) :: pdqfi(ip1jmp1,llm,nqtot)
+      REAL,INTENT(IN) :: pdhfi(ip1jmp1,llm)
+      REAL,INTENT(IN) :: pdpfi(ip1jmp1)
 c
-      REAL pdvfi(ip1jm,llm),pdufi(ip1jmp1,llm)
-      REAL pdqfi(ip1jmp1,llm,nqtot),pdhfi(ip1jmp1,llm),pdpfi(ip1jmp1)
-c
-      LOGICAL leapf,forward
+      LOGICAL,INTENT(IN) :: leapf,forward ! not used
 c
 c
@@ -71 +77 @@
       REAL xpn(iim),xps(iim),tpn,tps
       INTEGER j,k,iq,ij
-      REAL qtestw, qtestt
-      PARAMETER ( qtestw = 1.0e-15 )
-      PARAMETER ( qtestt = 1.0e-40 )
+      REAL,PARAMETER :: qtestw = 1.0e-15
+      REAL,PARAMETER :: qtestt = 1.0e-40
 
       REAL SSUM