Changeset 1321 for LMDZ4/trunk

Timestamp:

Mar 9, 2010, 3:42:32 PM (15 years ago)

Author:

Laurent Fairhead

Message:

The ability to read annual aerosol forcing files that had disappeared in
recent versions of the code is put back in

---

On ré-intégre la possibilité de lire des fichiers de forçage aérosols de
type annuel

File:

• LMDZ4/trunk/libf/phylmd/readaerosol.F90 (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/readaerosol.F90

@@ -66 +66 @@
      cyear='.nat'
      ! get_aero_fromfile returns pt_out allocated and initialized with data for 12 month 
+     ! pt_out has dimensions (klon, klev_src, 12)
+     CALL get_aero_fromfile(name_aero, cyear, klev_src, pt_ap, pt_b, p0, pt_out, psurf, load)
+     
+  ELSE IF (type == 'annuel') THEN
+! Read and return data from scenario annual files
+!****************************************************************************************     
+     WRITE(cyear,'(I4)') iyr_in
+     WRITE(lunout,*) 'get_aero 3 iyr_in=', iyr_in,'   ',cyear
+     ! get_aero_fromfile returns pt_out allocated and initialized with data for nbr_tsteps month 
      ! pt_out has dimensions (klon, klev_src, 12)
      CALL get_aero_fromfile(name_aero, cyear, klev_src, pt_ap, pt_b, p0, pt_out, psurf, load)
@@ -431 +440 @@
 
        IF ((pt_b(1) < pt_b(klev_src)) .OR. .NOT. new_file) THEN
-          WRITE(lunout,*) 'Vertical axis in file ',TRIM(fname), ' needs to be inverted'
-          WRITE(lunout,*) 'before pt_ap = ', pt_ap
-          WRITE(lunout,*) 'before pt_b = ', pt_b
+!          WRITE(lunout,*) 'Vertical axis in file ',TRIM(fname), ' needs to be inverted'
+!          WRITE(lunout,*) 'before pt_ap = ', pt_ap
+!          WRITE(lunout,*) 'before pt_b = ', pt_b
           
           ! Inverse vertical levels for varyear