--- trunk/Sources/phylmd/clesphys.f	2016/06/08 12:23:41	202
+++ trunk/phylmd/clesphys.f	2018/07/24 16:27:12	288
@@ -4,46 +4,33 @@
 
   implicit none
 
-  REAL co2_ppm ! concentration du gaz carbonique en ppmv
-  real solaire ! Constante solaire en W/m2
-  double precision RCO2 ! Concentration du CO2
-  double precision RCH4 ! Concentration du CH4
-  double precision RN2O ! Concentration du N2O
-  double precision RCFC11 ! Concentration du CFC11
-  double precision RCFC12 ! Concentration du CFC12
-  double precision CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt
-
-  ! Simulateur ISCCP:
-  INTEGER top_height
-  INTEGER overlap ! 1, 2 or 3
-
-  REAL cdmmax, cdhmax ! seuils cdrm, cdrh
-  REAL ksta, ksta_ter ! paramètres stabilité sur terres et en dehors
-  LOGICAL ok_kzmin ! calcul Kzmin dans la couche limite de surface
-
-  INTEGER lev_histhf ! niveau sorties 6h
-  ! 4: histhf3d.nc champs 3d niveaux modele
-
-  integer lev_histday ! niveau sorties journalieres
-  ! 3: champs 3D => F. Lott
-  ! 4: + champs sous-surfaces
-
-  integer lev_histmth ! niveau sorties mensuelles
-  ! 3: albedo, rugosite sous-surfaces
-  ! 4: champs tendances 3d
-
-  CHARACTER(len=4) type_run ! 'AMIP' ou 'ENSP'
-  LOGICAL ok_isccp, ok_regdyn
-
-  REAL lonmin_ins, lonmax_ins, latmin_ins, latmax_ins
-  ! longitude et latitude minimales et maximales pour la zone avec
-  ! sorties instantanées tous les pas de temps de la physique,
-  ! fichier "histbilKP_ins.nc"
+  REAL, protected:: co2_ppm = 348.
+  ! AMIP II, concentration du gaz carbonique en ppmv
+  
+  real, protected:: solaire = 1365. ! AMIP II, constante solaire en W/m2
+  double precision, save, protected:: RCO2 ! Concentration du CO2
+  double precision, save, protected:: RCH4 ! Concentration du CH4
+  double precision, save, protected:: RN2O ! Concentration du N2O
+  double precision, save, protected:: RCFC11 ! Concentration du CFC11
+  double precision, save, protected:: RCFC12 ! Concentration du CFC12
+  double precision, protected:: CH4_ppb = 1650., N2O_ppb = 306.
+  double precision, protected:: CFC11_ppt = 280., CFC12_ppt = 484.
+  REAL, protected:: cdmmax = 1.3E-3, cdhmax = 1.1E-3 ! seuils cdrm, cdrh
+  
+  REAL, protected:: ksta = 1e-10, ksta_ter = 1e-10
+  ! param\`etres de stabilit\'e sur terre et en dehors
+
+  LOGICAL, protected:: ok_kzmin  = .true.
+  ! calcul de Kzmin dans la couche limite de surface
+  
+  INTEGER, save, protected:: ecrit_ins = 1
+  ! number of time steps of physics between outputs
 
-  INTEGER ecrit_ins
-  logical:: ok_instan = .false. ! sorties instantanees dans le fichier histins
+  logical, protected:: ok_instan = .false.
+  ! sorties instantanees dans le fichier histins
 
-  save
+  real, protected:: f_cdrag_ter = 1., f_cdrag_oce = 0.8
+  ! surface drag coefficients
 
 contains
 
@@ -52,38 +39,11 @@
     use unit_nml_m, only: unit_nml
 
     namelist /clesphys_nml/ solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, &
-         CFC12_ppt, top_height, overlap, cdmmax, cdhmax, ksta, &
-         ksta_ter, ok_kzmin, lev_histhf, lev_histday, lev_histmth, &
-         type_run, ok_isccp, ok_regdyn, lonmin_ins, lonmax_ins, latmin_ins, &
-         latmax_ins, ecrit_ins, ok_instan
+         CFC12_ppt, cdmmax, cdhmax, ksta, ksta_ter, ok_kzmin, ecrit_ins, &
+         ok_instan, f_cdrag_ter, f_cdrag_oce
 
     !---------------------------------------------------------
 
-    solaire = 1365. ! AMIP II
-    co2_ppm = 348. ! AMIP II
-    CH4_ppb = 1650.
-    N2O_ppb = 306.
-    CFC11_ppt = 280.
-    CFC12_ppt = 484.
-    top_height = 3
-    overlap = 3
-    cdmmax = 1.3E-3
-    cdhmax = 1.1E-3
-    ksta = 1.0e-10
-    ksta_ter = 1.0e-10
-    ok_kzmin = .true.
-    lev_histhf = 0
-    lev_histday = 1
-    lev_histmth = 2
-    type_run = 'AMIP'
-    ok_isccp = .false.
-    ok_regdyn = .false.
-    lonmin_ins = 100.
-    lonmax_ins = 130.
-    latmin_ins = -20.
-    latmax_ins = 20.
-    ecrit_ins = NINT(86400./48.)
-
     print *, "Enter namelist 'clesphys_nml'."
     read(unit=*, nml=clesphys_nml)
     write(unit_nml, nml=clesphys_nml)