Changeset 4216 for dynamico_lmdz/simple_physics

Timestamp:

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

Author:

dubos

Message:

simple_physics : reworked comgeomfi

Location:

dynamico_lmdz/simple_physics/phyparam/param

Files:

• comgeomfi.F90 (modified) (1 diff)
• iniphyparam.F (modified) (4 diffs)

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

dynamico_lmdz/simple_physics/phyparam/param/iniphyparam.F

@@ -62 +62 @@
  
       REAL ptimestep
-      INTEGER ig,ierr,offset
  
       EXTERNAL inifrict
  
       print*,'INIPHYPARAM'
-      CALL InitComgeomfi
+
+      CALL init_comgeomfi(klon_omp, klev, longitude, latitude)
 
       IF (klon.NE.klon_omp) THEN
          PRINT*,'STOP in iniphyparam'
-         PRINT*,'Probleme de dimenesions :'
+         PRINT*,'Probleme de dimensions :'
          PRINT*,'klon     = ',klon
          PRINT*,'klon_omp   = ',klon_omp
@@ -79 +79 @@
       IF (nlayer.NE.nlayermx) THEN
          PRINT*,'STOP in iniphyparam'
-         PRINT*,'Probleme de dimenesions :'
+         PRINT*,'Probleme de dimensions :'
          PRINT*,'nlayer     = ',nlayer
          PRINT*,'nlayermx   = ',nlayermx
@@ -87 +87 @@
       IF (ngrid.NE.klon_glo) THEN
          PRINT*,'STOP in iniphyparam'
-         PRINT*,'Probleme de dimenesions :'
+         PRINT*,'Probleme de dimensions :'
          PRINT*,'ngrid     = ',ngrid
          PRINT*,'ngridmax   = ',klon_glo
-!        STOP
+        STOP
       ENDIF
 
@@ -180 +180 @@
 c-----------------------------------------------------------------------
 
-      offset=klon_mpi_begin-1
-
       print*,'latitude0  ohe',latitude(1:3),latitude(klon_omp)
-!      long(1:klon_omp)=plon(offset+klon_omp_begin:offset+klon_omp_end)
-!      lati(1:klon_omp)=plat(offset+klon_omp_begin:offset+klon_omp_end)
-!      area(1:klon_omp)=parea(offset+klon_omp_begin:offset+klon_omp_end)
-      long(1:klon_omp)=longitude(1:klon_omp)
-      lati(1:klon_omp)=latitude(1:klon_omp)
-      area(1:klon_omp)=cell_area(1:klon_omp)
-      totarea=sum(cell_area,ngrid)
       print*,'OK17 AAA'
-
-      sinlat(:)=sin(lati(:))
-      coslat(:)=cos(lati(:))
-      sinlon(:)=sin(long(:))
-      coslon(:)=cos(long(:))
 
       prad=planet_rad