Changeset 2315 for LMDZ5/trunk/libf/phylmd

Timestamp:

Jun 25, 2015, 5:25:50 PM (10 years ago)

Author:

Ehouarn Millour

Message:

More on physics/dynamics separation: make a vertical_layers_mod module to contain information on the vertical discretization. This module should be used from within the physics (instead of including comvert.h from dynamics).
EM

Location:

LMDZ5/trunk/libf/phylmd

Files:

• dyn1d/lmdz1d.F90 (modified) (2 diffs)
• ecribin.F90 (modified) (2 diffs)
• ecrireg.F90 (modified) (2 diffs)
• inistats.F90 (modified) (3 diffs)
• limit_netcdf.F90 (modified) (1 diff)
• phys_output_mod.F90 (modified) (2 diffs)
• readaerosol_interp.F90 (modified) (1 diff)
• rrtm/suphec.F90 (modified) (4 diffs)
• test_disvert_m.F90 (modified) (1 diff)
• vertical_layers_mod.F90 (added)

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

@@ -23 +23 @@
       USE mod_1D_amma_read
       USE print_control_mod, ONLY: prt_level
+      USE vertical_layers_mod, ONLY: init_vertical_layers
 
       implicit none
@@ -540 +541 @@
 !       Dans ce cas, on lit ap,bp dans le fichier hybrid.txt
       ENDIF
+      ! initialize ap,bp, etc. in vertical_layers_mod
+      call init_vertical_layers(llm,preff,scaleheight, &
+                            ap,bp,presnivs,pseudoalt)
+
       sig_s=presnivs/preff
       plev =ap+bp*psurf

LMDZ5/trunk/libf/phylmd/ecribin.F90

@@ -10 +10 @@
   include "paramet.h"
   include "comgeom.h"
-  include "comvert.h"
 
   ! arguments:
@@ -52 +51 @@
   include "paramet.h"
   include "comgeom.h"
-  include "comvert.h"
 
   ! arguments:

LMDZ5/trunk/libf/phylmd/ecrireg.F90

@@ -10 +10 @@
   include "paramet.h"
   include "comgeom.h"
-  include "comvert.h"
   include "regdim.h"
 
@@ -66 +65 @@
   include "paramet.h"
   include "comgeom.h"
-  include "comvert.h"
   include "regdim.h"
 

LMDZ5/trunk/libf/phylmd/inistats.F90

@@ -1 +1 @@
 SUBROUTINE inistats(ierr)
+
+  USE vertical_layers_mod, ONLY: ap,bp,preff,presnivs,pseudoalt
 
   IMPLICIT NONE
@@ -6 +8 @@
   include "paramet.h"
   include "comgeom.h"
-  include "comvert.h"
   include "comconst.h"
   include "statto.h"
@@ -40 +41 @@
   DO l = 1, llm
     sig_s(l) = ((ap(l)+ap(l+1))/preff+bp(l)+bp(l+1))/2.
-    pseudoalt(l) = log(preff/presnivs(l))*8.
   END DO
 

LMDZ5/trunk/libf/phylmd/limit_netcdf.F90

@@ -42 +42 @@
 ! Local variables:
   include "logic.h"
-  include "comvert.h"
   include "comgeom2.h"
   include "comconst.h"

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -46 +46 @@
     USE mod_grid_phy_lmdz, only: klon_glo
     USE print_control_mod, ONLY: prt_level,lunout
+    USE vertical_layers_mod, ONLY: ap,bp,preff,presnivs
 
 #ifdef CPP_XIOS
@@ -57 +58 @@
     include "clesphys.h"
     include "thermcell.h"
-    include "comvert.h"
 
     ! ug Nouveaux arguments n\'ecessaires au histwrite_mod:

LMDZ5/trunk/libf/phylmd/readaerosol_interp.F90

@@ -30 +30 @@
   INCLUDE "clesphys.h"
   INCLUDE "dimensions.h"
-  INCLUDE "comvert.h"
 !
 ! Input:

LMDZ5/trunk/libf/phylmd/rrtm/suphec.F90

@@ -87 +87 @@
 USE YOM_PHYS_GRID ,ONLY : PHYS_GRID
 USE YOMCT0  , ONLY  : LSCMEC   ,LROUGH   ,REXTZ0M  ,REXTZ0H
+USE vertical_layers_mod, ONLY: ap,bp
 
 IMPLICIT NONE
@@ -115 +116 @@
 #include "suwcou.intfb.h"
 #include "dimensions.h"
-#include "comvert.h"
 
 !     ------------------------------------------------------------------
@@ -168 +168 @@
 !ALLOCATE(VBH    (0:MAX(JPMXLE,NFLEVG)))  from suallo.F90
 !! 
-!! ATTENTION, il faut que ~dyn3d/comvert.h soit conforme au Fortran 90 !!
-!! 
 ALLOCATE(VAH    (0:NFLEVG))  ! Ajout ALLOCATE MPL 200509
 ALLOCATE(VBH    (0:NFLEVG))
@@ -177 +175 @@
 VP00=101325.     !!!!! A REVOIR (MPL)
 ZPRES(NFLEVG)=VP00
-! on recupere ap et bp de dyn3d (comvert.h) MPL 19.05.09
+! on recupere ap et bp de dyn3d (vertical_layers_mod) MPL 19.05.09
 ! Attention, VAH et VBH sont inverses, comme les niveaux
 ! plev(l)=PAPRS(klon,nlayer+1-l) de 1 a nlayer (apllmd.F)

LMDZ5/trunk/libf/phylmd/test_disvert_m.F90

@@ -14 +14 @@
 
     use exner_hyb_m, only: exner_hyb
+    use vertical_layers_mod, only: ap,bp,preff
 
     ! For llm:
     include "dimensions.h"
-
-    ! For ap, bp, preff:
-    include "comvert.h"
 
     ! For kappa, cpp: