Changeset 2319 for trunk/ICOSA_LMDZ

Timestamp:

May 12, 2020, 4:37:05 PM (5 years ago)

Author:

emillour

Message:

Dynamico-Venus interface:

• Update to follow up with changes in argument list of physiq() from r2125
• correct an OpenMP statement

EM

File:

• trunk/ICOSA_LMDZ/src/phyvenus/interface_icosa_lmdz.f90 (modified) (5 diffs)

trunk/ICOSA_LMDZ/src/phyvenus/interface_icosa_lmdz.f90

@@ -486 +486 @@
 !$OMP THREADPRIVATE(p_layer_phy)
     REAL(rstd),ALLOCATABLE,SAVE :: pk_phy(:,:)
-!$OMP THREADPRIVATE(p_layer_phy)
+!$OMP THREADPRIVATE(pk_phy)
     REAL(rstd),ALLOCATABLE,SAVE :: Temp_phy(:,:)
 !$OMP THREADPRIVATE(Temp_phy)
@@ -516 +516 @@
     LOGICAL,SAVE :: first=.TRUE.
 !$OMP THREADPRIVATE(first)
-    REAL(rstd),ALLOCATABLE,SAVE :: plevmoy(:)
-!$OMP THREADPRIVATE(plevmoy)
-    REAL(rstd),ALLOCATABLE,SAVE :: tmoy(:)
-!$OMP THREADPRIVATE(tmoy)
     
     IF(first) THEN 
@@ -553 +549 @@
       ALLOCATE(dq_phy(klon_omp,llm,nqtot))
       ALLOCATE(dps_phy(klon_omp))
-      ALLOCATE(plevmoy(llm+1))
-      ALLOCATE(tmoy(llm))
 !$OMP BARRIER
     ENDIF
@@ -653 +647 @@
 !$OMP BARRIER    
 
-! NB: arguments plevmoy(:) planet-averaged mean pressure (Pa) at interlayers
-!     and tmoy(:) planet-averaged mean temperature (K) at mid-layers
-!     are an issue. For now we just set them to unphysical values
-    plevmoy(:)=-999
-    tmoy(:)=-999
-    ! Ehouarn test: add some noise to ulon_phy and vlon_phy if they are zero
-    IF(minval(ulon_phy).eq.maxval(ulon_phy)) ulon_phy(:,:)=1.e-15
-    IF(minval(ulat_phy).eq.maxval(ulat_phy)) ulat_phy(:,:)=-1.e-15
     CALL physiq(klon_omp, llm, nqtot, &
                 debut, lafin, &
@@ -667 +653 @@
                 phi_phy, phis_phy, presnivs, &
                 ulon_phy, ulat_phy, Temp_phy, q_phy, &
-                wflux_phy, plevmoy, tmoy, &
+                wflux_phy, &
                 dulon_phy, dulat_phy, dTemp_phy, dq_phy, dps_phy)