Changeset 2357


Ignore:
Timestamp:
Aug 31, 2015, 6:25:19 PM (9 years ago)
Author:
lguez
Message:

The default value for gwd_rando_ruwmax is changed. This is ok because
the Lott GWD rando parameterization has not been much used yet.

New parameters GWD_FRONT_RUWMAX, GWD_FRONT_SAT, that can be chosen at
run-time, for frontal gravity waves.

New paramters sso_gkdrag, sso_grahil, sso_grcrit, sso_gfrcri,
sso_gkwake, sso_gklift that can be chosen at run-time, for orographic
gravity waves. The default values for those parameters are those that
were hard-coded before this revision.

Location:
LMDZ5/trunk/libf/phylmd
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/phylmd/YOEGWD.h

    r2072 r2357  
    2020!     S_c in equation (12) of Lott (JGR, vol 118, page 8897, 2013)
    2121
     22      REAL GWD_FRONT_RUWMAX,GWD_FRONT_SAT
     23! Same as GWD_RANDO params but for fronal GWs
     24
    2225
    2326      COMMON/YOEGWD/ GFRCRIT,GKWAKE,GRCRIT,GVCRIT,GKDRAG,GKLIFT,        &
    2427     &     GHMAX,GRAHILO,GSIGCR,NKTOPG,NSTRA,GSSEC,GTSEC,GVSEC,         &
    25      &     GWD_RANDO_RUWMAX, gwd_rando_sat
     28     &     GWD_RANDO_RUWMAX, gwd_rando_sat,                             &
     29     &     GWD_FRONT_RUWMAX, gwd_front_sat
    2630
    2731      save /YOEGWD/

  • LMDZ5/trunk/libf/phylmd/acama_gwd_rando_m.F90

    r2333 r2357  
    132132!    CMAX = 30.   ! Characteristic phase speed
    133133! Values when rot^2*EXP(-pi*sqrt(J)) is used                         
    134     RUWFRT=2.0   ! As RUWMAX but for frontal waves ~ N0*F0/4*DZ
    135     SATFRT=0.60   ! As SAT    but for frontal waves
     134!   RUWFRT=2.5   ! As RUWMAX but for frontal waves ~ N0*F0/4*DZ
     135!   SATFRT=0.60   ! As SAT    but for frontal waves
     136    RUWFRT=gwd_front_ruwmax 
     137    SATFRT=gwd_front_sat
    136138    CMAX = 40.    ! Characteristic phase speed
    137139! Phase speed test

  • LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

    r2344 r2357  
    204204    LOGICAL,SAVE :: ok_strato_omp
    205205    LOGICAL,SAVE :: ok_hines_omp, ok_gwd_rando_omp
    206     real, SAVE:: GWD_RANDO_RUWMAX_omp, gwd_rando_sat_omp
     206    real, SAVE:: gwd_rando_ruwmax_omp, gwd_rando_sat_omp
     207    real, SAVE:: gwd_front_ruwmax_omp, gwd_front_sat_omp
     208    real, save:: sso_gkdrag_omp,sso_grahil_omp,sso_grcrit_omp
     209    real, save:: sso_gfrcri_omp,sso_gkwake_omp,sso_gklift_omp
    207210    LOGICAL,SAVE :: ok_qch4_omp
    208211    LOGICAL,SAVE      :: carbon_cycle_tr_omp
    … …  
    218221    !-----------------------------------------------------------------
    219222
    220      print*,'CONFPHYS ENTREE'
     223    print*,'CONFPHYS ENTREE'
    221224    !$OMP MASTER
    222225    !Config Key  = type_ocean
    … …  
    913916    NSW_omp = 6
    914917    call getin('NSW',NSW_omp)
    915 !albedo SB >>>
     918    !albedo SB >>>
    916919    iflag_albedo_omp = 0
    917920    call getin('iflag_albedo',iflag_albedo_omp)
    … …  
    919922    ok_chlorophyll_omp=.false.
    920923    call getin('ok_chlorophyll',ok_chlorophyll_omp)
    921 !albedo SB <<<
     924    !albedo SB <<<
    922925
    923926    !
    … …  
    928931    !
    929932    iflag_cld_th_omp = 1
    930 ! On lit deux fois avec l'ancien et le nouveau nom
    931 ! pour assurer une retrocompatiblite.
    932 ! A abandonner un jour
     933    ! On lit deux fois avec l'ancien et le nouveau nom
     934    ! pour assurer une retrocompatiblite.
     935    ! A abandonner un jour
    933936    call getin('iflag_cldcon',iflag_cld_th_omp)
    934937    call getin('iflag_cld_th',iflag_cld_th_omp)
    … …  
    16781681    !
    16791682
    1680 ! Gustiness flags
     1683    ! Gustiness flags
    16811684    f_z0qh_oce_omp = 1.
    16821685    call getin('f_z0qh_oce',f_z0qh_oce_omp)
    … …  
    18111814    !Config  Def  = .FALSE.
    18121815    !Config  Help = active la version stratosph\'erique de LMDZ de F. Lott
     1816    !               Et la sponge layer (Runs Stratospheriques)
    18131817
    18141818    ok_strato_omp=.FALSE.
    … …  
    18191823    !Config  Def  = .FALSE.
    18201824    !Config  Help = Clefs controlant la parametrization de Hines
    1821     !               Et la sponge layer (Runs Stratospheriques)
    18221825
    18231826    ok_hines_omp=.FALSE.
    18241827    CALL getin('ok_hines',ok_hines_omp)
     1828
     1829    !  Parametres pour les ondes de gravite
     1830    ! 
     1831    !  Subgrid Scale Orography (Lott Miller (1997), Lott (1999))
     1832
     1833    sso_gkdrag_omp = merge(0.1875, 0.2, ok_strato_omp)
     1834    CALL getin('sso_gkdrag', sso_gkdrag_omp)
     1835
     1836    sso_grahil_omp=merge(0.1,1.,ok_strato_omp)
     1837    CALL getin('sso_grahil', sso_grahil_omp)
     1838
     1839    sso_grcrit_omp =merge(1.,0.01,ok_strato_omp)
     1840    CALL getin('sso_grcrit', sso_grcrit_omp)
     1841
     1842    sso_gfrcri_omp = 1.
     1843    CALL getin('sso_gfrcri', sso_gfrcri_omp)
     1844
     1845    sso_gkwake_omp = 0.50
     1846    CALL getin('sso_gkwake', sso_gkwake_omp)
     1847
     1848    sso_gklift_omp = merge(0.25,0.50,ok_strato_omp)
     1849    CALL getin('sso_gklift', sso_gklift_omp)
    18251850
    18261851    ! Random gravity waves:
    … …  
    18341859    ENDIF
    18351860
    1836     GWD_RANDO_RUWMAX_omp = 0.01
    1837     CALL getin('gwd_rando_ruwmax', GWD_RANDO_RUWMAX_omp)
     1861    gwd_rando_ruwmax_omp = 2.00
     1862    CALL getin('gwd_rando_ruwmax', gwd_rando_ruwmax_omp)
    18381863
    18391864    gwd_rando_sat_omp = 0.25
    18401865    CALL getin('gwd_rando_sat', gwd_rando_sat_omp)
     1866
     1867    gwd_front_ruwmax_omp = 2.50
     1868    CALL getin('gwd_front_ruwmax', gwd_front_ruwmax_omp)
     1869
     1870    gwd_front_sat_omp = 0.60
     1871    CALL getin('gwd_front_sat', gwd_front_sat_omp)
     1872
    18411873
    18421874    !Config  key = ok_qch4
    … …  
    20982130    tmax_fonte_cv = tmax_fonte_cv_omp
    20992131    alphas = alphas_omp
     2132
     2133    gkdrag=sso_gkdrag_omp
     2134    grahilo=sso_grahil_omp
     2135    grcrit=sso_grcrit_omp
     2136    gfrcrit=sso_gfrcri_omp
     2137    gkwake=sso_gkwake_omp
     2138    gklift=sso_gklift_omp
     2139
    21002140    ok_strato = ok_strato_omp
    21012141    ok_hines = ok_hines_omp
    21022142    ok_gwd_rando = ok_gwd_rando_omp
    2103     GWD_RANDO_RUWMAX = GWD_RANDO_RUWMAX_omp
     2143    gwd_rando_ruwmax = gwd_rando_ruwmax_omp
    21042144    gwd_rando_sat = gwd_rando_sat_omp
     2145    gwd_front_ruwmax = gwd_front_ruwmax_omp
     2146    gwd_front_sat = gwd_front_sat_omp
    21052147    ok_qch4 = ok_qch4_omp
    21062148    ok_LES = ok_LES_omp
    … …  
    21192161       version_ocean='sicOBS'
    21202162    ELSE IF (type_ocean=='slab' .AND. version_ocean/='sicOBS' &
    2121              .AND. version_ocean/='sicINT' .AND. version_ocean/='sicNO') THEN
     2163         .AND. version_ocean/='sicINT' .AND. version_ocean/='sicNO') THEN
    21222164       WRITE(lunout,*)' ERROR version_ocean=',version_ocean,' not valid with slab ocean'
    21232165       CALL abort_physic('conf_phys','version_ocean not valid',1)
    … …  
    23082350    write(lunout,*) 'ok_gwd_rando = ',  ok_gwd_rando
    23092351    write(lunout,*) 'ok_qch4 = ',  ok_qch4
    2310     write(lunout,*) 'GWD_RANDO_RUWMAX = ', GWD_RANDO_RUWMAX
     2352    write(lunout,*) 'gwd_rando_ruwmax = ', gwd_rando_ruwmax
    23112353    write(lunout,*) 'gwd_rando_sat = ', gwd_rando_sat
     2354    write(lunout,*) 'gwd_front_ruwmax = ', gwd_front_ruwmax
     2355    write(lunout,*) 'gwd_front_sat = ', gwd_front_sat
     2356    write(lunout,*) 'SSO gkdrag =',gkdrag
     2357    write(lunout,*) 'SSO grahilo=',grahilo
     2358    write(lunout,*) 'SSO grcrit=',grcrit
     2359    write(lunout,*) 'SSO gfrcrit=',gfrcrit
     2360    write(lunout,*) 'SSO gkwake=',gkwake
     2361    write(lunout,*) 'SSO gklift=',gklift
    23122362    write(lunout,*) 'read_climoz = ', read_climoz
    23132363    write(lunout,*) 'carbon_cycle_tr = ', carbon_cycle_tr

  • LMDZ5/trunk/libf/phylmd/orografi.F90

    r2346 r2357  
    16561656  gsigcr = 0.80
    16571657
    1658   gkdrag = 0.2
    1659   grahilo = 1.
    1660   grcrit = 0.01
    1661   gfrcrit = 1.0
    1662   gkwake = 0.50
    1663 
    1664   gklift = 0.50
     1658!  Values now specified in run.def, or conf_phys_m.F90
     1659!  gkdrag = 0.2
     1660!  grahilo = 1.
     1661!  grcrit = 0.01
     1662!  gfrcrit = 1.0
     1663!  gkwake = 0.50
     1664! gklift = 0.50
    16651665  gvcrit = 0.0
    16661666

  • LMDZ5/trunk/libf/phylmd/orografi_strato.F90

    r2346 r2357  
    18611861  if (nstra == 0) call abort_physic("sugwd_strato", "no level in stratosphere", 1)
    18621862
    1863   gsigcr = 0.80
    1864 
    1865   gkdrag = 0.1875
    1866   grahilo = 0.1
    1867   grcrit = 1.00
    1868   gfrcrit = 1.00
    1869   gkwake = 0.50
    1870 
    1871   gklift = 0.25
     1863!  Valeurs lues dans les .def, ou attribues dans conf_phys
     1864  !gkdrag = 0.2   
     1865  !grahilo = 0.1
     1866  !grcrit = 1.00
     1867  !gfrcrit = 0.70
     1868  !gkwake = 0.40
     1869  !gklift = 0.25
     1870
     1871  gsigcr = 0.80 ! Top of low level flow
    18721872  gvcrit = 0.1
    18731873

  • LMDZ5/trunk/libf/phylmd/physiq.F90

    r2351 r2357  
    38923892     CALL add_phys_tend(du_gwd_front, dv_gwd_front, dt0, dq0, dql0, dqi0, &
    38933893          paprs, 'front_gwd_rando', abortphy)
    3894 
    3895      !  LIGNE TEMPORAIRE POUR TESTER ROT (ECRITE AUSSI AU DESSOUS!!!):
    3896      east_gwstress=rot
    38973894  ENDIF
    38983895
    … …  
    39113908             * (paprs(:, k)-paprs(:, k+1))/rg
    39123909     ENDDO
    3913 
    3914      !  LIGNE TEMPORAIRE POUR TESTER ROT (ECRITE AUSSI AU DESSUS!!!):
    3915      east_gwstress=rot
    39163910  end if
    39173911
Note: See TracChangeset for help on using the changeset viewer.