--- trunk/phylmd/clesphys.f90	2019/06/13 14:40:06	328
+++ trunk/phylmd/clesphys.f90	2019/11/26 20:47:46	345
@@ -4,17 +4,12 @@
 
   implicit none
 
-  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:: solaire = 1365. ! AMIP II, constante solaire en W / m2
+  double precision, save, protected:: RCO2 ! mass mixing ratio of CO2
+  double precision, save, protected:: RCH4 ! mass mixing ratio of CH4
+  double precision, save, protected:: RN2O ! mass mixing ratio of N2O
+  double precision, save, protected:: RCFC11 ! mass mixing ratio of CFC11
+  double precision, save, protected:: RCFC12 ! mass mixing ratio of CFC12
   REAL, protected:: cdmmax = 1.3E-3, cdhmax = 1.1E-3 ! seuils cdrm, cdrh
   
   REAL, protected:: ksta = 1e-10, ksta_ter = 1e-10
@@ -23,7 +18,7 @@
   LOGICAL, protected:: ok_kzmin  = .true.
   ! calcul de Kzmin dans la couche limite de surface
   
-  INTEGER, save, protected:: ecrit_ins = 1
+  INTEGER, protected:: ecrit_ins = 1
   ! number of time steps of physics between outputs
 
   logical, protected:: ok_instan = .false.
@@ -38,6 +33,10 @@
 
     use unit_nml_m, only: unit_nml
 
+    REAL:: co2_ppm = 348. ! number mixing ratio, in ppm
+    real:: CH4_ppb = 1650., N2O_ppb = 306.
+    real:: CFC11_ppt = 280., CFC12_ppt = 484.
+
     namelist /clesphys_nml/ solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, &
          CFC12_ppt, cdmmax, cdhmax, ksta, ksta_ter, ok_kzmin, ecrit_ins, &
          ok_instan, f_cdrag_ter, f_cdrag_oce
@@ -48,11 +47,11 @@
     read(unit=*, nml=clesphys_nml)
     write(unit_nml, nml=clesphys_nml)
 
-    RCO2 = co2_ppm * 1.0e-06 * 44.011/28.97
-    RCH4 = CH4_ppb * 1.0E-09 * 16.043/28.97
-    RN2O = N2O_ppb * 1.0E-09 * 44.013/28.97
-    RCFC11=CFC11_ppt* 1.0E-12 * 137.3686/28.97
-    RCFC12 = CFC12_ppt * 1.0E-12 * 120.9140/28.97
+    RCO2 = co2_ppm * 1e-06 * 44.011 / 28.97
+    RCH4 = CH4_ppb * 1E-09 * 16.043 / 28.97
+    RN2O = N2O_ppb * 1E-09 * 44.013 / 28.97
+    RCFC11=CFC11_ppt* 1E-12 * 137.3686 / 28.97
+    RCFC12 = CFC12_ppt * 1E-12 * 120.9140 / 28.97
 
     print *, ' RCO2 = ', RCO2
     print *, ' RCH4 = ', RCH4