Changeset 1143 for LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90

Timestamp:

Apr 7, 2009, 6:41:02 PM (15 years ago)

Author:

jghattas

Message:

Recuperation des developpements fait uniquement sur la branche LMDZ4_V4_patches :

• ajoute de la nouvelle flag ok_dynzon
• ajoute du parametre aer_type
• optimisation : isccp_cloud_types.F

+ bug pour le slab dans conf_phys.F90

File:

• LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90 (modified) (5 diffs)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90

@@ -66 +66 @@
 
   character (len = 6),SAVE  :: type_ocean_omp, version_ocean_omp, ocean_omp
+  CHARACTER(len = 8),SAVE   :: aer_type_omp
   logical,SAVE              :: ok_veget_omp, ok_newmicro_omp
   logical,SAVE        :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
@@ -237 +238 @@
   aerosol_couple_omp = .false.
   CALL getin('aerosol_couple',aerosol_couple_omp)
+
+! 
+!Config Key  = aer_type 
+!Config Desc = Use a constant field for the aerosols 
+!Config Def  = scenario 
+!Config Help = Used in readsulfate.F 
+! 
+  aer_type_omp = 'scenario' 
+  call getin('aer_type', aer_type_omp) 
 
 !
@@ -1256 +1266 @@
     ok_aie = ok_aie_omp
     aerosol_couple = aerosol_couple_omp
+    aer_type = aer_type_omp
     bl95_b0 = bl95_b0_omp
     bl95_b1 = bl95_b1_omp
@@ -1310 +1321 @@
     END IF
 
-    IF (type_ocean=='slab' .AND. version_ocean/='xxxxxx') THEN
+    IF (type_ocean=='slab' .AND. version_ocean=='xxxxxx') THEN
        version_ocean='sicOBS'
     ELSE IF (type_ocean=='slab' .AND. version_ocean/='sicOBS') THEN
@@ -1385 +1396 @@
   write(numout,*)' ok_aie = ',ok_aie
   write(numout,*)' aerosol_couple = ', aerosol_couple
+  write(numout,*)' aer_type = ',aer_type
   write(numout,*)' bl95_b0 = ',bl95_b0
   write(numout,*)' bl95_b1 = ',bl95_b1