Ignore:
Timestamp:
Oct 30, 2023, 5:37:00 PM (7 months ago)
Author:
Laurent Fairhead
Message:

Merge of ACC branch with 4740 revision from trunk

Location:
LMDZ6/branches/Portage_acc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/Portage_acc

  • LMDZ6/branches/Portage_acc/libf/phylmd/conf_phys_m.F90

    r4584 r4743  
    1616       fact_cldcon, facttemps,ok_newmicro,iflag_radia,&
    1717       iflag_cld_th, &
    18        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
     18       ratqsbas,ratqshaut,tau_ratqs, &
    1919       ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, flag_volc_surfstrat, aerosol_couple, &
    2020       chemistry_couple, flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
     
    2929    USE carbon_cycle_mod,  ONLY: read_fco2_ocean_cor,var_fco2_ocean_cor
    3030    USE carbon_cycle_mod,  ONLY: read_fco2_land_cor,var_fco2_land_cor
     31    USE chemistry_cycle_mod, ONLY: dms_cycle_cpl
    3132    USE mod_grid_phy_lmdz, ONLY: klon_glo
    3233    USE print_control_mod, ONLY: lunout
    3334    use config_ocean_skin_m, only: config_ocean_skin
    3435    USE phys_state_var_mod, ONLY: phys_tstep
     36    USE infotrac_phy, ONLY: type_trac
    3537
    3638    INCLUDE "conema3.h"
     
    8587    REAL                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut,tau_ratqs
    8688    INTEGER              :: iflag_cld_th
    87     INTEGER              :: iflag_ratqs
     89     
    8890
    8991    CHARACTER (len = 6), SAVE  :: type_ocean_omp, version_ocean_omp, ocean_omp
     
    173175    LOGICAL,SAVE :: ok_ice_sursat_omp
    174176    LOGICAL,SAVE :: ok_plane_h2o_omp, ok_plane_contrail_omp
    175     INTEGER,SAVE :: iflag_rei_omp
    176177    REAL,SAVE :: rad_froid_omp, rad_chau1_omp, rad_chau2_omp
    177     REAL,SAVE :: rei_min_omp, rei_max_omp
    178178    INTEGER,SAVE :: iflag_sic_omp, iflag_inertie_omp
    179179    REAL,SAVE :: inertie_sol_omp,inertie_sno_omp,inertie_sic_omp
     
    233233    LOGICAL, SAVE :: carbon_cycle_cpl_omp
    234234    LOGICAL, SAVE :: carbon_cycle_rad_omp
     235    LOGICAL, SAVE :: dms_cycle_cpl_omp
    235236    INTEGER, SAVE :: level_coupling_esm_omp
    236237    LOGICAL, SAVE :: read_fco2_ocean_cor_omp
     
    242243    LOGICAL, SAVE :: ok_new_lscp_omp
    243244    LOGICAL, SAVE :: ok_icefra_lscp_omp
     245    !rajout de choix_bulk et nit_bulk par Olivier Torres
     246    INTEGER,SAVE  :: choix_bulk_omp
     247    INTEGER,SAVE  :: nit_bulk_omp
     248    INTEGER,SAVE  :: kz0_omp
    244249    LOGICAL, SAVE :: ok_bs_omp, ok_rad_bs_omp
    245250
     
    935940    nbapp_rad_omp = 12
    936941    CALL getin('nbapp_rad',nbapp_rad_omp)
     942
     943    !rajout Olivier Torres
     944    !Config  Key  = choix_bulk
     945    !Config  Desc = choix de la formulation bulk a prendre dans clcdrag au-dessus de l'ocean
     946    !Config  Def  = 0
     947    !Config         0 -> originale (lmdz/Louis 79)
     948    !Config         1 -> COARE
     949    !Config         2 -> CORE-"pure" (cf. Large)
     950    !Config         3 -> CORE-"mixte" (avec z_0 et C_T^N donnees par Smith 88)
     951    choix_bulk_omp = 0
     952    CALL getin('choix_bulk',choix_bulk_omp)
     953
     954    !Config  Key  = nit_bulk
     955    !Config  Desc = choix du nombre d'it de pt fixe dans la bulk
     956    !Config  Def  = 5
     957    nit_bulk_omp = 1
     958    CALL getin('nit_bulk',nit_bulk_omp)
     959
     960    !Config  Key  = kz0
     961    !Config  Desc = choix de la formulation z0 pour la bulk ECUME
     962    !Config  Def  = 1
     963    !Config         0 -> ARPEGE formulation
     964    !Config         1 -> Smith Formulation
     965    !Config         2 -> Direct computation using the stability functions
     966    kz0_omp = 0
     967    CALL getin('kz0',kz0_omp)
     968
    937969
    938970    !Config  Key  = iflag_con
     
    13051337
    13061338
    1307     !Config Key  = iflag_rei
    1308     !Config Desc = 
    1309     !Config Def  = 0
    1310     !Config Help =
    1311     !
    1312     iflag_rei_omp = 0
    1313     CALL getin('iflag_rei',iflag_rei_omp)
    1314 
    1315 
    13161339    !
    13171340    !Config Key  = iflag_ice_thermo
     
    13471370    ok_plane_contrail_omp = .FALSE.
    13481371    CALL getin('ok_plane_contrail',ok_plane_contrail_omp)
    1349 
    1350     !
    1351     !Config Key  = rei_min
    1352     !Config Desc = 
    1353     !Config Def  = 3.5
    1354     !Config Help =
    1355     !
    1356     rei_min_omp = 3.5
    1357     CALL getin('rei_min',rei_min_omp)
    1358 
    1359     !
    1360     !Config Key  = rei_max
    1361     !Config Desc = 
    1362     !Config Def  = 61.29
    1363     !Config Help =
    1364     !
    1365     rei_max_omp = 61.29
    1366     CALL getin('rei_max',rei_max_omp)
    13671372
    13681373    !
     
    22402245    CALL getin('level_coupling_esm',level_coupling_esm_omp)
    22412246
     2247
     2248    dms_cycle_cpl_omp=.FALSE.
     2249    CALL getin('transm_dms_oa',dms_cycle_cpl_omp)
     2250    !
     2251    !Config Key  = dms_cycle_cpl
     2252    !Config Desc = receive dms from pisces via oasis
     2253    !Config Def  = .FALSE.
     2254    !Config Help = can be activated only if lmdz use inca for the atmospheric chemistry
     2255
     2256   
    22422257    !$OMP END MASTER
    22432258    !$OMP BARRIER
     
    23052320    rad_chau1 = rad_chau1_omp
    23062321    rad_chau2 = rad_chau2_omp
    2307     iflag_rei=iflag_rei_omp
    23082322    iflag_ice_thermo = iflag_ice_thermo_omp
    23092323    ok_ice_sursat = ok_ice_sursat_omp
    23102324    ok_plane_h2o = ok_plane_h2o_omp
    23112325    ok_plane_contrail = ok_plane_contrail_omp
    2312     rei_min = rei_min_omp
    2313     rei_max = rei_max_omp
    23142326    top_height = top_height_omp
    23152327    overlap = overlap_omp
     
    25142526    read_fco2_land_cor = read_fco2_land_cor_omp
    25152527    var_fco2_land_cor = var_fco2_land_cor_omp
     2528    dms_cycle_cpl = dms_cycle_cpl_omp
     2529    !rajout Olivier Torres
     2530    kz0=kz0_omp
     2531    choix_bulk = choix_bulk_omp
     2532    nit_bulk = nit_bulk_omp
    25162533
    25172534    ! Test of coherence between type_ocean and version_ocean
     
    26332650    ENDIF
    26342651
     2652
     2653    ! Test on chemistry cycle
     2654    IF ((type_trac .ne. "inca" .AND. type_trac .ne. "inco") .AND. dms_cycle_cpl ) THEN
     2655       CALL abort_physic('conf_phys', 'dms_cycle_cpl has to be TRUE only with INCA coupling model',1)
     2656    ENDIF
     2657   
    26352658    ! ORCHIDEE must be activated for ifl_pbltree=1
    26362659    IF (.NOT. ok_veget .AND. ifl_pbltree==1) THEN
     
    27192742    WRITE(lunout,*) ' rad_chau1 = ',rad_chau1
    27202743    WRITE(lunout,*) ' rad_chau2 = ',rad_chau2
    2721     WRITE(lunout,*) ' iflag_rei = ',iflag_rei
    27222744    WRITE(lunout,*) ' iflag_ice_thermo = ',iflag_ice_thermo
    27232745    WRITE(lunout,*) ' ok_ice_sursat = ',ok_ice_sursat
    27242746    WRITE(lunout,*) ' ok_plane_h2o = ',ok_plane_h2o
    27252747    WRITE(lunout,*) ' ok_plane_contrail = ',ok_plane_contrail
    2726     WRITE(lunout,*) ' rei_min = ',rei_min
    2727     WRITE(lunout,*) ' rei_max = ',rei_max
    27282748    WRITE(lunout,*) ' overlap = ',overlap
    27292749    WRITE(lunout,*) ' cdmmax = ',cdmmax
     
    28442864    WRITE(lunout,*) ' read_fco2_land_cor = ', read_fco2_land_cor
    28452865    WRITE(lunout,*) ' var_fco2_land_cor = ', var_fco2_land_cor
     2866    WRITE(lunout,*) ' dms_cycle_cpl = ', dms_cycle_cpl
    28462867    WRITE(lunout,*) ' iflag_tsurf_inlandsis = ', iflag_tsurf_inlandsis
    28472868    WRITE(lunout,*) ' iflag_temp_inlandsis = ', iflag_temp_inlandsis
     
    28612882    WRITE(lunout,*) ' buf_sph_pol = ', buf_sph_pol
    28622883    WRITE(lunout,*) ' buf_siz_pol= ', buf_siz_pol
     2884    !rajout Olivier Torres
     2885    write(lunout,*) 'choix_bulk = ', choix_bulk
     2886    write(lunout,*) 'nit_bulk = ', nit_bulk
     2887    write(lunout,*) 'kz0 = ', kz0
    28632888
    28642889    !$OMP END MASTER
Note: See TracChangeset for help on using the changeset viewer.