Index: trunk/NEMO/OPA_SRC/LDF/ldfdyn.F90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfdyn.F90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfdyn.F90	(revision 719)
@@ -35,5 +35,5 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfdyn_antarctic.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfdyn_antarctic.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfdyn_antarctic.h90	(revision 719)
@@ -4,5 +4,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfdyn_arctic.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfdyn_arctic.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfdyn_arctic.h90	(revision 719)
@@ -4,5 +4,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfdyn_c1d.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfdyn_c1d.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfdyn_c1d.h90	(revision 719)
@@ -5,5 +5,5 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90	(revision 719)
@@ -8,5 +8,5 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90,v 1.6 2007/06/29 17:01:51 opalod Exp $ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90	(revision 719)
@@ -5,5 +5,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90,v 1.9 2007/07/04 13:02:29 opalod Exp $ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90	(revision 719)
@@ -12,5 +12,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfdyn_substitute.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfdyn_substitute.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfdyn_substitute.h90	(revision 719)
@@ -7,5 +7,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90	(revision 719)
@@ -16,9 +16,8 @@
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
-   USE sbc_oce         ! surface boundary condition: ocean
-   USE sbcrnf          ! river runoffs
    USE ldftra_oce      ! ocean tracer   lateral physics
    USE phycst          ! physical constants
    USE ldfslp          ! iso-neutral slopes
+   USE flxrnf          ! 
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
@@ -32,5 +31,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
@@ -178,5 +177,5 @@
             DO ji = 1, jpi
                zaht      = ( 1. -  MIN( 1., ABS( ff(ji,jj) / zf20 ) ) ) * ( aht0 - zaht_min )  &
-                  &      + aht0 * rnfmsk(ji,jj)                          ! enhanced near river mouths
+                  &      + aht0 * upsrnfh(ji,jj)                          ! enhanced near river mouths
                ahtu(ji,jj) = MAX( MAX( zaht_min, aeiu(ji,jj) ) + zaht, aht0 )
                ahtv(ji,jj) = MAX( MAX( zaht_min, aeiv(ji,jj) ) + zaht, aht0 )
@@ -353,5 +352,5 @@
             DO ji = 1, jpi
                zaht      = ( 1. -  MIN( 1., ABS( ff(ji,jj) / zf20 ) ) ) * ( aht0 - zaht_min )  &
-                  &      + aht0 * rnfmsk(ji,jj)                          ! enhanced near river mouths
+                  &      + aht0 * upsrnfh(ji,jj)                          ! enhanced near river mouths
                ahtu(ji,jj) = MAX( MAX( zaht_min, aeiu(ji,jj) ) + zaht, aht0 )
                ahtv(ji,jj) = MAX( MAX( zaht_min, aeiv(ji,jj) ) + zaht, aht0 )
Index: trunk/NEMO/OPA_SRC/LDF/ldfeiv_substitute.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfeiv_substitute.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfeiv_substitute.h90	(revision 719)
@@ -8,5 +8,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldfslp.F90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldfslp.F90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldfslp.F90	(revision 719)
@@ -49,6 +49,4 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: trunk/NEMO/OPA_SRC/LDF/ldftra.F90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldftra.F90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldftra.F90	(revision 719)
@@ -36,5 +36,5 @@
    !!---------------------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt
    !!---------------------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldftra_c1d.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldftra_c1d.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldftra_c1d.h90	(revision 719)
@@ -5,5 +5,5 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldftra_c2d.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldftra_c2d.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldftra_c2d.h90	(revision 719)
@@ -5,5 +5,5 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldftra_c3d.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldftra_c3d.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldftra_c3d.h90	(revision 719)
@@ -5,5 +5,5 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldftra_oce.F90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldftra_oce.F90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldftra_oce.F90	(revision 719)
@@ -11,5 +11,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
Index: trunk/NEMO/OPA_SRC/LDF/ldftra_substitute.h90
===================================================================
--- trunk/NEMO/OPA_SRC/LDF/ldftra_substitute.h90	(revision 717)
+++ trunk/NEMO/OPA_SRC/LDF/ldftra_substitute.h90	(revision 719)
@@ -7,5 +7,5 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$
+   !! $Header$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
