Changeset 1279 for LMDZ4/trunk/libf/phylmd/clesphys.h

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/clesphys.h (modified) (5 diffs)

LMDZ4/trunk/libf/phylmd/clesphys.h

@@ -1 +1 @@
 !
-!
+! $Id$
 !
 !  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
@@ -12 +12 @@
        LOGICAL ok_limitvrai
        INTEGER nbapp_rad, iflag_con
-       REAL co2_ppm, solaire
-       REAL*8 RCO2, RCH4, RN2O, RCFC11, RCFC12  
-       REAL*8 CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt
+       REAL co2_ppm, co2_ppm0, solaire
+       REAL(kind=8) RCO2, RCH4, RN2O, RCFC11, RCFC12  
+       REAL(kind=8) CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt
 
 !OM ---> correction du bilan d'eau global
@@ -35 +35 @@
 ! Hauteur (imposee) du contenu en eau du sol
            REAL qsol0
+! Frottement au sol (Cdrag)
+       Real f_cdrag_ter,f_cdrag_oce
+! Rugoro
+       Real f_rugoro
+
 !IM lev_histhf  : niveau sorties 6h
 !IM lev_histday : niveau sorties journalieres
 !IM lev_histmth : niveau sorties mensuelles
        INTEGER lev_histhf, lev_histday, lev_histmth
-       CHARACTER*4 type_run
-! aer_type: pour utiliser un fichier constant dans readsulfate 
+       Integer lev_histins, lev_histLES  
+       CHARACTER(len=4) type_run
+! aer_type: pour utiliser un fichier constant dans readaerosol 
        CHARACTER*8 :: aer_type 
        LOGICAL ok_isccp, ok_regdyn
@@ -48 +54 @@
        REAL ecrit_LES
        REAL freq_ISCCP, ecrit_ISCCP
+       REAL freq_COSP
+       LOGICAL :: ok_cosp
        INTEGER :: ip_ebil_phy, iflag_rrtm
        LOGICAL :: ok_strato
@@ -58 +66 @@
      &     , top_height, overlap, cdmmax, cdhmax, ksta, ksta_ter        &
      &     , ok_kzmin, fmagic, pmagic                                   &
+     &     , f_cdrag_ter,f_cdrag_oce,f_rugoro                           &
      &     , lev_histhf, lev_histday, lev_histmth                       &
-     &     , type_run, ok_isccp, ok_regdyn                              &
+     &     , lev_histins, lev_histLES                                   &
+     &     , type_run, ok_isccp, ok_regdyn, ok_cosp                     &
      &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
      &     , ecrit_ins, ecrit_hf, ecrit_hf2mth, ecrit_day               &
      &     , ecrit_mth, ecrit_tra, ecrit_reg                            &
-     &     , freq_ISCCP, ecrit_ISCCP, ip_ebil_phy                       &
+     &     , freq_ISCCP, ecrit_ISCCP, freq_COSP, ip_ebil_phy            &
      &     , ok_lic_melt, cvl_corr, aer_type                            &
-     &     , qsol0, iflag_rrtm, ok_strato,ok_hines,ecrit_LES
+     &     , qsol0, iflag_rrtm, ok_strato,ok_hines,ecrit_LES            &
+     &     , co2_ppm0
      
 !$OMP THREADPRIVATE(/clesphys/)