Changeset 1356 for trunk/LMDZ.VENUS/Tools

Timestamp:

Oct 8, 2014, 9:26:28 AM (10 years ago)

Author:

slebonnois

Message:

SL: update to newstart/start2archive tools in Venus+Titan / additional diagnostics in radiative fluxes for Titan

Location:

trunk/LMDZ.VENUS/Tools

Files:

• angmom.F90 (modified) (3 diffs)
• compile_pgf (modified) (1 diff)

trunk/LMDZ.VENUS/Tools/angmom.F90

@@ -242 +242 @@
 call get_var3d(infid,lonlength,latlength,timelength,text,ps,ierr1,ierr2)
 if (ierr1.ne.NF_NOERR) then
-  write(*,*) "  looking for psol instead... "
-  text="psol"
+  write(*,*) "  looking for ps instead... "
+  text="ps"
   call get_var3d(infid,lonlength,latlength,timelength,text,ps,ierr1,ierr2)
-  if (ierr1.ne.NF_NOERR) stop "Error: Failed to get psol ID"
+  if (ierr1.ne.NF_NOERR) then
+    write(*,*) "  looking for psol instead... "
+    text="psol"
+    call get_var3d(infid,lonlength,latlength,timelength,text,ps,ierr1,ierr2)
+    if (ierr1.ne.NF_NOERR) stop "Error: Failed to get psol ID"
+  endif
 endif
 if (ierr2.ne.NF_NOERR) stop "Error: Failed reading surface pressure"
@@ -467 +472 @@
   do ilev=1,altlength
 ! Need to be consistent with GCM computations
-!    if (za(ilon,ilat,ilev,itim).ne.miss_val) then
+    if (vitu(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
@@ -526 +531 @@
  do ilat=1,latlength
   do ilev=1,altlength
+    if (rayon(ilon,ilat,ilev,itim).ne.miss_val) then
       oaam(itim) = oaam(itim) &
        + osam(ilon,ilat,ilev,itim)/ hadday * dmass(ilon,ilat,ilev,itim)
       raam(itim) = raam(itim) &
        + rsam(ilon,ilat,ilev,itim)/ hadday * dmass(ilon,ilat,ilev,itim)
+    endif
   enddo
  enddo

trunk/LMDZ.VENUS/Tools/compile_pgf

@@ -1 +1 @@
 # path for netcdf should be adapted to your configuration !
 
-\rm planet.h
-ln -s $2.h planet.h
+#\rm planet.h
+#ln -s $2.h planet.h
  pgf95 -Bstatic cpdet.F90 moyzon.F moyzon2.F moytim.F dx_dp.F epflux.F90 \
     io.F90 dmass.F90 reverse.F90 $1.F90 \