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/phyredem.F90

    r5717 r5791  
    3131                                du_gwd_rando, du_gwd_front, u10m, v10m, &
    3232                                treedrg, solswfdiff, delta_sal, ds_ns, dt_ns, &
    33                                 delta_sst, ratqs_inter_, dter, dser, dt_ds
     33!GG                                delta_sst, ratqs_inter_, dter, dser, dt_ds
     34                                delta_sst, ratqs_inter_, dter, dser, dt_ds, &
     35                                hice, tice, bilg_cumul
     36!GG
    3437#ifdef ISO
    3538  USE phys_state_var_mod, ONLY: xtsol, fxtevap,xtrain_fall, xtsnow_fall,     &
     
    5154  USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send, carbon_cycle_rad, RCO2_glo
    5255  USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic, epsfra
    53   USE surface_data, ONLY: type_ocean, version_ocean
    54   USE ocean_slab_mod, ONLY : nslay, tslab, seaice, tice, fsic
     56!GG  USE surface_data, ONLY: type_ocean, version_ocean
     57  USE surface_data, ONLY: type_ocean, version_ocean, iflag_seaice, iflag_seaice_alb, &
     58                          iflag_leads
     59!GG
     60  USE ocean_slab_mod, ONLY : nslay, tslab, seaice, tice_slab, fsic
    5561  USE time_phylmdz_mod, ONLY: annee_ref, day_end, itau_phy, pdtphys
    5662  use config_ocean_skin_m, only: activate_ocean_skin
     
    136142  IF (carbon_cycle_rad) tab_cntrl(17) = RCO2_glo
    137143  !PRINT*, "PC : phyredem RCO2_glo =",RCO2_glo
     144  !GG
     145  tab_cntrl(18 ) = iflag_seaice
     146  tab_cntrl(19 ) = iflag_seaice_alb
     147  tab_cntrl(20 ) = iflag_leads
     148  !GG
    138149
    139150  DO pass=1,2   ! pass=1 netcdf definition ; pass=2 netcdf write
     
    214225
    215226    CALL put_field_srf1(pass,"SNOW", "Neige", snow(:,:))
     227
     228    !GG
     229    CALL put_field(pass,"hice", "Ice thickness", hice)
     230    CALL put_field(pass,"tice", "Sea Ice temperature", tice)
     231    CALL put_field(pass,"bilg_cumul", "Flux conductivite + transmit sea-ice", bilg_cumul)
     232    !GG
    216233
    217234    CALL put_field(pass,"RADS", "Rayonnement net a la surface", radsol)
     
    388405        IF (version_ocean == 'sicINT') THEN
    389406            CALL put_field(pass,"seaice", "Slab seaice (kg/m2)", seaice)
    390             CALL put_field(pass,"slab_tice", "Slab sea ice temperature", tice)
     407            CALL put_field(pass,"slab_tice", "Slab sea ice temperature", tice_slab)
    391408        END IF
    392409    END IF
Note: See TracChangeset for help on using the changeset viewer.