Changeset 1048 for trunk/LMDZ.VENUS/libf/phyvenus

Timestamp:

Sep 23, 2013, 7:02:50 PM (11 years ago)

Author:

slebonnois

Message:

SL: update pour divers details titan + quelques modifs arch et makelmdz

File:

• trunk/LMDZ.VENUS/libf/phyvenus/grid_noro.F (modified) (6 diffs)

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

@@ -52 +52 @@
 C=======================================================================
 
-      IMPLICIT INTEGER (I,J)
-      IMPLICIT REAL(X,Z) 
+      IMPLICIT none 
       
 #include "dimensions.h"
+#include "YOMCST.h"
 
       INTEGER imdep, jmdep
@@ -63 +63 @@
       INTEGER imar, jmar
 c parametres lies au fichier d entree... A documenter...
-      parameter(iext=216, epsfra = 1.e-5)
+      integer iext
+      parameter(iext=216)
       REAL xusn(imdep+2*iext),yusn(jmdep+2)
       REAL zusn(imdep+2*iext,jmdep+2)
   
+c local var
+      real zdeltax,zdeltay,zlenx,zleny,xincr
+      real zbordnor,zbordsud,zbordest,zbordoue,weighx,weighy
+      real zllmmea,zllmstd,zllmsig,zllmgam,zllmpic,zllmval,zllmthe
+      real zminthe,xk,xl,xm,xp,xq,xw
+      real zmeanor,zmeasud,zstdnor,zstdsud,zsignor,zsigsud
+      real zweinor,zweisud,zpicnor,zpicsud,zvalnor,zvalsud
+      integer i,j,ii,jj
+
 C INTERMEDIATE FIELDS  (CORRELATIONS OF OROGRAPHY GRADIENT)
 
@@ -87 +97 @@
 c
       print *,' parametres de l orographie a l echelle sous maille' 
-      xpi=acos(-1.)
-      rad    = 6 371 229.
-      zdeltay=2.*xpi/REAL(jmdep)*rad
+
+      zdeltay=2.*RPI/REAL(jmdep)*RA
 c
 c  quelques tests de dimensions:
@@ -123 +132 @@
       DO i=1,iext
         zusn(i,j+1)=zdata(imdep-iext+i,j)
-        xusn(i)=xdata(imdep-iext+i)-2.*xpi
+        xusn(i)=xdata(imdep-iext+i)-2.*RPI
         zusn(imdep+iext+i,j+1)=zdata(i,j)
-        xusn(imdep+iext+i)=xdata(i)+2.*xpi
+        xusn(imdep+iext+i)=xdata(i)+2.*RPI
       ENDDO
       ENDDO
@@ -197 +206 @@
 c  SUMMATION OVER GRIDPOINT AREA
 c 
-      zleny=xpi/REAL(jmdep)*rad
-      xincr=xpi/2./REAL(jmdep)
+      zleny=RPI/REAL(jmdep)*RA
+      xincr=RPI/2./REAL(jmdep)
        DO ii = 1, imar+1
        DO jj = 1, jmar
@@ -208 +217 @@
             zlenx=zleny*cos(yusn(j))
             zdeltax=zdeltay*cos(yusn(j))
-            zbordnor=(c(jj)-yusn(j)+xincr)*rad
-            zbordsud=(yusn(j)-d(jj)+xincr)*rad
+            zbordnor=(c(jj)-yusn(j)+xincr)*RA
+            zbordsud=(yusn(j)-d(jj)+xincr)*RA
             weighy=AMAX1(0.,
      *             amin1(zbordnor,zbordsud,zleny))
          IF(weighy.ne.0)THEN
          DO i = 2, imdep+2*iext-1
-            zbordest=(xusn(i)-a(ii)+xincr)*rad*cos(yusn(j))
-            zbordoue=(b(ii)+xincr-xusn(i))*rad*cos(yusn(j))
+            zbordest=(xusn(i)-a(ii)+xincr)*RA*cos(yusn(j))
+            zbordoue=(b(ii)+xincr-xusn(i))*RA*cos(yusn(j))
             weighx=AMAX1(0.,
      *             amin1(zbordest,zbordoue,zlenx))