--- trunk/dyn3d/test_fxhyp.f	2018/07/11 17:06:09	275
+++ trunk/dyn3d/test_fxhyp.f	2018/07/12 14:49:20	276
@@ -1,32 +1,30 @@
 program test_fxhyp
 
   USE dimensions, ONLY: iim
+  use dynetat0_m, only: read_serre
   use fxhyp_m, only: fxhyp
-  use jumble, only: new_unit
-  use read_serre_m, only: read_serre
-  use unit_nml_m, only: unit_nml
+  use unit_nml_m, only: unit_nml, set_unit_nml
 
   implicit none
 
   REAL, dimension(iim + 1):: xprimm025, rlonv, xprimv, rlonu, xprimu, xprimp025
-  integer unit
 
   !--------------------------------------------------------
 
-  call new_unit(unit_nml)
+  call set_unit_nml
   open(unit_nml, file="used_namelists.txt", status="replace", action="write")
   call read_serre
   call fxhyp(xprimm025, rlonv, xprimv, rlonu, xprimu, xprimp025)
   close(unit_nml)
 
-  unit = unit_nml
-  open(unit, file="test_fxhyp_out.txt", status="replace", action="write")
-  write(unit, fmt = *) "xprimm025 = ", xprimm025
-  write(unit, fmt = *) "rlonv = ", rlonv
-  write(unit, fmt = *) "xprimv = ", xprimv
-  write(unit, fmt = *) "rlonu = ", rlonu
-  write(unit, fmt = *) "xprimu = ", xprimu
-  write(unit, fmt = *) "xprimp025 = ", xprimp025
-  close(unit)
+  ! We can use the same unit number although we are not writing a namelist:
+  open(unit_nml, file="test_fxhyp_out.txt", status="replace", action="write")
+  write(unit_nml, fmt = *) "xprimm025 = ", xprimm025
+  write(unit_nml, fmt = *) "rlonv = ", rlonv
+  write(unit_nml, fmt = *) "xprimv = ", xprimv
+  write(unit_nml, fmt = *) "rlonu = ", rlonu
+  write(unit_nml, fmt = *) "xprimu = ", xprimu
+  write(unit_nml, fmt = *) "xprimp025 = ", xprimp025
+  close(unit_nml)
 
 end program test_fxhyp