Changeset 1151

Timestamp:

Apr 28, 2009, 6:33:49 PM (15 years ago)

Author:

jghattas

Message:

• readaerosol : ENDIF mal place. Bug existant depuis la merge avec la branche LMDZ4_V3_patches. Le bug existe sur cette branche.

• etat0_netcdf : manque des variables dans call conf_phys.

Location:

LMDZ4/branches/LMDZ4-dev/libf

Files:

• dyn3d/etat0_netcdf.F (modified) (2 diffs)
• dyn3dpar/etat0_netcdf.F (modified) (2 diffs)
• phylmd/readaerosol.F90 (modified) (2 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/etat0_netcdf.F

@@ -126 +126 @@
       logical              :: ok_journe, ok_mensuel, ok_instan, ok_hf
       logical              :: ok_LES
-      LOGICAL              :: ok_ade, ok_aie, aerosol_couple
+      LOGICAL              :: ok_ade, ok_aie, aerosol_couple, new_aod
+      INTEGER              :: flag_aerosol
       REAL                 :: bl95_b0, bl95_b1
       real                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut
@@ -169 +170 @@
      &                 iflag_ratqs,ratqsbas,ratqshaut,                  &
      &                 ok_ade, ok_aie, aerosol_couple,                  &
+     &                 flag_aerosol, new_aod,                           &
      &                 bl95_b0, bl95_b1,                                &
      &                 iflag_thermals,nsplit_thermals,tau_thermals,     &

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/etat0_netcdf.F

@@ -127 +127 @@
       logical              :: ok_journe, ok_mensuel, ok_instan, ok_hf
       logical              :: ok_LES
-      LOGICAL              :: ok_ade, ok_aie, aerosol_couple
+      LOGICAL              :: ok_ade, ok_aie, aerosol_couple, new_aod
+      INTEGER              :: flag_aerosol
       REAL                 :: bl95_b0, bl95_b1
       real                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut
@@ -169 +170 @@
      &                 iflag_ratqs,ratqsbas,ratqshaut,                  &
      &                 ok_ade, ok_aie, aerosol_couple,                  &
+     &                 flag_aerosol, new_aod,                           &
      &                 bl95_b0, bl95_b1,                                &
      &                 iflag_thermals,nsplit_thermals,tau_thermals,     &

LMDZ4/branches/LMDZ4-dev/libf/phylmd/readaerosol.F90

@@ -143 +143 @@
                     WRITE(lunout,*) 'get_aero  iyr=', iyr,'   ',cyear
                     CALL get_aero_fromfile(cyear, var_1, name_aero(id_aero))
-                 ELSE
-                    ! Read in data:
+
+                 ELSE ! Read data from 2 decades
                     ! a) from actual 10-yr-period
                     IF (iyr.LT.1900) THEN
@@ -159 +159 @@
                     WRITE(cyear,'(I4)') iyr1
                     WRITE(lunout,*) 'get_aero  iyr=', iyr,'   ',cyear
-                    
                     CALL get_aero_fromfile(cyear, var_1, name_aero(id_aero))
                     
-                 ENDIF
-                 ! If to read two decades:
-                 IF (.NOT.lonlyone) THEN
-                    
-                    ! b) from the next following one
-                    WRITE(cyear,'(I4)') iyr2
-                    WRITE(lunout,*) 'get_aero  iyr=', iyr,'   ',cyear
-                    
-                    CALL get_aero_fromfile(cyear, var_2, name_aero(id_aero))
-                    
-                    ! Interpolate linarily to the actual year:
-                    DO it=1,12
-                       DO k=1,klev
-                          DO j=1,jjm
-                             DO i=1,iim
-                                var_1(i,j,k,it) = &
-                                     var_1(i,j,k,it) - FLOAT(iyr-iyr1)/FLOAT(iyr2-iyr1) * &
-                                     (var_1(i,j,k,it) - var_2(i,j,k,it))
+                    ! If to read two decades:
+                    IF (.NOT.lonlyone) THEN
+                       
+                       ! b) from the next following one
+                       WRITE(cyear,'(I4)') iyr2
+                       WRITE(lunout,*) 'get_aero  iyr=', iyr,'   ',cyear
+                       
+                       CALL get_aero_fromfile(cyear, var_2, name_aero(id_aero))
+                       
+                       ! Interpolate linarily to the actual year:
+                       DO it=1,12
+                          DO k=1,klev
+                             DO j=1,jjm
+                                DO i=1,iim
+                                   var_1(i,j,k,it) = &
+                                        var_1(i,j,k,it) - FLOAT(iyr-iyr1)/FLOAT(iyr2-iyr1) * &
+                                        (var_1(i,j,k,it) - var_2(i,j,k,it))
+                                ENDDO
                              ENDDO
                           ENDDO
                        ENDDO
-                    ENDDO
                     
-                 ENDIF     !lonlyone
+                    ENDIF ! lonlyone
+                 ENDIF ! iyr .LT. 1850        
               ENDIF ! aer_type