Changeset 2786

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

Location:

LMDZ5/trunk/libf

Files:

• dyn3d_common/disvert.F90 (modified) (2 diffs)
• dynphy_lonlat/inigeomphy_mod.F90 (modified) (2 diffs)
• dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (2 diffs)
• dynphy_lonlat/phymar/iniphysiq_mod.F90 (modified) (2 diffs)
• phy_common/vertical_layers_mod.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/vertical_layers_mod.F90) (6 diffs)
• phylmd/dyn1d/lmdz1d.F90 (modified) (3 diffs)
• phymar/vertical_layers_mod.F90 (deleted)

LMDZ5/trunk/libf/dyn3d_common/disvert.F90

@@ -10 +10 @@
   use new_unit_m, only: new_unit
   use assert_m, only: assert
-  USE comvert_mod, ONLY: ap, bp, nivsigs, nivsig, dpres, presnivs, &
-                         pa, preff, scaleheight
+  USE comvert_mod, ONLY: ap, bp, aps, bps, nivsigs, nivsig, dpres, presnivs, &
+                         pseudoalt, pa, preff, scaleheight
   USE logic_mod, ONLY: ok_strato
 
@@ -346 +346 @@
   DO l = 1, llm
      dpres(l) = bp(l) - bp(l+1)
+     aps(l) =  0.5 *( ap(l) +ap(l+1))
+     bps(l) =  0.5 *( bp(l) +bp(l+1))
      presnivs(l) = 0.5 *( ap(l)+bp(l)*preff + ap(l+1)+bp(l+1)*preff )
+     pseudoalt(l) = log(preff/presnivs(l))*scaleheight
      write(lunout, *)'PRESNIVS(', l, ')=', presnivs(l), ' Z ~ ', &
-          log(preff/presnivs(l))*scaleheight &
+          pseudoalt(l) &
           , ' DZ ~ ', scaleheight*log((ap(l)+bp(l)*preff)/ &
           max(ap(l+1)+bp(l+1)*preff, 1.e-10))

LMDZ5/trunk/libf/dynphy_lonlat/inigeomphy_mod.F90

@@ -24 +24 @@
   USE mod_interface_dyn_phys, ONLY :  init_interface_dyn_phys
   USE nrtype, ONLY: pi
+  USE comvert_mod, ONLY: preff, ap, bp, aps, bps, presnivs, &
+                         scaleheight, pseudoalt
+  USE vertical_layers_mod, ONLY: init_vertical_layers
   IMPLICIT NONE
 
@@ -216 +219 @@
                      airefi,cufi,cvfi)
 
+  ! copy over preff , ap(), bp(), etc 
+  CALL init_vertical_layers(nlayer,preff,scaleheight, &
+                            ap,bp,aps,bps,presnivs,pseudoalt)
+
 !$OMP END PARALLEL
 

LMDZ5/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -12 +12 @@
                      prad,pg,pr,pcpp,iflag_phys)
   USE dimphy, ONLY: init_dimphy
-  USE comvert_mod, ONLY: preff, ap, bp, presnivs, scaleheight, pseudoalt
   USE inigeomphy_mod, ONLY: inigeomphy
   USE mod_grid_phy_lmdz, ONLY: nbp_lon,nbp_lat,nbp_lev,klon_glo ! number of atmospheric columns (on full grid)
@@ -110 +109 @@
 !$OMP COPYIN(annee_ref, day_ini, day_ref, start_time)
 
-  ! copy over preff , ap(), bp(), etc 
-  CALL init_vertical_layers(nlayer,preff,scaleheight, &
-                            ap,bp,presnivs,pseudoalt)
-
   ! Initialize physical constants in physics:
   CALL inifis(punjours,prad,pg,pr,pcpp)

LMDZ5/trunk/libf/dynphy_lonlat/phymar/iniphysiq_mod.F90

@@ -12 +12 @@
                      prad,pg,pr,pcpp,iflag_phys)
   USE dimphy, ONLY: init_dimphy
-  USE comvert_mod, ONLY: preff, ap, bp, presnivs, scaleheight, pseudoalt
   USE inigeomphy_mod, ONLY: inigeomphy
   USE vertical_layers_mod, ONLY : init_vertical_layers
@@ -71 +70 @@
 !$OMP PARALLEL
 
-  ! copy over preff , ap(), bp(), etc 
-  CALL init_vertical_layers(nlayer,preff,scaleheight, &
-                            ap,bp,presnivs,pseudoalt)
-
   ! Initialize tracer names, numbers, etc. for physics
   CALL init_infotrac_phy(nqtot)

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_(:)

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -40 +40 @@
    USE physiq_mod, ONLY: physiq
    USE comvert_mod, ONLY: presnivs, ap, bp, dpres,nivsig, nivsigs, pa, &
-                          preff
+                          preff, aps, bps, pseudoalt, scaleheight
+   USE vertical_layers_mod, ONLY: init_vertical_layers
    USE temps_mod, ONLY: annee_ref, calend, day_end, day_ini, day_ref, &
                         itau_dyn, itau_phy, start_time
@@ -634 +635 @@
         call disvert0(pa,preff,ap,bp,dpres,presnivs,nivsigs,nivsig)
         print *,'On utilise disvert0'
+        aps(1:llm)=0.5*(ap(1:llm)+ap(2:llm+1))
+        bps(1:llm)=0.5*(bp(1:llm)+bp(2:llm+1))
+        scaleheight=8.
+        pseudoalt(1:llm)=-scaleheight*log(presnivs(1:llm)/preff)
       ELSE
         call disvert()
@@ -641 +646 @@
       ENDIF
       ! initialize ap,bp, etc. in vertical_layers_mod
+      CALL init_vertical_layers(llm,preff,scaleheight, &
+                                ap,bp,aps,bps,presnivs,pseudoalt)
+
       sig_s=presnivs/preff
       plev =ap+bp*psurf