Ignore:
Timestamp:
Mar 29, 2023, 3:14:27 PM (18 months ago)
Author:
lguez
Message:

Sync latest trunk changes to branch LMDZ_ECRad

Location:
LMDZ6/branches/LMDZ_ECRad
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/LMDZ_ECRad

  • LMDZ6/branches/LMDZ_ECRad/libf/phylmdiso/phyredem.F90

    r4170 r4482  
    3030                                du_gwd_rando, du_gwd_front, u10m, v10m, &
    3131                                treedrg, solswfdiff, delta_sal, ds_ns, dt_ns, &
    32                                 delta_sst, ratqs_inter
     32                                delta_sst, ratqs_inter, dter, dser, dt_ds
    3333#ifdef ISO
    3434  USE phys_state_var_mod, ONLY: xtsol, fxtevap,xtrain_fall, xtsnow_fall,     &
     
    3939  USE iostart, ONLY: open_restartphy, close_restartphy, enddef_restartphy, put_field, put_var
    4040  USE traclmdz_mod, ONLY : traclmdz_to_restart
    41   USE infotrac_phy, ONLY: types_trac, nqtot, tracers, nbtr, niso
     41  USE infotrac_phy, ONLY: type_trac, nqtot, tracers, nbtr, niso
    4242#ifdef ISO
    4343#ifdef ISOVERIF
     
    4545#endif
    4646#endif
    47   USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
     47  USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send, carbon_cycle_rad, RCO2_glo
    4848  USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic, epsfra
    4949  USE surface_data, ONLY: type_ocean, version_ocean
     
    130130
    131131  ! co2_ppm0 : initial value of atmospheric CO2
    132   tab_cntrl(16) = co2_ppm0
     132  ! tab_cntrl(16) = co2_ppm0
     133
     134  !  PC -- initial value of RCO2 for the radiation scheme
     135  !  tab_cntrl(17) = co2_ppm * 1.0e-06 * RMCO2 / RMD
     136  IF (carbon_cycle_rad) tab_cntrl(17) = RCO2_glo
     137  !PRINT*, "PC : phyredem RCO2_glo =",RCO2_glo
    133138
    134139  DO pass=1,2   ! pass=1 netcdf definition ; pass=2 netcdf write
     
    171176    CALL put_field(pass,"FSIC", "fraction glace mer", pctsrf(:, is_sic))
    172177
    173     IF(nbsrf>99) THEN
    174       PRINT*, "Trop de sous-mailles";  CALL abort_physic("phyredem", "", 1)
    175     END IF
    176     IF(nsoilmx>99) THEN
    177       PRINT*, "Trop de sous-surfaces"; CALL abort_physic("phyredem", "", 1)
    178     END IF
    179     IF(nsw>99) THEN
    180       PRINT*, "Trop de bandes"; CALL abort_physic("phyredem", "", 1)
    181     END IF
     178    IF(nbsrf  >99) CALL abort_physic("phyredem", "Trop de sous-mailles", 1)
     179    IF(nsoilmx>99) CALL abort_physic("phyredem", "Trop de sous-mailles", 1)
     180    IF(nsw    >99) CALL abort_physic("phyredem", "Trop de bandes", 1)
    182181
    183182!    Surface variables
     
    345344
    346345
    347     IF (ANY(types_trac == 'co2i') .OR. ANY(types_trac == 'inco')) THEN
     346    IF (ANY(type_trac == ['co2i','inco'])) THEN
    348347       IF (carbon_cycle_cpl) THEN
    349348          IF (.NOT. ALLOCATED(co2_send)) THEN
     
    356355
    357356    ! trs from traclmdz_mod
    358     ELSE IF (ANY(types_trac == 'lmdz')) THEN
     357    ELSE IF (type_trac == 'lmdz') THEN
    359358       CALL traclmdz_to_restart(trs)
    360359       it = 0
     
    394393          CALL put_field(pass, "delta_SST", &
    395394               "ocean-air interface temperature minus bulk SST", delta_sst)
     395          CALL put_field(pass, "dter", &
     396               "ocean-air interface temperature minus subskin temperature", &
     397               dter)
     398          CALL put_field(pass, "dser", &
     399               "ocean-air interface salinity minus subskin salinity", dser)
     400          CALL put_field(pass, "dt_ds", &
     401               "(tks / tkt) * dTer", dt_ds)
    396402       end if
    397403       
Note: See TracChangeset for help on using the changeset viewer.