Ignore:
Timestamp:
Jul 28, 2025, 7:23:15 PM (7 days ago)
Author:
aborella
Message:

Merge with trunk r5789

Location:
LMDZ6/branches/contrails
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/contrails

  • LMDZ6/branches/contrails/libf/phylmdiso/phyetat0_mod.F90

    r5717 r5791  
    2020#endif
    2121  USE phyetat0_get_mod, ONLY : phyetat0_get, phyetat0_srf
    22   USE surface_data,     ONLY : type_ocean, version_ocean
     22!GG  USE surface_data,     ONLY : type_ocean, version_ocean
     23  USE surface_data,     ONLY : type_ocean, version_ocean, iflag_seaice, &
     24                                   iflag_seaice_alb, iflag_leads
     25!GG
    2326  USE phys_state_var_mod, ONLY : ancien_ok, clwcon, detr_therm, phys_tstep, &
    2427       qsol, fevap, z0m, z0h, agesno, &
     
    3740       zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl, u10m, v10m, treedrg, &
    3841       ale_wake, ale_bl_stat, ds_ns, dt_ns, delta_sst, delta_sal, dter, dser, &
    39        dt_ds, ratqs_inter_
     42!GG       dt_ds, ratqs_inter_
     43       dt_ds, ratqs_inter_, &
     44       hice, tice, bilg_cumul
     45!GG
     46
    4047!FC
    4148  USE geometry_mod,     ONLY: longitude_deg, latitude_deg
     
    4653  USE carbon_cycle_mod, ONLY: carbon_cycle_init, carbon_cycle_cpl, carbon_cycle_tr, carbon_cycle_rad, co2_send, RCO2_glo
    4754  USE indice_sol_mod,   ONLY: nbsrf, is_ter, epsfra, is_lic, is_oce, is_sic
    48   USE ocean_slab_mod,   ONLY: nslay, tslab, seaice, tice, ocean_slab_init
     55  !GG USE ocean_slab_mod,   ONLY: nslay, tslab, seaice, tice, ocean_slab_init
     56  USE ocean_slab_mod,   ONLY: nslay, tslab, seaice, tice_slab, ocean_slab_init
     57  !GG
    4958  USE time_phylmdz_mod, ONLY: init_iteration, pdtphys, itau_phy
    5059  use wxios_mod, ONLY: missing_val_xios => missing_val, using_xios
     
    179188  IF (ok_orolf) tab_cntrl(11) =1.
    180189  IF (ok_limitvrai) tab_cntrl(12) =1.
     190  !GG
     191  tab_cntrl(18) =iflag_seaice
     192  tab_cntrl(19) =iflag_seaice_alb
     193  tab_cntrl(20) =iflag_leads
     194  !GG
    181195
    182196  itau_phy = tab_cntrl(15)
     
    624638      ! Sea ice variables
    625639      IF (version_ocean == 'sicINT') THEN
    626           found=phyetat0_get(tice,"slab_tice","slab_tice",0.)
     640          found=phyetat0_get(tice_slab,"slab_tice","slab_tice",0.)
     641  !GG        found=phyetat0_get(tice,"slab_tice","slab_tice",0.)
    627642          IF (.NOT. found) THEN
    628               PRINT*, "phyetat0: Le champ <tice> est absent"
     643  !GG            PRINT*, "phyetat0: Le champ <tice> est absent"
     644              PRINT*, "phyetat0: Le champ <tice_slab> est absent"
    629645              PRINT*, "Initialisation a tsol_sic"
    630                   tice(:)=ftsol(:,is_sic)
     646  !GG                tice(:)=ftsol(:,is_sic)
     647                  tice_slab(:)=ftsol(:,is_sic)
    631648          ENDIF
    632649          found=phyetat0_get(seaice,"seaice","seaice",0.)
     
    675692  end if
    676693
     694  !GG
     695  ! Sea ice
     696  !IF (iflag_seaice == 2) THEN
     697
     698  found=phyetat0_get(hice,"hice","Ice thickness",0.)
     699  IF (.NOT. found) THEN
     700       PRINT*, "phyetat0: Le champ <hice> est absent"
     701       PRINT*, "Initialisation a hice=1m "
     702       hice(:)=1.0
     703  END IF
     704  found=phyetat0_get(tice,"tice","Sea Ice temperature",0.)
     705  IF (.NOT. found) THEN
     706       PRINT*, "phyetat0: Le champ <tice> est absent"
     707       PRINT*, "Initialisation a tsol_sic"
     708       tice(:)=ftsol(:,is_sic)
     709  END IF
     710  found=phyetat0_get(bilg_cumul,"bilg_cumul","Flux conductivite + transmit sea-ice",0.)
     711  IF (.NOT. found) THEN
     712       PRINT*, "phyetat0: Le champ <bilg_cumul> est absent"
     713       PRINT*, "Initialisation a zero"
     714       bilg_cumul(:)=0.0
     715  END IF
     716
     717  !END IF
     718  !GG
    677719  ! on ferme le fichier
    678720  CALL close_startphy
     
    686728!#endif
    687729  if ( iflag_physiq <= 1 ) then
    688   CALL pbl_surface_init(fder, snow, qsurf, tsoil)
     730  !GG CALL pbl_surface_init(fder, snow, qsurf, tsoil)
     731  CALL pbl_surface_init(fder, snow, qsurf, tsoil, hice, tice, bilg_cumul)
     732  !GG
    689733#ifdef ISO
    690734  CALL pbl_surface_init_iso(xtsnow,Rland_ice)
Note: See TracChangeset for help on using the changeset viewer.