--- trunk/libf/dyn3d/comvert.f90	2011/07/19 12:54:20	48
+++ trunk/libf/dyn3d/comvert.f90	2012/09/20 09:57:03	65
@@ -28,6 +28,7 @@
 
     use nr_util, only: pi
     use jumble, only: new_unit
+    use unit_nml_m, only: unit_nml
 
     REAL s(llm+1)
     ! "s(l)" is the atmospheric hybrid sigma-pressure coordinate at
@@ -37,10 +38,10 @@
     ! "ds(l)" : épaisseur de la couche "l" dans la coordonnée "s"
 
     INTEGER l, unit
-    REAL alpha, x(llm), trash
+    REAL alpha, x(llm)
 
-    character(len=7):: s_sampling = "LMD5"
-    ! (other allowed values are "param", "strato1", "strato2" and "read")
+    character(len=7):: s_sampling = "tropo"
+    ! (other allowed values are "param", "strato1", "strato" and "read")
 
     real:: h = 7. ! scale height, in km
     ! (used only if "s_sampling" == "param" or "strato1")
@@ -66,7 +67,7 @@
 
     print *, "Enter namelist 'disvert_nml'."
     read(unit=*, nml=disvert_nml)
-    write(unit=*, nml=disvert_nml)
+    write(unit_nml, nml=disvert_nml)
 
     select case (s_sampling)
     case ("param")
@@ -77,8 +78,7 @@
             = cosh((l - 1) / k0) **(- alpha * k0 / h) &
             * exp(- alpha / h * tanh((llm - k1) / k0) &
             * beta **(l - 1 - (llm - k1)) / log(beta))
-    case ("LMD5")
-       ! Ancienne discrétisation
+    case ("tropo")
        s(1) = 1.
        s(llm+1) = 0.
        forall (l = 1: llm) ds(l) &
@@ -102,7 +102,7 @@
 
        s(2:llm) = (exp(- zz(2:llm) / h) - exp(- zz(llm + 1) / h)) &
             / (1. - exp(- zz(llm + 1) / h))
-    case ("strato2")
+    case ("strato")
        ! Recommended by F. Lott for a domain including the stratosphere
        s(1) = 1.
        s(llm+1) = 0.
@@ -120,7 +120,7 @@
             position="rewind")
        read(unit, fmt=*) ! skip title line
        do l = 1, llm + 1
-          read(unit, fmt=*) trash, s(l)
+          read(unit, fmt=*) s(l)
        end do
        close(unit)
        ! Quick check: