Changeset 2786 for LMDZ5/trunk/libf/phy_common

Timestamp:

Jan 30, 2017, 11:24:47 AM (8 years ago)

Author:

Ehouarn Millour

Message:

Further convergence with planetary models:

• move vertical_layers_mod.F90 to phy_common and call init_vertical_layers in inigeomphy_mod
• add aps and bps (mid-layer coordinates) to vertical_layers_mod.F90
• same adaptations for the 1D case

EM

File:

• LMDZ5/trunk/libf/phy_common/vertical_layers_mod.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/vertical_layers_mod.F90) (6 diffs)

LMDZ5/trunk/libf/phy_common/vertical_layers_mod.F90

@@ -9 +9 @@
    REAL,SAVE,ALLOCATABLE :: bp(:) ! hybrid (sigma contribution) coordinate 
                                   ! at layer interfaces (Pa)
+   REAL,SAVE,ALLOCATABLE :: aps(:) ! hybrid (pressure contribution) coordinate 
+                                   ! at mid-layer (Pa)
+   REAL,SAVE,ALLOCATABLE :: bps(:) ! hybrid (sigma contribution) coordinate 
+                                   ! at mid-layer
    REAL,SAVE,ALLOCATABLE :: presnivs(:) ! reference pressure at mid-layer (Pa),
                                         ! based on preff, ap and bp
@@ -14 +18 @@
                                          ! based on preff and scaleheight
    
-!$OMP THREADPRIVATE(preff,scaleheight,ap,bp,presnivs,pseudoalt)
+!$OMP THREADPRIVATE(preff,scaleheight,ap,bp,aps,bps,presnivs,pseudoalt)
 
 
@@ -20 +24 @@
 
   SUBROUTINE init_vertical_layers(nlayer,preff_,scaleheight_,ap_,bp_,&
-                                 presnivs_, pseudoalt_)
+                                 aps_,bps_,presnivs_, pseudoalt_)
     IMPLICIT NONE
     INTEGER,INTENT(IN) :: nlayer ! number of atmospheric layers
@@ -27 +31 @@
     REAL,INTENT(IN)    :: ap_(nlayer+1) ! hybrid coordinate at interfaces
     REAL,INTENT(IN)    :: bp_(nlayer+1) ! hybrid coordinate at interfaces
+    REAL,INTENT(IN)    :: aps_(nlayer) ! hybrid coordinate at mid-layer
+    REAL,INTENT(IN)    :: bps_(nlayer) ! hybrid coordinate at mid-layer
     REAL,INTENT(IN)    :: presnivs_(nlayer) ! Appproximative pressure of atm. layers (Pa)
     REAL,INTENT(IN)    :: pseudoalt_(nlayer) ! pseudo-altitude of atm. layers (km)
@@ -32 +38 @@
     ALLOCATE(ap(nlayer+1))
     ALLOCATE(bp(nlayer+1))
+    ALLOCATE(aps(nlayer))
+    ALLOCATE(bps(nlayer))
     ALLOCATE(presnivs(nlayer))
     ALLOCATE(pseudoalt(nlayer))
@@ -39 +47 @@
     ap(:) = ap_(:)
     bp(:) = bp_(:)
+    aps(:) = aps_(:)
+    bps(:) = bps_(:)
     presnivs(:) = presnivs_(:)
     pseudoalt(:) = pseudoalt_(:)