--- trunk/libf/dyn3d/inter_barxy.f90	2008/07/25 19:59:34	13
+++ trunk/libf/dyn3d/inter_barxy.f90	2011/01/25 15:11:05	39
@@ -2,9 +2,6 @@
 
   ! From inter_barxy.F, version 1.1.1.1 2004/05/19 12:53:07
 
-  ! This file is clean: there is neither C preprocessor directive, nor
-  ! include line.
-
   implicit none
 
   private
@@ -16,8 +13,7 @@
 
     ! Author: P. Le Van
 
-    use numer_rec, only: assert_eq, assert
-
+    use nr_util, only: assert_eq, assert
     use dimens_m, only: iim, jjm
     use comgeom, only: aire_2d, apoln, apols
 
@@ -115,7 +111,7 @@
     !      ( L'indice 1 correspond a l'interface mailLE 1 / maille 2)
     !      ( Les abscisses sont exprimées en degres)
 
-    use numer_rec, only: assert_eq
+    use nr_util, only: assert_eq
 
     IMPLICIT NONE
 
@@ -300,7 +296,7 @@
     ! Version unidimensionnelle, en latitude.
     ! L'indice 1 correspond à l'interface maille 1 -- maille 2.
 
-    use numer_rec, only: assert
+    use nr_util, only: assert
 
     IMPLICIT NONE
 
@@ -349,7 +345,7 @@
           dym        = 0.
           jmod       = jmod + 1
        ELSE
-          ! yjmod(jmod) == yjdat(jdat)
+          ! {yjmod(jmod) == yjdat(jdat)}
           dy         = yjmod(jmod) - y0
           dym        = dym + dy
           inter_bary(jmod) = (inter_bary(jmod) + dy * fdat(jdat)) / dym
@@ -377,8 +373,7 @@
     ! reverses their order.
     ! Finally, the procedure adds 90° as the last value of the array.
 
-    use numer_rec, only: assert_eq
-    use comconst, only: pi
+    use nr_util, only: assert_eq, pi
 
     IMPLICIT NONE
 
@@ -436,7 +431,7 @@
     ! This procedure converts to degrees, if necessary, and inverts the
     ! order.
 
-    use comconst, only: pi
+    use nr_util, only: pi
 
     IMPLICIT NONE