Index: LMDZ5/trunk/libf/phylmd/YOEGWD.h =================================================================== --- LMDZ5/trunk/libf/phylmd/YOEGWD.h (revision 2356) +++ LMDZ5/trunk/libf/phylmd/YOEGWD.h (revision 2357) @@ -20,8 +20,12 @@ ! S_c in equation (12) of Lott (JGR, vol 118, page 8897, 2013) + REAL GWD_FRONT_RUWMAX,GWD_FRONT_SAT +! Same as GWD_RANDO params but for fronal GWs + COMMON/YOEGWD/ GFRCRIT,GKWAKE,GRCRIT,GVCRIT,GKDRAG,GKLIFT, & & GHMAX,GRAHILO,GSIGCR,NKTOPG,NSTRA,GSSEC,GTSEC,GVSEC, & - & GWD_RANDO_RUWMAX, gwd_rando_sat + & GWD_RANDO_RUWMAX, gwd_rando_sat, & + & GWD_FRONT_RUWMAX, gwd_front_sat save /YOEGWD/ Index: LMDZ5/trunk/libf/phylmd/acama_gwd_rando_m.F90 =================================================================== --- LMDZ5/trunk/libf/phylmd/acama_gwd_rando_m.F90 (revision 2356) +++ LMDZ5/trunk/libf/phylmd/acama_gwd_rando_m.F90 (revision 2357) @@ -132,6 +132,8 @@ ! CMAX = 30. ! Characteristic phase speed ! Values when rot^2*EXP(-pi*sqrt(J)) is used - RUWFRT=2.0 ! As RUWMAX but for frontal waves ~ N0*F0/4*DZ - SATFRT=0.60 ! As SAT but for frontal waves +! RUWFRT=2.5 ! As RUWMAX but for frontal waves ~ N0*F0/4*DZ +! SATFRT=0.60 ! As SAT but for frontal waves + RUWFRT=gwd_front_ruwmax + SATFRT=gwd_front_sat CMAX = 40. ! Characteristic phase speed ! Phase speed test Index: LMDZ5/trunk/libf/phylmd/conf_phys_m.F90 =================================================================== --- LMDZ5/trunk/libf/phylmd/conf_phys_m.F90 (revision 2356) +++ LMDZ5/trunk/libf/phylmd/conf_phys_m.F90 (revision 2357) @@ -204,5 +204,8 @@ LOGICAL,SAVE :: ok_strato_omp LOGICAL,SAVE :: ok_hines_omp, ok_gwd_rando_omp - real, SAVE:: GWD_RANDO_RUWMAX_omp, gwd_rando_sat_omp + real, SAVE:: gwd_rando_ruwmax_omp, gwd_rando_sat_omp + real, SAVE:: gwd_front_ruwmax_omp, gwd_front_sat_omp + real, save:: sso_gkdrag_omp,sso_grahil_omp,sso_grcrit_omp + real, save:: sso_gfrcri_omp,sso_gkwake_omp,sso_gklift_omp LOGICAL,SAVE :: ok_qch4_omp LOGICAL,SAVE :: carbon_cycle_tr_omp @@ -218,5 +221,5 @@ !----------------------------------------------------------------- - print*,'CONFPHYS ENTREE' + print*,'CONFPHYS ENTREE' !$OMP MASTER !Config Key = type_ocean @@ -913,5 +916,5 @@ NSW_omp = 6 call getin('NSW',NSW_omp) -!albedo SB >>> + !albedo SB >>> iflag_albedo_omp = 0 call getin('iflag_albedo',iflag_albedo_omp) @@ -919,5 +922,5 @@ ok_chlorophyll_omp=.false. call getin('ok_chlorophyll',ok_chlorophyll_omp) -!albedo SB <<< + !albedo SB <<< ! @@ -928,7 +931,7 @@ ! iflag_cld_th_omp = 1 -! On lit deux fois avec l'ancien et le nouveau nom -! pour assurer une retrocompatiblite. -! A abandonner un jour + ! On lit deux fois avec l'ancien et le nouveau nom + ! pour assurer une retrocompatiblite. + ! A abandonner un jour call getin('iflag_cldcon',iflag_cld_th_omp) call getin('iflag_cld_th',iflag_cld_th_omp) @@ -1678,5 +1681,5 @@ ! -! Gustiness flags + ! Gustiness flags f_z0qh_oce_omp = 1. call getin('f_z0qh_oce',f_z0qh_oce_omp) @@ -1811,4 +1814,5 @@ !Config Def = .FALSE. !Config Help = active la version stratosph\'erique de LMDZ de F. Lott + ! Et la sponge layer (Runs Stratospheriques) ok_strato_omp=.FALSE. @@ -1819,8 +1823,29 @@ !Config Def = .FALSE. !Config Help = Clefs controlant la parametrization de Hines - ! Et la sponge layer (Runs Stratospheriques) ok_hines_omp=.FALSE. CALL getin('ok_hines',ok_hines_omp) + + ! Parametres pour les ondes de gravite + ! + ! Subgrid Scale Orography (Lott Miller (1997), Lott (1999)) + + sso_gkdrag_omp = merge(0.1875, 0.2, ok_strato_omp) + CALL getin('sso_gkdrag', sso_gkdrag_omp) + + sso_grahil_omp=merge(0.1,1.,ok_strato_omp) + CALL getin('sso_grahil', sso_grahil_omp) + + sso_grcrit_omp =merge(1.,0.01,ok_strato_omp) + CALL getin('sso_grcrit', sso_grcrit_omp) + + sso_gfrcri_omp = 1. + CALL getin('sso_gfrcri', sso_gfrcri_omp) + + sso_gkwake_omp = 0.50 + CALL getin('sso_gkwake', sso_gkwake_omp) + + sso_gklift_omp = merge(0.25,0.50,ok_strato_omp) + CALL getin('sso_gklift', sso_gklift_omp) ! Random gravity waves: @@ -1834,9 +1859,16 @@ ENDIF - GWD_RANDO_RUWMAX_omp = 0.01 - CALL getin('gwd_rando_ruwmax', GWD_RANDO_RUWMAX_omp) + gwd_rando_ruwmax_omp = 2.00 + CALL getin('gwd_rando_ruwmax', gwd_rando_ruwmax_omp) gwd_rando_sat_omp = 0.25 CALL getin('gwd_rando_sat', gwd_rando_sat_omp) + + gwd_front_ruwmax_omp = 2.50 + CALL getin('gwd_front_ruwmax', gwd_front_ruwmax_omp) + + gwd_front_sat_omp = 0.60 + CALL getin('gwd_front_sat', gwd_front_sat_omp) + !Config key = ok_qch4 @@ -2098,9 +2130,19 @@ tmax_fonte_cv = tmax_fonte_cv_omp alphas = alphas_omp + + gkdrag=sso_gkdrag_omp + grahilo=sso_grahil_omp + grcrit=sso_grcrit_omp + gfrcrit=sso_gfrcri_omp + gkwake=sso_gkwake_omp + gklift=sso_gklift_omp + ok_strato = ok_strato_omp ok_hines = ok_hines_omp ok_gwd_rando = ok_gwd_rando_omp - GWD_RANDO_RUWMAX = GWD_RANDO_RUWMAX_omp + gwd_rando_ruwmax = gwd_rando_ruwmax_omp gwd_rando_sat = gwd_rando_sat_omp + gwd_front_ruwmax = gwd_front_ruwmax_omp + gwd_front_sat = gwd_front_sat_omp ok_qch4 = ok_qch4_omp ok_LES = ok_LES_omp @@ -2119,5 +2161,5 @@ version_ocean='sicOBS' ELSE IF (type_ocean=='slab' .AND. version_ocean/='sicOBS' & - .AND. version_ocean/='sicINT' .AND. version_ocean/='sicNO') THEN + .AND. version_ocean/='sicINT' .AND. version_ocean/='sicNO') THEN WRITE(lunout,*)' ERROR version_ocean=',version_ocean,' not valid with slab ocean' CALL abort_physic('conf_phys','version_ocean not valid',1) @@ -2308,6 +2350,14 @@ write(lunout,*) 'ok_gwd_rando = ', ok_gwd_rando write(lunout,*) 'ok_qch4 = ', ok_qch4 - write(lunout,*) 'GWD_RANDO_RUWMAX = ', GWD_RANDO_RUWMAX + write(lunout,*) 'gwd_rando_ruwmax = ', gwd_rando_ruwmax write(lunout,*) 'gwd_rando_sat = ', gwd_rando_sat + write(lunout,*) 'gwd_front_ruwmax = ', gwd_front_ruwmax + write(lunout,*) 'gwd_front_sat = ', gwd_front_sat + write(lunout,*) 'SSO gkdrag =',gkdrag + write(lunout,*) 'SSO grahilo=',grahilo + write(lunout,*) 'SSO grcrit=',grcrit + write(lunout,*) 'SSO gfrcrit=',gfrcrit + write(lunout,*) 'SSO gkwake=',gkwake + write(lunout,*) 'SSO gklift=',gklift write(lunout,*) 'read_climoz = ', read_climoz write(lunout,*) 'carbon_cycle_tr = ', carbon_cycle_tr Index: LMDZ5/trunk/libf/phylmd/orografi.F90 =================================================================== --- LMDZ5/trunk/libf/phylmd/orografi.F90 (revision 2356) +++ LMDZ5/trunk/libf/phylmd/orografi.F90 (revision 2357) @@ -1656,11 +1656,11 @@ gsigcr = 0.80 - gkdrag = 0.2 - grahilo = 1. - grcrit = 0.01 - gfrcrit = 1.0 - gkwake = 0.50 - - gklift = 0.50 +! Values now specified in run.def, or conf_phys_m.F90 +! gkdrag = 0.2 +! grahilo = 1. +! grcrit = 0.01 +! gfrcrit = 1.0 +! gkwake = 0.50 +! gklift = 0.50 gvcrit = 0.0 Index: LMDZ5/trunk/libf/phylmd/orografi_strato.F90 =================================================================== --- LMDZ5/trunk/libf/phylmd/orografi_strato.F90 (revision 2356) +++ LMDZ5/trunk/libf/phylmd/orografi_strato.F90 (revision 2357) @@ -1861,13 +1861,13 @@ if (nstra == 0) call abort_physic("sugwd_strato", "no level in stratosphere", 1) - gsigcr = 0.80 - - gkdrag = 0.1875 - grahilo = 0.1 - grcrit = 1.00 - gfrcrit = 1.00 - gkwake = 0.50 - - gklift = 0.25 +! Valeurs lues dans les .def, ou attribues dans conf_phys + !gkdrag = 0.2 + !grahilo = 0.1 + !grcrit = 1.00 + !gfrcrit = 0.70 + !gkwake = 0.40 + !gklift = 0.25 + + gsigcr = 0.80 ! Top of low level flow gvcrit = 0.1 Index: LMDZ5/trunk/libf/phylmd/physiq.F90 =================================================================== --- LMDZ5/trunk/libf/phylmd/physiq.F90 (revision 2356) +++ LMDZ5/trunk/libf/phylmd/physiq.F90 (revision 2357) @@ -3892,7 +3892,4 @@ CALL add_phys_tend(du_gwd_front, dv_gwd_front, dt0, dq0, dql0, dqi0, & paprs, 'front_gwd_rando', abortphy) - - ! LIGNE TEMPORAIRE POUR TESTER ROT (ECRITE AUSSI AU DESSOUS!!!): - east_gwstress=rot ENDIF @@ -3911,7 +3908,4 @@ * (paprs(:, k)-paprs(:, k+1))/rg ENDDO - - ! LIGNE TEMPORAIRE POUR TESTER ROT (ECRITE AUSSI AU DESSUS!!!): - east_gwstress=rot end if