Changeset 4664


Ignore:
Timestamp:
Sep 2, 2023, 10:52:57 AM (9 months ago)
Author:
fhourdin
Message:

standardisatio des noms pour lscp et fisrtilp

fisrtilp passe dans le module lmdz_lscp_old.F90
Prepartation de la replaysation de fisrtilp (deja fait pour lscp)

Location:
LMDZ6/trunk/libf
Files:
3 added
3 deleted
9 edited
4 moved

Legend:

Unmodified
Added
Removed

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

    r4523 r4664  
    1010use blowing_snow_ini_mod, only : coef_eva_bs,RTT,RD,RG,expo_eva_bs, fallv_bs
    1111use blowing_snow_ini_mod, only : RCPD, RLSTT, RLMLT, RLVTT, RVTMP2, niter_bs
    12 USE lscp_tools_mod, only : calc_qsat_ecmwf
     12USE lmdz_lscp_tools, only : calc_qsat_ecmwf
    1313
    1414implicit none

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

    r4535 r4664  
    1717 
    1818  USE print_control_mod, ONLY: lunout, prt_level
    19   USE lscp_ini_mod, ONLY: t_glace_min, t_glace_max, exposant_glace, iflag_t_glace
     19  USE lmdz_lscp_ini, ONLY: t_glace_min, t_glace_max, exposant_glace, iflag_t_glace
    2020  ! lscp_ini contains:
    2121  ! t_glace_min: if T < Tmin, the cloud is only made of water ice

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

    r4651 r4664  
    15091509      use lmdz_cloudth_ini, only: iflag_cloudth_vert,iflag_ratqs
    15101510      use lmdz_cloudth_ini, only:  C_mpc ,Ni,C_cap,Ei,d_top ,vert_alpha, vert_alpha_th ,sigma1s_factor,sigma1s_power,sigma2s_factor,sigma2s_power,cloudth_ratqsmin ,iflag_cloudth_vert_noratqs
    1511       use lscp_tools_mod, ONLY: CALC_QSAT_ECMWF, FALLICE_VELOCITY
     1511      use lmdz_lscp_tools, ONLY: CALC_QSAT_ECMWF, FALLICE_VELOCITY
    15121512
    15131513      use phys_local_var_mod, ONLY : qlth, qith, qsith, wiceth

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

    r4663 r4664  
    1 MODULE lscp_mod
     1MODULE lmdz_lscp
    22
    33IMPLICIT NONE
    … …  
    9494! USE de modules contenant des fonctions.
    9595USE lmdz_cloudth, ONLY : cloudth, cloudth_v3, cloudth_v6, cloudth_mpc
    96 USE lscp_tools_mod, ONLY : calc_qsat_ecmwf, icefrac_lscp, calc_gammasat
    97 USE lscp_tools_mod, ONLY : fallice_velocity, distance_to_cloud_top
     96USE lmdz_lscp_tools, ONLY : calc_qsat_ecmwf, icefrac_lscp, calc_gammasat
     97USE lmdz_lscp_tools, ONLY : fallice_velocity, distance_to_cloud_top
    9898USE ice_sursat_mod, ONLY : ice_sursat
    9999
    100 ! Use du module lscp_ini_mod contenant les constantes
    101 USE lscp_ini_mod, ONLY : seuil_neb, niter_lscp, iflag_evap_prec, t_coup, DDT0, ztfondue, rain_int_min
    102 USE lscp_ini_mod, ONLY : iflag_mpc_bl, ok_radocond_snow, a_tr_sca, cld_expo_con, cld_expo_lsc
    103 USE lscp_ini_mod, ONLY : iflag_cloudth_vert, iflag_rain_incloud_vol, iflag_t_glace, t_glace_min
    104 USE lscp_ini_mod, ONLY : coef_eva, coef_eva_i,cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
    105 USE lscp_ini_mod, ONLY : iflag_bergeron, iflag_fisrtilp_qsat, iflag_vice, cice_velo, dice_velo
    106 USE lscp_ini_mod, ONLY : iflag_autoconversion, ffallv_con, ffallv_lsc
    107 USE lscp_ini_mod, ONLY : RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT, RD, RG
     100! Use du module lmdz_lscp_ini contenant les constantes
     101USE lmdz_lscp_ini, ONLY : seuil_neb, niter_lscp, iflag_evap_prec, t_coup, DDT0, ztfondue, rain_int_min
     102USE lmdz_lscp_ini, ONLY : iflag_mpc_bl, ok_radocond_snow, a_tr_sca, cld_expo_con, cld_expo_lsc
     103USE lmdz_lscp_ini, ONLY : iflag_cloudth_vert, iflag_rain_incloud_vol, iflag_t_glace, t_glace_min
     104USE lmdz_lscp_ini, ONLY : coef_eva, coef_eva_i,cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
     105USE lmdz_lscp_ini, ONLY : iflag_bergeron, iflag_fisrtilp_qsat, iflag_vice, cice_velo, dice_velo
     106USE lmdz_lscp_ini, ONLY : iflag_autoconversion, ffallv_con, ffallv_lsc
     107USE lmdz_lscp_ini, ONLY : RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT, RD, RG
    108108
    109109IMPLICIT NONE
    … …  
    13371337!+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    13381338
    1339 END MODULE lscp_mod
     1339END MODULE lmdz_lscp

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

    r4663 r4664  
    1 MODULE lscp_ini_mod
     1MODULE lmdz_lscp_ini
    22
    33IMPLICIT NONE
    … …  
    263263END SUBROUTINE lscp_ini
    264264
    265 END MODULE lscp_ini_mod
     265END MODULE lmdz_lscp_ini

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

    r4663 r4664  
    22!
    33!
     4MODULE lmdz_lscp_old
     5CONTAINS
    46SUBROUTINE fisrtilp(dtime,paprs,pplay,t,q,ptconv,ratqs, &
    57     d_t, d_q, d_ql, d_qi, rneb, radliq, rain, snow,          &
    … …  
    2022  ! flag to include modifications to ensure energy conservation (if flag >0)
    2123  USE add_phys_tend_mod, only : fl_cor_ebil
    22   USE lscp_ini_mod, ONLY: iflag_t_glace,t_glace_min, t_glace_max, exposant_glace
    23   USE lscp_ini_mod, ONLY: iflag_cloudth_vert, iflag_rain_incloud_vol
    24   USE lscp_ini_mod, ONLY: coef_eva, coef_eva_i, ffallv_lsc, ffallv_con
    25   USE lscp_ini_mod, ONLY: cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
    26   USE lscp_ini_mod, ONLY: reevap_ice, iflag_bergeron, iflag_fisrtilp_qsat, iflag_pdf
     24  USE lmdz_lscp_ini, ONLY: iflag_t_glace,t_glace_min, t_glace_max, exposant_glace
     25  USE lmdz_lscp_ini, ONLY: iflag_cloudth_vert, iflag_rain_incloud_vol
     26  USE lmdz_lscp_ini, ONLY: coef_eva, coef_eva_i, ffallv_lsc, ffallv_con
     27  USE lmdz_lscp_ini, ONLY: cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
     28  USE lmdz_lscp_ini, ONLY: reevap_ice, iflag_bergeron, iflag_fisrtilp_qsat, iflag_pdf
    2729      use phys_output_var_mod, ONLY : cloudth_sth,cloudth_senv
    2830      use phys_output_var_mod, ONLY : cloudth_sigmath,cloudth_sigmaenv
    … …  
    17431745
    17441746END SUBROUTINE fisrtilp
     1747END MODULE lmdz_lscp_old

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

    r4613 r4664  
    33!=============================================
    44! A FAIRE :
    5 ! Traiter le probleme de USE lscp_tools_mod, ONLY: CALC_QSAT_ECMWF
     5! Traiter le probleme de USE lmdz_lscp_tools, ONLY: CALC_QSAT_ECMWF
    66!=============================================
    77
    … …  
    326326! Effect of subgrid surface heterogeneities on ratqs
    327327
    328 USE lscp_tools_mod, ONLY: CALC_QSAT_ECMWF
     328USE lmdz_lscp_tools, ONLY: CALC_QSAT_ECMWF
    329329
    330330USE lmdz_ratqs_ini, ONLY : RG,RD,RTT,nbsrf

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

    r4590 r4664  
    66
    77   integer :: dvdq=1,dqimpl=-1,prt_level=0,lunout
    8    real RG,RD,RCPD,RKAPPA,RLVTT,RLvCp,RETV
    9    real           :: r_aspect_thermals,tau_thermals,fact_thermals_ed_dz
    10    integer        :: iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure
    11    integer        :: iflag_thermals_down
    12    real           :: fact_thermals_down
     8   real    :: RG,RD,RCPD,RKAPPA,RLVTT,RLvCp,RETV
     9   real    :: r_aspect_thermals,tau_thermals,fact_thermals_ed_dz
     10   integer :: iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure
     11   integer :: iflag_thermals_down
     12   real    :: fact_thermals_down
    1313
    1414!$OMP THREADPRIVATE(dvdq,dqimpl,prt_level,lunout)
    … …  
    109109
    110110
     111
     112write(lunout,*) 'thermcell_ini ,prt_level                =',  prt_level                   
     113write(lunout,*) 'thermcell_ini ,RG                       =',  RG                     
     114write(lunout,*) 'thermcell_ini ,RD                       =',  RD                       
     115write(lunout,*) 'thermcell_ini ,RCPD                     =',  RCPD                   
     116write(lunout,*) 'thermcell_ini ,RKAPPA                   =',  RKAPPA                 
     117write(lunout,*) 'thermcell_ini ,RLVTT                    =',  RLVTT                   
     118write(lunout,*) 'thermcell_ini ,RLvCp                    =',  RLvCp                   
     119write(lunout,*) 'thermcell_ini ,RETV                     =',  RETV                   
     120write(lunout,*) 'thermcell_ini ,tau_thermals             =',  tau_thermals           
     121write(lunout,*) 'thermcell_ini ,lunout                   =',  lunout                 
     122write(lunout,*) 'thermcell_ini ,r_aspect_thermals        =',  r_aspect_thermals       
     123write(lunout,*) 'thermcell_ini ,tau_thermals             =',  tau_thermals           
     124write(lunout,*) 'thermcell_ini ,fact_thermals_ed_dz      =',  fact_thermals_ed_dz
     125write(lunout,*) 'thermcell_ini ,fact_thermals_ed_dz      =',  fact_thermals_ed_dz
     126write(lunout,*) 'thermcell_ini ,iflag_thermals_ed        =',  iflag_thermals_ed       
     127write(lunout,*) 'thermcell_ini ,iflag_thermals_optflux   =',  iflag_thermals_optflux
     128write(lunout,*) 'thermcell_ini ,iflag_thermals_closure   =',  iflag_thermals_closure
     129write(lunout,*) 'thermcell_ini ,iflag_thermals_down      =',  iflag_thermals_down
     130write(lunout,*) 'thermcell_ini ,fact_thermals_down       =',  fact_thermals_down
     131write(lunout,*) 'thermcell_ini ,fact_epsilon             =',  fact_epsilon           
     132write(lunout,*) 'thermcell_ini ,betalpha                 =',  betalpha               
     133write(lunout,*) 'thermcell_ini ,afact                    =',  afact                   
     134write(lunout,*) 'thermcell_ini ,fact_shell               =',  fact_shell             
     135write(lunout,*) 'thermcell_ini ,detr_min                 =',  detr_min               
     136write(lunout,*) 'thermcell_ini ,entr_min                 =',  entr_min               
     137write(lunout,*) 'thermcell_ini ,detr_q_coef              =',  detr_q_coef             
     138write(lunout,*) 'thermcell_ini ,detr_q_power             =',  detr_q_power           
     139write(lunout,*) 'thermcell_ini ,mix0                     =',  mix0                   
     140write(lunout,*) 'thermcell_ini ,thermals_flag_alim       =',  thermals_flag_alim
     141
    111142 RETURN
    112143

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

    r4639 r4664  
    1212  USE phys_state_var_mod, ONLY: rnebcon, clwcon
    1313  USE icefrac_lsc_mod ! computes ice fraction (JBM 3/14)
    14   USE lscp_ini_mod, only: iflag_t_glace
     14  USE lmdz_lscp_ini, only: iflag_t_glace
    1515  USE ioipsl_getin_p_mod, ONLY : getin_p
    1616  USE print_control_mod, ONLY: lunout
    17   USE lscp_tools_mod, only: icefrac_lscp
     17  USE lmdz_lscp_tools, only: icefrac_lscp
    1818
    1919

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

    r4639 r4664  
    55    temp_cltop, cldtaupi, re, fl)
    66  USE dimphy
    7   USE lscp_tools_mod, only: icefrac_lscp
     7  USE lmdz_lscp_tools, only: icefrac_lscp
    88  USE icefrac_lsc_mod ! computes ice fraction (JBM 3/14)
    9   USE lscp_ini_mod, only : iflag_t_glace
     9  USE lmdz_lscp_ini, only : iflag_t_glace
    1010  USE phys_local_var_mod, ONLY: ptconv
    1111  IMPLICIT NONE

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

    r4657 r4664  
    7878    USE write_field_phy
    7979    USE wxios, ONLY: g_ctx, wxios_set_context
    80     USE lscp_mod, ONLY : lscp
     80    USE lmdz_lscp, ONLY : lscp
     81    USE lmdz_lscp_old, ONLY : fisrtilp
    8182    USE lmdz_wake_ini, ONLY : wake_ini
    8283    USE yamada_ini_mod, ONLY : yamada_ini
    … …  
    8586    USE lmdz_thermcell_dtke, ONLY : thermcell_dtke
    8687    USE blowing_snow_ini_mod, ONLY : blowing_snow_ini , qbst_bs
    87     USE lscp_ini_mod, ONLY : lscp_ini
     88    USE lmdz_lscp_ini, ONLY : lscp_ini
    8889    USE lmdz_ratqs_main, ONLY : ratqs_main
    8990    USE lmdz_ratqs_ini, ONLY : ratqs_ini
    … …  
    813814    !KE43
    814815    EXTERNAL conema3  ! convect4.3
    815     EXTERNAL fisrtilp  ! schema de condensation a grande echelle (pluie)
    816816    !AA
    817817    ! JBM (3/14) fisrtilp_tr not loaded

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

    r4663 r4664  
    33!
    44!
     5MODULE lmdz_lscp_old
     6CONTAINS
    57SUBROUTINE fisrtilp(dtime,paprs,pplay,t,q,ptconv,ratqs, &
    68     d_t, d_q, d_ql, d_qi, rneb, radliq, rain, snow,          &
    … …  
    2628  ! flag to include modifications to ensure energy conservation (if flag >0)
    2729  USE add_phys_tend_mod, only : fl_cor_ebil
    28   USE lscp_ini_mod, ONLY: iflag_t_glace,t_glace_min, t_glace_max, exposant_glace
    29   USE lscp_ini_mod, ONLY: iflag_cloudth_vert, iflag_rain_incloud_vol
    30   USE lscp_ini_mod, ONLY: coef_eva, coef_eva_i, ffallv_lsc, ffallv_con
    31   USE lscp_ini_mod, ONLY: cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
    32   USE lscp_ini_mod, ONLY: reevap_ice, iflag_bergeron, iflag_fisrtilp_qsat, iflag_pdf
     30  USE lmdz_lscp_ini, ONLY: iflag_t_glace,t_glace_min, t_glace_max, exposant_glace
     31  USE lmdz_lscp_ini, ONLY: iflag_cloudth_vert, iflag_rain_incloud_vol
     32  USE lmdz_lscp_ini, ONLY: coef_eva, coef_eva_i, ffallv_lsc, ffallv_con
     33  USE lmdz_lscp_ini, ONLY: cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
     34  USE lmdz_lscp_ini, ONLY: reevap_ice, iflag_bergeron, iflag_fisrtilp_qsat, iflag_pdf
    3335      use phys_output_var_mod, ONLY : cloudth_sth,cloudth_senv
    3436      use phys_output_var_mod, ONLY : cloudth_sigmath,cloudth_sigmaenv
    … …  
    27412743
    27422744END SUBROUTINE fisrtilp
     2745END MODULE lmdz_lscp_old

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

    r4653 r4664  
    7777    USE write_field_phy
    7878    USE wxios, ONLY: g_ctx, wxios_set_context, using_xios
    79     USE lscp_mod, ONLY : lscp
     79    USE lmdz_lscp, ONLY : lscp
     80    USE lmdz_lscp_old, ONLY : fisrtilp
    8081    USE lmdz_wake_ini, ONLY : wake_ini
    8182    USE yamada_ini_mod, ONLY : yamada_ini
    … …  
    8485    USE lmdz_thermcell_dtke, ONLY : thermcell_dtke
    8586    USE blowing_snow_ini_mod, ONLY : blowing_snow_ini , qbst_bs
    86     USE lscp_ini_mod, ONLY : lscp_ini
     87    USE lmdz_lscp_ini, ONLY : lscp_ini
    8788    USE lmdz_ratqs_main, ONLY : ratqs_main
    8889    USE lmdz_ratqs_ini, ONLY : ratqs_ini
    … …  
    885886    !KE43
    886887    EXTERNAL conema3  ! convect4.3
    887     EXTERNAL fisrtilp  ! schema de condensation a grande echelle (pluie)
    888888    !AA
    889889    ! JBM (3/14) fisrtilp_tr not loaded
Note: See TracChangeset for help on using the changeset viewer.