Changeset 892 for trunk/LMDZ.COMMON

Timestamp:

Mar 5, 2013, 4:01:03 PM (12 years ago)

Author:

slebonnois

Message:

SL: Important commit ! Adaptation of Venus physics to parallel computation / template for arch on the LMD servers using ifort / documentation for 1D column physics and for parallel computations

Location:

trunk/LMDZ.COMMON

Files:

• arch/arch-linux-64bit-para.fcm (added)
• arch/arch-linux-64bit-para.path (added)
• libf/dyn3dpar/calfis_p.F (modified) (7 diffs)

trunk/LMDZ.COMMON/libf/dyn3dpar/calfis_p.F

@@ -169 +169 @@
       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(:)
@@ -205 +206 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-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+                 zqfi_omp,zdufi_omp,zdvfi_omp,
@@ -543 +544 @@
         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))
@@ -576 +578 @@
         do i=1,klon  
           zplay_omp(i,l)=zplay(offset+i,l)
+        enddo 
+      enddo
+        
+       do l=1,llm
+        do i=1,klon  
+          zpk_omp(i,l)=zpk(offset+i,l)
         enddo 
       enddo
@@ -733 +741 @@
         CALL physiq (klon,
      .             llm,
+     .             nqtot,
      .             debut_split,
      .             lafin_split,
@@ -740 +749 @@
      .             zplev_omp,
      .             zplay_omp,
+     .             zpk_omp,
      .             zphi_omp,
      .             zphis_omp,
@@ -747 +757 @@
      .             ztfi_omp,
      .             zqfi_omp,
-c#ifdef INCA
      .             flxwfi_omp,
-c#endif
      .             zdufi_omp,
      .             zdvfi_omp,
      .             zdtfi_omp,
      .             zdqfi_omp,
-     .             zdpsrf_omp,
-cIM diagnostique PVteta, Amip2          
-     .             pducov,
-     .             PVteta)
+     .             zdpsrf_omp)
       endif ! planet_type
          zufi_omp(:,:)=zufi_omp(:,:)+zdufi_omp(:,:)*zdt_split