Changeset 859 for LMDZ4/branches/LMDZ4_V3_patches/libf

Timestamp:

Nov 5, 2007, 12:24:58 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Pb de lecture de la variable AC
LF

File:

• LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/readsulfate.F (modified) (2 diffs)

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/readsulfate.F

@@ -132 +132 @@
       IF (aer_type == 'actuel  ') then
         cyear='1980'
+        CALL getso4fromfile(cyear, so4_1)
       ELSE IF (aer_type == 'preind  ') THEN
         cyear='.nat'
+        CALL getso4fromfile(cyear, so4_1)
       ELSE
         IF (iyr .lt. 1850) THEN
@@ -148 +150 @@
         ! a) from actual 10-yr-period
 
-        IF (iyr.LT.1900) THEN
-           iyr1 = 1850
-           iyr2 = 1900
-        ELSE IF (iyr.ge.1900.and.iyr.lt.1920) THEN
-           iyr1 = 1900
-           iyr2 = 1920
-        ELSE 
-           iyr1 = INT(iyr/10)*10
-           iyr2 = INT(1+iyr/10)*10
+          IF (iyr.LT.1900) THEN
+             iyr1 = 1850
+             iyr2 = 1900
+          ELSE IF (iyr.ge.1900.and.iyr.lt.1920) THEN
+             iyr1 = 1900
+             iyr2 = 1920
+          ELSE 
+             iyr1 = INT(iyr/10)*10
+             iyr2 = INT(1+iyr/10)*10
+          ENDIF
+          WRITE(cyear,'(I4)') iyr1
         ENDIF
-        WRITE(cyear,'(I4)') iyr1
-      ENDIF
-      WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
-      CALL getso4fromfile(cyear, so4_1)
+        WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
+        CALL getso4fromfile(cyear, so4_1)
 
       
       ! If to read two decades:
-      IF (.NOT.lonlyone) THEN
+        IF (.NOT.lonlyone) THEN
          
       ! b) from the next following one
-      WRITE(cyear,'(I4)') iyr2
-      WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
-      CALL getso4fromfile(cyear, so4_2)
-
-      ENDIF
+          WRITE(cyear,'(I4)') iyr2
+          WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
+          CALL getso4fromfile(cyear, so4_2)
+
+        ENDIF !lonlyone
  
       ! Interpolate linarily to the actual year:
-      DO it=1,12
-         DO k=1,klev
-            DO j=1,jjm
-               DO i=1,iim
-                  so4_1(i,j,k,it)=so4_1(i,j,k,it)
+        DO it=1,12
+           DO k=1,klev
+              DO j=1,jjm
+                 DO i=1,iim
+                    so4_1(i,j,k,it)=so4_1(i,j,k,it)
      .                 - FLOAT(iyr-iyr1)/FLOAT(iyr2-iyr1)
      .                 * (so4_1(i,j,k,it) - so4_2(i,j,k,it))
-               ENDDO
-            ENDDO
-         ENDDO
-      ENDDO                           
-      
-      ENDIF !lonlyone
+                 ENDDO
+              ENDDO
+           ENDDO
+        ENDDO                           
+      
+      ENDIF !aer_type
       
       ! Transform the horizontal 2D-field into the physics-field