Changeset 2604 for LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F

Timestamp:

Jul 26, 2016, 5:37:18 PM (8 years ago)

Author:

Ehouarn Millour

Message:

Add Exner function to the call_physiq arguments (not used by the Earth physics) to harmonize physics/dynamics interface.
EM

File:

• LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F (modified) (8 diffs)

LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F

@@ -162 +162 @@
       REAL,ALLOCATABLE,SAVE :: zufi(:,:), zvfi(:,:), zrfi(:,:)
       REAL,ALLOCATABLE,SAVE :: ztfi(:,:),zqfi(:,:,:)
+      REAL,ALLOCATABLE,SAVE ::  zpk(:,:)
 c
       REAL,ALLOCATABLE,SAVE :: pcvgu(:,:), pcvgv(:,:)
@@ -174 +175 @@
       REAL,ALLOCATABLE,SAVE :: zplev_omp(:,:)
       REAL,ALLOCATABLE,SAVE :: zplay_omp(:,:)
+      REAL,ALLOCATABLE,SAVE :: zpk_omp(:,:)
       REAL,ALLOCATABLE,SAVE :: zphi_omp(:,:)
       REAL,ALLOCATABLE,SAVE :: zphis_omp(:)
@@ -211 +213 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-c$OMP THREADPRIVATE(zplev_omp,zplay_omp,zphi_omp,zphis_omp,
+c$OMP THREADPRIVATE(zplev_omp,zplay_omp,zpk_omp,zphi_omp,zphis_omp,
 c$OMP+                 presnivs_omp,zufi_omp,zvfi_omp,ztfi_omp,
 c$OMP+                 zrfi_omp,zqfi_omp,zdufi_omp,zdvfi_omp,
@@ -275 +277 @@
       ALLOCATE(zdufi2(klon+iim,llm),zdvfi2(klon+iim,llm))
       ALLOCATE(flxwfi(klon,llm))
+      ALLOCATE(zpk(klon,llm))
 c$OMP END MASTER
 c$OMP BARRIER          
@@ -328 +331 @@
       ENDDO
 c$OMP END DO NOWAIT
+
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+      DO l=1,llm
+        do ig0=1,klon
+          i=index_i(ig0)
+          j=index_j(ig0)
+          zpk(ig0,l)=ppk(i,j,l)
+        enddo
+      ENDDO
+c$OMP END DO NOWAIT
+
 c
 c
@@ -537 +551 @@
         allocate(zplev_omp(klon,llm+1))
         allocate(zplay_omp(klon,llm))
+        allocate(zpk_omp(klon,llm))
         allocate(zphi_omp(klon,llm))
         allocate(zphis_omp(klon))
@@ -574 +589 @@
       enddo
         
+       do l=1,llm
+        do i=1,klon  
+          zpk_omp(i,l)=zpk(offset+i,l)
+        enddo 
+      enddo
+        
       do l=1,llm
         do i=1,klon
@@ -680 +701 @@
      &                   jD_cur,jH_cur_split,zdt_split,
      &                   zplev_omp,zplay_omp,
-     &                   zphi_omp,zphis_omp,
+     &                   zpk_omp,zphi_omp,zphis_omp,
      &                   presnivs_omp,
      &                   zufi_omp,zvfi_omp,zrfi_omp,ztfi_omp,zqfi_omp,