Index: LMDZ6/trunk/libf/grid/fxy_new_mod_h.f90 =================================================================== --- LMDZ6/trunk/libf/grid/fxy_new_mod_h.f90 (revision 5288) +++ LMDZ6/trunk/libf/grid/fxy_new_mod_h.f90 (revision 5289) @@ -5,5 +5,5 @@ USE serre_mod, ONLY: pxo, pyo, alphax, alphay, transx, transy USE dimensions_mod, ONLY: iim, jjm, llm, ndm - USE lmdz_paramet + USE paramet_mod_h IMPLICIT NONE; PRIVATE PUBLIC fx, fxprim, fy, fyprim Index: LMDZ6/trunk/libf/phylmd/Dust/bcscav_spl.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/bcscav_spl.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/Dust/bcscav_spl.f90 (revision 5289) @@ -3,5 +3,6 @@ USE dimphy USE dimensions_mod, ONLY: iim, jjm, llm, ndm -USE yomcst_mod_h + USE yomcst_mod_h + USE yoecumf_mod_h IMPLICIT NONE !===================================================================== @@ -13,6 +14,4 @@ INCLUDE "chem.h" - - INCLUDE "YOECUMF.h" ! REAL :: pdtime, alpha_r, alpha_s, R_r, R_s Index: LMDZ6/trunk/libf/phylmd/Dust/gastoparticle.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/gastoparticle.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/Dust/gastoparticle.f90 (revision 5289) @@ -4,5 +4,6 @@ !nhl . fluxso4chem, flux_sparam_sulf, - USE dimphy +USE yoecumf_mod_h + USE dimphy USE infotrac ! USE indice_sol_mod @@ -16,5 +17,4 @@ INCLUDE "chem_spla.h" - INCLUDE "YOECUMF.h" ! REAL :: pdtphys Index: LMDZ6/trunk/libf/phylmd/Dust/inscav_spl.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/inscav_spl.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/Dust/inscav_spl.f90 (revision 5289) @@ -4,5 +4,6 @@ USE dimphy USE dimensions_mod, ONLY: iim, jjm, llm, ndm -USE yomcst_mod_h + USE yomcst_mod_h + USE yoecumf_mod_h IMPLICIT NONE !===================================================================== @@ -14,6 +15,4 @@ INCLUDE "chem.h" - - INCLUDE "YOECUMF.h" ! INTEGER :: it Index: LMDZ6/trunk/libf/phylmd/Dust/lsc_scav_orig.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/lsc_scav_orig.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/Dust/lsc_scav_orig.f90 (revision 5289) @@ -14,5 +14,6 @@ USE dimensions_mod, ONLY: iim, jjm, llm, ndm -USE yomcst_mod_h + USE yomcst_mod_h + USE yoecumf_mod_h IMPLICIT NONE !===================================================================== @@ -25,6 +26,4 @@ include "chem.h" - - include "YOECUMF.h" REAL,INTENT(IN) :: pdtime ! time step (s) Index: LMDZ6/trunk/libf/phylmd/Dust/lsc_scav_spl.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/lsc_scav_spl.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/Dust/lsc_scav_spl.f90 (revision 5289) @@ -15,5 +15,6 @@ USE iophy USE dimensions_mod, ONLY: iim, jjm, llm, ndm -USE yomcst_mod_h + USE yomcst_mod_h + USE yoecumf_mod_h IMPLICIT NONE !===================================================================== @@ -27,6 +28,4 @@ include "chem.h" - - include "YOECUMF.h" REAL,INTENT(IN) :: pdtime ! time step (s) Index: LMDZ6/trunk/libf/phylmd/Dust/seasalt.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/seasalt.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/Dust/seasalt.f90 (revision 5289) @@ -4,5 +4,6 @@ SUBROUTINE seasalt(v_10m, u_10m, pct_ocean, lmt_sea_salt) - USE dimphy +USE yoecumf_mod_h + USE dimphy USE dimensions_mod, ONLY: iim, jjm, llm, ndm USE yomcst_mod_h @@ -13,5 +14,4 @@ INCLUDE "chem_spla.h" - INCLUDE "YOECUMF.h" ! INTEGER :: i, bin !local variables Index: LMDZ6/trunk/libf/phylmd/Dust/sediment_mod.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/sediment_mod.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/Dust/sediment_mod.f90 (revision 5289) @@ -8,5 +8,6 @@ !nhl . xlon,xlat, ! - USE dimphy +USE yoecumf_mod_h + USE dimphy USE infotrac USE dimensions_mod, ONLY: iim, jjm, llm, ndm @@ -18,5 +19,4 @@ ! INCLUDE "dimphy.h" - INCLUDE "YOECUMF.h" ! REAL :: RHcl(klon,klev) ! humidite relative ciel clair Index: LMDZ6/trunk/libf/phylmd/YOECUMF.h =================================================================== --- LMDZ6/trunk/libf/phylmd/YOECUMF.h (revision 5288) +++ (revision ) @@ -1,48 +1,0 @@ -! -! $Id$ -! -! ATTENTION!!!!: ce fichier include est compatible format fixe/format libre -! veillez n'utiliser que des ! pour les commentaires -! et bien positionner les & des lignes de continuation -! (les placer en colonne 6 et en colonne 73) -! -! ---------------------------------------------------------------- -!* *COMMON* *YOECUMF* - PARAMETERS FOR CUMULUS MASSFLUX SCHEME -! ---------------------------------------------------------------- -! - COMMON /YOECUMF/ & - & LMFPEN,LMFSCV,LMFMID,LMFDD,LMFDUDV, & - & ENTRPEN,ENTRSCV,ENTRMID,ENTRDD,CMFCTOP, & - & CMFCMAX,CMFCMIN,CMFDEPS,RHCDD,CPRCON - - LOGICAL LMFPEN,LMFSCV,LMFMID,LMFDD,LMFDUDV - REAL ENTRPEN, ENTRSCV, ENTRMID, ENTRDD - REAL CMFCTOP, CMFCMAX, CMFCMIN, CMFDEPS, RHCDD, CPRCON -!$OMP THREADPRIVATE(/YOECUMF/) -! -!*if (DOC,declared) <> 'UNKNOWN' -!* *COMMON* *YOECUMF* - PARAMETERS FOR CUMULUS MASSFLUX SCHEME -! -! M.TIEDTKE E. C. M. W. F. 18/1/89 -! -! NAME TYPE PURPOSE -! ---- ---- ------- -! -! LMFPEN LOGICAL TRUE IF PENETRATIVE CONVECTION IS SWITCHED ON -! LMFSCV LOGICAL TRUE IF SHALLOW CONVECTION IS SWITCHED ON -! LMFMID LOGICAL TRUE IF MIDLEVEL CONVECTION IS SWITCHED ON -! LMFDD LOGICAL TRUE IF CUMULUS DOWNDRAFT IS SWITCHED ON -! LMFDUDV LOGICAL TRUE IF CUMULUS FRICTION IS SWITCHED ON -! ENTRPEN REAL ENTRAINMENT RATE FOR PENETRATIVE CONVECTION -! ENTRSCV REAL ENTRAINMENT RATE FOR SHALLOW CONVECTION -! ENTRMID REAL ENTRAINMENT RATE FOR MIDLEVEL CONVECTION -! ENTRDD REAL ENTRAINMENT RATE FOR CUMULUS DOWNDRAFTS -! CMFCTOP REAL RELAT. CLOUD MASSFLUX AT LEVEL ABOVE NONBUOYANC -! CMFCMAX REAL MAXIMUM MASSFLUX VALUE ALLOWED FOR -! CMFCMIN REAL MINIMUM MASSFLUX VALUE (FOR SAFETY) -! CMFDEPS REAL FRACTIONAL MASSFLUX FOR DOWNDRAFTS AT LFS -! RHCDD REAL RELATIVE SATURATION IN DOWNDRAFTS -! CPRCON REAL COEFFICIENTS FOR DETERMINING CONVERSION -! FROM CLOUD WATER TO RAIN -!*ifend -! ---------------------------------------------------------------- Index: LMDZ6/trunk/libf/phylmd/conflx.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/conflx.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/conflx.f90 (revision 5289) @@ -206,5 +206,6 @@ ! ldcum, ktype, pmfu, pmfd, pen_u, pde_u, pen_d, pde_d, dt_con, dq_con, pmflxr, pmflxs) -USE yoethf_mod_h +USE yoecumf_mod_h + USE yoethf_mod_h USE dimphy USE yomcst_mod_h @@ -212,5 +213,4 @@ ! ------------------------------------------------------------------ - include "YOECUMF.h" ! ---------------------------------------------------------------- REAL pten(klon, klev), pqen(klon, klev), pqsen(klon, klev) @@ -683,5 +683,6 @@ pmfub, pentr, pmfus, pmfuq, pmful, plude, pdmfup, kcbot, kctop, kctop0, & kcum, pen_u, pde_u) -USE yoethf_mod_h +USE yoecumf_mod_h + USE yoethf_mod_h USE dimphy USE yomcst_mod_h @@ -692,5 +693,4 @@ ! ---------------------------------------------------------------------- - include "YOECUMF.h" REAL pdtime @@ -983,5 +983,6 @@ pmfds, pmfuq, pmfdq, pmful, plude, pdmfup, pdmfdp, pten, prfl, psfl, & pdpmel, ktopm2, pmflxr, pmflxs) -USE yoethf_mod_h +USE yoecumf_mod_h + USE yoethf_mod_h USE dimphy USE print_control_mod, ONLY: prt_level @@ -993,5 +994,4 @@ ! ---------------------------------------------------------------------- - include "YOECUMF.h" REAL cevapcu(klon, klev) @@ -1228,5 +1228,6 @@ SUBROUTINE flxdtdq(pdtime, ktopm2, paph, ldcum, pten, pmfus, pmfds, pmfuq, & pmfdq, pmful, pdmfup, pdmfdp, pdpmel, dt_con, dq_con) -USE yoethf_mod_h +USE yoecumf_mod_h + USE yoethf_mod_h USE dimphy USE yomcst_mod_h @@ -1236,5 +1237,4 @@ ! ---------------------------------------------------------------------- - include "YOECUMF.h" ! ----------------------------------------------------------------- LOGICAL llo1 @@ -1291,5 +1291,6 @@ SUBROUTINE flxdlfs(ptenh, pqenh, pgeoh, paph, ptu, pqu, ldcum, kcbot, kctop, & pmfub, prfl, ptd, pqd, pmfd, pmfds, pmfdq, pdmfdp, kdtop, lddraf) -USE yoethf_mod_h +USE yoecumf_mod_h + USE yoethf_mod_h USE dimphy USE yomcst_mod_h @@ -1312,5 +1313,4 @@ ! ---------------------------------------------------------------------- - include "YOECUMF.h" REAL ptenh(klon, klev) @@ -1402,4 +1402,5 @@ USE yomcst_mod_h USE yoethf_mod_h + USE yoecumf_mod_h IMPLICIT NONE @@ -1419,6 +1420,4 @@ ! ---------------------------------------------------------------------- - - include "YOECUMF.h" REAL ptenh(klon, klev), pqenh(klon, klev) @@ -1587,9 +1586,9 @@ END SUBROUTINE flxadjtq SUBROUTINE flxsetup - IMPLICIT NONE +USE yoecumf_mod_h + IMPLICIT NONE ! THIS ROUTINE DEFINES DISPOSABLE PARAMETERS FOR MASSFLUX SCHEME - include "YOECUMF.h" entrpen = 1.0E-4 ! ENTRAINMENT RATE FOR PENETRATIVE CONVECTION Index: LMDZ6/trunk/libf/phylmd/cvltr.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cvltr.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/cvltr.f90 (revision 5289) @@ -10,5 +10,6 @@ qPa,qMel,qTrdi,dtrcvMA,Mint, & zmfd1a,zmfphi2,zmfdam) -USE conema3_mod_h +USE yoecumf_mod_h + USE conema3_mod_h USE IOIPSL USE dimphy @@ -23,5 +24,4 @@ - include "YOECUMF.h" ! Entree Index: LMDZ6/trunk/libf/phylmd/cvltr_noscav.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cvltr_noscav.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/cvltr_noscav.f90 (revision 5289) @@ -3,5 +3,6 @@ ! SUBROUTINE cvltr_noscav(it,pdtime,da, phi, mp,wght_cvfd,paprs,pplay,x,upd,dnd,dx) - USE dimphy +USE yoecumf_mod_h + USE dimphy USE infotrac_phy, ONLY : nbtr USE yomcst_mod_h @@ -12,5 +13,4 @@ !===================================================================== - include "YOECUMF.h" ! Entree Index: LMDZ6/trunk/libf/phylmd/cvltr_scav.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cvltr_scav.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/cvltr_scav.f90 (revision 5289) @@ -11,5 +11,6 @@ zmfd1a,zmfphi2,zmfdam) ! -USE conema3_mod_h +USE yoecumf_mod_h + USE conema3_mod_h USE IOIPSL USE dimphy @@ -24,5 +25,4 @@ - include "YOECUMF.h" include "chem.h" Index: LMDZ6/trunk/libf/phylmd/cvltr_spl.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cvltr_spl.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/cvltr_spl.f90 (revision 5289) @@ -11,5 +11,6 @@ qPa,qMel,qTrdi,dtrcvMA,Mint, & zmfd1a,zmfphi2,zmfdam) -USE conema3_mod_h +USE yoecumf_mod_h + USE conema3_mod_h USE IOIPSL USE dimphy @@ -24,5 +25,4 @@ - include "YOECUMF.h" include "chem.h" Index: LMDZ6/trunk/libf/phylmd/cvltrorig.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cvltrorig.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/cvltrorig.f90 (revision 5289) @@ -3,5 +3,6 @@ ! SUBROUTINE cvltrorig(it,pdtime,da, phi, mp,paprs,pplay,x,upd,dnd,dx) - USE dimphy +USE yoecumf_mod_h + USE dimphy USE infotrac_phy, ONLY : nbtr USE yomcst_mod_h @@ -12,5 +13,4 @@ !===================================================================== - include "YOECUMF.h" ! Entree Index: LMDZ6/trunk/libf/phylmd/flxtr.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/flxtr.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/flxtr.f90 (revision 5289) @@ -6,4 +6,5 @@ USE dimphy USE yomcst_mod_h + USE yoecumf_mod_h IMPLICIT NONE ! ===================================================================== @@ -26,7 +27,4 @@ ! ===================================================================== - - include "YOECUMF.h" - REAL pdtime ! --les flux sont definis au 1/2 niveaux Index: LMDZ6/trunk/libf/phylmd/init_be.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/init_be.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/init_be.f90 (revision 5289) @@ -7,6 +7,6 @@ USE indice_sol_mod USE geometry_mod, ONLY : longitude, latitude - USE yomcst_mod_h + USE yoecumf_mod_h IMPLICIT NONE !===================================================================== @@ -19,8 +19,4 @@ ! last modified by : A. Jamelot (LMD/CEA) 04/03/2009 !===================================================================== - - - INCLUDE "YOECUMF.h" - ! ! Input Arguments Index: LMDZ6/trunk/libf/phylmd/lsc_scav.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/lsc_scav.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/lsc_scav.f90 (revision 5289) @@ -13,4 +13,5 @@ USE iophy USE yomcst_mod_h + USE yoecumf_mod_h IMPLICIT NONE !===================================================================== @@ -22,6 +23,4 @@ include "chem.h" - - include "YOECUMF.h" ! inputs Index: LMDZ6/trunk/libf/phylmd/nflxtr.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/nflxtr.f90 (revision 5288) +++ LMDZ6/trunk/libf/phylmd/nflxtr.f90 (revision 5289) @@ -5,4 +5,5 @@ USE dimphy USE yomcst_mod_h + USE yoecumf_mod_h IMPLICIT NONE !===================================================================== @@ -22,6 +23,4 @@ !===================================================================== ! - - include "YOECUMF.h" REAL,INTENT(IN) :: pdtime ! pdtphys Index: LMDZ6/trunk/libf/phylmd/yoecumf_mod_h.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/yoecumf_mod_h.f90 (revision 5289) +++ LMDZ6/trunk/libf/phylmd/yoecumf_mod_h.f90 (revision 5289) @@ -0,0 +1,42 @@ +MODULE yoecumf_mod_h + ! ---------------------------------------------------------------- + !* *COMMON* *YOECUMF* - PARAMETERS FOR CUMULUS MASSFLUX SCHEME + ! ---------------------------------------------------------------- + + IMPLICIT NONE; PRIVATE + PUBLIC ENTRPEN, ENTRSCV, ENTRMID, ENTRDD, CMFCTOP, CMFCMAX, CMFCMIN, CMFDEPS, RHCDD, & + CPRCON, LMFPEN, LMFSCV, LMFMID, LMFDD, LMFDUDV + + LOGICAL LMFPEN, LMFSCV, LMFMID, LMFDD, LMFDUDV + REAL ENTRPEN, ENTRSCV, ENTRMID, ENTRDD + REAL CMFCTOP, CMFCMAX, CMFCMIN, CMFDEPS, RHCDD, CPRCON + !$OMP THREADPRIVATE(ENTRPEN, ENTRSCV, ENTRMID, ENTRDD, CMFCTOP, CMFCMAX, CMFCMIN, CMFDEPS, RHCDD, & + !$OMP CPRCON, LMFPEN, LMFSCV, LMFMID, LMFDD, LMFDUDV) + + !*if (DOC,declared) <> 'UNKNOWN' + !* *COMMON* *YOECUMF* - PARAMETERS FOR CUMULUS MASSFLUX SCHEME + + ! M.TIEDTKE E. C. M. W. F. 18/1/89 + + ! NAME TYPE PURPOSE + ! ---- ---- ------- + + ! LMFPEN LOGICAL TRUE IF PENETRATIVE CONVECTION IS SWITCHED ON + ! LMFSCV LOGICAL TRUE IF SHALLOW CONVECTION IS SWITCHED ON + ! LMFMID LOGICAL TRUE IF MIDLEVEL CONVECTION IS SWITCHED ON + ! LMFDD LOGICAL TRUE IF CUMULUS DOWNDRAFT IS SWITCHED ON + ! LMFDUDV LOGICAL TRUE IF CUMULUS FRICTION IS SWITCHED ON + ! ENTRPEN REAL ENTRAINMENT RATE FOR PENETRATIVE CONVECTION + ! ENTRSCV REAL ENTRAINMENT RATE FOR SHALLOW CONVECTION + ! ENTRMID REAL ENTRAINMENT RATE FOR MIDLEVEL CONVECTION + ! ENTRDD REAL ENTRAINMENT RATE FOR CUMULUS DOWNDRAFTS + ! CMFCTOP REAL RELAT. CLOUD MASSFLUX AT LEVEL ABOVE NONBUOYANC + ! CMFCMAX REAL MAXIMUM MASSFLUX VALUE ALLOWED FOR + ! CMFCMIN REAL MINIMUM MASSFLUX VALUE (FOR SAFETY) + ! CMFDEPS REAL FRACTIONAL MASSFLUX FOR DOWNDRAFTS AT LFS + ! RHCDD REAL RELATIVE SATURATION IN DOWNDRAFTS + ! CPRCON REAL COEFFICIENTS FOR DETERMINING CONVERSION + ! FROM CLOUD WATER TO RAIN + !*ifend + ! ---------------------------------------------------------------- +END MODULE yoecumf_mod_h Index: LMDZ6/trunk/libf/phylmdiso/YOECUMF.h =================================================================== --- LMDZ6/trunk/libf/phylmdiso/YOECUMF.h (revision 5288) +++ (revision ) @@ -1,1 +1,0 @@ -link ../phylmd/YOECUMF.h Index: LMDZ6/trunk/libf/phylmdiso/yoecumf_mod_h.f90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/yoecumf_mod_h.f90 (revision 5289) +++ LMDZ6/trunk/libf/phylmdiso/yoecumf_mod_h.f90 (revision 5289) @@ -0,0 +1,1 @@ +link ../phylmd/yoecumf_mod_h.f90