Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys_m.F90 (modified) (21 diffs)

LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90

@@ -27 +27 @@
     USE phys_cal_mod
     USE carbon_cycle_mod, ONLY : carbon_cycle_tr, carbon_cycle_cpl
-    USE control_mod
     USE mod_grid_phy_lmdz, only: klon_glo
-
+    USE print_control_mod, ONLY: lunout
 
 
@@ -39 +38 @@
 
     include "thermcell.h"
-    include "iniprint.h"
 
 
@@ -206 +204 @@
     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
@@ -220 +221 @@
     !-----------------------------------------------------------------
 
-     print*,'CONFPHYS ENTREE'
+    print*,'CONFPHYS ENTREE'
     !$OMP MASTER 
     !Config Key  = type_ocean 
@@ -249 +250 @@
        WRITE(lunout,*)'Variable OCEAN has been replaced by the variable type_ocean.'
        WRITE(lunout,*)'You have to update your parameter file physiq.def to succed running'
-       CALL abort_gcm('conf_phys','Variable OCEAN no longer existing, use variable name type_ocean',1)
+       CALL abort_physic('conf_phys','Variable OCEAN no longer existing, use variable name type_ocean',1)
     END IF
 
@@ -262 +263 @@
        WRITE(lunout,*)'ERROR! Timestep of coupling between atmosphere and ocean'
        WRITE(lunout,*)'cannot be zero.'
-       CALL abort_gcm('conf_phys','t_coupl = 0.',1)
+       CALL abort_physic('conf_phys','t_coupl = 0.',1)
     END IF
 
@@ -915 +916 @@
     NSW_omp = 6
     call getin('NSW',NSW_omp)
-!albedo SB >>>
+    !albedo SB >>>
     iflag_albedo_omp = 0
     call getin('iflag_albedo',iflag_albedo_omp)
@@ -921 +922 @@
     ok_chlorophyll_omp=.false.
     call getin('ok_chlorophyll',ok_chlorophyll_omp)
-!albedo SB <<<
+    !albedo SB <<<
 
     !
@@ -930 +931 @@
     !
     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)
@@ -1680 +1681 @@
     !
 
-! Gustiness flags
+    ! Gustiness flags
     f_z0qh_oce_omp = 1.
     call getin('f_z0qh_oce',f_z0qh_oce_omp)
@@ -1813 +1814 @@
     !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.
@@ -1821 +1823 @@
     !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:
@@ -1836 +1859 @@
     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
@@ -2022 +2052 @@
     iflag_radia = iflag_radia_omp
     iflag_rrtm = iflag_rrtm_omp
+    iflag_albedo = iflag_albedo_omp
+    ok_chlorophyll = ok_chlorophyll_omp
     NSW = NSW_omp
     iflag_cld_th = iflag_cld_th_omp
@@ -2098 +2130 @@
     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
@@ -2113 +2155 @@
     IF (type_ocean=='couple' .AND. (version_ocean/='opa8' .AND. version_ocean/='nemo') ) THEN
        WRITE(lunout,*)' ERROR version_ocean=',version_ocean,' not valid in coupled configuration'
-       CALL abort_gcm('conf_phys','version_ocean not valid',1)
+       CALL abort_physic('conf_phys','version_ocean not valid',1)
     END IF
 
@@ -2119 +2161 @@
        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_gcm('conf_phys','version_ocean not valid',1)
+       CALL abort_physic('conf_phys','version_ocean not valid',1)
     END IF
 
@@ -2128 +2170 @@
     IF (ok_ade .OR. ok_aie) THEN 
        IF ( flag_aerosol .EQ. 0 ) THEN
-          CALL abort_gcm('conf_phys','flag_aerosol=0 not compatible avec ok_ade ou ok_aie=.TRUE.',1)
+          CALL abort_physic('conf_phys','flag_aerosol=0 not compatible avec ok_ade ou ok_aie=.TRUE.',1)
        END IF
        IF ( .NOT. new_aod .AND.  flag_aerosol .NE. 1) THEN
-          CALL abort_gcm('conf_phys','new_aod=.FALSE. not compatible avec flag_aerosol=1',1)
+          CALL abort_physic('conf_phys','new_aod=.FALSE. not compatible avec flag_aerosol=1',1)
        END IF
     END IF
@@ -2137 +2179 @@
     ! ok_cdnc must be set to y if ok_aie is activated
     IF (ok_aie .AND. .NOT. ok_cdnc) THEN
-       CALL abort_gcm('conf_phys', 'ok_cdnc must be set to y if ok_aie is activated',1)
+       CALL abort_physic('conf_phys', 'ok_cdnc must be set to y if ok_aie is activated',1)
     ENDIF
 
@@ -2308 +2350 @@
     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
@@ -2328 +2378 @@
 
   use IOIPSL
+  USE print_control_mod, ONLY: lunout
   implicit none
-  include "iniprint.h"
   ! Configuration de l'interace atm/surf
   !