Changeset 2315

Timestamp:

Jun 25, 2015, 5:25:50 PM (9 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

Files:

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

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90

@@ -3 +3 @@
 
 
-SUBROUTINE iniphysiq(iim,jjm,nlayer,punjours, pdayref,ptimestep,         &
+SUBROUTINE iniphysiq(ii,jj,nlayer,punjours, pdayref,ptimestep,           &
                      rlatu,rlonv,aire,cu,cv,                             &
                      prad,pg,pr,pcpp,iflag_phys)
@@ -13 +13 @@
                                 klon_omp_end, & ! end index of local omp subgrid
                                 klon_mpi_begin ! start indes of columns (on local mpi grid)
+  USE vertical_layers_mod, ONLY : init_vertical_layers
   USE comgeomphy, ONLY: initcomgeomphy, &
                         airephy, & ! physics grid area (m2)
@@ -28 +29 @@
   ! =======================================================================
 
+  include "dimensions.h"
+  include "comvert.h"
   include "iniprint.h"
 
@@ -36 +39 @@
   REAL, INTENT (IN) :: punjours ! length (in s) of a standard day
   INTEGER, INTENT (IN) :: nlayer ! number of atmospheric layers
-  INTEGER, INTENT (IN) :: iim ! number of atmospheric columns along longitudes
-  INTEGER, INTENT (IN) :: jjm ! number of atompsheric columns along latitudes
-  REAL, INTENT (IN) :: rlatu(jjm+1) ! latitudes of the physics grid
-  REAL, INTENT (IN) :: rlonv(iim+1) ! longitudes of the physics grid
-  REAL, INTENT (IN) :: aire(iim+1,jjm+1) ! area of the dynamics grid (m2)
-  REAL, INTENT (IN) :: cu((iim+1)*(jjm+1)) ! cu coeff. (u_covariant = cu * u)
-  REAL, INTENT (IN) :: cv((iim+1)*jjm) ! cv coeff. (v_covariant = cv * v)
+  INTEGER, INTENT (IN) :: ii ! number of atmospheric columns along longitudes
+  INTEGER, INTENT (IN) :: jj ! number of atompsheric columns along latitudes
+  REAL, INTENT (IN) :: rlatu(jj+1) ! latitudes of the physics grid
+  REAL, INTENT (IN) :: rlonv(ii+1) ! longitudes of the physics grid
+  REAL, INTENT (IN) :: aire(ii+1,jj+1) ! area of the dynamics grid (m2)
+  REAL, INTENT (IN) :: cu((ii+1)*(jj+1)) ! cu coeff. (u_covariant = cu * u)
+  REAL, INTENT (IN) :: cv((ii+1)*jj) ! cv coeff. (v_covariant = cv * v)
   INTEGER, INTENT (IN) :: pdayref ! reference day of for the simulation
   REAL, INTENT (IN) :: ptimestep !physics time step (s)
@@ -70 +73 @@
   END IF
 
-  !call init_phys_lmdz(iim,jjm+1,llm,1,(/(jjm-1)*iim+2/))
+  !call init_phys_lmdz(ii,jj+1,llm,1,(/(jj-1)*ii+2/))
   
   ! Generate global arrays on full physics grid
@@ -82 +85 @@
     cufi(1) = cu(1)
     cvfi(1) = cv(1)
-    DO j=2,jjm
-      DO i=1,iim
-        latfi((j-2)*iim+1+i)= rlatu(j)
-        lonfi((j-2)*iim+1+i)= rlonv(i)
-        cufi((j-2)*iim+1+i) = cu((j-1)*(iim+1)+i)
-        cvfi((j-2)*iim+1+i) = cv((j-1)*(iim+1)+i)
+    DO j=2,jj
+      DO i=1,ii
+        latfi((j-2)*ii+1+i)= rlatu(j)
+        lonfi((j-2)*ii+1+i)= rlonv(i)
+        cufi((j-2)*ii+1+i) = cu((j-1)*(ii+1)+i)
+        cvfi((j-2)*ii+1+i) = cv((j-1)*(ii+1)+i)
       ENDDO
     ENDDO
     ! South pole
-    latfi(klon_glo)= rlatu(jjm+1)
+    latfi(klon_glo)= rlatu(jj+1)
     lonfi(klon_glo)= 0.
-    cufi(klon_glo) = cu((iim+1)*jjm+1)
-    cvfi(klon_glo) = cv((iim+1)*jjm-iim)
+    cufi(klon_glo) = cu((ii+1)*jj+1)
+    cvfi(klon_glo) = cv((ii+1)*jj-ii)
 
     ! build airefi(), mesh area on physics grid
-    CALL gr_dyn_fi(1,iim+1,jjm+1,klon_glo,aire,airefi)
+    CALL gr_dyn_fi(1,ii+1,jj+1,klon_glo,aire,airefi)
     ! Poles are single points on physics grid
-    airefi(1)=sum(aire(1:iim,1))
-    airefi(klon_glo)=sum(aire(1:iim,jjm+1))
+    airefi(1)=sum(aire(1:ii,1))
+    airefi(klon_glo)=sum(aire(1:ii,jj+1))
 
     ! Sanity check: do total planet area match between physics and dynamics?
-    total_area_dyn=sum(aire(1:iim,1:jjm+1))
+    total_area_dyn=sum(aire(1:ii,1:jj+1))
     total_area_phy=sum(airefi(1:klon_glo))
     IF (total_area_dyn/=total_area_phy) THEN
@@ -128 +131 @@
   CALL inifis(punjours,prad,pg,pr,pcpp)
   
+  ! copy over preff , ap(), bp(), etc 
+  CALL init_vertical_layers(nlayer,preff,scaleheight, &
+                            ap,bp,presnivs,pseudoalt)
+
   ! Now generate local lon/lat/cu/cv/area arrays
   CALL initcomgeomphy

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: