Changeset 1406 for LMDZ4/trunk


Ignore:
Timestamp:
Jul 5, 2010, 11:32:26 AM (14 years ago)
Author:
Laurent Fairhead
Message:

Modifications to the etat0_netcdf routines from r1370 and r1379 were not
taken into account by the recent merge between the trunk and the dev branch


Des modification aux routines etat0_netcdf venant des révisions r1370 et r1379
n'ont pas été prises en compte par la dernière fusion entre le tronc et la
branche de développement

LG

Location:
LMDZ4/trunk/libf
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ4/trunk/libf/dyn3d/etat0_netcdf.F90

    r1403 r1406  
    2323  USE regr_lat_time_climoz_m, ONLY: regr_lat_time_climoz
    2424  USE conf_phys_m,            ONLY: conf_phys
     25! For parameterization of ozone chemistry:
     26  use regr_lat_time_coefoz_m, only: regr_lat_time_coefoz
     27  use press_coefoz_m, only: press_coefoz
     28  use regr_pr_o3_m, only: regr_pr_o3
    2529  USE netcdf, ONLY : NF90_OPEN, NF90_NOWRITE, NF90_CLOSE, NF90_NOERR
    2630#endif
     
    102106  INTEGER :: iflag_thermals_ed, iflag_thermals_optflux
    103107  REAL    :: tau_thermals, solarlong0,  seuil_inversion
    104   INTEGER :: read_climoz ! read ozone climatology
    105   REAL    :: alp_offset
     108  INTEGER :: read_climoz ! read ozone climatology
    106109!  Allowed values are 0, 1 and 2
    107110!     0: do not read an ozone climatology
     
    110113!     climatology and the daylight climatology
    111114!-------------------------------------------------------------------------------
     115  REAL    :: alp_offset
     116  logical found
     117
    112118!--- Constants
    113119  pi     = 4. * ATAN(1.)
     
    285291  q3d(:,:,:,:) = 0.0 ; q3d(:,:,:,1) = qd(:,:,:)
    286292
     293!     Parameterization of ozone chemistry:
     294!     Look for ozone tracer:
     295      i = 1
     296      DO
     297         found = tname(i)=="O3" .OR. tname(i)=="o3"
     298         if (found .or. i == nqtot) exit
     299         i = i + 1
     300      end do
     301      if (found) then
     302         call regr_lat_time_coefoz
     303         call press_coefoz
     304         call regr_pr_o3(p3d, q3d(:, :, :, i))
     305!     Convert from mole fraction to mass fraction:
     306         q3d(:, :, :, i) = q3d(:, :, :, i)  * 48. / 29.
     307      end if
     308
    287309!--- OZONE CLIMATOLOGY
    288310  IF(read_climoz>=1) CALL regr_lat_time_climoz(read_climoz)
     
    483505  wake_cstar(:) = 0.
    484506  wake_fip(:) = 0.
     507  wake_pe = 0.
     508  fm_therm = 0.
     509  entr_therm = 0.
     510  detr_therm = 0.
     511
    485512  CALL fonte_neige_init(run_off_lic_0)
    486513  CALL pbl_surface_init( qsol, fder, snsrf, qsolsrf, evap, frugs, agesno, tsoil )
  • LMDZ4/trunk/libf/dyn3dpar/etat0_netcdf.F90

    r1403 r1406  
    2222  USE regr_lat_time_climoz_m, ONLY: regr_lat_time_climoz
    2323  USE conf_phys_m,            ONLY: conf_phys
     24! For parameterization of ozone chemistry:
     25  use regr_lat_time_coefoz_m, only: regr_lat_time_coefoz
     26  use press_coefoz_m, only: press_coefoz
     27  use regr_pr_o3_m, only: regr_pr_o3
    2428  USE netcdf, ONLY : NF90_OPEN, NF90_NOWRITE, NF90_CLOSE, NF90_NOERR
    2529#endif
     
    103107  REAL    :: tau_thermals, solarlong0,  seuil_inversion
    104108  INTEGER :: read_climoz ! read ozone climatology
    105   REAL    :: alp_offset
    106109!  Allowed values are 0, 1 and 2
    107110!     0: do not read an ozone climatology
     
    110113!     climatology and the daylight climatology
    111114!-------------------------------------------------------------------------------
     115  REAL    :: alp_offset
     116  LOGICAL found
     117
    112118!--- Constants
    113119  pi     = 4. * ATAN(1.)
     
    285291  q3d(:,:,:,:) = 0.0 ; q3d(:,:,:,1) = qd(:,:,:)
    286292
     293! Parameterization of ozone chemistry:
     294! Look for ozone tracer:
     295  i = 1
     296  DO
     297    found = tname(i)=="O3" .OR. tname(i)=="o3"
     298    if (found .or. i == nqtot) exit
     299    i = i + 1
     300  end do
     301  if (found) then
     302    call regr_lat_time_coefoz
     303    call press_coefoz
     304    call regr_pr_o3(p3d, q3d(:, :, :, i))
     305!   Convert from mole fraction to mass fraction:
     306    q3d(:, :, :, i) = q3d(:, :, :, i)  * 48. / 29.
     307  end if
     308
    287309!--- OZONE CLIMATOLOGY
    288310  IF(read_climoz>=1) CALL regr_lat_time_climoz(read_climoz)
Note: See TracChangeset for help on using the changeset viewer.