--- trunk/dyn3d/serre.f	2014/03/05 14:57:53	82
+++ trunk/Sources/dyn3d/read_serre.f	2015/05/26 17:46:03	139
@@ -1,24 +1,44 @@
-module serre
+module read_serre_m
 
   implicit none
 
-  REAL:: clon = 0. ! longitude of the center of the zoom, in degrees
-  real:: clat = 0. ! latitude of the center of the zoom, in degrees
+contains
 
-  real, save:: transx, transy
-  real, save:: alphax, alphay ! anciennes formulations des grossissements
-  real, save:: pxo, pyo
+  subroutine read_serre
 
-  real:: grossismx = 1. ! facteur de grossissement du zoom, selon la longitude
-  real:: grossismy = 1. ! facteur de grossissement du zoom, selon la latitude
+    use dynetat0_m, only: clon, clat, grossismx, grossismy, dzoomx, dzoomy, &
+         taux, tauy
+    use unit_nml_m, only: unit_nml
+    use nr_util, only: assert, pi
+
+    REAL:: clon_deg = 0. ! longitude of the center of the zoom, in degrees
+    real:: clat_deg = 0. ! latitude of the center of the zoom, in degrees
+
+    namelist /serre_nml/ clon_deg, clat_deg, grossismx, grossismy, dzoomx, &
+         dzoomy, taux, tauy
+
+    !-------------------------------------------------
+
+    ! Default values:
+    clon_deg = 0.
+    clat_deg = 0.
+    grossismx = 1.
+    grossismy = 1.
+    dzoomx = 0.2
+    dzoomy = 0.2
+    taux = 3.
+    tauy = 3. 
+
+    print *, "Enter namelist 'serre_nml'."
+    read(unit=*, nml=serre_nml)
+    write(unit_nml, nml=serre_nml)
+
+    call assert(grossismx >= 1. .and. grossismy >= 1., "read_serre grossism")
+    call assert(dzoomx > 0., dzoomx < 1., dzoomy < 1., &
+         "read_serre dzoomx dzoomy")
+    clon = clon_deg / 180. * pi
+    clat = clat_deg / 180. * pi
 
-  real:: dzoomx = 0.
-  ! extension en longitude de la zone du zoom (fraction de la zone totale)
+  end subroutine read_serre
 
-  real:: dzoomy = 0.
-  ! extension en latitude de la zone du zoom (fraction de la zone totale)
-
-  real:: taux = 3. ! raideur du zoom en X
-  real:: tauy = 3. ! raideur du zoom en Y
-
-end module serre
+end module read_serre_m