Index: LMDZ6/trunk/libf/phylmd/cv30_routines.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv30_routines.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv30_routines.f90 (revision 5276) @@ -5,4 +5,6 @@ SUBROUTINE cv30_param(nd, delt) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -85,4 +87,6 @@ SUBROUTINE cv30_prelim(len, nd, ndp1, t, q, p, ph, lv, cpn, tv, gz, h, hm, & th) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -108,5 +112,4 @@ REAL cpx(len, nd) - include "cvthermo.h" include "cv30param.h" @@ -343,4 +346,6 @@ SUBROUTINE cv30_undilute1(len, nd, t, q, qs, gz, plcl, p, nk, icb, tp, tvp, & clw, icbs) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -357,6 +362,4 @@ ! - if icbs=icb, compute also tp(icb+1),tvp(icb+1) & clw(icb+1) ! ---------------------------------------------------------------- - - include "cvthermo.h" include "cv30param.h" @@ -839,4 +842,6 @@ ep, sigp, buoy) ! epmax_cape: ajout arguments + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -859,5 +864,4 @@ ! --------------------------------------------------------------------- - include "cvthermo.h" include "cv30param.h" include "conema3.h" @@ -1212,4 +1216,6 @@ SUBROUTINE cv30_closure(nloc, ncum, nd, icb, inb, pbase, p, ph, tv, buoy, & sig, w0, cape, m) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -1220,5 +1226,4 @@ ! =================================================================== - include "cvthermo.h" include "cv30param.h" @@ -1418,4 +1423,6 @@ u, v, tra, h, lv, qnk, hp, tv, tvp, ep, clw, m, sig, ment, qent, uent, & vent, sij, elij, ments, qents, traent) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -1426,5 +1433,4 @@ ! --------------------------------------------------------------------- - include "cvthermo.h" include "cv30param.h" @@ -1816,8 +1822,9 @@ mp, rp, up, vp, trap, wt, water, evap, b & ! RomP-jyg , wdtraina, wdtrainm) ! 26/08/10 RomP-jyg + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & - ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac + ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac IMPLICIT NONE - include "cvthermo.h" include "cv30param.h" @@ -2183,7 +2190,8 @@ USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - include "cvthermo.h" include "cv30param.h" include "conema3.h" @@ -3274,4 +3282,6 @@ ,cape,ep,hp,icb,inb,clw,nk,t,h,lv & ,epmax_diag) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav implicit none @@ -3281,5 +3291,4 @@ ! Toutes les autres variables fn de ep sont calcul�es plus bas. - INCLUDE "cvthermo.h" INCLUDE "cv30param.h" INCLUDE "conema3.h" Index: LMDZ6/trunk/libf/phylmd/cv3_buoy.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv3_buoy.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv3_buoy.f90 (revision 5276) @@ -10,7 +10,8 @@ ! ************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - include "cvthermo.h" include "cv3param.h" include "YOMCST2.h" Index: LMDZ6/trunk/libf/phylmd/cv3_cine.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv3_cine.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv3_cine.f90 (revision 5276) @@ -15,4 +15,6 @@ ! ************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO & , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA & @@ -30,5 +32,4 @@ - include "cvthermo.h" include "cv3param.h" ! input: Index: LMDZ6/trunk/libf/phylmd/cv3_enthalpmix.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv3_enthalpmix.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv3_enthalpmix.f90 (revision 5276) @@ -11,4 +11,6 @@ ! ************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO & , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA & @@ -34,5 +36,4 @@ ! =============================================================== - include "cvthermo.h" include "YOETHF.h" Index: LMDZ6/trunk/libf/phylmd/cv3_estatmix.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv3_estatmix.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv3_estatmix.f90 (revision 5276) @@ -12,4 +12,6 @@ ! **************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO & , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA & @@ -35,5 +37,4 @@ ! =============================================================== - include "cvthermo.h" include "YOETHF.h" Index: LMDZ6/trunk/libf/phylmd/cv3_routines.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv3_routines.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv3_routines.f90 (revision 5276) @@ -184,5 +184,7 @@ SUBROUTINE cv3_incrcount(len, nd, delt, sig) -USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & +USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav + USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac IMPLICIT NONE @@ -225,4 +227,6 @@ SUBROUTINE cv3_prelim(len, nd, ndp1, t, q, p, ph, & lv, lf, cpn, tv, gz, h, hm, th) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -248,5 +252,4 @@ REAL cpx(len, nd) - include "cvthermo.h" include "cv3param.h" @@ -314,4 +317,6 @@ USE add_phys_tend_mod, ONLY: fl_cor_ebil USE print_control_mod, ONLY: prt_level + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -332,5 +337,4 @@ include "cv3param.h" - include "cvthermo.h" !inputs: @@ -605,4 +609,6 @@ SUBROUTINE cv3_undilute1(len, nd, t, qs, gz, plcl, p, icb, tnk, qnk, gznk, & tp, tvp, clw, icbs) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -622,5 +628,4 @@ ! ---------------------------------------------------------------- - include "cvthermo.h" include "cv3param.h" @@ -1141,4 +1146,6 @@ USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -1161,5 +1168,4 @@ ! --------------------------------------------------------------------- - include "cvthermo.h" include "cv3param.h" include "conema3.h" @@ -2050,4 +2056,6 @@ pbase, p, ph, tv, buoy, & sig, w0, cape, m, iflag) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -2060,5 +2068,4 @@ ! =================================================================== - include "cvthermo.h" include "cv3param.h" @@ -2296,4 +2303,6 @@ USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -2303,5 +2312,4 @@ ! --------------------------------------------------------------------- - include "cvthermo.h" include "cv3param.h" @@ -2717,4 +2725,6 @@ faci, b, sigd, & wdtrainA, wdtrainS, wdtrainM) ! RomP + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -2722,5 +2732,4 @@ IMPLICIT NONE - include "cvthermo.h" include "cv3param.h" include "nuage.h" @@ -3466,8 +3475,8 @@ USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac - + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - include "cvthermo.h" include "cv3param.h" include "conema3.h" @@ -4961,4 +4970,6 @@ ep, Vprecip, elij, clw, epmlmMm, eplaMm, & icb, inb) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -5151,4 +5162,6 @@ USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav implicit none @@ -5158,5 +5171,4 @@ ! Toutes les autres variables fn de ep sont calcul�es plus bas. - include "cvthermo.h" include "cv3param.h" include "conema3.h" Index: LMDZ6/trunk/libf/phylmd/cv3p1_closure.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv3p1_closure.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv3p1_closure.f90 (revision 5276) @@ -19,4 +19,6 @@ ! ************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE print_control_mod, ONLY: prt_level, lunout USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO & @@ -34,5 +36,4 @@ IMPLICIT NONE - include "cvthermo.h" include "cv3param.h" include "YOMCST2.h" Index: LMDZ6/trunk/libf/phylmd/cv3p2_closure.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv3p2_closure.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv3p2_closure.f90 (revision 5276) @@ -18,4 +18,6 @@ ! ************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -35,5 +37,4 @@ IMPLICIT NONE - include "cvthermo.h" include "cv3param.h" include "YOMCST2.h" Index: LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90 (revision 5276) @@ -13,4 +13,6 @@ ! ************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -21,5 +23,4 @@ IMPLICIT NONE - include "cvthermo.h" include "cv3param.h" include "YOMCST2.h" Index: LMDZ6/trunk/libf/phylmd/cv_driver.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv_driver.F90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv_driver.F90 (revision 5276) @@ -682,4 +682,6 @@ SUBROUTINE cv_flag(iflag_ice_thermo) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -699,14 +701,14 @@ ! ! si icvflag_Tpa=0, alors la fraction de glace dans l'ascendance adiabatique est - ! fonction de la temperature de l'environnement et la temperature de l'ascendance est - ! calculee en deux it�rations, une en supposant qu'il n'y a pas de glace et l'autre + ! fonction de la temperature de l'environnement et la temperature de l'ascendance est + ! calculee en deux it�rations, une en supposant qu'il n'y a pas de glace et l'autre ! en ajoutant la glace (ancien sch�ma d'Arnaud Jam). ! si icvflag_Tpa=1, alors la fraction de glace dans l'ascendance adiabatique est - ! fonction de la temperature de l'environnement et la temperature de l'ascendance est + ! fonction de la temperature de l'environnement et la temperature de l'ascendance est ! calculee en une seule iteration. ! si icvflag_Tpa=2, alors la fraction de glace dans l'ascendance adiabatique est - ! fonction de la temperature de l'ascendance et la temperature de l'ascendance est + ! fonction de la temperature de l'ascendance et la temperature de l'ascendance est ! calculee en une seule iteration. - icvflag_Tpa=0 + icvflag_Tpa=0 call getin_p('icvflag_Tpa', icvflag_Tpa) @@ -728,4 +730,6 @@ , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS & , RALPD, RBETD, RGAMD + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -735,5 +739,4 @@ - include "cvthermo.h" INTEGER iflag_con Index: LMDZ6/trunk/libf/phylmd/cv_routines.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cv_routines.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmd/cv_routines.f90 (revision 5276) @@ -3,4 +3,6 @@ SUBROUTINE cv_param(nd) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -75,4 +77,6 @@ SUBROUTINE cv_prelim(len, nd, ndp1, t, q, p, ph, lv, cpn, tv, gz, h, hm) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -93,5 +97,4 @@ REAL cpx(len, nd) - include "cvthermo.h" include "cvparam.h" @@ -254,7 +257,8 @@ SUBROUTINE cv_undilute1(len, nd, t, q, qs, gz, p, nk, icb, icbmax, tp, tvp, & clw) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - include "cvthermo.h" include "cvparam.h" @@ -481,4 +485,6 @@ SUBROUTINE cv_undilute2(nloc, ncum, nd, icb, nk, tnk, qnk, gznk, t, q, qs, & gz, p, dph, h, tv, lv, inb, inb1, tp, tvp, clw, hp, ep, sigp, frac) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -492,6 +498,4 @@ ! FIND THE LEVEL OF NEUTRAL BUOYANCY ! --------------------------------------------------------------------- - - include "cvthermo.h" include "cvparam.h" @@ -764,4 +768,6 @@ SUBROUTINE cv_closure(nloc, ncum, nd, nk, icb, tv, tvp, p, ph, dph, plcl, & cpn, iflag, cbmf) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -781,6 +787,4 @@ REAL dtpbl(nloc), dtmin(nloc), tvpplcl(nloc), tvaplcl(nloc) REAL work(nloc) - - include "cvthermo.h" include "cvparam.h" @@ -847,7 +851,8 @@ h, lv, qnk, hp, tv, tvp, ep, clw, cbmf, m, ment, qent, uent, vent, nent, & sij, elij) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - include "cvthermo.h" include "cvparam.h" @@ -1098,8 +1103,7 @@ SUBROUTINE cv_unsat(nloc, ncum, nd, inb, t, q, qs, gz, u, v, p, ph, h, lv, & ep, sigp, clw, m, ment, elij, iflag, mp, qp, up, vp, wt, water, evap) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - - - include "cvthermo.h" include "cvparam.h" @@ -1301,7 +1305,8 @@ ment, qent, uent, vent, nent, elij, tv, tvp, iflag, wd, qprime, tprime, & precip, cbmf, ft, fq, fu, fv, ma, qcondc) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - include "cvthermo.h" include "cvparam.h" Index: LMDZ6/trunk/libf/phylmd/cvthermo.h =================================================================== --- LMDZ6/trunk/libf/phylmd/cvthermo.h (revision 5275) +++ (revision ) @@ -1,16 +1,0 @@ -! -! $Header$ -! -! Thermodynamical constants for convectL: - - real cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0 - real clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl, clmci - real eps, epsi, epsim1 - real ginv, hrd - real grav - - COMMON /cvthermo/ cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl & - ,t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & - ,clmci, eps, epsi, epsim1, ginv, hrd, grav - -!$OMP THREADPRIVATE(/cvthermo/) Index: LMDZ6/trunk/libf/phylmd/cvthermo_mod_h.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cvthermo_mod_h.f90 (revision 5276) +++ LMDZ6/trunk/libf/phylmd/cvthermo_mod_h.f90 (revision 5276) @@ -0,0 +1,17 @@ +! Replaces cvthermo.h + +MODULE cvthermo_mod_h + IMPLICIT NONE; PRIVATE + PUBLIC cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav + + ! Thermodynamical constants for convectL: + REAL cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0 + REAL clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl, clmci + REAL eps, epsi, epsim1 + REAL ginv, hrd + REAL grav + + !$OMP THREADPRIVATE(cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + !$OMP , clmci, eps, epsi, epsim1, ginv, hrd, grav) +END MODULE cvthermo_mod_h Index: LMDZ6/trunk/libf/phylmdiso/cv30_routines.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cv30_routines.F90 (revision 5275) +++ LMDZ6/trunk/libf/phylmdiso/cv30_routines.F90 (revision 5276) @@ -5,4 +5,6 @@ SUBROUTINE cv30_param(nd, delt) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -85,4 +87,6 @@ SUBROUTINE cv30_prelim(len, nd, ndp1, t, q, p, ph, lv, cpn, tv, gz, h, hm, & th) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -108,5 +112,4 @@ REAL cpx(len, nd) - include "cvthermo.h" include "cv30param.h" @@ -389,4 +392,6 @@ #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -404,5 +409,4 @@ ! ---------------------------------------------------------------- - include "cvthermo.h" include "cv30param.h" @@ -1150,4 +1154,6 @@ #endif #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -1170,5 +1176,4 @@ ! --------------------------------------------------------------------- - include "cvthermo.h" include "cv30param.h" include "conema3.h" @@ -1615,4 +1620,6 @@ SUBROUTINE cv30_closure(nloc, ncum, nd, icb, inb, pbase, p, ph, tv, buoy, & sig, w0, cape, m) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -1623,5 +1630,4 @@ ! =================================================================== - include "cvthermo.h" include "cv30param.h" @@ -1851,4 +1857,6 @@ #endif #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -1859,5 +1867,4 @@ ! --------------------------------------------------------------------- - include "cvthermo.h" include "cv30param.h" @@ -2668,4 +2675,6 @@ #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -2673,5 +2682,4 @@ - include "cvthermo.h" include "cv30param.h" @@ -3403,9 +3411,10 @@ #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac IMPLICIT NONE - include "cvthermo.h" include "cv30param.h" include "conema3.h" @@ -6355,5 +6364,7 @@ ,cape,ep,hp,icb,inb,clw,nk,t,h,lv & ,epmax_diag) - implicit none + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav +implicit none ! On fait varier epmax en fn de la cape @@ -6362,5 +6373,4 @@ ! Toutes les autres variables fn de ep sont calculees plus bas. -INCLUDE "cvthermo.h" INCLUDE "cv30param.h" INCLUDE "conema3.h" Index: LMDZ6/trunk/libf/phylmdiso/cv3_enthalpmix.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cv3_enthalpmix.F90 (revision 5275) +++ LMDZ6/trunk/libf/phylmdiso/cv3_enthalpmix.F90 (revision 5276) @@ -18,4 +18,6 @@ ! ************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO & , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA & @@ -41,5 +43,4 @@ ! =============================================================== - include "cvthermo.h" include "YOETHF.h" Index: LMDZ6/trunk/libf/phylmdiso/cv3_estatmix.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cv3_estatmix.F90 (revision 5275) +++ LMDZ6/trunk/libf/phylmdiso/cv3_estatmix.F90 (revision 5276) @@ -19,4 +19,6 @@ ! **************************************************************** + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO & , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA & @@ -42,5 +44,4 @@ ! =============================================================== - include "cvthermo.h" include "YOETHF.h" Index: LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90 (revision 5275) +++ LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90 (revision 5276) @@ -185,5 +185,7 @@ SUBROUTINE cv3_incrcount(len, nd, delt, sig) -USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & +USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav + USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac IMPLICIT NONE @@ -226,4 +228,6 @@ SUBROUTINE cv3_prelim(len, nd, ndp1, t, q, p, ph, & lv, lf, cpn, tv, gz, h, hm, th) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -249,5 +253,4 @@ REAL cpx(len, nd) - include "cvthermo.h" include "cv3param.h" @@ -323,4 +326,6 @@ #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE mod_phys_lmdz_transfert_para, ONLY : bcast USE add_phys_tend_mod, ONLY: fl_cor_ebil @@ -344,5 +349,4 @@ include "cv3param.h" - include "cvthermo.h" !inputs: @@ -701,4 +705,6 @@ #endif #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -716,5 +722,4 @@ ! ---------------------------------------------------------------- - include "cvthermo.h" include "cv3param.h" @@ -1484,4 +1489,6 @@ #endif #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -1506,5 +1513,4 @@ ! --------------------------------------------------------------------- - include "cvthermo.h" include "cv3param.h" include "conema3.h" @@ -2513,4 +2519,6 @@ pbase, p, ph, tv, buoy, & sig, w0, cape, m, iflag) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -2521,5 +2529,4 @@ ! =================================================================== - include "cvthermo.h" include "cv3param.h" @@ -2784,4 +2791,6 @@ #endif #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -2793,5 +2802,4 @@ ! --------------------------------------------------------------------- - include "cvthermo.h" include "cv3param.h" @@ -3612,4 +3620,6 @@ #endif #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -3617,5 +3627,4 @@ - include "cvthermo.h" include "cv3param.h" include "nuage.h" @@ -4725,9 +4734,10 @@ #endif #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac IMPLICIT NONE - include "cvthermo.h" include "cv3param.h" include "conema3.h" @@ -7615,5 +7625,7 @@ , pbase, p, ph, tv, buoy, sig, w0,iflag & , epmax_diag) - USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav + USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac implicit none @@ -7624,5 +7636,4 @@ ! Toutes les autres variables fn de ep sont calculees plus bas. - include "cvthermo.h" include "cv3param.h" include "conema3.h" Index: LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90 (revision 5275) +++ LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90 (revision 5276) @@ -39,9 +39,10 @@ #endif #endif + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac IMPLICIT NONE - include "cvthermo.h" include "cv3param.h" include "YOMCST2.h" Index: LMDZ6/trunk/libf/phylmdiso/cv_driver.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cv_driver.F90 (revision 5275) +++ LMDZ6/trunk/libf/phylmdiso/cv_driver.F90 (revision 5276) @@ -1229,4 +1229,6 @@ SUBROUTINE cv_flag(iflag_ice_thermo) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, & ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac @@ -1287,4 +1289,6 @@ , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS & , RALPD, RBETD, RGAMD + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -1292,5 +1296,4 @@ ! Set thermodynamical constants for convectL ! ------------------------------------------------------------- - include "cvthermo.h" INTEGER iflag_con Index: LMDZ6/trunk/libf/phylmdiso/cv_routines.f90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cv_routines.f90 (revision 5275) +++ LMDZ6/trunk/libf/phylmdiso/cv_routines.f90 (revision 5276) @@ -3,4 +3,6 @@ SUBROUTINE cv_param(nd) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -75,4 +77,6 @@ SUBROUTINE cv_prelim(len, nd, ndp1, t, q, p, ph, lv, cpn, tv, gz, h, hm) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -93,5 +97,4 @@ REAL cpx(len, nd) - include "cvthermo.h" include "cvparam.h" @@ -254,7 +257,7 @@ SUBROUTINE cv_undilute1(len, nd, t, q, qs, gz, p, nk, icb, icbmax, tp, tvp, & clw) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - - include "cvthermo.h" include "cvparam.h" @@ -481,4 +484,6 @@ SUBROUTINE cv_undilute2(nloc, ncum, nd, icb, nk, tnk, qnk, gznk, t, q, qs, & gz, p, dph, h, tv, lv, inb, inb1, tp, tvp, clw, hp, ep, sigp, frac) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -492,6 +497,4 @@ ! FIND THE LEVEL OF NEUTRAL BUOYANCY ! --------------------------------------------------------------------- - - include "cvthermo.h" include "cvparam.h" @@ -764,4 +767,6 @@ SUBROUTINE cv_closure(nloc, ncum, nd, nk, icb, tv, tvp, p, ph, dph, plcl, & cpn, iflag, cbmf) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE @@ -782,5 +787,4 @@ REAL work(nloc) - include "cvthermo.h" include "cvparam.h" @@ -847,7 +851,8 @@ h, lv, qnk, hp, tv, tvp, ep, clw, cbmf, m, ment, qent, uent, vent, nent, & sij, elij) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - include "cvthermo.h" include "cvparam.h" @@ -1098,8 +1103,8 @@ SUBROUTINE cv_unsat(nloc, ncum, nd, inb, t, q, qs, gz, u, v, p, ph, h, lv, & ep, sigp, clw, m, ment, elij, iflag, mp, qp, up, vp, wt, water, evap) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - - include "cvthermo.h" include "cvparam.h" @@ -1301,7 +1306,8 @@ ment, qent, uent, vent, nent, elij, tv, tvp, iflag, wd, qprime, tprime, & precip, cbmf, ft, fq, fu, fv, ma, qcondc) + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE - include "cvthermo.h" include "cvparam.h" Index: LMDZ6/trunk/libf/phylmdiso/cvthermo.h =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cvthermo.h (revision 5275) +++ (revision ) @@ -1,1 +1,0 @@ -link ../phylmd/cvthermo.h Index: LMDZ6/trunk/libf/phylmdiso/cvthermo_mod_h.f90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/cvthermo_mod_h.f90 (revision 5276) +++ LMDZ6/trunk/libf/phylmdiso/cvthermo_mod_h.f90 (revision 5276) @@ -0,0 +1,1 @@ +link ../phylmd/cvthermo_mod_h.f90 Index: LMDZ6/trunk/libf/phylmdiso/lmdz_wake.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/lmdz_wake.F90 (revision 5275) +++ LMDZ6/trunk/libf/phylmdiso/lmdz_wake.F90 (revision 5276) @@ -55,4 +55,6 @@ , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS & , RALPD, RBETD, RGAMD + USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl & + , clmci, eps, epsi, epsim1, ginv, hrd, grav IMPLICIT NONE ! ============================================================================ @@ -144,9 +146,4 @@ ! Cgw : vitesse de propagation de onde de gravité ! LL : distance entre 2 poches - - ! ------------------------------------------------------------------------- - ! Déclaration de variables - ! ------------------------------------------------------------------------- - include "cvthermo.h" ! Arguments en entree