Changeset 228

Timestamp:

Jun 20, 2001, 12:33:59 PM (23 years ago)

Author:

lmdzadmin

Message:

detail dans l'initialisation
LF

Location:

LMDZ.3.3/branches/rel-LF/libf/dyn3d

Files:

• gcm.F (modified) (1 diff)
• grid_noro.F (modified) (5 diffs)

LMDZ.3.3/branches/rel-LF/libf/dyn3d/gcm.F

@@ -213 +213 @@
 
 c     OPEN( 99,file ='run.def',status='old',form='formatted')
-      CALL defrun_new( 99, .TRUE. , clesphy0 )
+c      CALL defrun_new( 99, .TRUE. , clesphy0 )
+      CALL conf_gcm( 99, .TRUE. , clesphy0 )
 c     CLOSE(99)
 

LMDZ.3.3/branches/rel-LF/libf/dyn3d/grid_noro.F

@@ -52 +52 @@
       IMPLICIT REAL(X,Z) 
       
-          parameter(iusn=2160,jusn=1080,iext=216)
+          parameter(iusn=2160,jusn=1080,iext=216, epsfra = 1.e-5)
 #include "dimensions.h"
           REAL xusn(iusn+2*iext),yusn(jusn+2)   
@@ -78 +78 @@
       REAL zpic(imar+1,jmar),zval(imar+1,jmar)
 c$$$ PB     integer mask(imar+1,jmar)
-      real mask(imar+1,jmar)
+      real mask(imar+1,jmar), mask_tmp(imar+1,jmar)
       real num_tot(2200,1100),num_lan(2200,1100)
 c
@@ -300 +300 @@
        CALL MVA9(zxtzy,iim+1,jjm+1) 
 c$$$       CALL MVA9(zytzy,iim+1,jjm+1)
+C$$$   Masque prenant en compte maximum de terre
+       mask_tmp= 0.0
+       WHERE(mask .GE. epsfra) mask_tmp = 1.
 
        DO ii = 1, imar
@@ -314 +317 @@
            if(xq.le.xw) xq=xw
            if(abs(xm).le.xw) xm=xw*sign(1.,xm)
-c$$$c slope: 
+c slope: 
 c$$$           zsig(ii,jj)=sqrt(xq)*mask(ii,jj)
 c$$$c isotropy:
@@ -327 +330 @@
 C$$* PB modif pour maque de terre fractionnaire
 c slope: 
-           zsig(ii,jj)=sqrt(xq)
+           zsig(ii,jj)=sqrt(xq)*mask_tmp(ii,jj)
 c isotropy:
-           zgam(ii,jj)=xp/xq
+           zgam(ii,jj)=xp/xq*mask_tmp(ii,jj)
 c angle theta:
-           zthe(ii,jj)=57.29577951*atan2(xm,xl)/2.
-           zphi(ii,jj)=zmea(ii,jj)
-c$$$           zmea(ii,jj)=zmea(ii,jj)
-c$$$           zpic(ii,jj)=zpic(ii,jj)
-c$$$           zval(ii,jj)=zval(ii,jj)
-c$$$           zstd(ii,jj)=zstd(ii,jj)
+           zthe(ii,jj)=57.29577951*atan2(xm,xl)/2.*mask_tmp(ii,jj)
+           zphi(ii,jj)=zmea(ii,jj)*mask_tmp(ii,jj)
+           zmea(ii,jj)=zmea(ii,jj)*mask_tmp(ii,jj)
+           zpic(ii,jj)=zpic(ii,jj)*mask_tmp(ii,jj)
+           zval(ii,jj)=zval(ii,jj)*mask_tmp(ii,jj)
+           zstd(ii,jj)=zstd(ii,jj)*mask_tmp(ii,jj)
 c          print 101,ii,jj,
 c    *           zmea(ii,jj),zstd(ii,jj),zsig(ii,jj),zgam(ii,jj),