Changeset 2786 for LMDZ5/trunk/libf/dynphy_lonlat

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/dynphy_lonlat

Files:

• inigeomphy_mod.F90 (modified) (2 diffs)
• phylmd/iniphysiq_mod.F90 (modified) (2 diffs)
• phymar/iniphysiq_mod.F90 (modified) (2 diffs)

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)