--- trunk/Sources/dyn3d/etat0.f	2017/01/12 12:31:31	212
+++ trunk/dyn3d/etat0.f	2018/07/12 15:56:17	277
@@ -1,19 +1,10 @@
-module etat0_mod
-
-  use indicesol, only: nbsrf
-  use dimphy, only: klon
+module etat0_m
 
   IMPLICIT NONE
 
-  REAL pctsrf(klon, nbsrf)
-  ! ("pctsrf(i, :)" is the composition of the surface at horizontal
-  ! position "i")
-
-  private nbsrf, klon
-
 contains
 
-  SUBROUTINE etat0(phis)
+  SUBROUTINE etat0(phis, pctsrf)
 
     ! From "etat0_netcdf.F", version 1.3, 2005/05/25 13:10:09
 
@@ -21,21 +12,19 @@
     use comconst, only: cpp, kappa, iniconst
     use comgeom, only: aire_2d, apoln, apols, cu_2d, cv_2d, inigeom
     use conf_gcm_m, only: nday
-    use dimens_m, only: iim, jjm, llm, nqmx
-    use dimphy, only: zmasq
+    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, xprimp025, xprimm025, rlatu1, &
-         rlatu2, rlatu, rlatv, yprimu1, yprimu2, rlonu, rlonv, xprimu, xprimv
+    use dynetat0_m, only: day_ref, annee_ref, rlatu, rlatv, rlonu, rlonv, &
+         fyhyp, fxhyp
     use dynredem0_m, only: dynredem0
     use dynredem1_m, only: dynredem1
     use exner_hyb_m, only: exner_hyb
-    use fxhyp_m, only: fxhyp
-    use fyhyp_m, only: fyhyp
     use geopot_m, only: geopot
     use grille_m_m, only: grille_m
     use grid_change, only: init_dyn_phy, dyn_phy
-    use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra
+    use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra, nbsrf
     use iniadvtrac_m, only: iniadvtrac
     use inifilr_m, only: inifilr
     use massdair_m, only: massdair
@@ -43,7 +32,7 @@
     use netcdf95, only: nf95_close, nf95_get_var, nf95_gw_var, nf95_put_var, &
          nf95_inq_varid, nf95_open
     use nr_util, only: pi, assert
-    use phyetat0_m, only: rlat, rlon, itau_phy
+    use phyetat0_m, only: rlat, rlon, itau_phy, zmasq
     use phyredem0_m, only: phyredem0, ncid_restartphy
     use phyredem_m, only: phyredem
     use q_sat_m, only: q_sat
@@ -59,6 +48,10 @@
     REAL, intent(out):: phis(:, :) ! (iim + 1, jjm + 1)
     ! surface geopotential, in m2 s-2
 
+    REAL, intent(out):: pctsrf(:, :) ! (klon, nbsrf)
+    ! "pctsrf(i, :)" is the composition of the surface at horizontal
+    ! position "i".
+
     ! Local:
 
     REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, teta
@@ -91,7 +84,7 @@
     ! D\'eclarations pour lecture glace de mer :
     INTEGER iml_lic, jml_lic
     INTEGER ncid, varid
-    REAL, pointer:: dlon_lic(:), dlat_lic(:)
+    REAL, ALLOCATABLE:: dlon_lic(:), dlat_lic(:)
     REAL, ALLOCATABLE:: fraclic(:, :) ! fraction land ice
     REAL flic_tmp(iim + 1, jjm + 1) ! fraction land ice temporary
 
@@ -130,13 +123,8 @@
     pa = 5e4
     CALL disvert
     call test_disvert
-
-    CALL fyhyp(rlatu, rlatv, rlatu2, yprimu2, rlatu1, yprimu1)
-    CALL fxhyp(xprimm025, rlonv, xprimv, rlonu, xprimu, xprimp025)
-
-    rlatu(1) = pi / 2.
-    rlatu(jjm + 1) = -rlatu(1)
-
+    CALL fyhyp
+    CALL fxhyp
     CALL inigeom
     CALL inifilr
 
@@ -261,15 +249,13 @@
          rlatu)
     flic_tmp(iim + 1, :) = flic_tmp(1, :)
 
-    deallocate(dlon_lic, dlat_lic) ! pointers
-
     ! Passage sur la grille physique
     pctsrf = 0.
     pctsrf(:, is_lic) = pack(flic_tmp, dyn_phy)
     ! Ad\'equation avec le maque terre/mer
     WHERE (pctsrf(:, is_lic) < EPSFRA) pctsrf(:, is_lic) = 0.
     WHERE (zmasq < EPSFRA) pctsrf(:, is_lic) = 0.
-    pctsrf(:, is_ter) = zmasq
+    where (zmasq <= EPSFRA) pctsrf(:, is_ter) = zmasq
     where (zmasq > EPSFRA)
        where (pctsrf(:, is_lic) >= zmasq)
           pctsrf(:, is_lic) = zmasq
@@ -349,4 +335,4 @@
 
   END SUBROUTINE etat0
 
-end module etat0_mod
+end module etat0_m