--- trunk/Sources/filtrez/test_inifilr.f	2015/09/14 17:13:16	169
+++ trunk/filtrez/test_inifilr.f	2018/12/10 15:54:30	313
@@ -1,19 +1,15 @@
 program test_inifilr
 
-  use dimens_m, only: iim, jjm
-  use dynetat0_m, only: xprimp025, xprimm025, rlatu1, rlatu2, rlatu, rlatv, &
-       yprimu1, yprimu2, rlonu, rlonv, xprimu, xprimv
-  use fxhyp_m, only: fxhyp
-  use fyhyp_m, only: fyhyp
+  use dimensions, only: iim, jjm
+  use dynetat0_m, only: rlatu, rlatv, fyhyp, fxhyp
+  use dynetat0_chosen_m, only: read_serre
   use inifilr_m, only: inifilr, jfiltnu, jfiltnv, jfiltsu, jfiltsv, &
        matriceun, matrinvn, matricevn, matriceus, matrinvs, matricevs
-  use jumble, only: new_unit
   use netcdf, only: NF90_CLOBBER, NF90_FLOAT
   use netcdf95, only: nf95_create, NF95_DEF_DIM, NF95_DEF_VAR, NF95_ENDDEF, &
        NF95_PUT_VAR, NF95_CLOSE, nf95_put_att
   use nr_util, only: pi
-  use unit_nml_m, only: unit_nml
-  use read_serre_m, only: read_serre
+  use unit_nml_m, only: unit_nml, set_unit_nml
 
   IMPLICIT NONE
 
@@ -24,15 +20,11 @@
 
   !-----------------------------------------------------------------------
 
-  call new_unit(unit_nml)
+  call set_unit_nml
   open(unit_nml, file="used_namelists.txt", status="replace", action="write")
   call read_serre
-
-  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 inifilr
   close(unit_nml)