Changeset 1146 for LMDZ4/trunk/libf/phylmd/conf_phys.F90

Timestamp:

Apr 9, 2009, 12:11:35 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Réintegration dans le tronc des modifications issues de la branche LMDZ-dev
comprises entre la révision 1074 et 1145
Validation: une simulation de 1 jour en séquentiel sur PC donne les mêmes
résultats entre la trunk et la dev
LF

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys.F90 (modified) (7 diffs)

LMDZ4/trunk/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        
@@ -238 +239 @@
   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) 
+
 !
 !Config Key  = bl95_b0
@@ -462 +472 @@
 !Config  Help = Connais pas !
        ok_orolf_omp = .TRUE.
-       CALL getin('ok_orolf_omp', ok_orolf_omp)
+       CALL getin('ok_orolf', ok_orolf_omp)
 
 !Config  Key  = ok_limitvrai
@@ -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
@@ -1394 +1406 @@
   write(numout,*)' iflag_thermals_ed = ', iflag_thermals_ed
   write(numout,*)' iflag_thermals_optflux = ', iflag_thermals_optflux
+  write(numout,*)' iflag_clos = ', iflag_clos
   write(numout,*)' type_run = ',type_run 
   write(numout,*)' ok_isccp = ',ok_isccp