Changeset 1146 for LMDZ4/trunk/libf/phylmd/readsulfate.F

Timestamp:

Apr 9, 2009, 12:11:35 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Réintegration dans le tronc des modifications issues de la branche LMDZ-dev
comprises entre la révision 1074 et 1145
Validation: une simulation de 1 jour en séquentiel sur PC donne les mêmes
résultats entre la trunk et la dev
LF

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/readsulfate.F (modified) (4 diffs)

LMDZ4/trunk/libf/phylmd/readsulfate.F

@@ -36 +36 @@
 #include "chem.h"      
 #include "dimensions.h"      
-cym#include "dimphy.h"      
 #include "temps.h"      
+#include "clesphys.h"
+#include "iniprint.h"
 c 
 c Input:
@@ -84 +85 @@
 
       if (is_mpi_root) then
+
+        IF (aer_type /= 'actuel  ' .AND. aer_type /= 'preind  ' .AND.   &
+     &      aer_type /= 'scenario') THEN
+          WRITE(lunout,*)' *** Warning ***'
+          WRITE(lunout,*)'Option aer_type pour les aerosols = ',        &
+     &        aer_type
+          WRITE(lunout,*)'Cas non prevu, force a preind'
+          aer_type = 'preind  '
+        ENDIF
             
       iday = INT(r_day) 
@@ -118 +128 @@
 
 
-      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)
+
+      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
+           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
-
-      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)
+        ! 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
+          ENDIF
+          WRITE(cyear,'(I4)') iyr1
+        ENDIF
+        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)
+
  
       ! 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 !lonlyone    
+      ENDIF !aer_type
       
       ! Transform the horizontal 2D-field into the physics-field
@@ -537 +557 @@
 
       SUBROUTINE getso4fromfile (cyr, so4)
-      use dimphy
+      USE dimphy
 #include "netcdf.inc"
 #include "dimensions.h"      
-cccc#include "dimphy.h"
       CHARACTER*15 fname
       CHARACTER*4 cyr