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

Timestamp:

Jan 30, 2015, 2:57:13 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2158:2186 into testing branch.

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys_m.F90 (modified) (7 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 control_mod
+    USE mod_grid_phy_lmdz, only: klon_glo
+
+
 
     include "conema3.h"
@@ -164 +167 @@
     REAL, SAVE ::  fmagic_omp, pmagic_omp
     INTEGER,SAVE :: iflag_pbl_omp,lev_histhf_omp,lev_histday_omp,lev_histmth_omp
+    INTEGER,SAVE :: iflag_pbl_split_omp
     Integer, save :: lev_histins_omp, lev_histLES_omp 
     INTEGER, SAVE :: lev_histdayNMC_omp
@@ -878 +882 @@
     !Config Help = 
     !
-    NSW_omp = 2
+    NSW_omp = 6
     call getin('NSW',NSW_omp)
 
@@ -1199 +1203 @@
     call getin('iflag_pbl',iflag_pbl_omp)
     !
+    !Config Key  = iflag_pbl_split
+    !Config Desc = binary flag: least signif bit = split vdf; next bit = split thermals
+    !Config Def  = 0
+    !Config Help = 0-> no splitting; 1-> vdf splitting; 2-> thermals splitting; 3-> full splitting
+    !
+    iflag_pbl_split_omp = 0
+    call getin('iflag_pbl_split',iflag_pbl_split_omp)
+    !
     !Config Key  = iflag_thermals
     !Config Desc =
@@ -1719 +1731 @@
 
     ok_gwd_rando_omp = .FALSE.
-    CALL getin('ok_gwd_rando', ok_gwd_rando_omp)
+    IF ( klon_glo == 1 ) THEN
+       print*,'La parametrisation des ondes de gravites non orographiques'
+       print*,'ne fonctionne pas en 1D'
+    ELSE
+       CALL getin('ok_gwd_rando', ok_gwd_rando_omp)
+    ENDIF
 
     GWD_RANDO_RUWMAX_omp = 0.01
@@ -1854 +1871 @@
     pmagic = pmagic_omp
     iflag_pbl = iflag_pbl_omp
+    iflag_pbl_split = iflag_pbl_split_omp
     lev_histhf = lev_histhf_omp
     lev_histday = lev_histday_omp
@@ -2110 +2128 @@
     write(lunout,*)' freq_calNMC = ',freq_calNMC
     write(lunout,*)' iflag_pbl = ', iflag_pbl
+    write(lunout,*)' iflag_pbl_split = ', iflag_pbl_split
     write(lunout,*)' iflag_thermals = ', iflag_thermals
     write(lunout,*)' iflag_thermals_ed = ', iflag_thermals_ed