Changeset 975 for trunk/LMDZ.VENUS/Tools

Timestamp:

May 29, 2013, 12:17:13 PM (12 years ago)

Author:

slebonnois

Message:

SL: small bug in the tool for stream function computation (Venus and Titan)

File:

• trunk/LMDZ.VENUS/Tools/psi.F90 (modified) (6 diffs)

trunk/LMDZ.VENUS/Tools/psi.F90

@@ -45 +45 @@
 real,dimension(:,:,:),allocatable :: ps ! surface pressure
 real,dimension(:,:,:,:),allocatable :: vitv ! meridional wind (in m/s)
+real,dimension(:,:,:,:),allocatable :: za   ! areoid levels (m)
 
 real,dimension(:,:,:,:),allocatable :: rayon ! distance to center (m)
@@ -166 +167 @@
 ! 2.1.4 Altitude above areoide
 !===============================================================================
-! Only needed if g(z) on Titan...
-
-!allocate(za(lonlength,latlength,altlength,timelength))
-
-!text="zareoid"
-!call get_var4d(infid,lonlength,latlength,altlength,timelength,text,za,ierr1,ierr2)
-!if (ierr1.ne.NF_NOERR) stop "Error: Failed to get za ID"
-!if (ierr2.ne.NF_NOERR) stop "Error: Failed reading zareoid"
+
+allocate(za(lonlength,latlength,altlength,timelength))
+
+text="zareoid"
+call get_var4d(infid,lonlength,latlength,altlength,timelength,text,za,ierr1,ierr2)
+if (ierr1.ne.NF_NOERR) stop "Error: Failed to get za ID"
+if (ierr2.ne.NF_NOERR) stop "Error: Failed reading zareoid"
 
 !===============================================================================
@@ -191 +191 @@
   do ilev=1,altlength
 ! Need to be consistent with GCM computations
-!    if (za(ilon,ilat,ilev,itim).ne.miss_val) then
+    if (za(ilon,ilat,ilev,itim).ne.miss_val) then
      rayon(ilon,ilat,ilev,itim) = a0
 !     rayon(ilon,ilat,ilev,itim) = za(ilon,ilat,ilev,itim) + a0
       grav(ilon,ilat,ilev,itim) = g0*a0*a0 &
                  /(rayon(ilon,ilat,ilev,itim)*rayon(ilon,ilat,ilev,itim))
-!    else
-!     rayon(ilon,ilat,ilev,itim) = miss_val
-!      grav(ilon,ilat,ilev,itim) = miss_val
-!    endif
+    else
+     rayon(ilon,ilat,ilev,itim) = miss_val
+      grav(ilon,ilat,ilev,itim) = miss_val
+    endif
   enddo
  enddo
@@ -220 +220 @@
  do ilev=1,altlength
   do ilon=1,lonlength
-    if (rayon(ilon,ilat,ilev,itim).ne.miss_val) then
+    if (dmass(ilon,ilat,ilev,itim).ne.miss_val) then
       vm(ilon,ilat,ilev,itim) = vitv(ilon,ilat,ilev,itim)  &
                               * dmass(ilon,ilat,ilev,itim) &
@@ -235 +235 @@
   psi(ilat,altlength,itim) = 0.
   do ilon=1,lonlength
-    if (rayon(ilon,ilat,altlength,itim).ne.miss_val) then
+    if (vm(ilon,ilat,altlength,itim).ne.miss_val) then
       psi(ilat,altlength,itim) = psi(ilat,altlength,itim) &
            + vm(ilon,ilat,altlength,itim)
@@ -243 +243 @@
   psi(ilat,ilev,itim) = psi(ilat,ilev+1,itim)
   do ilon=1,lonlength
-    if (rayon(ilon,ilat,ilev,itim).ne.miss_val) then
+    if (vm(ilon,ilat,ilev,itim).ne.miss_val) then
       psi(ilat,ilev,itim) = psi(ilat,ilev,itim) &
            + vm(ilon,ilat,ilev,itim)