Changeset 4216 for dynamico_lmdz/simple_physics/phyparam/param/comgeomfi.F90

Timestamp:

Jan 7, 2020, 6:27:58 PM (5 years ago)

Author:

dubos

Message:

simple_physics : reworked comgeomfi

File:

• dynamico_lmdz/simple_physics/phyparam/param/comgeomfi.F90 (modified) (1 diff)

dynamico_lmdz/simple_physics/phyparam/param/comgeomfi.F90

@@ -3 +3 @@
   SAVE
 
-  REAL, allocatable :: long(:), lati(:), area(:), &
-       sinlon(:), coslon(:), sinlat(:), coslat(:)
-  REAL :: totarea
-  INTEGER :: ngridmax,nlayermx,nsoilmx
-!$OMP THREADPRIVATE(long,lati,area,sinlon,coslon,sinlat,coslat,totarea)
+  REAL, ALLOCATABLE :: long(:), lati(:), sinlon(:), coslon(:), sinlat(:), coslat(:)
+  INTEGER :: ngridmax, nlayermx, nsoilmx
+!$OMP THREADPRIVATE(long,lati,sinlon,coslon,sinlat,coslat,totarea)
 !$OMP THREADPRIVATE(ngridmax,nlayermx,nsoilmx)
 
 CONTAINS
     
-  SUBROUTINE InitComgeomfi
-    USE mod_phys_lmdz_para
-    USE dimphy, ONLY : klon,klev
-    USE geometry_mod, ONLY : latitude_deg,longitude_deg
-    
-    print*,'Dans initcomgeomfi '
-    ngridmax=klon_omp
+  SUBROUTINE init_comgeomfi(klon, klev, longitude, latitude)
+    INTEGER, INTENT(IN) :: klon, klev
+    REAL, INTENT(IN) :: longitude(klon), latitude(klon) ! in radians
+    ngridmax=klon
     nlayermx=klev
     nsoilmx=10
-    print*,'ngridmax,nlayermx',ngridmax,nlayermx
- 
-    allocate(long(klon_omp))
-    allocate(lati(klon_omp))
-    long=longitude_deg
-    lati=latitude_deg
-    allocate(area(klon_omp))
-    allocate(sinlon(klon_omp))
-    allocate(coslon(klon_omp))
-    allocate(sinlat(klon_omp))
-    allocate(coslat(klon_omp))
-
-  END SUBROUTINE InitComgeomfi
+    allocate(long(klon))
+    allocate(lati(klon))
+    allocate(sinlon(klon))
+    allocate(coslon(klon))
+    allocate(sinlat(klon))
+    allocate(coslat(klon))
+    long(:) = longitude(:)
+    lati(:) = latitude(:)
+    sinlat(:)=sin(lati(:))
+    coslat(:)=cos(lati(:))
+    sinlon(:)=sin(long(:))
+    coslon(:)=cos(long(:))
+  END SUBROUTINE init_comgeomfi
   
 END MODULE comgeomfi