Ignore:
Timestamp:
Jul 29, 2024, 9:59:33 AM (6 months ago)
Author:
abarral
Message:

Put nuage.h, flux_arp.h, compbl.h into modules
Move unused phylmd/ini_hist* to obsolete

Location:
LMDZ6/branches/Amaury_dev/libf
Files:
2 deleted
35 edited
8 moved

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

    r5137 r5139  
    9595            ratqs_inter_, rneb_ancien
    9696    USE lmdz_alpale
     97    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    9798
    9899    IMPLICIT NONE
    … …  
    128129    REAL :: alp_offset
    129130    LOGICAL :: filtre_oro = .FALSE.
    130 
    131     INCLUDE "compbl.h"
    132131
    133132    deg2rad = pi / 180.0

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phys_output_write_spl_mod.F90

    r5137 r5139  
    398398    USE lmdz_alpale
    399399    USE lmdz_clesphys
     400    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    400401
    401402    IMPLICIT NONE
    402403
    403404    !   INCLUDE "temps.h"
    404     INCLUDE "compbl.h"
    405405    INCLUDE "dimensions.h"
    406406

  • LMDZ6/branches/Amaury_dev/libf/phylmd/calbeta.F90

    r5134 r5139  
    77  USE dimphy
    88  USE indice_sol_mod
     9  USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
    910
    1011  IMPLICIT NONE
    11 
    12   INCLUDE "flux_arp.h"
    1312
    1413!======================================================================

  • LMDZ6/branches/Amaury_dev/libf/phylmd/climb_hq_mod.F90

    r5117 r5139  
    4747! Input arguments
    4848!****************************************************************************************
     49    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
     50
     51    IMPLICIT NONE
    4952    INTEGER, INTENT(IN)                      :: knon
    5053    REAL, DIMENSION(klon,klev), INTENT(IN)   :: coefhq
    … …  
    8487!****************************************************************************************
    8588    INCLUDE "YOMCST.h"
    86     INCLUDE "compbl.h"   
    87 
    88 
    8989!****************************************************************************************
    9090! 1)
    … …  
    331331! Input arguments
    332332!****************************************************************************************
     333    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
     334    IMPLICIT NONE
    333335    INTEGER, INTENT(IN)                      :: knon
    334336    REAL, INTENT(IN)                         :: dtime
    … …  
    358360!****************************************************************************************
    359361    INCLUDE "YOMCST.h"
    360     INCLUDE "compbl.h"   
    361 
    362362!****************************************************************************************
    363363! 1)

  • LMDZ6/branches/Amaury_dev/libf/phylmd/climb_qbs_mod.F90

    r5099 r5139  
    3535! Input arguments
    3636!****************************************************************************************
     37    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
     38    IMPLICIT NONE
    3739    INTEGER, INTENT(IN)                      :: knon
    3840    REAL, DIMENSION(klon,klev), INTENT(IN)   :: coefqbs
    … …  
    6466!****************************************************************************************
    6567    INCLUDE "YOMCST.h"
    66     INCLUDE "compbl.h"   
    67 
    68 
    6968!****************************************************************************************
    7069! 1)
    … …  
    260259! Input arguments
    261260!****************************************************************************************
     261    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
     262
     263    IMPLICIT NONE
    262264    INTEGER, INTENT(IN)                      :: knon
    263265    REAL, INTENT(IN)                         :: dtime
    … …  
    287289!****************************************************************************************
    288290    INCLUDE "YOMCST.h"
    289     INCLUDE "compbl.h"   
    290 
    291291!****************************************************************************************
    292292! 1)

  • LMDZ6/branches/Amaury_dev/libf/phylmd/climb_wind_mod.F90

    r5117 r5139  
    8888! Input arguments
    8989!****************************************************************************************
     90    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
     91
     92    IMPLICIT NONE
    9093    INTEGER, INTENT(IN)                      :: knon
    9194    REAL, INTENT(IN)                         :: dtime
    … …  
    123126!****************************************************************************************
    124127    INCLUDE "YOMCST.h"
    125     INCLUDE "compbl.h"   
    126 
    127128!****************************************************************************************
    128129! Initialize module
    … …  
    274275! Input arguments
    275276!****************************************************************************************
     277    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
     278    IMPLICIT NONE
     279
    276280    INTEGER, INTENT(IN)                     :: knon
    277281    REAL, INTENT(IN)                        :: dtime
    … …  
    299303!****************************************************************************************
    300304    INCLUDE "YOMCST.h"
    301     INCLUDE "compbl.h"   
    302 
    303305!****************************************************************************************
    304306

  • LMDZ6/branches/Amaury_dev/libf/phylmd/coef_diff_turb_mod.F90

    r5137 r5139  
    2020    USE lmdz_print_control, ONLY: prt_level, lunout
    2121    USE lmdz_clesphys
     22    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    2223
    2324! Calculate coefficients(ycoefm, ycoefh) for turbulent diffusion in the
    … …  
    6162! Include
    6263!****************************************************************************************
    63     INCLUDE "compbl.h"
    6464    INCLUDE "YOETHF.h"
    6565    INCLUDE "YOMCST.h"
    … …  
    211211    USE indice_sol_mod
    212212    USE lmdz_print_control, ONLY: prt_level, lunout
     213    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    213214 
    214215!======================================================================
    … …  
    234235    INCLUDE "YOMCST.h"
    235236    INCLUDE "FCTTRE.h"
    236     INCLUDE "compbl.h"
    237237
    238238! Arguments:

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

    r5137 r5139  
    3939    USE lmdz_alpale
    4040    USE lmdz_clesphys
     41    USE lmdz_nuage_params
     42    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    4143
    4244    INCLUDE "conema3.h"
    43     INCLUDE "nuage.h"
    4445    INCLUDE "YOMCST.h"
    4546    INCLUDE "YOMCST2.h"
    4647
    4748    !IM : on inclut/initialise les taux de CH4, N2O, CFC11 et CFC12
    48     INCLUDE "compbl.h"
    4949    INCLUDE "comsoil.h"
    5050    INCLUDE "YOEGWD.h"

  • LMDZ6/branches/Amaury_dev/libf/phylmd/create_etat0_unstruct_mod.F90

    r5137 r5139  
    9494  USE lmdz_alpale
    9595  USE lmdz_clesphys
     96  USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    9697
    9798  IMPLICIT NONE
    … …  
    113114    REAL,    DIMENSION(klon_mpi)             :: cell_area_mpi
    114115    REAL,    DIMENSION(klon_mpi,nbsrf)       :: pctsrf_mpi
    115 
    116     INCLUDE "compbl.h"
    117116
    118117    INTEGER :: ji,j,i

  • LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_routines.F90

    r5117 r5139  
    27102710                     wdtrainA, wdtrainS, wdtrainM)                                      ! RomP
    27112711  USE lmdz_print_control, ONLY: prt_level, lunout
     2712  USE lmdz_nuage_params
     2713
    27122714  IMPLICIT NONE
    27132715
    … …  
    27162718  include "cv3param.h"
    27172719  include "cvflag.h"
    2718   include "nuage.h"
    27192720
    27202721!inputs:

  • LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_1dutils.f90

    r5135 r5139  
    6464    USE IOIPSL
    6565    USE lmdz_print_control, ONLY: lunout
     66    USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     67
    6668    !-----------------------------------------------------------------------
    6769    !     Auteurs :   A. Lahellec  .
    … …  
    7173
    7274    include "compar1d.h"
    73     include "flux_arp.h"
    7475    include "tsoilnudge.h"
    7576    include "fcg_gcssold.h"

  • LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_old_lmdz1d.F90

    r5137 r5139  
    5252    USE lmdz_1dutils, ONLY: fq_sat, conf_unicol, dyn1deta0, dyn1dredem
    5353    USE lmdz_clesphys
     54    USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     55    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    5456
    5557    INCLUDE "dimensions.h"
    … …  
    5759    INCLUDE "dimsoil.h"
    5860    INCLUDE "compar1d.h"
    59     INCLUDE "flux_arp.h"
    6061    INCLUDE "date_cas.h"
    6162    INCLUDE "tsoilnudge.h"
    6263    INCLUDE "fcg_gcssold.h"
    63     INCLUDE "compbl.h"
    6464
    6565    !=====================================================================

  • LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_scm.F90

    r5137 r5139  
    4545    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_OUTPUTPHYSSCM
    4646    USE lmdz_clesphys
     47    USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     48    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    4749
    4850    INCLUDE "dimensions.h"
    … …  
    5052    INCLUDE "dimsoil.h"
    5153    INCLUDE "compar1d.h"
    52     INCLUDE "flux_arp.h"
    5354    INCLUDE "date_cas.h"
    5455    INCLUDE "tsoilnudge.h"
    5556    INCLUDE "fcg_gcssold.h"
    56     INCLUDE "compbl.h"
    5757
    5858    !=====================================================================

  • LMDZ6/branches/Amaury_dev/libf/phylmd/ener_conserv.F90

    r5137 r5139  
    3131USE lmdz_abort_physic, ONLY: abort_physic
    3232USE lmdz_clesphys
     33USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    3334
    3435IMPLICIT NONE
    3536INCLUDE "YOMCST.h"
    3637INCLUDE "YOETHF.h"
    37 INCLUDE "compbl.h"
    3838
    3939! Arguments

  • LMDZ6/branches/Amaury_dev/libf/phylmd/freinage.F90

    r5137 r5139  
    88    USE dimphy, ONLY: klon, klev
    99    USE lmdz_clesphys
     10    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    1011!    USE control, ONLY: nvm
    1112!    USE indice_sol_mod, ONLY: nvm_orch
    … …  
    1819!FC
    1920    include "dimpft.h"
    20     include "compbl.h"
    2121
    2222    ! 0. DECLARATIONS:

  • LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/surf_inlandsis_mod.F90

    r5137 r5139  
    10421042        USE indice_sol_mod
    10431043        USE lmdz_clesphys
     1044        USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    10441045
    10451046        IMPLICIT NONE
    … …  
    10481049        ! Objet: Lecture du fichier de conditions initiales pour SISVAT
    10491050        !======================================================================
    1050         include "compbl.h"
    10511051
    10521052        !======================================================================
    … …  
    12781278        USE dimphy
    12791279        USE lmdz_clesphys
     1280        USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    12801281
    12811282        IMPLICIT NONE
    1282 
    1283         include "compbl.h"
    12841283
    12851284        !======================================================================

  • LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_compbl.f90

    r5138 r5139  
     1! Replaces compbl.h
    12
    2       ! $Header$
     3MODULE lmdz_compbl
     4  IMPLICIT NONE; PRIVATE
     5  PUBLIC iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    36
    4 !jyg+al1<
    5 !!      integer iflag_pbl,iflag_pbl_split
    6 !!      common/compbl/iflag_pbl,iflag_pbl_split
    7 !!FC      integer iflag_pbl, iflag_pbl_split, iflag_order2_sollw
    8 !FC      common/compbl/iflag_pbl, iflag_pbl_split, iflag_order2_sollw
    9       INTEGER iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    10       common/compbl/iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    11 !>jyg+al1
    12 !$OMP THREADPRIVATE(/compbl/)
     7  !!      integer iflag_pbl,iflag_pbl_split
     8  !!      common/compbl/iflag_pbl,iflag_pbl_split
     9  !!FC      integer iflag_pbl, iflag_pbl_split, iflag_order2_sollw
     10  !FC      common/compbl/iflag_pbl, iflag_pbl_split, iflag_order2_sollw
     11  INTEGER iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
     12  !$OMP THREADPRIVATE(iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree)
     13
     14  !>jyg+al1
     15
     16END MODULE lmdz_compbl

  • LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_flux_arp.f90

    r5138 r5139  
    1 
    21! $Id: flux_arp.h 2010-08-04 17:02:56Z lahellec $
     2! Replaces flux_arh.h
    33! Modif EV, 10/2020
    44
    5       LOGICAL :: ok_flux_surf
    6       LOGICAL :: ok_prescr_ust !for prescribed ustar
    7       LOGICAL :: ok_prescr_beta
    8       LOGICAL :: ok_forc_tsurf
     5MODULE lmdz_flux_arp
     6  PRIVATE NONE; PRIVATE
     7  PUBLIC fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
    98
     9  LOGICAL :: ok_flux_surf
     10  LOGICAL :: ok_prescr_ust !for prescribed ustar
     11  LOGICAL :: ok_prescr_beta
     12  LOGICAL :: ok_forc_tsurf
    1013
    11       REAL :: fsens
    12       REAL :: flat
    13       REAL :: betaevap
    14       REAL :: ust
    15       REAL :: tg
     14  REAL :: fsens
     15  REAL :: flat
     16  REAL :: betaevap
     17  REAL :: ust
     18  REAL :: tg
    1619
    17       common /flux_arp/fsens,flat,betaevap,ust,tg,ok_flux_surf,ok_prescr_ust,ok_prescr_beta,ok_forc_tsurf
    18 
    19 !$OMP THREADPRIVATE(/flux_arp/)
     20  !$OMP THREADPRIVATE(fsens,flat,betaevap,ust,tg,ok_flux_surf,ok_prescr_ust,ok_prescr_beta,ok_forc_tsurf)
     21END MODULE lmdz_flux_arp
    2022
    2123

  • LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_nuage_params.f90

    r5138 r5139  
     1! Replaces nuage.h
    12
    2 ! $Id$
     3MODULE lmdz_nuage_params
     4  IMPLICIT NONE; PRIVATE
     5  PUBLIC rad_froid, rad_chau1, rad_chau2, &
     6          tau_cld_cv, coefw_cld_cv, &
     7          tmax_fonte_cv, iflag_ratqs, &
     8          iflag_cld_cv, &
     9          ok_icefra_lscp
    310
    4       REAL rad_froid, rad_chau1, rad_chau2
    5       REAL tau_cld_cv,coefw_cld_cv
    6       REAL tmax_fonte_cv
    7       INTEGER iflag_cld_cv, iflag_ratqs
    8       LOGICAL ok_icefra_lscp
     11  REAL rad_froid, rad_chau1, rad_chau2
     12  REAL tau_cld_cv, coefw_cld_cv
     13  REAL tmax_fonte_cv
     14  INTEGER iflag_cld_cv, iflag_ratqs
     15  LOGICAL ok_icefra_lscp
    916
    10       common /nuagecom/ rad_froid,rad_chau1, rad_chau2,                 &
    11                         tau_cld_cv,coefw_cld_cv,                        &
    12                         tmax_fonte_cv,iflag_ratqs,                      &
    13                         iflag_cld_cv,                                   &
    14                         ok_icefra_lscp
    15 !$OMP THREADPRIVATE(/nuagecom/)
     17  !$OMP THREADPRIVATE(rad_froid,rad_chau1, rad_chau2,                 &
     18  !$OMP                    tau_cld_cv,coefw_cld_cv,                        &
     19  !$OMP                    tmax_fonte_cv,iflag_ratqs,                      &
     20  !$OMP                    iflag_cld_cv,                                   &
     21  !$OMP                    ok_icefra_lscp)
     22
     23END MODULE lmdz_nuage_params

  • LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_yomcst.f90

    r5119 r5139  
    1 ! TODO: REPLACE YOMCST.h ONCE .F -> .f90 !
     1! Replaces yomcst.h
    22
    33module lmdz_yomcst
     4  IMPLICIT NONE; PRIVATE
     5
     6  PUBLIC RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
     7          , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
     8          , R_ecc, R_peri, R_incl                                      &
     9          , RA, RG, R1SA                                         &
     10          , RSIGMA                                                     &
     11          , R, RMD, RMV, RD, RV, RCPD                    &
     12          , RMO3, RMCO2, RMC, RMCH4, RMN2O, RMCFC11, RMCFC12        &
     13          , RCPV, RCVD, RCVV, RKAPPA, RETV, eps_w                    &
     14          , RCW, RCS                                                 &
     15          , RLVTT, RLSTT, RLMLT, RTT, RATM                           &
     16          , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
     17          , RALPD, RBETD, RGAMD
     18
    419  ! A1.0 Fundamental constants
    520  REAL RPI, RCLUM, RHPLA, RKBOL, RNAVO
    … …  
    2540  REAL RALPD, RBETD, RGAMD
    2641
    27   COMMON/YOMCST/RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
    28           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
    29           , R_ecc, R_peri, R_incl                                      &
    30           , RA, RG, R1SA                                         &
    31           , RSIGMA                                                     &
    32           , R, RMD, RMV, RD, RV, RCPD                    &
    33           , RMO3, RMCO2, RMC, RMCH4, RMN2O, RMCFC11, RMCFC12        &
    34           , RCPV, RCVD, RCVV, RKAPPA, RETV, eps_w                    &
    35           , RCW, RCS                                                 &
    36           , RLVTT, RLSTT, RLMLT, RTT, RATM                           &
    37           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
    38           , RALPD, RBETD, RGAMD
    39   !$OMP THREADPRIVATE(/YOMCST/)
     42  !$OMP THREADPRIVATE(RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
     43  !$OMP      , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
     44  !$OMP      , R_ecc, R_peri, R_incl                                      &
     45  !$OMP      , RA, RG, R1SA                                         &
     46  !$OMP      , RSIGMA                                                     &
     47  !$OMP      , R, RMD, RMV, RD, RV, RCPD                    &
     48  !$OMP      , RMO3, RMCO2, RMC, RMCH4, RMN2O, RMCFC11, RMCFC12        &
     49  !$OMP      , RCPV, RCVD, RCVV, RKAPPA, RETV, eps_w                    &
     50  !$OMP      , RCW, RCS                                                 &
     51  !$OMP      , RLVTT, RLSTT, RLMLT, RTT, RATM                           &
     52  !$OMP      , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
     53  !$OMP      , RALPD, RBETD, RGAMD)
    4054
    4155END MODULE lmdz_yomcst

  • LMDZ6/branches/Amaury_dev/libf/phylmd/nuage.F90

    r5137 r5139  
    1010  USE phys_local_var_mod, ONLY: ptconv
    1111  USE lmdz_clesphys
     12  USE lmdz_nuage_params ! JBM 3/14
    1213
    1314  IMPLICIT NONE
    … …  
    4142
    4243  include "YOMCST.h"
    43   include "nuage.h" ! JBM 3/14
    4444
    4545  REAL paprs(klon, klev+1), pplay(klon, klev)

  • LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_forced_mod.F90

    r5137 r5139  
    4242    USE config_ocean_skin_m, ONLY: activate_ocean_skin
    4343  USE lmdz_clesphys
     44  USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
    4445#ifdef ISO
    4546    USE infotrac_phy, ONLY: ntiso,niso
    … …  
    5354
    5455    INCLUDE "YOMCST.h"
    55     INCLUDE "flux_arp.h"
    5656
    5757! Input arguments
    … …  
    268268    USE phys_output_var_mod, ONLY: sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o
    269269  USE lmdz_clesphys
     270  USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
    270271#ifdef ISO
    271272    USE infotrac_phy, ONLY: niso, ntiso
    … …  
    281282    INCLUDE "dimsoil.h"
    282283    INCLUDE "YOMCST.h"
    283     INCLUDE "flux_arp.h"
    284284
    285285! Input arguments

  • LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90

    r5137 r5139  
    415415    USE netcdf, ONLY: missing_val_netcdf => nf90_fill_real
    416416  USE lmdz_clesphys
     417  USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     418  USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    417419
    418420    IMPLICIT NONE
    … …  
    422424    INCLUDE "YOETHF.h"
    423425    INCLUDE "FCTTRE.h"
    424     INCLUDE "compbl.h"
    425     INCLUDE "flux_arp.h"
    426426    !FC
    427427    INCLUDE "dimpft.h"
    … …  
    42734273    USE config_ocean_skin_m, ONLY: activate_ocean_skin
    42744274  USE lmdz_clesphys
     4275  USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    42754276
    42764277    INCLUDE "dimsoil.h"
    4277     INCLUDE "compbl.h"
    42784278
    42794279    ! Input variables

  • LMDZ6/branches/Amaury_dev/libf/phylmd/perturb_radlwsw.F90

    r5134 r5139  
    44
    55      USE dimphy
     6      USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     7
    68      IMPLICIT NONE
    7       INCLUDE "flux_arp.h"     
    89
    910! Arguments :

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phyetat0_mod.F90

    r5137 r5139  
    4444    USE lmdz_alpale
    4545    USE lmdz_clesphys
     46    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    4647
    4748    IMPLICIT NONE
    … …  
    5152    !======================================================================
    5253    include "dimsoil.h"
    53     include "compbl.h"
    5454    include "YOMCST.h"
    5555    !======================================================================

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phyredem.F90

    r5137 r5139  
    4444  USE lmdz_alpale
    4545  USE lmdz_clesphys
     46  USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    4647
    4748  IMPLICIT NONE
    4849
    4950  include "dimsoil.h"
    50   include "compbl.h"
    5151  !======================================================================
    5252  CHARACTER*(*) fichnom

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_write_mod.F90

    r5137 r5139  
    470470    USE lmdz_alpale
    471471    USE lmdz_clesphys
     472    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    472473
    473474    IMPLICIT NONE
    474475
    475     INCLUDE "compbl.h"
    476476    INCLUDE "YOMCST.h"
    477477

  • LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90

    r5137 r5139  
    352352    USE lmdz_alpale
    353353    USE lmdz_clesphys
     354    USE lmdz_nuage_params
     355    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    354356
    355357    IMPLICIT NONE
    … …  
    11561158    !IM 100106 BEG : pouvoir sortir les ctes de la physique
    11571159    include "conema3.h"
    1158     include "nuage.h"
    1159     include "compbl.h"
    11601160    !IM 100106 END : pouvoir sortir les ctes de la physique
    11611161

  • LMDZ6/branches/Amaury_dev/libf/phylmd/screenc_mod.F90

    r5117 r5139  
    1919                         ustar, testar, qstar, okri, ri1, &
    2020                         pref, delu, delte, delq, s_pblh, prain, tsol, pat1)
     21        USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     22
    2123      IMPLICIT NONE
    2224!-----------------------------------------------------------------------
    … …  
    7375!-----------------------------------------------------------------------
    7476      include "YOMCST.h"
    75       include "flux_arp.h"
    7677
    7778! Variables locales 
    … …  
    122123                         ri1, iri1, &
    123124                         pref, delm, delh, zri1, s_pblh, prain, tsol, pat1)
     125        USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     126
    124127      IMPLICIT NONE
    125128!-----------------------------------------------------------------------
    … …  
    177180!-----------------------------------------------------------------------
    178181      include "YOMCST.h"
    179       include "flux_arp.h"
    180182
    181183! Variables locales 

  • LMDZ6/branches/Amaury_dev/libf/phylmd/stdlevvar_mod.F90

    r5117 r5139  
    2020                           ts1, qsurf, z0m, z0h, psol, pat1, &
    2121                           t_2m, q_2m, t_10m, q_10m, u_10m, ustar, s_pblh, prain, tsol)
     22        USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     23
    2224      IMPLICIT NONE
    2325!-------------------------------------------------------------------------
    … …  
    7173      REAL, DIMENSION(klon), INTENT(IN) :: tsol
    7274!-------------------------------------------------------------------------
    73       include "flux_arp.h"
    7475      include "YOMCST.h"
    7576!IM PLUS
    … …  
    320321
    321322      USE lmdz_ioipsl_getin_p, ONLY: getin_p
     323      USE lmdz_flux_arp, ONLY: fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
     324
    322325      IMPLICIT NONE
    323326!-------------------------------------------------------------------------
    … …  
    380383      REAL, DIMENSION(klon) :: tsol
    381384!-------------------------------------------------------------------------
    382       include "flux_arp.h"
    383385      include "YOMCST.h"
    384386!IM PLUS

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_nofrein_mod.F90

    r5117 r5139  
    5757    USE lmdz_print_control, ONLY: lunout
    5858    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
     59    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    5960#ifdef CPP_VEGET
    6061    USE time_phylmdz_mod, ONLY: itau_phy
    … …  
    115116    INCLUDE "YOMCST.h"
    116117    INCLUDE "dimpft.h"
    117     INCLUDE "compbl.h"
    118118
    119119! Parametres d'entree

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_noz0h_mod.F90

    r5117 r5139  
    5555    USE lmdz_print_control, ONLY: lunout
    5656    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
     57    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    5758#ifdef CPP_VEGET
    5859    USE time_phylmdz_mod, ONLY: itau_phy
    … …  
    113114    INCLUDE "YOMCST.h"
    114115    INCLUDE "dimpft.h" 
    115     INCLUDE "compbl.h"
    116116
    117117! Parametres d'entree

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/climb_hq_mod.F90

    r5136 r5139  
    5656#endif               
    5757            )
     58  USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    5859#ifdef ISOVERIF
    5960USE isotopes_mod, ONLY: iso_eau,iso_HDO
    … …  
    126127!****************************************************************************************
    127128    INCLUDE "YOMCST.h"
    128     INCLUDE "compbl.h"   
    129    
     129
    130130#ifdef ISO
    131131#ifdef ISOVERIF
    … …  
    498498       )
    499499
     500  USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    500501#ifdef ISOVERIF
    501502USE infotrac_phy, ONLY: nzone
    … …  
    555556!****************************************************************************************
    556557    INCLUDE "YOMCST.h"
    557     INCLUDE "compbl.h"       
    558 
    559558!****************************************************************************************
    560559! 1)

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_routines.F90

    r5132 r5139  
    35883588  USE lmdz_print_control, ONLY: prt_level, lunout
    35893589  USE lmdz_abort_physic, ONLY: abort_physic
     3590  USE lmdz_nuage_params
    35903591#ifdef ISO
    35913592    USE infotrac_phy, ONLY: ntraciso=>ntiso
    … …  
    36163617  include "cv3param.h"
    36173618  include "cvflag.h"
    3618   include "nuage.h"
    36193619
    36203620!inputs:

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/isotopes_routines_mod.F90

    r5137 r5139  
    1572015720        iso_HTO
    1572115721        USE lmdz_clesphys
     15722        USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    1572215723#ifdef ISOVERIF
    1572315724  USE isotopes_verif_mod
    … …  
    1572815729
    1572915730 include "dimsoil.h"
    15730  include "compbl.h"
    1573115731
    1573215732!#ifdef ISOVERIF
    … …  
    1589415894&       Rdefault,iso_O17,ridicule,ridicule_qsol
    1589515895USE lmdz_clesphys
     15896USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    1589615897#ifdef ISOVERIF
    1589715898  USE isotopes_verif_mod
    … …  
    1590315904
    1590415905 include "dimsoil.h"
    15905  include "compbl.h"
    1590615906
    1590715907        ! arguments 
    … …  
    1627516275#endif
    1627616276USE lmdz_clesphys
     16277USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
     16278
    1627716279   IMPLICIT NONE
    1627816280
    1627916281 include "dimsoil.h"
    16280  include "compbl.h"
    1628116282
    1628216283   REAL, INTENT(IN) ::             snow     (klon,nbsrf)

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_compbl.f90

    r5138 r5139  
    1 link ../phylmd/compbl.h
     1link ../phylmd/lmdz_compbl.f90

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_flux_arp.f90

    r5138 r5139  
    1 link ../phylmd/flux_arp.h
     1link ../phylmd/lmdz_flux_arp.f90

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_nuage_params.f90

    r5138 r5139  
    1 link ../phylmd/nuage.h
     1link ../phylmd/lmdz_nuage_params.f90

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90

    r5137 r5139  
    5353  USE lmdz_alpale
    5454  USE lmdz_clesphys
     55  USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    5556#ifdef ISO
    5657  USE infotrac_phy, ONLY: niso
    … …  
    6869  !======================================================================
    6970  include "dimsoil.h"
    70   include "compbl.h"
    7171  include "YOMCST.h"
    7272  !======================================================================

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

    r5137 r5139  
    5454  USE lmdz_alpale
    5555  USE lmdz_clesphys
     56  USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    5657
    5758  IMPLICIT NONE
    5859
    5960  include "dimsoil.h"
    60   include "compbl.h"
    6161  !======================================================================
    6262  CHARACTER*(*) fichnom
    … …  
    511511      USE lmdz_alpale
    512512      USE lmdz_clesphys
     513      USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    513514
    514515        IMPLICIT NONE
    … …  
    517518
    518519 include "dimsoil.h"
    519  include "compbl.h"
    520520      ! inputs
    521521      !REAL xtsol(niso,klon)

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

    r5137 r5139  
    420420       USE lmdz_alpale
    421421       USE lmdz_clesphys
     422       USE lmdz_nuage_params
     423    USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
    422424
    423425    IMPLICIT NONE
    … …  
    12701272    !IM 100106 BEG : pouvoir sortir les ctes de la physique
    12711273    include "conema3.h"
    1272     include "nuage.h"
    1273     include "compbl.h"
    12741274    !IM 100106 END : pouvoir sortir les ctes de la physique
    12751275
Note: See TracChangeset for help on using the changeset viewer.