Changeset 1894 for LMDZ5/trunk/libf/phylmd
- Timestamp:
- Oct 22, 2013, 11:37:11 AM (11 years ago)
- Location:
- LMDZ5/trunk/libf/phylmd
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/phylmd/albsno.F90
r782 r1894 5 5 6 6 IMPLICIT NONE 7 8 INCLUDE "clesphys.h" 7 9 8 10 ! Input arguments … … 33 35 !**************************************************************************************** 34 36 37 if (albsno0>=0.) then 38 init(:)=albsno0 39 decay(:)=0. 40 endif 41 35 42 veget = 0. 36 43 veget(:,1) = 1. ! desert partout -
LMDZ5/trunk/libf/phylmd/clesphys.h
r1877 r1894 41 41 REAL fmagic, pmagic 42 42 ! Hauteur (imposee) du contenu en eau du sol 43 REAL qsol0 43 REAL qsol0,albsno0,evap0 44 44 ! Frottement au sol (Cdrag) 45 45 Real f_cdrag_ter,f_cdrag_oce … … 101 101 & , freq_ISCCP, ecrit_ISCCP, freq_COSP, ip_ebil_phy & 102 102 & , ok_lic_melt, cvl_corr, aer_type & 103 & , qsol0, iflag_rrtm, ok_strato,ok_hines,ecrit_LES & 103 & , qsol0,albsno0,evap0 & 104 & , iflag_rrtm, ok_strato,ok_hines,ecrit_LES & 104 105 & , co2_ppm0, iflag_ice_thermo 105 106 -
LMDZ5/trunk/libf/phylmd/conf_phys_m.F90
r1877 r1894 148 148 REAL,SAVE :: inertie_sol_omp,inertie_sno_omp,inertie_ice_omp 149 149 REAL,SAVE :: qsol0_omp 150 REAL,SAVE :: evap0_omp 151 REAL,SAVE :: albsno0_omp 150 152 REAL :: solarlong0 151 153 REAL,SAVE :: solarlong0_omp … … 175 177 INTEGER, SAVE :: nbapp_rad_omp, iflag_con_omp 176 178 INTEGER, SAVE :: iflag_ener_conserv_omp 179 INTEGER, SAVE :: iflag_fisrtilp_qsat_omp 177 180 LOGICAL,SAVE :: ok_strato_omp 178 181 LOGICAL,SAVE :: ok_hines_omp … … 686 689 CALL getin('iflag_ener_conserv',iflag_ener_conserv_omp) 687 690 691 !Config Key = iflag_fisrtilp_qsat 692 !Config Desc = Flag de convection 693 !Config Def = 1 694 !Config Help = Flag pour la convection les options suivantes existent : 695 !Config -1 pour Kinetic energy correction 696 !Config 1 conservation kinetic and enthalpy 697 iflag_fisrtilp_qsat_omp = 0 698 CALL getin('iflag_fisrtilp_qsat',iflag_fisrtilp_qsat_omp) 699 688 700 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 689 701 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 897 909 ! 898 910 !----------------------------------------------------------------------- 899 ! Valeur imposee de l'humidite du sol pour le modele bucket. 900 !Config Key = qsol0 901 !Config Desc = 902 !Config Def = -1. 903 !Config Help = 904 ! 911 ! Valeur imposee pour configuration idealisees 912 !Config Key = qsol0 pour le bucket, evap0 pour aquaplanetes, albsno0 913 ! Default value -1 to activate the full computation 905 914 qsol0_omp = -1. 906 915 call getin('qsol0',qsol0_omp) 916 evap0_omp = -1. 917 call getin('evap0',evap0_omp) 918 albsno0_omp = -1. 919 call getin('albsno0',albsno0_omp) 907 920 ! 908 921 !----------------------------------------------------------------------- … … 1680 1693 iflag_con = iflag_con_omp 1681 1694 iflag_ener_conserv = iflag_ener_conserv_omp 1695 iflag_fisrtilp_qsat = iflag_fisrtilp_qsat_omp 1682 1696 1683 1697 epmax = epmax_omp … … 1695 1709 solarlong0 = solarlong0_omp 1696 1710 qsol0 = qsol0_omp 1711 evap0 = evap0_omp 1712 albsno0 = albsno0_omp 1697 1713 inertie_sol = inertie_sol_omp 1698 1714 inertie_ice = inertie_ice_omp … … 1895 1911 write(lunout,*)'iflag_con=',iflag_con 1896 1912 write(lunout,*)'iflag_ener_conserv=',iflag_ener_conserv 1913 write(lunout,*)'iflag_fisrtilp_qsat=',iflag_fisrtilp_qsat 1897 1914 write(lunout,*)' epmax = ', epmax 1898 1915 write(lunout,*)' ok_adj_ema = ', ok_adj_ema … … 1966 1983 write(lunout,*)' solarlong0 = ', solarlong0 1967 1984 write(lunout,*)' qsol0 = ', qsol0 1985 write(lunout,*)' evap0 = ', evap0 1986 write(lunout,*)' albsno0 = ', albsno0 1968 1987 write(lunout,*)' inertie_sol = ', inertie_sol 1969 1988 write(lunout,*)' inertie_ice = ', inertie_ice -
LMDZ5/trunk/libf/phylmd/fisrtilp.F90
r1855 r1894 566 566 zqn(i) = zq(i) 567 567 rneb(i,k) = 1.0 568 zcond(i) = MAX(0.0,zqn(i)-zqs(i))/(1 +zdqs(i))568 zcond(i) = MAX(0.0,zqn(i)-zqs(i))/(1.+iflag_fisrtilp_qsat*zdqs(i)) 569 569 rhcl(i,k)=1.0 570 570 ELSE 571 zcond(i) = MAX(0.0,zqn(i)-zqs(i))*rneb(i,k)/(1 +zdqs(i))571 zcond(i) = MAX(0.0,zqn(i)-zqs(i))*rneb(i,k)/(1.+iflag_fisrtilp_qsat*zdqs(i)) 572 572 rhcl(i,k)=(zqs(i)+zq(i)-zdelq)/2./zqs(i) 573 573 ENDIF -
LMDZ5/trunk/libf/phylmd/fisrtilp.h
r793 r1894 14 14 LOGICAL reevap_ice 15 15 INTEGER iflag_pdf 16 INTEGER iflag_fisrtilp_qsat 16 17 17 18 common/comfisrtilp/ & … … 24 25 & ,coef_eva & 25 26 & ,reevap_ice & 27 & ,iflag_fisrtilp_qsat & 26 28 & ,iflag_pdf 27 29 -
LMDZ5/trunk/libf/phylmd/pbl_surface_mod.F90
r1887 r1894 269 269 INCLUDE "YOETHF.h" 270 270 INCLUDE "temps.h" 271 !****************************************************************************************272 ! Declarations specifiques pour le 1D. A reprendre273 271 INCLUDE "flux_arp.h" 274 ! Input variables275 272 !**************************************************************************************** 276 273 REAL, INTENT(IN) :: dtime ! time interval (s) … … 512 509 513 510 !**************************************************************************************** 511 514 512 ! End of declarations 515 513 !**************************************************************************************** … … 562 560 ! Force soil water content to qsol0 if qsol0>0 and VEGET=F (use bucket 563 561 ! instead of ORCHIDEE) 564 IF (qsol0> 0.) THEN562 IF (qsol0>=0.) THEN 565 563 PRINT*,'WARNING : On impose qsol=',qsol0 566 564 qsol(:)=qsol0 … … 983 981 ! 984 982 !**************************************************************************************** 983 984 if (evap0>=0.) then 985 yevap(:)=evap0 986 yevap(:)=RLVTT*evap0 987 endif 988 989 985 990 y_d_ts(1:knon) = ytsurf_new(1:knon) - yts(1:knon) 986 991
Note: See TracChangeset
for help on using the changeset viewer.