Changeset 640

Timestamp:

May 19, 2005, 10:27:15 AM (20 years ago)

Author:

Laurent Fairhead

Message:

Synchro avec la version modifiée de LMDZ.3.3. Routine a ré-écrire
LF

File:

• LMDZ4/trunk/libf/phylmd/readsulfate.F (modified) (6 diffs)

LMDZ4/trunk/libf/phylmd/readsulfate.F

@@ -51 +51 @@
 c ----------------      
       INTEGER i, ig, k, it
-      INTEGER j, iday, ny, iyr
+      INTEGER j, iday, ny, iyr, iyr1, iyr2
       parameter (ny=jjm+1)
       
       INTEGER ismaller
-      INTEGER idec1, idec2 ! The two decadal data read ini
+CJLD      INTEGER idec1, idec2 ! The two decadal data read ini
       CHARACTER*4 cyear
       
@@ -103 +103 @@
       ENDDO
 
-      ! Read in data:
+
+      IF (iyr .lt. 1850) THEN
+         cyear='.nat'
+         WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
+         CALL getso4fromfile(cyear, so4_1)
+      ELSE IF (iyr .ge. 2100) THEN
+         cyear='2100'
+         WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
+         CALL getso4fromfile(cyear, so4_1)
+      ELSE
+
+        ! Read in data:
       ! a) from actual 10-yr-period
 
-      idec1 = (iyr-1900)/10
-      IF (idec1.LT.10) THEN
-         cyear='19'//char(idec1+48)//'0'
-      ELSE         
-         cyear='20'//char(idec1-10+48)//'0'
+      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
+      WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
       CALL getso4fromfile(cyear, so4_1)
 
@@ -117 +134 @@
       ! If to read two decades:
       IF (.NOT.lonlyone) THEN
-      idec2=idec1+1
          
       ! b) from the next following one
-      IF (idec2.LT.10) THEN
-         cyear='19'//char(idec2+48)//'0'
-      ELSE
-         cyear='20'//char(idec2-10+48)//'0'
+      WRITE(cyear,'(I4)') iyr2
+      WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
+      CALL getso4fromfile(cyear, so4_2)
+
       ENDIF
-      CALL getso4fromfile(cyear, so4_2)
-         
+ 
       ! Interpolate linarily to the actual year:
       DO it=1,12
@@ -133 +148 @@
                DO i=1,iim
                   so4_1(i,j,k,it)=so4_1(i,j,k,it)
-     .                 - FLOAT(iyr-1900-10*idec1)/10.
+     .                 - FLOAT(iyr-iyr1)/FLOAT(iyr2-iyr1)
      .                 * (so4_1(i,j,k,it) - so4_2(i,j,k,it))
                ENDDO
@@ -226 +241 @@
 
       
-      ! The sulfate concentration [molec cm-3] is read in. 
-      ! Convert it into mass [ug SO4/m3]
-      ! masse_so4 in [g/mol], n_avogadro in [molec/mol]
+CJLD      ! The sulfate concentration [molec cm-3] is read in. 
+CJLD      ! Convert it into mass [ug SO4/m3]
+CJLD      ! masse_so4 in [g/mol], n_avogadro in [molec/mol]
+      ! The sulfate mass [ug SO4/m3] is read in. 
       DO k=1,klev
          DO i=1,klon
-            sulfate(i,k) = sulfate(i,k)*masse_so4
-     .           /n_avogadro*1.e+12
+CJLD            sulfate(i,k) = sulfate(i,k)*masse_so4
+CJLD     .           /n_avogadro*1.e+12
             so4_out(i,k) = sulfate(i,k)
             IF (so4_out(i,k).LT.0) 
@@ -443 +459 @@
 
       
-      ! The sulfate concentration [molec cm-3] is read in. 
-      ! Convert it into mass [ug SO4/m3]
-      ! masse_so4 in [g/mol], n_avogadro in [molec/mol]
+CJLD      ! The sulfate concentration [molec cm-3] is read in. 
+CJLD      ! Convert it into mass [ug SO4/m3]
+CJLD      ! masse_so4 in [g/mol], n_avogadro in [molec/mol]
       DO k=1,klev
          DO i=1,klon
-            pi_sulfate(i,k) = pi_sulfate(i,k)*masse_so4
-     .           /n_avogadro*1.e+12
+CJLD            pi_sulfate(i,k) = pi_sulfate(i,k)*masse_so4
+CJLD     .           /n_avogadro*1.e+12
             pi_so4_out(i,k) = pi_sulfate(i,k)
          ENDDO