Changeset 3825 for dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/comgeomphy.F90

Timestamp:

May 6, 2015, 12:14:12 PM (10 years ago)

Author:

ymipsl

Message:

Reorganize geometry and grid modules. Prepare physics for unstructutured grid support. Simplify initialization of physics from dynamic.
Compiled only with dynd3dmem, but not tested for moment.

YM

File:

• dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/comgeomphy.F90 (modified) (3 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/comgeomphy.F90

@@ -1 +1 @@
 module comgeomphy
-   real,save,allocatable :: airephy(:)
-   real,save,allocatable :: cuphy(:)
-   real,save,allocatable :: cvphy(:)
-   real,save,allocatable :: rlatd(:)
-   real,save,allocatable :: rlond(:)
-!$OMP THREADPRIVATE(airephy,cuphy,cvphy,rlatd,rlond)
+!   real,save,allocatable :: airephy(:) => transfered in geometry_mod (area)
+!   real,save,allocatable :: cuphy(:) => transfered in regular_lonlat_mod : dlon_reg
+!   real,save,allocatable :: cvphy(:) => transfered in regular_lonlat_mod : dlat_reg
+!   real,save,allocatable :: rlatd(:) => transfered in geometry_mod (longitude) 
+!   real,save,allocatable :: rlond(:) => transfered in geometry_mod (latitude) 
+!!$OMP THREADPRIVATE(airephy,rlatd,rlond)
    ! general (over global grid) latitudes and longitudes:
    ! useful for outputs
-   real,save,allocatable :: rlonv(:) ! longitudes (rad)
-   real,save,allocatable :: rlonu(:) ! longitude boundaries (rad)
-   real,save,allocatable :: rlatu(:) ! latitudes (rad)
-   real,save,allocatable :: rlatv(:) ! latitude boundaries (rad)
-!$OMP THREADPRIVATE(rlonv,rlonu,rlatu,rlatv)
+!   real,save,allocatable :: rlonv(:) ! longitudes (rad)           => transfered in regular_lonlat_mod 
+!   real,save,allocatable :: rlonu(:) ! longitude boundaries (rad) => transfered in regular_lonlat_mod 
+!   real,save,allocatable :: rlatu(:) ! latitudes (rad)            => transfered in regular_lonlat_mod
+!   real,save,allocatable :: rlatv(:) ! latitude boundaries (rad)  => transfered in regular_lonlat_mod 
+!!$OMP THREADPRIVATE(rlonv,rlonu,rlatu,rlatv)
 
    ! vertical grid
-   real,save :: preff  ! reference surface pressure (Pa)
-   real,save,allocatable :: ap(:)
-   real,save,allocatable :: bp(:)
-   real,save,allocatable :: presnivs(:)
-   real,save,allocatable :: pseudoalt(:)
-!$OMP THREADPRIVATE(preff,ap,bp,presnivs,pseudoalt)
+!   real,save :: preff  ! reference surface pressure (Pa)
+!   real,save,allocatable :: ap(:)        => transfered in vertical_mod
+!   real,save,allocatable :: bp(:)        => transfered in vertical_mod
+!   real,save,allocatable :: presnivs(:)  => transfered in vertical_mod
+!   real,save,allocatable :: pseudoalt(:) => transfered in vertical_mod
+!!$OMP THREADPRIVATE(preff,ap,bp,presnivs,pseudoalt)
 
 contains
@@ -28 +28 @@
     integer,intent(in) :: klon_omp ! number of columns (on local omp grid)
  
-    allocate(airephy(klon_omp))
-    allocate(cuphy(klon_omp))
-    allocate(cvphy(klon_omp))
-    allocate(rlatd(klon_omp))
-    allocate(rlond(klon_omp))
+!    allocate(airephy(klon_omp))
+!    allocate(rlatd(klon_omp))
+!    allocate(rlond(klon_omp))
 
   end subroutine InitComgeomphy
   
-  subroutine initcomgeomphy_horiz(iim,jjm,rlonu_dyn,rlonv_dyn,&
-                                  rlatu_dyn,rlatv_dyn)
+  subroutine initcomgeomphy_horiz(iim,jjm)
     IMPLICIT NONE
     integer,intent(in) :: iim
     integer,intent(in) :: jjm
-    real,intent(in) :: rlonu_dyn(iim+1) ! dyn grid boundaries (rad)
-    real,intent(in) :: rlonv_dyn(iim+1) ! dyn grid longitudes (rad)
-    real,intent(in) :: rlatu_dyn(jjm+1) ! dyn grid latitudes (rad)
-    real,intent(in) :: rlatv_dyn(jjm)  ! dyn grid boundaries (rad)
     
-    allocate(rlonu(iim+1))
-    allocate(rlonv(iim+1))
-    allocate(rlatu(jjm+1))
-    allocate(rlatv(jjm))
-    
-    rlonu(:)=rlonu_dyn(:)
-    rlonv(:)=rlonv_dyn(:)
-    rlatu(:)=rlatu_dyn(:)
-    rlatv(:)=rlatv_dyn(:)
-    
+   
   end subroutine initcomgeomphy_horiz
   
@@ -68 +52 @@
     real,intent(in) :: pseudoalt_dyn(nlayer) ! pseudo-altitude of atm. layers (km)
   
-    allocate(ap(nlayer+1))
-    allocate(bp(nlayer+1))
-    allocate(presnivs(nlayer))
-    allocate(pseudoalt(nlayer))
-  
-    preff=preff_dyn
-    ap(:)=ap_dyn(:)
-    bp(:)=bp_dyn(:)
-    presnivs(:)=presnivs_dyn(:)
-    pseudoalt(:)=pseudoalt_dyn(:)
+!    allocate(ap(nlayer+1))
+!    allocate(bp(nlayer+1))
+!    allocate(presnivs(nlayer))
+!    allocate(pseudoalt(nlayer))
+!  
+!    preff=preff_dyn
+!    ap(:)=ap_dyn(:)
+!    bp(:)=bp_dyn(:)
+!    presnivs(:)=presnivs_dyn(:)
+!    pseudoalt(:)=pseudoalt_dyn(:)
 
   end subroutine initcomgeomphy_vert