Changeset 778 for trunk/LMDZ.VENUS/libf

Timestamp:

Sep 12, 2012, 3:45:33 PM (12 years ago)

Author:

slebonnois

Message:

SL: bug correction for a file specific to Venus and Titan, + Venus gravity waves routine update (work still in progress)

Location:

trunk/LMDZ.VENUS/libf/phyvenus

Files:

• YOEGWD.h (modified) (1 diff)
• flott_gwd_ran.F (deleted)
• flott_gwd_ran.F90 (added)
• readstartphy.F (modified) (10 diffs)

trunk/LMDZ.VENUS/libf/phyvenus/YOEGWD.h

@@ -1 @@
-C     -----------------------------------------------------------------
-C*    *COMMON* *YOEGWD* - PARAMETERS FOR GRAVITY WAVE DRAG CALCULATIONS
-C     -----------------------------------------------------------------
-C
-      integer NKTOPG,NTOP
-      real GFRCRIT,GKWAKE,GRCRIT,GVCRIT,GKDRAG,GKLIFT
-      real GHMAX,GRAHILO,GSIGCR,GSSEC,GTSEC,GVSEC
-      COMMON/YOEGWD/ GFRCRIT,GKWAKE,GRCRIT,GVCRIT,GKDRAG,GKLIFT
-     *        ,GHMAX,GRAHILO,GSIGCR,NKTOPG,NTOP,GSSEC,GTSEC,GVSEC
+!     -----------------------------------------------------------------
+!*    *COMMON* *YOEGWD* - PARAMETERS FOR GRAVITY WAVE DRAG CALCULATIONS
+!     -----------------------------------------------------------------
+!
+      integer :: NKTOPG,NTOP
+      real    :: GFRCRIT,GKWAKE,GRCRIT,GVCRIT,GKDRAG,GKLIFT
+      real    :: GHMAX,GRAHILO,GSIGCR,GSSEC,GTSEC,GVSEC
+      COMMON/YOEGWD/ GFRCRIT,GKWAKE,GRCRIT,GVCRIT,GKDRAG,GKLIFT  &
+         ,GHMAX,GRAHILO,GSIGCR,NKTOPG,NTOP,GSSEC,GTSEC,GVSEC
 

trunk/LMDZ.VENUS/libf/phyvenus/readstartphy.F

@@ -20 +20 @@
 #include "temps.h"
 c======================================================================
+      integer ngridmx
+      parameter (ngridmx=(2+(jjm-1)*iim - 1/jjm))
+
       CHARACTER*(*) fichnom
-      REAL rlat(klon), rlon(klon)
-      REAL tsol(klon)
-      REAL tsoil(klon,nsoilmx)
-      REAL albe(klon)
+      REAL rlat(ngridmx), rlon(ngridmx)
+      REAL tsol(ngridmx)
+      REAL tsoil(ngridmx,nsoilmx)
+      REAL albe(ngridmx)
 cIM BEG alblw
-      REAL alblw(klon)
+      REAL alblw(ngridmx)
 cIM END alblw
-      REAL radsol(klon)
-      REAL sollw(klon)
-      real solsw(klon)
-      real fder(klon)
+      REAL radsol(ngridmx)
+      REAL sollw(ngridmx)
+      real solsw(ngridmx)
+      real fder(ngridmx)
       INTEGER length
       PARAMETER (length=100)
@@ -114 +117 @@
          PRINT*, 'phyetat0: Le champ <TS> est present'
 #ifdef NC_DOUBLE
-         ierr = NF_GET_VAR_DOUBLE(nid, nvarid, tsol(1))
-#else
-         ierr = NF_GET_VAR_REAL(nid, nvarid, tsol(1))
+         ierr = NF_GET_VAR_DOUBLE(nid, nvarid, tsol)
+#else
+         ierr = NF_GET_VAR_REAL(nid, nvarid, tsol)
 #endif
          IF (ierr.NE.NF_NOERR) THEN
@@ -124 +127 @@
          xmin = 1.0E+20
          xmax = -1.0E+20
-         DO i = 1, klon
+         DO i = 1, ngridmx
             xmin = MIN(tsol(i),xmin)
             xmax = MAX(tsol(i),xmax)
@@ -143 +146 @@
          PRINT*, "phyetat0: Le champ <Tsoil"//str2//"> est absent"
          PRINT*, "          Il prend donc la valeur de surface"
-         DO i=1, klon
+         DO i=1, ngridmx
              tsoil(i,isoil)=tsol(i)
          ENDDO
@@ -158 +161 @@
       ENDIF
       ENDDO
+
 c
 c Lecture de albedo au sol:
@@ -179 +183 @@
          xmin = 1.0E+20
          xmax = -1.0E+20
-         DO i = 1, klon
+         DO i = 1, ngridmx
             xmin = MIN(albe(i),xmin)
             xmax = MAX(albe(i),xmax)
@@ -207 +211 @@
       xmin = 1.0E+20
       xmax = -1.0E+20
-      DO i = 1, klon
+      DO i = 1, ngridmx
          xmin = MIN(solsw(i),xmin)
          xmax = MAX(solsw(i),xmax)
@@ -233 +237 @@
       xmin = 1.0E+20
       xmax = -1.0E+20
-      DO i = 1, klon
+      DO i = 1, ngridmx
          xmin = MIN(sollw(i),xmin)
          xmax = MAX(sollw(i),xmax)
@@ -260 +264 @@
       xmin = 1.0E+20
       xmax = -1.0E+20
-      DO i = 1, klon
+      DO i = 1, ngridmx
          xmin = MIN(fder(i),xmin)
          xmax = MAX(fder(i),xmax)
@@ -285 +289 @@
       xmin = 1.0E+20
       xmax = -1.0E+20
-      DO i = 1, klon
+      DO i = 1, ngridmx
          xmin = MIN(radsol(i),xmin)
          xmax = MAX(radsol(i),xmax)