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

Timestamp:

Apr 17, 2016, 10:23:21 PM (9 years ago)

Author:

emillour

Message:

Mars GCM:

• fix for 1D in writediagfi to enable writing at "ecritphy" rate.
• removed iniprint.h from phymars/dyn1d since it is in "misc"
• Some code cleanup in anticipation of future updates:
  • changed variable names in comgeomphy.F90: give them more explicit names: rlond => longitude , rlatd => latitude, airephy => cell_area, cuphy => dx , cvphy => dy
  • removed long(), lati() and area() from comgeomfi_h.F90, use longitude(), latitude() and cell_are() from comgeomphy.F90 instead

EM

File:

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

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

@@ -5 +5 @@
 
        ! These arrays are allocated in phys_state_var_init
-       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: long ! longitudes (rad)
-       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: lati ! latitudes (rad)
-       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: area ! mesh area (m2)
-       REAL,SAVE :: totarea
+!       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: long ! longitudes (rad)
+!       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: lati ! latitudes (rad)
+!       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: area ! mesh area (m2)
+!       REAL,SAVE :: totarea
        REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: sinlon 
        REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: coslon
@@ -21 +21 @@
          integer,intent(in) :: ngrid ! number of atmospheric columns
 
-         allocate(lati(ngrid))
-         allocate(long(ngrid))
-         allocate(area(ngrid))
+!        allocate(lati(ngrid))
+!         allocate(long(ngrid))
+!         allocate(area(ngrid))
          allocate(sinlat(ngrid))
          allocate(coslat(ngrid))
@@ -41 +41 @@
 
          ! 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)
+!         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))
-            coslat(ig)=cos(lati(ig))
-            sinlon(ig)=sin(long(ig))
-            coslon(ig)=cos(long(ig))
+            sinlat(ig)=sin(plat(ig))
+            coslat(ig)=cos(plat(ig))
+            sinlon(ig)=sin(plon(ig))
+            coslon(ig)=cos(plon(ig))
          ENDDO