Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/conf_phys_m.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

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

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/conf_phys_m.F90

@@ -92 +92 @@
     LOGICAL, SAVE       :: ok_newmicro_omp
     LOGICAL, SAVE       :: ok_all_xml_omp
-    LOGICAL, SAVE       :: ok_lwoff_omp
     LOGICAL, SAVE       :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
     LOGICAL, SAVE       :: ok_LES_omp   
@@ -214 +213 @@
     LOGICAL,SAVE :: ok_lic_cond_omp
     !
-    INTEGER,SAVE  :: iflag_cycle_diurne_omp
-    LOGICAL,SAVE  :: soil_model_omp,new_oliq_omp
+    LOGICAL,SAVE  :: cycle_diurne_omp,soil_model_omp,new_oliq_omp
     LOGICAL,SAVE  :: ok_orodr_omp, ok_orolf_omp, ok_limitvrai_omp
     INTEGER, SAVE :: nbapp_rad_omp, iflag_con_omp
@@ -297 +295 @@
     ok_all_xml_omp = .FALSE.
     CALL getin('ok_all_xml', ok_all_xml_omp)
-
-    !
-    !Config Key  = ok_lwoff
-    !Config Desc = inhiber l effet radiatif LW des nuages
-    !Config Def  = .FALSE.
-    !Config Help = 
-    !
-    ok_lwoff_omp = .FALSE.
-    CALL getin('ok_lwoff', ok_lwoff_omp)
     !
 
@@ -416 +405 @@
     ! - flag_aerosol=5 => dust only
     ! - flag_aerosol=6 => all aerosol
-    ! - flag_aerosol=7 => natural aerosol + MACv2SP
-    ! - (in this case aerosols.1980.nc should point to aerosols.nat.nc)
 
     flag_aerosol_omp = 0
@@ -722 +709 @@
     ! Constantes precedemment dans dyn3d/conf_gcm
 
-    !Config  Key  = iflag_cycle_diurne
-    !Config  Desc = Cycle diurne
-    !Config  Def  = 1
+    !Config  Key  = cycle_diurne
+    !Config  Desc = Cycle ddiurne
+    !Config  Def  = y
     !Config  Help = Cette option permet d'eteidre le cycle diurne.
     !Config         Peut etre util pour accelerer le code !
-    iflag_cycle_diurne_omp = 1
-    CALL getin('iflag_cycle_diurne',iflag_cycle_diurne_omp)
+    cycle_diurne_omp = .TRUE.
+    CALL getin('cycle_diurne',cycle_diurne_omp)
 
     !Config  Key  = soil_model
@@ -2168 +2155 @@
     RCFC12_per = RCFC12_per_omp
 
-    iflag_cycle_diurne = iflag_cycle_diurne_omp
+    cycle_diurne = cycle_diurne_omp
     soil_model = soil_model_omp
     new_oliq = new_oliq_omp
@@ -2259 +2246 @@
 
     ok_all_xml = ok_all_xml_omp
-    ok_lwoff = ok_lwoff_omp
     ok_newmicro = ok_newmicro_omp
     ok_journe = ok_journe_omp
@@ -2452 +2438 @@
 
     ! Flag_aerosol cannot be to zero if we are in coupled mode for aerosol
-    IF (aerosol_couple .AND. flag_aerosol .EQ. 0 ) THEN
+    IF (aerosol_couple .AND. flag_aerosol .eq. 0 ) THEN
        CALL abort_physic('conf_phys', 'flag_aerosol cannot be to zero if aerosol_couple=y ', 1)
     ENDIF
 
     ! flag_aerosol need to be different to zero if ok_cdnc is activated
-    IF (ok_cdnc .AND. flag_aerosol .EQ. 0) THEN
+    IF (ok_cdnc .AND. flag_aerosol .eq. 0) THEN
        CALL abort_physic('conf_phys', 'flag_aerosol cannot be to zero if ok_cdnc is activated ', 1)
     ENDIF
@@ -2464 +2450 @@
     IF (ok_aie .AND. .NOT. ok_cdnc) THEN
        CALL abort_physic('conf_phys', 'ok_cdnc must be set to y if ok_aie is activated',1)
-    ENDIF
-
-    ! flag_aerosol=7 => MACv2SP climatology 
-    IF (flag_aerosol.EQ.7.AND. iflag_rrtm.NE.1) THEN
-       CALL abort_physic('conf_phys', 'flag_aerosol=7 (MACv2SP) can only be activated with RRTM',1)
-    ENDIF
-    IF (flag_aerosol.EQ.7.AND. NSW.NE.6) THEN
-       CALL abort_physic('conf_phys', 'flag_aerosol=7 (MACv2SP) can only be activated with NSW=6',1)
     ENDIF
 
@@ -2487 +2465 @@
     ! ORCHIDEE must be activated for ifl_pbltree=1
     IF (.NOT. ok_veget .AND. ifl_pbltree==1) THEN
-       WRITE(lunout,*)'Warning: ORCHIDEE must be activated for ifl_pbltree=1'
-       WRITE(lunout,*)'ifl_pbltree is now changed to zero'
-       ifl_pbltree=0
+       WRITE(lunout,*)' ORCHIDEE must be activated for ifl_pbltree=1'
+       CALL abort_physic('conf_phys','ok_veget and ifl_pbltree not coherent',1)
     END IF
 
@@ -2529 +2506 @@
     write(lunout,*)'ok_lic_melt=', ok_lic_melt
     write(lunout,*)'ok_lic_cond=', ok_lic_cond
-    write(lunout,*)'iflag_cycle_diurne=',iflag_cycle_diurne
+    write(lunout,*)'cycle_diurne=',cycle_diurne
     write(lunout,*)'soil_model=',soil_model
     write(lunout,*)'new_oliq=',new_oliq