Ignore:
Timestamp:
Jun 25, 2014, 5:43:19 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2054:2070 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/phyredem.F90

    r1999 r2073  
    1515  USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
    1616  USE indice_sol_mod
     17  USE surface_data
     18  USE ocean_slab_mod, ONLY : tslab
    1719
    1820  IMPLICIT none
     
    3335
    3436  REAL tsoil(klon, nsoilmx, nbsrf)
    35   REAL tslab(klon), seaice(klon)
    3637  REAL qsurf(klon, nbsrf)
    3738  REAL qsol(klon)
     
    322323
    323324  CALL put_field("DETR_THERM", "DETR_THERM", detr_therm)
     325
     326  CALL put_field("ALE_BL", "ALE_BL", Ale_bl)
     327
     328  CALL put_field("ALE_BL_TRIG", "ALE_BL_TRIG", Ale_bl_trig)
     329
     330  CALL put_field("ALP_BL", "ALP_BL", Alp_bl)
    324331
    325332  ! trs from traclmdz_mod
     
    340347  END IF
    341348
     349  ! Restart variables for Slab ocean
     350  IF (type_ocean == 'slab') THEN
     351      CALL put_field("tslab", "Slab ocean temperature", tslab)
     352  END IF
     353
    342354  if (ok_gwd_rando) then
    343355     call put_field("du_gwd_rando", &
Note: See TracChangeset for help on using the changeset viewer.