Changeset 738 for LMDZ4/branches

Timestamp:

Nov 28, 2006, 3:40:13 PM (18 years ago)

Author:

lmdzadmin

Message:

Correction bug: le seed pour le simulateur ISCCP doit etre aleatoire.
FC/IM

Location:

LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd

Files:

• calcul_simulISCCP.h (modified) (1 diff)
• physiq.F (modified) (1 diff)

LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/calcul_simulISCCP.h

@@ -97 +97 @@
       ENDIF !debut
 c
-cIM: initialisation de seed
+cIM: initialisation de seed 
+c       DO i=1, klon
+c         seed(i)=i+100
+c       ENDDO
+c
         DO i=1, klon
-          seed(i)=i+100
+c
+         aa=ABS(paprs(i,2)-NINT(paprs(i,2)))
+         seed_re(i)=1000.*aa+1.
+         seed(i)=NINT(seed_re(i))
+c
+         IF(seed(i).LT.50) THEN
+c          print*,'seed<50 avant i seed itap paprs',i,
+c    .     seed(i),itap,paprs(i,2)
+           seed(i)=50+seed(i)+i+itap
+           seed_old(i)=seed(i)
+c
+           IF(itap.GT.1) then
+            IF(seed(i).EQ.seed_old(i)) THEN
+             seed(i)=seed(i)+10
+             seed_old(i)=seed(i)
+            ENDIF   
+           ENDIF
+c
+c          print*,'seed<50 apres i seed itap paprs',i,
+c    .     seed(i),itap,paprs(i,2)
+c
+          ELSE IF(seed(i).EQ.0) THEN
+           print*,'seed=0 i paprs aa seed_re',
+     .     i,paprs(i,2),aa,seed_re(i)
+           STOP    
+          ELSE IF(seed(i).LT.0) THEN
+           print*,'seed < 0, i seed itap paprs',i,
+     .     seed(i),itap,paprs(i,2)
+           STOP    
+          ENDIF
+c
         ENDDO
 c     

LMDZ4/branches/LMDZ4_V2_patch/libf/phylmd/physiq.F

@@ -381 +381 @@
       REAL nbsunlit(nregISCtot,klon)  !nbsunlit : moyenne de sunlit
       INTEGER ncol, seed(klon)
+cIM ajout seed_re (REAL)et seed_old (integer)
+      REAL seed_re(klon), aa
+      INTEGER seed_old(klon)
+      SAVE seed_old
+
 
 c ncol = nb. de sous-colonnes pour chaque maille du GCM