Changeset 1233 for trunk/LMDZ.MARS/libf/phymars/comgeomfi_h.F90

Timestamp:

May 1, 2014, 12:06:13 AM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS. Filling geom arrays is now out of phys_var_state_init. Done through a merged function ini_fillgeom within the comgeomfi_h module. Cosmetic changes. New interface with the mesoscale model: lesser amount of dirty MESOSCALE includes.

File:

• trunk/LMDZ.MARS/libf/phymars/comgeomfi_h.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/comgeomfi_h.F90

@@ -24 +24 @@
          allocate(long(ngrid))
          allocate(area(ngrid))
-
-         end subroutine ini_comgeomfi_h
-
-         subroutine ini_sincosgeom(ngrid)
-
-         implicit none
-         integer,intent(in) :: ngrid ! number of atmospheric columns
-         integer :: ig
-
-         if (.not.allocated(lati)) then
-           PRINT*,"lati not allocated. did you run ini_comgeomfi_h?"
-           STOP
-         endif
-
          allocate(sinlat(ngrid))
          allocate(coslat(ngrid))
          allocate(sinlon(ngrid))
          allocate(coslon(ngrid))
+
+         end subroutine ini_comgeomfi_h
+
+         subroutine ini_fillgeom(ngrid,plat,plon,parea)
+
+         implicit none
+         INTEGER,INTENT(IN) :: ngrid ! number of atmospheric columns
+         REAL,INTENT(IN) :: plat(ngrid),plon(ngrid),parea(ngrid)
+         EXTERNAL SSUM
+         REAL SSUM
+         integer :: ig
+
+         ! fill "comgeomfi_h" data
+         call SCOPY(ngrid,plon,1,long,1)
+         call SCOPY(ngrid,plat,1,lati,1)
+         call SCOPY(ngrid,parea,1,area,1)
+         totarea=SSUM(ngrid,area,1)
          DO ig=1,ngrid
             sinlat(ig)=sin(lati(ig))
@@ -48 +51 @@
             coslon(ig)=cos(long(ig))
          ENDDO
-         end subroutine ini_sincosgeom
+
+         end subroutine ini_fillgeom
 
        end module comgeomfi_h