Changeset 857

Timestamp:

Oct 30, 2007, 4:58:43 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Inclusion d'un parametre aer_type qui permet de définir le type d'aerosols
lus dans readsulfate (pre-industriels, naturels ou scenario). SD
LF

Location:

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• conf_phys.F90 (modified) (4 diffs)
• readsulfate.F (modified) (3 diffs)

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/clesphys.h

@@ -45 +45 @@
        INTEGER :: ip_ebil_phy
        LOGICAL ok_slab_sicOBS
+!LF aer_actuel: pour utiliser un fichier constant dans readsulfate
+       CHARACTER*8 :: aer_type
 
        COMMON/clesphys/cycle_diurne, soil_model, new_oliq,              &
@@ -57 +59 @@
      &     , ecrit_mth, ecrit_tra, ecrit_reg                            &
      &     , freq_ISCCP, ecrit_ISCCP, ip_ebil_phy                       &
-     &     , ok_slab_sicOBS, ok_lic_melt, cvl_corr
+     &     , ok_slab_sicOBS, ok_lic_melt, cvl_corr, aer_type
      
 !$OMP THREADPRIVATE(/clesphys/)

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/conf_phys.F90

@@ -56 +56 @@
   logical,SAVE        :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
   LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp
+  character (len = 8),SAVE  :: aer_type_omp
   REAL,SAVE           :: bl95_b0_omp, bl95_b1_omp
   REAL,SAVE           :: freq_ISCCP_omp, ecrit_ISCCP_omp
@@ -165 +166 @@
   ok_aie_omp = .false.
   call getin('ok_aie', ok_aie_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)
 
 !
@@ -828 +838 @@
     ok_ade = ok_ade_omp
     ok_aie = ok_aie_omp
+    aer_type = aer_type_omp
     bl95_b0 = bl95_b0_omp
     bl95_b1 = bl95_b1_omp
@@ -906 +917 @@
   write(numout,*)' ok_ade = ',ok_ade
   write(numout,*)' ok_aie = ',ok_aie
+  write(numout,*)' aer_type = ',aer_type
   write(numout,*)' bl95_b0 = ',bl95_b0
   write(numout,*)' bl95_b1 = ',bl95_b1

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/readsulfate.F

@@ -38 +38 @@
 cym#include "dimphy.h"      
 #include "temps.h"      
+#include "clesphys.h"
+#include "iniprint.h"
 c 
 c Input:
@@ -84 +86 @@
 
       if (is_mpi_root) then
+
+        IF (aer_type /= 'actuel  ' .AND. aer_type /= 'preind  ' .AND.   &
+     &      aer_type /= 'scenario') THEN
+          WRITE(lunout,*)' *** Warning ***'
+          WRITE(lunout,*)'Option aer_type pour les aerosols = ',        &
+     &        aer_type
+          WRITE(lunout,*)'Cas non prevu, force a preind'
+          aer_type = 'preind  '
+        ENDIF
             
       iday = INT(r_day) 
@@ -118 +129 @@
 
 
-      IF (iyr .lt. 1850) THEN
-         cyear='.nat'
-         WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
-         CALL getso4fromfile(cyear, so4_1)
-      ELSE IF (iyr .ge. 2100) THEN
-         cyear='2100'
-         WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
-         CALL getso4fromfile(cyear, so4_1)
+
+      IF (aer_type == 'actuel  ') then
+        cyear='1980'
+      ELSE IF (aer_type == 'preind  ') THEN
+        cyear='.nat'
       ELSE
+        IF (iyr .lt. 1850) THEN
+           cyear='.nat'
+           WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
+           CALL getso4fromfile(cyear, so4_1)
+        ELSE IF (iyr .ge. 2100) THEN
+           cyear='2100'
+           WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
+           CALL getso4fromfile(cyear, so4_1)
+        ELSE
 
         ! Read in data:
-      ! a) from actual 10-yr-period
-
-      IF (iyr.LT.1900) THEN
-         iyr1 = 1850
-         iyr2 = 1900
-      ELSE IF (iyr.ge.1900.and.iyr.lt.1920) THEN
-         iyr1 = 1900
-         iyr2 = 1920
-      ELSE 
-         iyr1 = INT(iyr/10)*10
-         iyr2 = INT(1+iyr/10)*10
+        ! a) from actual 10-yr-period
+
+        IF (iyr.LT.1900) THEN
+           iyr1 = 1850
+           iyr2 = 1900
+        ELSE IF (iyr.ge.1900.and.iyr.lt.1920) THEN
+           iyr1 = 1900
+           iyr2 = 1920
+        ELSE 
+           iyr1 = INT(iyr/10)*10
+           iyr2 = INT(1+iyr/10)*10
+        ENDIF
+        WRITE(cyear,'(I4)') iyr1
       ENDIF
-      WRITE(cyear,'(I4)') iyr1
       WRITE(*,*) 'getso4  iyr=', iyr,'   ',cyear
       CALL getso4fromfile(cyear, so4_1)