--- trunk/dyn3d/etat0.f	2018/07/20 14:30:23	279
+++ trunk/dyn3d/etat0.f	2018/12/10 15:54:30	313
@@ -15,9 +15,9 @@
     use dimensions, only: iim, jjm, llm, nqmx
     use dimphy, only: klon
     use dimsoil, only: nsoilmx
-    use disvert_m, only: ap, bp, preff, pa, disvert
-    use dynetat0_m, only: day_ref, annee_ref, rlatu, rlatv, rlonu, rlonv, &
-         fyhyp, fxhyp
+    use disvert_m, only: ap, bp, preff, disvert
+    use dynetat0_m, only: rlatu, rlatv, rlonu, rlonv, fyhyp, fxhyp
+    use dynetat0_chosen_m, only: day_ref
     use dynredem0_m, only: dynredem0
     use dynredem1_m, only: dynredem1
     use exner_hyb_m, only: exner_hyb
@@ -43,7 +43,6 @@
     use start_init_phys_m, only: start_init_phys
     use start_inter_3d_m, only: start_inter_3d
     use test_disvert_m, only: test_disvert
-    use unit_nml_m, only: unit_nml
 
     REAL, intent(out):: phis(:, :) ! (iim + 1, jjm + 1)
     ! surface geopotential, in m2 s-2
@@ -64,7 +63,7 @@
 
     real qsat(iim + 1, jjm + 1, llm) ! mass fraction of saturating water vapor
     REAL qsolsrf(klon, nbsrf), snsrf(klon, nbsrf) 
-    REAL albe(klon, nbsrf), evap(klon, nbsrf)
+    REAL albe(klon, nbsrf)
     REAL tsoil(klon, nsoilmx, nbsrf) 
     REAL null_array(klon)
     REAL solsw(klon), sollw(klon)
@@ -106,21 +105,14 @@
     ! ("p3d(i, j, l)" is at longitude "rlonv(i)", latitude "rlatu(j)",
     ! for interface "l")
 
-    namelist /etat0_nml/ day_ref, annee_ref
-
     !---------------------------------
 
     print *, "Call sequence information: etat0"
 
-    print *, "Enter namelist 'etat0_nml'."
-    read(unit=*, nml=etat0_nml)
-    write(unit_nml, nml=etat0_nml)
-
     CALL iniconst
 
     ! Construct a grid:
 
-    pa = 5e4
     CALL disvert
     call test_disvert
     CALL fyhyp
@@ -290,7 +282,6 @@
     albe(:, is_lic) = 0.6
     albe(:, is_oce) = 0.5
     albe(:, is_sic) = 0.6
-    evap = 0.
     qsolsrf = 150.
     tsoil = spread(spread(pack(tsol_2d, dyn_phy), 2, nsoilmx), 3, nbsrf)
     solsw = 165.
@@ -309,17 +300,17 @@
     sig1 = 0.
     w01 = 0.
 
-    nday = 0
+    nday = 0 ! side effect
     call phyredem0
 
     call nf95_inq_varid(ncid_restartphy, "trs", varid)
     call nf95_put_var(ncid_restartphy, varid, null_array)
 
     call phyredem(pctsrf, tsoil(:, 1, :), tsoil, qsolsrf, &
-         pack(qsol_2d, dyn_phy), snsrf, albe, evap, null_array, null_array, &
-         solsw, sollw, null_array, null_array, frugs, agesno, zmea, zstd, &
-         zsig, zgam, zthe, zpic, zval, t_ancien, q_ancien, rnebcon, ratqs, &
-         clwcon, null_array, sig1, w01)
+         pack(qsol_2d, dyn_phy), snsrf, albe, null_array, null_array, solsw, &
+         sollw, null_array, null_array, frugs, agesno, zmea, zstd, zsig, zgam, &
+         zthe, zpic, zval, t_ancien, q_ancien, rnebcon, ratqs, clwcon, &
+         null_array, sig1, w01)
 
   END SUBROUTINE etat0