Changeset 4687


Ignore:
Timestamp:
Sep 11, 2023, 9:56:55 PM (8 months ago)
Author:
evignon
Message:

je renomme les routines atke suivant la convention decidee
pour la reecriture

Location:
LMDZ6/trunk/libf
Files:
5 edited
6 moved

Legend:

Unmodified
Added
Removed

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

    r4481 r4687  
    2323  USE print_control_mod, ONLY: lunout, prt_level
    2424  USE ioipsl_getin_p_mod, ONLY : getin_p
    25   USE atke_turbulence_ini_mod, ONLY : ric, cinf, cepsilon, pr_slope, pr_asym, pr_neut
     25  USE lmdz_atke_turbulence_ini, ONLY : ric, cinf, cepsilon, pr_slope, pr_asym, pr_neut
    2626
    2727  IMPLICIT NONE

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

    r4686 r4687  
    1 module atke_exchange_coeff_mod
     1module lmdz_atke_exchange_coeff
    22
    33implicit none
    … …  
    2626
    2727
    28 USE atke_turbulence_ini_mod, ONLY : iflag_atke, kappa, l0, ric, cinf, rpi, rcpd, atke_ok_virtual
    29 USE atke_turbulence_ini_mod, ONLY : cepsilon, pr_slope, pr_asym, pr_neut, ctkes,rg, rd, rv, atke_ok_vdiff
    30 USE atke_turbulence_ini_mod, ONLY : viscom, viscoh, clmix, clmixshear, iflag_atke_lmix, lmin, smmin
     28USE lmdz_atke_turbulence_ini, ONLY : iflag_atke, kappa, l0, ric, cinf, rpi, rcpd, atke_ok_virtual
     29USE lmdz_atke_turbulence_ini, ONLY : cepsilon, pr_slope, pr_asym, pr_neut, ctkes,rg, rd, rv, atke_ok_vdiff
     30USE lmdz_atke_turbulence_ini, ONLY : viscom, viscoh, clmix, clmixshear, iflag_atke_lmix, lmin, smmin
    3131
    3232implicit none
    … …  
    182182             lstrat=clmix*sqrt(tke(igrid,ilay))/sqrt(N2(igrid,ilay))
    183183             lstrat=max(lstrat,lmin)
    184              !Monin-Obukhov consistent interpolation, Van de Wiel et al. 2010
    185              l_exchange(igrid,ilay)=(1./(2.*l_exchange(igrid,ilay))+sqrt(1./(4.*l_exchange(igrid,ilay) &
    186                                    *l_exchange(igrid,ilay))+1./(2.*lstrat*lstrat)))**(-1.0)
     184             !Inverse quadratic interpolation, Van de Wiel et al. 2010
     185             l_exchange(igrid,ilay)=(1./(l_exchange(igrid,ilay))+1./(lstrat))**(-1.0)
    187186          ENDIF
    188187      ENDDO
    … …  
    198197                    clmixshear*sqrt(tke(igrid,ilay))/sqrt(shear2(igrid,ilay)))
    199198             lstrat=max(lstrat,lmin)
    200              !Monin-Obukhov consistent interpolation, Van de Wiel et al. 2010   
    201              l_exchange(igrid,ilay)=(1./(2.*l_exchange(igrid,ilay))+sqrt(1./(4.*l_exchange(igrid,ilay) &
    202                                    *l_exchange(igrid,ilay))+1./(2.*lstrat*lstrat)))**(-1.0)
    203 
     199             !Inverse quadratic interpolation, Van de Wiel et al. 2010   
     200             l_exchange(igrid,ilay)=(1./(l_exchange(igrid,ilay))+1./(lstrat))**(-1.0)
    204201          ENDIF
    205202      ENDDO
    … …  
    356353! E Vignon, July 2023
    357354
    358 USE atke_turbulence_ini_mod, ONLY : rd, cke, viscom
     355USE lmdz_atke_turbulence_ini, ONLY : rd, cke, viscom
    359356
    360357
    … …  
    449446
    450447
    451 end module atke_exchange_coeff_mod
     448end module lmdz_atke_exchange_coeff

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

    r4686 r4687  
    1 MODULE atke_turbulence_ini_mod
     1MODULE lmdz_atke_turbulence_ini
    22
    33implicit none
    … …  
    139139END SUBROUTINE atke_ini
    140140
    141 END MODULE  atke_turbulence_ini_mod
     141END MODULE  lmdz_atke_turbulence_ini

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

    r4686 r4687  
    1 module call_atke_mod
     1module lmdz_call_atke
    22
    3 USE atke_exchange_coeff_mod, ONLY :  atke_compute_km_kh
     3USE lmdz_atke_exchange_coeff, ONLY :  atke_compute_km_kh
    44
    55implicit none
    … …  
    1515
    1616
    17 USE atke_turbulence_ini_mod, ONLY : iflag_num_atke, rg, rd
     17USE lmdz_atke_turbulence_ini, ONLY : iflag_num_atke, rg, rd
    1818
    1919implicit none
    … …  
    167167
    168168
    169 end module call_atke_mod
     169end module lmdz_call_atke

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

    r4653 r4687  
    2424  USE climb_wind_mod,      ONLY : climb_wind_down, climb_wind_up
    2525  USE coef_diff_turb_mod,  ONLY : coef_diff_turb
    26   USE call_atke_mod,       ONLY : call_atke
     26  USE lmdz_call_atke,      ONLY : call_atke
    2727  USE ioipsl_getin_p_mod,  ONLY : getin_p
    2828  USE cdrag_mod

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

    r4683 r4687  
    8383    USE lmdz_wake_ini, ONLY : wake_ini
    8484    USE yamada_ini_mod, ONLY : yamada_ini
    85     USE atke_turbulence_ini_mod, ONLY : atke_ini
     85    USE lmdz_atke_turbulence_ini, ONLY : atke_ini
    8686    USE lmdz_thermcell_ini, ONLY : thermcell_ini
    8787    USE lmdz_thermcell_dtke, ONLY : thermcell_dtke

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

    r4686 r4687  
    1 link ../phylmd/atke_exchange_coeff_mod.F90
     1link ../phylmd/lmdz_atke_exchange_coeff.F90

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

    r4686 r4687  
    1 link ../phylmd/atke_turbulence_ini_mod.F90
     1link ../phylmd/lmdz_atke_turbulence_ini.F90

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

    r4686 r4687  
    1 link ../phylmd/call_atke_mod.F90
     1link ../phylmd/lmdz_call_atke.F90

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

    r4653 r4687  
    2424  USE climb_wind_mod,      ONLY : climb_wind_down, climb_wind_up
    2525  USE coef_diff_turb_mod,  ONLY : coef_diff_turb
    26   USE call_atke_mod,       ONLY :  call_atke
     26  USE lmdz_call_atke,      ONLY :  call_atke
    2727  USE ioipsl_getin_p_mod,  ONLY : getin_p
    2828  USE cdrag_mod

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

    r4685 r4687  
    8282    USE lmdz_wake_ini, ONLY : wake_ini
    8383    USE yamada_ini_mod, ONLY : yamada_ini
    84     USE atke_turbulence_ini_mod, ONLY : atke_ini
     84    USE lmdz_atke_turbulence_ini, ONLY : atke_ini
    8585    USE lmdz_thermcell_ini, ONLY : thermcell_ini
    8686    USE lmdz_thermcell_dtke, ONLY : thermcell_dtke
Note: See TracChangeset for help on using the changeset viewer.