Ignore:
Timestamp:
Feb 1, 2021, 3:30:57 PM (3 years ago)
Author:
lguez
Message:

Merge Ocean_skin branch back into trunk

Location:
LMDZ6/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/trunk

  • LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

    r3799 r3815  
    199199         o_col_O3_strato, o_col_O3_tropo,                 &
    200200!--interactive CO2
    201          o_flx_co2_ocean, o_flx_co2_land, o_flx_co2_ff, o_flx_co2_bb
    202 
     201         o_flx_co2_ocean, o_flx_co2_land, o_flx_co2_ff, o_flx_co2_bb, &
     202         o_delta_sst, o_delta_sal, o_ds_ns, o_dt_ns, o_dter, o_dser, o_tkt, &
     203         o_tks, o_taur, o_sss
    203204
    204205#ifdef CPP_StratAer
     
    245246         T2sumSTD, nlevSTD, du_gwd_rando, du_gwd_front, &
    246247         ulevSTD, vlevSTD, wlevSTD, philevSTD, qlevSTD, tlevSTD, &
    247          rhlevSTD, O3STD, O3daySTD, uvSTD, vqSTD, vTSTD, wqSTD, &
    248          vphiSTD, wTSTD, u2STD, v2STD, T2STD, missing_val_nf90
     248         rhlevSTD, O3STD, O3daySTD, uvSTD, vqSTD, vTSTD, wqSTD, vphiSTD, &
     249         wTSTD, u2STD, v2STD, T2STD, missing_val_nf90, delta_sal, ds_ns, &
     250         dt_ns, delta_sst
    249251
    250252    USE phys_local_var_mod, ONLY: zxfluxlat, slp, ptstar, pt0, zxtsol, zt2m, &
     
    353355         alt_tropo, &
    354356!Ionela
    355          ok_4xCO2atm
     357         ok_4xCO2atm, dter, dser, tkt, tks, taur, sss
    356358
    357359    USE ocean_slab_mod, ONLY: nslay, tslab, slab_bilg, tice, seaice, &
     
    380382#endif
    381383    USE tracinca_mod, ONLY: config_inca
     384    use config_ocean_skin_m, only: activate_ocean_skin
    382385
    383386    USE vertical_layers_mod, ONLY: presnivs
     
    23852388       ENDIF   !(iflag_phytrac==1)
    23862389
     2390       if (activate_ocean_skin >= 1) then
     2391          CALL histwrite_phy(o_delta_sst, delta_sst)
     2392          CALL histwrite_phy(o_delta_sal, delta_sal)
     2393          CALL histwrite_phy(o_ds_ns, ds_ns)
     2394          CALL histwrite_phy(o_dt_ns, dt_ns)
     2395          CALL histwrite_phy(o_dter, dter)
     2396          CALL histwrite_phy(o_dser, dser)
     2397          CALL histwrite_phy(o_tkt, tkt)
     2398          CALL histwrite_phy(o_tks, tks)
     2399          CALL histwrite_phy(o_taur, taur)
     2400          CALL histwrite_phy(o_sss, sss)
     2401       end if
     2402
    23872403       IF (.NOT.vars_defined) THEN
    23882404          !$OMP MASTER
Note: See TracChangeset for help on using the changeset viewer.