Changeset 66 for trunk/libf/phylmd/readaerosol_interp.F90

Timestamp:

Feb 16, 2011, 4:57:45 PM (14 years ago)

Author:

emillour

Message:

EM: Mise a niveau par rapport a la version terrestre (LMDZ5V2.0-dev, rev 1487)

• Mise a jour des scripts (terrestres) 'makegcm' et 'create_make_gcm'
• Ajout du script 'makelmdz' (version "amelioree", en Bash, de makegcm)
• Mise a jour des routines dans phylmd (sauf regr_lat_time_climoz_m.F)

• disvert (dans dyn3d et dyn3dpar): passage au Fortran 90
• parallel.F90 (dyn3dpar): correction bug
• etat0_netcdf.F90 (dyn3d et dyn3dpar) : mise a jour mineure
• ce0l.F90 (dyn3dpar) : correction bug
• abort_gcm.F (dyn3dpar) : correction bug
• ugeostr.F90 (dyn3d et dyn3dpar) : passage au Fortran 90
• fluxstokenc_p.F (dyn3dpar) : correction bug
• iniacademic.F90 (dyn3d et dyn3dpar) : passage au Fortran 90
• friction_p.F (dyn3dpar) : correction bug
• infotrac.F90 (dyn3d et dyn3dpar) : correction bug mineur sur lecture traceurs
• caladvtrac.F (dyn3d) : modifications cosmetiques

File:

• trunk/libf/phylmd/readaerosol_interp.F90 (modified) (3 diffs)

trunk/libf/phylmd/readaerosol_interp.F90

@@ -92 +92 @@
   LOGICAL,SAVE       :: debug=.FALSE.! Debugging in this subroutine
 !$OMP THREADPRIVATE(vert_interp, debug)
+  CHARACTER(len=8)      :: type
+  CHARACTER(len=8)      :: filename
 
 
@@ -173 +175 @@
      ! Reading values corresponding to the closest year taking into count the choice of aer_type. 
      ! For aer_type=scenario interpolation between 2 data sets is done in readaerosol.
-     CALL readaerosol(name_aero(id_aero), aer_type, iyr, klev_src, pt_ap, pt_b, pt_tmp, &
+     ! If aer_type=mix1 or mix2, the run type and file name depends on the aerosol.
+     IF (aer_type=='preind' .OR. aer_type=='actuel' .OR. aer_type=='annuel' .OR. aer_type=='scenario') THEN
+        ! Standard case
+        filename='aerosols'
+        type=aer_type
+     ELSE IF (aer_type == 'mix1') THEN
+        ! Special case using a mix of decenal sulfate file and annual aerosols(all aerosols except sulfate)
+        IF (name_aero(id_aero) == 'SO4') THEN
+           filename='so4.run '
+           type='scenario'
+        ELSE
+           filename='aerosols'
+           type='annuel'
+        END IF
+     ELSE  IF (aer_type == 'mix2') THEN
+        ! Special case using a mix of decenal sulfate file and natrual aerosols
+        IF (name_aero(id_aero) == 'SO4') THEN
+           filename='so4.run '
+           type='scenario'
+        ELSE
+           filename='aerosols'
+           type='preind'
+        END IF
+     ELSE
+        CALL abort_gcm('readaerosol_interp', 'this aer_type not supported',1)
+     END IF
+
+     CALL readaerosol(name_aero(id_aero), type, filename, iyr, klev_src, pt_ap, pt_b, pt_tmp, &
           psurf_year(:,:,id_aero), load_year(:,:,id_aero))
      IF (.NOT. ALLOCATED(var_year)) THEN
@@ -182 +211 @@
 
      ! Reading values corresponding to the preindustrial concentrations.
-     CALL readaerosol(name_aero(id_aero), 'preind', iyr, pi_klev_src, pt_ap, pt_b, pt_tmp, &
+     type='preind'
+     CALL readaerosol(name_aero(id_aero), type, filename, iyr, pi_klev_src, pt_ap, pt_b, pt_tmp, &
           pi_psurf_year(:,:,id_aero), pi_load_year(:,:,id_aero))