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

Timestamp:

Apr 13, 2015, 10:21:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes 2216:2237 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

@@ -15 +15 @@
        solarlong0,seuil_inversion, &
        fact_cldcon, facttemps,ok_newmicro,iflag_radia,&
-       iflag_cldth, &
+       iflag_cld_th, &
        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
        ok_ade, ok_aie, ok_cdnc, aerosol_couple, &
@@ -81 +81 @@
     REAL                 :: bl95_b0, bl95_b1
     real                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut,tau_ratqs
-    integer              :: iflag_cldth
+    integer              :: iflag_cld_th
     integer              :: iflag_ratqs
 
@@ -110 +110 @@
     integer,SAVE        :: iflag_radia_omp
     integer,SAVE        :: iflag_rrtm_omp
+    integer,SAVE        :: iflag_albedo_omp !albedo SB
+    logical,save        :: ok_chlorophyll_omp ! albedo SB  
     integer,SAVE        :: NSW_omp
-    integer,SAVE        :: iflag_cldth_omp, ip_ebil_phy_omp
+    integer,SAVE        :: iflag_cld_th_omp, ip_ebil_phy_omp
     integer,SAVE        :: iflag_ratqs_omp
 
@@ -889 +891 @@
     NSW_omp = 6
     call getin('NSW',NSW_omp)
-
-    !
-    !Config Key  = iflag_cldth 
+!albedo SB >>>
+    iflag_albedo_omp = 0
+    call getin('iflag_albedo',iflag_albedo_omp)
+
+    ok_chlorophyll_omp=.false.
+    call getin('ok_chlorophyll',ok_chlorophyll_omp)
+!albedo SB <<<
+
+    !
+    !Config Key  = iflag_cld_th 
     !Config Desc =  
     !Config Def  = 1
     !Config Help = 
     !
-    iflag_cldth_omp = 1
+    iflag_cld_th_omp = 1
 ! On lit deux fois avec l'ancien et le nouveau nom 
 ! pour assurer une retrocompatiblite.
 ! A abandonner un jour
-    call getin('iflag_cldcon',iflag_cldth_omp)
-    call getin('iflag_cldth',iflag_cldth_omp)
-
-    !
-    !Config Key  = iflag_cld_cv
-    !Config Desc =
-    !Config Def  = 1
-    !Config Help =
-    !
-    iflag_cld_cv_omp = 1
+    call getin('iflag_cldcon',iflag_cld_th_omp)
+    call getin('iflag_cld_th',iflag_cld_th_omp)
+    iflag_cld_cv_omp = 0 
     call getin('iflag_cld_cv',iflag_cld_cv_omp)
 
@@ -1973 +1975 @@
     iflag_rrtm = iflag_rrtm_omp
     NSW = NSW_omp
-    iflag_cldth = iflag_cldth_omp
+    iflag_cld_th = iflag_cld_th_omp
     iflag_cld_cv = iflag_cld_cv_omp
     tau_cld_cv = tau_cld_cv_omp
@@ -2128 +2130 @@
     write(lunout,*)' reevap_ice = ', reevap_ice
     write(lunout,*)' iflag_pdf = ', iflag_pdf
-    write(lunout,*)' iflag_cldth = ', iflag_cldth
+    write(lunout,*)' iflag_cld_th = ', iflag_cld_th
     write(lunout,*)' iflag_cld_cv = ', iflag_cld_cv
     write(lunout,*)' tau_cld_cv = ', tau_cld_cv
@@ -2135 +2137 @@
     write(lunout,*)' iflag_rrtm = ', iflag_rrtm
     write(lunout,*)' NSW = ', NSW
+    write(lunout,*)' iflag_albedo = ', iflag_albedo !albedo SB
+    write(lunout,*)' ok_chlorophyll =',ok_chlorophyll ! albedo SB
     write(lunout,*)' iflag_ratqs = ', iflag_ratqs
     write(lunout,*)' seuil_inversion = ', seuil_inversion