Changeset 6201


Ignore:
Timestamp:
Apr 23, 2026, 8:18:01 PM (11 days ago)
Author:
lguez
Message:

Bug fix: move variables from module alpale_mod

To module conf_phys_m. Motivation: remove a circular dependency
which was introduced by revision r6187. The circular dependency was:
phys_state_var_mod -> conf_phys_m -> alpale_mod ->
phys_local_var_mod -> phys_state_var_mod. By moving the variables
from alpale_mod to conf_phys_m, we can remove the use of
alpale_mod in conf_phys_m. It is better for the moved variables to
be in conf_phys_m where they are defined and can be protected.

Location:
LMDZ6/trunk/libf
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90

    r6195 r6201  
    9191  USE regr_horiz_time_climoz_m, ONLY: regr_horiz_time_climoz
    9292  USE indice_sol_mod
    93   USE conf_phys_m, ONLY: conf_phys, read_climoz
     93  USE conf_phys_m, ONLY: conf_phys, read_climoz, iflag_wake
    9494  USE init_ssrf_m, ONLY: start_init_subsurf
    9595  USE phys_state_var_mod, ONLY: beta_aridity, delta_tsurf, awake_dens, cv_gen, &
    9696       ratqs_inter_
    97   USE alpale_mod
    9897  USE compbl_mod_h
    9998  IMPLICIT NONE

  • LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90

    r6191 r6201  
    9393
    9494USE compbl_mod_h
    95     USE alpale_mod
    9695        USE dimphy, ONLY: klon, klev, klevp1
    9796    USE ocean_slab_mod, ONLY: nslay
    9897    USE conf_phys_m, ONLY: aerosol_couple, ok_ade, ok_aie, ok_cdnc, &
    99                            flag_aerosol, flag_aerosol_strat, read_climoz
     98         flag_aerosol, flag_aerosol_strat, read_climoz, iflag_clos_bl, &
     99         iflag_coupl, iflag_trig_bl, iflag_wake
    100100    USE phys_output_ctrlout_mod, ONLY: o_phis, o_aire, is_ter, is_lic, is_oce, &
    101101         is_ave, is_sic, o_contfracATM, o_contfracOR, &

  • LMDZ6/trunk/libf/phylmd/alpale_mod.f90

    r5977 r6201  
    55  IMPLICIT NONE; PRIVATE
    66  PUBLIC :: alpale
    7 
    8   !=====================================================================
    9   ! Specifique de Ale/Alp :
    10   !=====================================================================
    11   PUBLIC iflag_trig_bl, iflag_clos_bl, tau_trig_shallow, tau_trig_deep, iflag_strig, &
    12           alp_bl_k, s_trig, h_trig, iflag_coupl, iflag_clos, iflag_wake
    13   ! dans alealp_th, thermcell_alp, physiq_mod, conf_phys
    14   INTEGER :: iflag_trig_bl, iflag_clos_bl, iflag_strig
    15   INTEGER :: tau_trig_shallow, tau_trig_deep
    16   REAL :: s_trig, h_trig
    17   ! thermcell_alp et convection ...
    18   INTEGER :: iflag_coupl, iflag_clos, iflag_wake
    19   ! thermcell_alp
    20   REAL :: alp_bl_k
    21   !$OMP THREADPRIVATE(iflag_trig_bl, iflag_clos_bl, tau_trig_shallow, tau_trig_deep, iflag_strig)
    22   !$OMP THREADPRIVATE(alp_bl_k, s_trig, h_trig, iflag_coupl, iflag_clos, iflag_wake)
    237
    248CONTAINS
    … …  
    4125
    4226    USE dimphy
     27    use conf_phys_m, only: iflag_coupl, iflag_trig_bl, iflag_wake
    4328    USE ioipsl_getin_p_mod, ONLY: getin_p
    4429    USE print_control_mod, ONLY: mydebug => debug, lunout, prt_level

  • LMDZ6/trunk/libf/phylmd/alpale_th_mod.f90

    r6048 r6201  
    2121SUBROUTINE alpale_th_first()
    2222
    23   USE alpale_mod, ONLY: iflag_clos_bl
     23  USE conf_phys_m, ONLY: iflag_clos_bl
    2424  USE ioipsl_getin_p_mod, ONLY : getin_p
    2525
    … …  
    5757  USE dimphy
    5858  USE print_control_mod, ONLY: mydebug=>debug , lunout, prt_level
    59   USE alpale_mod, ONLY: iflag_clos_bl, iflag_coupl, iflag_trig_bl, s_trig, tau_trig_deep, tau_trig_shallow
     59  USE conf_phys_m, ONLY: iflag_clos_bl, iflag_coupl, iflag_trig_bl, s_trig, tau_trig_deep, tau_trig_shallow
    6060  IMPLICIT NONE
    6161

  • LMDZ6/trunk/libf/phylmd/calwake_mod.f90

    r6088 r6201  
    6161  USE lmdz_wake2, ONLY : wake2
    6262  USE lmdz_wake3, ONLY : wake3
    63   USE alpale_mod, ONLY: iflag_wake
     63  USE conf_phys_m, ONLY: iflag_wake
    6464  USE yomcst_mod_h
    6565IMPLICIT NONE

  • LMDZ6/trunk/libf/phylmd/conf_phys_m.f90

    r6200 r6201  
    7272  !$OMP THREADPRIVATE(adjust_tropopause)
    7373
     74  !=====================================================================
     75  ! Specifique de Ale/Alp :
     76  !=====================================================================
     77  ! dans alealp_th, thermcell_alp, physiq_mod, conf_phys
     78  INTEGER :: iflag_trig_bl, iflag_clos_bl, iflag_strig
     79  INTEGER :: tau_trig_shallow, tau_trig_deep
     80  REAL :: s_trig, h_trig
     81  ! thermcell_alp et convection ...
     82  INTEGER :: iflag_coupl, iflag_clos, iflag_wake
     83  ! thermcell_alp
     84  REAL :: alp_bl_k
     85  !$OMP THREADPRIVATE(iflag_trig_bl, iflag_clos_bl, tau_trig_shallow, tau_trig_deep, iflag_strig)
     86  !$OMP THREADPRIVATE(alp_bl_k, s_trig, h_trig, iflag_coupl, iflag_clos, iflag_wake)
     87
    7488CONTAINS
    7589
    … …  
    7892    USE compbl_mod_h
    7993    USE ioipsl_getin_p_mod, ONLY : getin_p
    80     USE alpale_mod
    8194    USE yomcst_mod_h
    8295    USE IOIPSL

  • LMDZ6/trunk/libf/phylmd/create_etat0_unstruct_mod.f90

    r6033 r6201  
    9898  USE dimsoil_mod_h, ONLY: nsoilmx
    9999  USE clesphys_mod_h
    100   USE alpale_mod
     100  USE conf_phys_m, only: iflag_wake
    101101  USE compbl_mod_h
    102102  IMPLICIT NONE

  • LMDZ6/trunk/libf/phylmd/lmdz_thermcell_alp.f90

    r5390 r6201  
    2020
    2121USE yoethf_mod_h
    22       USE alpale_mod
     22USE conf_phys_m, only: alp_bl_k, h_trig, iflag_clos_bl, iflag_coupl, &
     23     iflag_strig, iflag_trig_bl, s_trig
    2324            USE yomcst_mod_h
    2425      USE indice_sol_mod

  • LMDZ6/trunk/libf/phylmd/phyetat0_mod.f90

    r6132 r6201  
    6464  USE dimsoil_mod_h, ONLY: nsoilmx
    6565  USE yomcst_mod_h
    66   USE alpale_mod
     66  USE conf_phys_m, only: iflag_wake
    6767  USE compbl_mod_h
    6868  USE lmdz_gwd_ini, ONLY: ok_gwd_rando, ok_orodr, ok_orolf

  • LMDZ6/trunk/libf/phylmd/phyredem.f90

    r6116 r6201  
    1010!-------------------------------------------------------------------------------
    1111  USE compbl_mod_h
    12   USE alpale_mod
     12  USE conf_phys_m, only: iflag_wake
    1313  USE clesphys_mod_h
    1414  USE dimphy, ONLY: klon, klev

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

    r6197 r6201  
    3636    USE conf_phys_m, ONLY : aerosol_couple, ok_ade, ok_aie, ok_volcan, &
    3737         flag_aerosol, flag_aerosol_strat, ok_cdnc, read_climoz, &
    38          adjust_tropopause
     38         adjust_tropopause, iflag_clos_bl, iflag_coupl, iflag_trig_bl, &
     39         iflag_wake
    3940    USE phys_output_ctrlout_mod, ONLY: o_phis, o_aire, is_ter, is_lic, is_oce, &
    4041         o_longitude, o_latitude, &
    … …  
    542543    USE ch4n2o_correction_mod, ONLY: ok_CH4_eff_ppb, ok_N2O_eff_ppb
    543544    USE compbl_mod_h
    544     USE alpale_mod
    545545    USE clesphys_mod_h
    546546    USE tracinca_mod, ONLY: config_inca

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

    r6198 r6201  
    7070         adjust_tropopause
    7171    USE conf_phys_m , ONLY : flag_bc_internal_mixture
    72     USE conf_phys_m , ONLY : solarlong0,alp_offset,flag_aer_feedback,flag_aerosol_strat
     72    USE conf_phys_m , ONLY : solarlong0,alp_offset,flag_aer_feedback, &
     73         flag_aerosol_strat, iflag_clos, iflag_coupl, iflag_wake
    7374
    7475

  • LMDZ6/trunk/libf/phylmdiso/calwake.F90

    r5894 r6201  
    6666  USE lmdz_wake2, ONLY : wake2
    6767  USE lmdz_wake3, ONLY : wake3
    68   USE alpale_mod, ONLY: iflag_wake
     68  USE conf_phys_m, ONLY: iflag_wake
    6969#ifdef ISO
    7070  USE infotrac_phy, ONLY : ntraciso=>ntiso

  • LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90

    r6132 r6201  
    7676  USE dimsoil_mod_h, ONLY: nsoilmx
    7777  USE yomcst_mod_h
    78   USE alpale_mod
     78  USE conf_phys_m, only: iflag_wake
    7979  USE compbl_mod_h
    8080  USE lmdz_gwd_ini, ONLY: ok_gwd_rando, ok_orodr, ok_orolf

  • LMDZ6/trunk/libf/phylmdiso/phyredem.F90

    r6132 r6201  
    1010!-------------------------------------------------------------------------------
    1111  USE compbl_mod_h
    12   USE alpale_mod
     12  USE conf_phys_m, only: iflag_wake
    1313  USE clesphys_mod_h
    1414  USE dimphy, ONLY: klon, klev
    … …  
    582582#endif
    583583  USE compbl_mod_h
    584   USE alpale_mod
    585584  USE clesphys_mod_h
    586585  USE dimsoil_mod_h, ONLY: nsoilmx

  • LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

    r6198 r6201  
    4141         adjust_tropopause
    4242    USE conf_phys_m , ONLY : flag_bc_internal_mixture
    43     USE conf_phys_m , ONLY : solarlong0,alp_offset,flag_aer_feedback,flag_aerosol_strat
     43    USE conf_phys_m , ONLY : solarlong0,alp_offset,flag_aer_feedback, &
     44         flag_aerosol_strat, iflag_clos, iflag_coupl, iflag_wake
    4445
    4546
Note: See TracChangeset for help on using the changeset viewer.