Index: /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/c1d.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/c1d.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/c1d.F90	(revision 2208)
@@ -20,5 +20,5 @@
    !! NEMO/C1D 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!=====================================================================
 END MODULE c1d
Index: /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/diawri_c1d.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/diawri_c1d.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/diawri_c1d.F90	(revision 2208)
@@ -47,5 +47,5 @@
    !! NEMO/C1D 3.0 , LOCEAN-IPSL  (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/dyncor_c1d.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/dyncor_c1d.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/dyncor_c1d.F90	(revision 2208)
@@ -31,5 +31,5 @@
    !! NEMO/C1D  3.0 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/dynnxt_c1d.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/dynnxt_c1d.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/dynnxt_c1d.F90	(revision 2208)
@@ -27,5 +27,5 @@
    !! NEMO/C1D  3.0 , LOCEAN-IPSL (2008) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/step_c1d.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/step_c1d.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/C1D_SRC/step_c1d.F90	(revision 2208)
@@ -69,5 +69,5 @@
    !! NEMO 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/dom_ice_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/dom_ice_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/dom_ice_2.F90	(revision 2208)
@@ -10,5 +10,5 @@
    !!   LIM 2.0, UCL-LOCEAN-IPSL (2005)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    USE par_ice_2
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/ice_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/ice_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/ice_2.F90	(revision 2208)
@@ -12,5 +12,5 @@
    !!  LIM 2.0, UCL-LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    !! * Modules used
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limadv_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limadv_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limadv_2.F90	(revision 2208)
@@ -39,5 +39,5 @@
    !! NEMO/LIM 3.2,  UCL-LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdia_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdia_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdia_2.F90	(revision 2208)
@@ -59,5 +59,5 @@
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdmp_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdmp_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdmp_2.F90	(revision 2208)
@@ -39,5 +39,5 @@
    !!   LIM 2.0 , UCL-LOCEAN-IPSL  (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdyn_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdyn_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limdyn_2.F90	(revision 2208)
@@ -41,5 +41,5 @@
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limistate_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limistate_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limistate_2.F90	(revision 2208)
@@ -48,5 +48,5 @@
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limrhg_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limrhg_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limrhg_2.F90	(revision 2208)
@@ -42,5 +42,5 @@
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limrst_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limrst_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limrst_2.F90	(revision 2208)
@@ -37,5 +37,5 @@
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limsbc_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limsbc_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limsbc_2.F90	(revision 2208)
@@ -46,5 +46,5 @@
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limtab_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limtab_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limtab_2.F90	(revision 2208)
@@ -22,5 +22,5 @@
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limthd_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limthd_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limthd_2.F90	(revision 2208)
@@ -52,5 +52,5 @@
    !! NEMO/LIM 3.2,  UCL-LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limthd_zdf_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limthd_zdf_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limthd_zdf_2.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limtrp_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limtrp_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limtrp_2.F90	(revision 2208)
@@ -46,5 +46,5 @@
    !! NEMO/LIM 3.2,  UCL-LOCEAN-IPSL (2010) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limwri_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limwri_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/limwri_2.F90	(revision 2208)
@@ -62,5 +62,5 @@
    !!  LIM 2.0, UCL-LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/par_ice_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/par_ice_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_2/par_ice_2.F90	(revision 2208)
@@ -26,5 +26,5 @@
    !! NEMO/LIM 2.0, UCL-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE par_ice_2
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/dom_ice.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/dom_ice.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/dom_ice.F90	(revision 2208)
@@ -28,5 +28,5 @@
    !! NEMO/LIM 3.2, UCL-ASTR-LOCEAN-IPSL (2009)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE dom_ice
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limadv.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limadv.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limadv.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !! NEMO/LIM 3.2,  UCL-LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limdyn.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limdyn.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limdyn.F90	(revision 2208)
@@ -42,5 +42,5 @@
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limistate.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limistate.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limistate.F90	(revision 2208)
@@ -52,5 +52,5 @@
    !!   LIM 3.0,  UCL-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limitd_me.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limitd_me.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limitd_me.F90	(revision 2208)
@@ -90,5 +90,5 @@
    !!   LIM 3.0,  UCL-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limitd_th.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limitd_th.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limitd_th.F90	(revision 2208)
@@ -48,5 +48,5 @@
    !!   LIM 3.0,  UCL-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limmsh.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limmsh.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limmsh.F90	(revision 2208)
@@ -26,5 +26,5 @@
    !! NEMO/LIM 3.2,  UCL-ASTR-LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limrhg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limrhg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limrhg.F90	(revision 2208)
@@ -46,5 +46,5 @@
    !!   LIM 3.0,  UCL-LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limrst.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limrst.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limrst.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !!   LIM 3.0,  UCL-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limsbc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limsbc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limsbc.F90	(revision 2208)
@@ -48,5 +48,5 @@
    !! NEMO/LIM  3.2 ,  UCL-LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limtab.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limtab.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limtab.F90	(revision 2208)
@@ -24,5 +24,5 @@
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd.F90	(revision 2208)
@@ -56,5 +56,5 @@
    !! NEMO/LIM  3.2 ,  UCL-LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_dh.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_dh.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_dh.F90	(revision 2208)
@@ -39,5 +39,5 @@
    !! NEMO/LIM 3.2,  UCL-LOCEAN-IPSL (2009)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_dif.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_dif.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_dif.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !!   LIM 3.0,  UCL-LOCEAN-IPSL (2005)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_ent.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_ent.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_ent.F90	(revision 2208)
@@ -43,5 +43,5 @@
    !!   LIM 3.0,  UCL-LOCEAN-IPSL (2005)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_lac.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_lac.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_lac.F90	(revision 2208)
@@ -45,5 +45,5 @@
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_sal.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_sal.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limthd_sal.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limtrp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limtrp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limtrp.F90	(revision 2208)
@@ -51,5 +51,5 @@
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limupdate.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limupdate.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limupdate.F90	(revision 2208)
@@ -57,5 +57,5 @@
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limvar.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limvar.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/limvar.F90	(revision 2208)
@@ -65,5 +65,5 @@
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/par_ice.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/par_ice.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/par_ice.F90	(revision 2208)
@@ -22,5 +22,5 @@
    !! NEMO/LIM 3.2, UCL-ASTR-LOCEAN-IPSL (2009)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE par_ice
Index: /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/thd_ice.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/thd_ice.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/LIM_SRC_3/thd_ice.F90	(revision 2208)
@@ -9,5 +9,5 @@
    !!   LIM 3.0, UCL-LOCEAN-IPSL (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    !! * Modules used
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif2model.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif2model.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif2model.F90	(revision 2208)
@@ -3,5 +3,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_oce.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE agrif_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_interp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_interp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_interp.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_sponge.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_sponge.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_sponge.F90	(revision 2208)
@@ -17,5 +17,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_update.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_update.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_opa_update.F90	(revision 2208)
@@ -18,5 +18,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_interp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_interp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_interp.F90	(revision 2208)
@@ -16,5 +16,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_sponge.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_sponge.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_sponge.F90	(revision 2208)
@@ -18,5 +18,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id: agrif_opa_sponge.F90 1156 2008-06-26 16:06:45Z rblod $
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_update.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_update.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_top_update.F90	(revision 2208)
@@ -20,5 +20,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_user.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_user.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/NST_SRC/agrif_user.F90	(revision 2208)
@@ -3,5 +3,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/daymod.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/daymod.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/daymod.F90	(revision 2208)
@@ -43,5 +43,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domngb.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domngb.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domngb.F90	(revision 2208)
@@ -21,5 +21,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2008) 
    !! $Id: domngb.F90 1725 2009-11-12 15:04:08Z smasson $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domstp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domstp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domstp.F90	(revision 2208)
@@ -29,5 +29,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domzgr_substitute.h90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domzgr_substitute.h90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/DOM/domzgr_substitute.h90	(revision 2208)
@@ -132,4 +132,4 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/in_out_manager.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/in_out_manager.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/in_out_manager.F90	(revision 2208)
@@ -113,5 +113,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom.F90	(revision 2208)
@@ -69,5 +69,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_def.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_def.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_def.F90	(revision 2208)
@@ -10,5 +10,5 @@
    !! OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!---------------------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_ioipsl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_ioipsl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_ioipsl.F90	(revision 2208)
@@ -37,5 +37,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_nf90.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_nf90.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_nf90.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_rstdimg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_rstdimg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/IOM/iom_rstdimg.F90	(revision 2208)
@@ -37,5 +37,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/LDF/ldfslp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/LDF/ldfslp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/LDF/ldfslp.F90	(revision 2208)
@@ -49,5 +49,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SBC/sbc_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SBC/sbc_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SBC/sbc_oce.F90	(revision 2208)
@@ -5,5 +5,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
    !! History :  9.0   !  06-06  (G. Madec)  Original code
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SBC/sbcrnf.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SBC/sbcrnf.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SBC/sbcrnf.F90	(revision 2208)
@@ -6,5 +6,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!=====================================================================
    !! History :       !  00-11  (R. Hordoir, E. Durand)  NetCDF FORMAT
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SOL/sol_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SOL/sol_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/SOL/sol_oce.F90	(revision 2208)
@@ -12,5 +12,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    !! * Modules used
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/eosbn2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/eosbn2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/eosbn2.F90	(revision 2208)
@@ -62,5 +62,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/lib_mpp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/lib_mpp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/lib_mpp.F90	(revision 2208)
@@ -105,5 +105,5 @@
    !! ========================= !!
 !$AGRIF_DO_NOT_TREAT
-   INCLUDE mpif.h
+   INCLUDE 'mpif.h'
 !$AGRIF_END_DO_NOT_TREAT
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/trc_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/trc_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OFF_SRC/trc_oce.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id: trc_oce.F90 1834 2010-04-14 11:54:19Z cetlod $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdy_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdy_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdy_oce.F90	(revision 2208)
@@ -90,5 +90,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE bdy_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdy_par.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdy_par.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdy_par.F90	(revision 2208)
@@ -31,5 +31,5 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE bdy_par
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdydta.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdydta.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdydta.F90	(revision 2208)
@@ -61,5 +61,5 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdydyn.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdydyn.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdydyn.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdyini.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdyini.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdyini.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdytides.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdytides.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdytides.F90	(revision 2208)
@@ -58,5 +58,5 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdytra.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdytra.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdytra.F90	(revision 2208)
@@ -27,5 +27,5 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdyvol.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdyvol.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/BDY/bdyvol.F90	(revision 2208)
@@ -32,5 +32,5 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diaar5.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diaar5.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diaar5.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diafwb.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diafwb.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diafwb.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diagap.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diagap.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diagap.F90	(revision 2208)
@@ -47,5 +47,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diahth.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diahth.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diahth.F90	(revision 2208)
@@ -44,5 +44,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diaptr.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diaptr.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DIA/diaptr.F90	(revision 2208)
@@ -102,5 +102,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/closea.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/closea.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/closea.F90	(revision 2208)
@@ -46,5 +46,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/daymod.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/daymod.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/daymod.F90	(revision 2208)
@@ -45,5 +45,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/dom_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/dom_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/dom_oce.F90	(revision 2208)
@@ -9,5 +9,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    USE par_oce      ! ocean parameters
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domain.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domain.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domain.F90	(revision 2208)
@@ -43,5 +43,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software is governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software is governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!-------------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domcfg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domcfg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domcfg.F90	(revision 2208)
@@ -24,5 +24,5 @@
    !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domhgr.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domhgr.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domhgr.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/dommsk.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/dommsk.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/dommsk.F90	(revision 2208)
@@ -44,5 +44,5 @@
    !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domngb.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domngb.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domngb.F90	(revision 2208)
@@ -21,5 +21,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2008) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domstp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domstp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domstp.F90	(revision 2208)
@@ -29,5 +29,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domvvl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domvvl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domvvl.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domzgr.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domzgr.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domzgr.F90	(revision 2208)
@@ -34,5 +34,4 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE closea          ! closed seas
-   USE c1d             ! 1D configuration
 
    IMPLICIT NONE
@@ -59,5 +58,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -482,7 +481,9 @@
       !                                               ! =============== !
 
-      !                                               ! =================== !
-      IF( .NOT. lk_c1d )   CALL zgr_bat_ctl           !   Bathymetry check  !
-      !                                               ! =================== !
+#if ! defined key_c1d
+      !                          ! =================== !
+      CALL zgr_bat_ctl           !   Bathymetry check  !
+      !                          ! =================== !
+#endif
    END SUBROUTINE zgr_bat
 
@@ -984,7 +985,9 @@
       !                                               ! =============== !
 
-      !                                               ! =================== !
-      IF( .NOT. lk_c1d )   CALL zgr_bat_ctl           !   Bathymetry check  !
-      !                                               ! =================== !
+#if ! defined key_c1d
+      !                          ! =================== !
+      CALL zgr_bat_ctl           !   Bathymetry check  !
+      !                          ! =================== !
+#endif
    END SUBROUTINE zgr_zps
 
@@ -1476,7 +1479,9 @@
       !                                               ! ===========
 
-      !                                               ! =================== !
-      IF( .NOT. lk_c1d )   CALL zgr_bat_ctl           !   Bathymetry check  !
-      !                                               ! =================== !
+#if ! defined key_c1d
+      !                          ! =================== !
+      CALL zgr_bat_ctl           !   Bathymetry check  !
+      !                          ! =================== !
+#endif
 
       !                                               ! =============
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domzgr_substitute.h90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domzgr_substitute.h90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/domzgr_substitute.h90	(revision 2208)
@@ -132,4 +132,4 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/phycst.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/phycst.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DOM/phycst.F90	(revision 2208)
@@ -83,5 +83,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/divcur.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/divcur.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/divcur.F90	(revision 2208)
@@ -340,5 +340,17 @@
          ENDIF
 #endif         
+<<<<<<< .working
          IF( .NOT. AGRIF_Root() ) THEN
+=======
+#if defined key_bdy
+         ! unstructured open boundaries (div must be zero behind the open boundary)
+         DO jj = 1, jpj
+           DO ji = 1, jpi
+             hdivn(ji,jj,jk)=hdivn(ji,jj,jk)*bdytmask(ji,jj)
+           END DO
+         END DO
+#endif        
+         IF( .NOT. AGRIF_Root() ) THEN
+>>>>>>> .merge-right.r2207
             IF ((nbondi ==  1).OR.(nbondi == 2)) hdivn(nlci-1 , :     ,jk) = 0.e0      ! east
             IF ((nbondi == -1).OR.(nbondi == 2)) hdivn(2      , :     ,jk) = 0.e0      ! west
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv_cen2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv_cen2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv_cen2.F90	(revision 2208)
@@ -31,5 +31,5 @@
    !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv_ubs.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv_ubs.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynadv_ubs.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynbfr.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynbfr.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynbfr.F90	(revision 2208)
@@ -32,5 +32,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id: dynzdf.F90 1152 2008-06-26 14:11:13Z rblod $
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynhpg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynhpg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynhpg.F90	(revision 2208)
@@ -61,5 +61,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynkeg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynkeg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynkeg.F90	(revision 2208)
@@ -29,5 +29,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynldf.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynldf.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynldf.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynldf_iso.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynldf_iso.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynldf_iso.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynnxt.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynnxt.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynnxt.F90	(revision 2208)
@@ -33,9 +33,11 @@
    USE bdydta          ! unstructured open boundary conditions
    USE bdydyn          ! unstructured open boundary conditions
-   USE agrif_opa_update
-   USE agrif_opa_interp
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! lateral boundary condition (or mpp link)
    USE prtctl          ! Print control
+#if defined key_agrif
+   USE agrif_opa_update
+   USE agrif_opa_interp
+#endif
 
    IMPLICIT NONE
@@ -49,5 +51,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software is governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software is governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!-------------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg.F90	(revision 2208)
@@ -37,5 +37,5 @@
    !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_exp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_exp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_exp.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_flt.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_flt.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_flt.F90	(revision 2208)
@@ -44,7 +44,9 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
-   USE agrif_opa_interp
    USE iom
    USE restart         ! only for lrst_oce
+#if defined key_agrif
+   USE agrif_opa_interp
+#endif
 
    IMPLICIT NONE
@@ -60,5 +62,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_oce.F90	(revision 2208)
@@ -44,5 +44,5 @@
    !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!======================================================================
 END MODULE dynspg_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_ts.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_ts.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynspg_ts.F90	(revision 2208)
@@ -59,5 +59,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software is governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software is governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!-------------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynvor.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynvor.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynvor.F90	(revision 2208)
@@ -55,5 +55,5 @@
    !! NEMO/OPA 3,2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzad.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzad.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzad.F90	(revision 2208)
@@ -33,5 +33,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf.F90	(revision 2208)
@@ -42,5 +42,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf_exp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf_exp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf_exp.F90	(revision 2208)
@@ -33,5 +33,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf_imp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/dynzdf_imp.F90	(revision 2208)
@@ -15,5 +15,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    !! * Modules used
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/sshwzv.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/sshwzv.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/sshwzv.F90	(revision 2208)
@@ -48,5 +48,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/flo_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/flo_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/flo_oce.F90	(revision 2208)
@@ -51,5 +51,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE flo_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/floats.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/floats.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/floats.F90	(revision 2208)
@@ -29,5 +29,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/flowri.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/flowri.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/FLO/flowri.F90	(revision 2208)
@@ -34,5 +34,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/in_out_manager.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/in_out_manager.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/in_out_manager.F90	(revision 2208)
@@ -110,5 +110,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom.F90	(revision 2208)
@@ -70,5 +70,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_def.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_def.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_def.F90	(revision 2208)
@@ -10,5 +10,5 @@
    !! OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!---------------------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_ioipsl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_ioipsl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_ioipsl.F90	(revision 2208)
@@ -37,5 +37,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_nf90.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_nf90.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_nf90.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_rstdimg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_rstdimg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/iom_rstdimg.F90	(revision 2208)
@@ -37,5 +37,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/restart.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/restart.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/IOM/restart.F90	(revision 2208)
@@ -20,5 +20,4 @@
    USE in_out_manager  ! I/O manager
    USE iom             ! I/O module
-   USE c1d             ! re-initialization of u-v mask for the 1D configuration
    USE zpshde          ! partial step: hor. derivative (zps_hde routine)
    USE eosbn2          ! equation of state            (eos bn2 routine)
@@ -42,5 +41,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfdyn.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfdyn.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfdyn.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE ldfdyn_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfslp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfslp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldfslp.F90	(revision 2208)
@@ -56,5 +56,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldftra.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldftra.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldftra.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldftra_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldftra_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/LDF/ldftra_oce.F90	(revision 2208)
@@ -70,5 +70,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!=====================================================================
 END MODULE ldftra_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obc_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obc_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obc_oce.F90	(revision 2208)
@@ -233,5 +233,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!======================================================================
 END MODULE obc_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obcini.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obcini.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obcini.F90	(revision 2208)
@@ -33,5 +33,5 @@
    !! NEMO/OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -427,4 +427,5 @@
                obcsurftot = obcsurftot+hu(ji,jj)*e2u(ji,jj)*uemsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
             END DO
+<<<<<<< .working
          END DO
       END IF
@@ -434,4 +435,12 @@
             DO jj = 1, jpj 
                obcsurftot = obcsurftot+hu(ji,jj)*e2u(ji,jj)*uwmsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
+=======
+         END DO
+      END IF
+      IF( lp_obc_west ) THEN ! ... West open boundary lateral surface
+         DO ji = niw0, niw1
+            DO jj = 1, jpj 
+               obcsurftot = obcsurftot+hu(ji,jj)*e2u(ji,jj)*uwmsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
+>>>>>>> .merge-right.r2207
             END DO
          END DO
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/albedo.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/albedo.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/albedo.F90	(revision 2208)
@@ -47,5 +47,5 @@
    !! NEMO/OPA 9.0 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/cpl_oasis3.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/cpl_oasis3.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/cpl_oasis3.F90	(revision 2208)
@@ -66,5 +66,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Header$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/cpl_oasis4.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/cpl_oasis4.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/cpl_oasis4.F90	(revision 2208)
@@ -120,5 +120,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/fldread.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/fldread.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/fldread.F90	(revision 2208)
@@ -93,5 +93,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/geo2ocean.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/geo2ocean.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/geo2ocean.F90	(revision 2208)
@@ -42,5 +42,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/oasis4_date.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/oasis4_date.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/oasis4_date.F90	(revision 2208)
@@ -12,5 +12,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 !##################### WARNING coupled mode ###############################
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbc_ice.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbc_ice.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbc_ice.F90	(revision 2208)
@@ -63,5 +63,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbc_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbc_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbc_oce.F90	(revision 2208)
@@ -73,5 +73,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $ Id: $
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcana.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcana.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcana.F90	(revision 2208)
@@ -41,5 +41,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcblk_clio.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcblk_clio.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcblk_clio.F90	(revision 2208)
@@ -83,5 +83,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcblk_core.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcblk_core.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcblk_core.F90	(revision 2208)
@@ -73,5 +73,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbccpl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbccpl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbccpl.F90	(revision 2208)
@@ -165,5 +165,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcflx.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcflx.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcflx.F90	(revision 2208)
@@ -54,5 +54,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcfwb.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcfwb.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcfwb.F90	(revision 2208)
@@ -42,5 +42,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
@@ -167,4 +167,6 @@
             IF( lk_mpp )   CALL  mpp_sum( zsurf_neg )
             IF( lk_mpp )   CALL  mpp_sum( zsurf_pos )
+            IF( lk_mpp )   CALL  mpp_sum( zsurf_neg )
+            IF( lk_mpp )   CALL  mpp_sum( zsurf_pos )
             
             IF( z_fwf < 0.e0 ) THEN
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_if.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_if.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_if.F90	(revision 2208)
@@ -32,5 +32,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim.F90	(revision 2208)
@@ -19,5 +19,4 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
-   USE c1d             ! 1d configuration
    USE dom_oce         ! ocean space and time domain
    USE lib_mpp
@@ -65,5 +64,5 @@
    !! NEMO/LIM 3.0 , UCL-LOCEAN-IPSL  (2008)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -196,5 +195,6 @@
          IF( ln_nicep )   CALL lim_prt_state( jiindx, jjindx, 1, ' - Beginning the time step - ' )   ! control print
          !
-         IF( .NOT. lk_c1d ) THEN                     ! Ice dynamics & transport (not in 1D case)
+#if ! defined key_c1d
+         ! Ice dynamics & transport (not in 1D case)
                           CALL lim_dyn( kt )              ! Ice dynamics    ( rheology/dynamics )
                           CALL lim_trp( kt )              ! Ice transport   ( Advection/diffusion )
@@ -203,5 +203,5 @@
          IF( ln_nicep )   CALL lim_prt_state( jiindx, jjindx,-1, ' - ice dyn & trp - ' )   ! control print
                           CALL lim_itd_me                 ! Mechanical redistribution ! (ridging/rafting)
-         ENDIF
+#endif
          !
          !                                           ! Ice thermodynamics 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90	(revision 2208)
@@ -17,5 +17,4 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
-   USE c1d             ! 1d configuration
    USE dom_oce         ! ocean space and time domain
    USE lib_mpp
@@ -61,5 +60,5 @@
    !! NEMO/SBC  3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -174,9 +173,10 @@
 
                                         CALL lim_rst_opn_2  ( kt )      ! Open Ice restart file
-         IF( .NOT. lk_c1d ) THEN                                        ! Ice dynamics & transport (not in 1D case)
+#if ! defined key_c1d
+            ! Ice dynamics & transport (not in 1D case)
                                         CALL lim_dyn_2      ( kt )           ! Ice dynamics    ( rheology/dynamics )
                                         CALL lim_trp_2      ( kt )           ! Ice transport   ( Advection/diffusion )
             IF( ln_limdmp )             CALL lim_dmp_2      ( kt )           ! Ice damping 
-         ENDIF
+#endif
 #if defined key_coupled
          IF( ksbc == 5    )             CALL sbc_cpl_ice_flx( reshape( frld, (/jpi,jpj,1/) ),        &
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcmod.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcmod.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcmod.F90	(revision 2208)
@@ -54,5 +54,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcrnf.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcrnf.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcrnf.F90	(revision 2208)
@@ -73,5 +73,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcssm.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcssm.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcssm.F90	(revision 2208)
@@ -29,5 +29,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcssr.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcssr.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcssr.F90	(revision 2208)
@@ -48,5 +48,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/sol_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/sol_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/sol_oce.F90	(revision 2208)
@@ -52,5 +52,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 END MODULE sol_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solmat.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solmat.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solmat.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solpcg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solpcg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solpcg.F90	(revision 2208)
@@ -25,5 +25,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solsor.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solsor.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solsor.F90	(revision 2208)
@@ -31,5 +31,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solver.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solver.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SOL/solver.F90	(revision 2208)
@@ -33,5 +33,5 @@
    !! NEMO/OPA 9.0 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/eosbn2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/eosbn2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/eosbn2.F90	(revision 2208)
@@ -63,5 +63,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv.F90	(revision 2208)
@@ -47,5 +47,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_cen2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_cen2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_cen2.F90	(revision 2208)
@@ -56,5 +56,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_eiv.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_eiv.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_eiv.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_muscl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_muscl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_muscl.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_muscl2.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_muscl2.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_qck.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_qck.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_qck.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_tvd.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_tvd.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_tvd.F90	(revision 2208)
@@ -46,5 +46,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_ubs.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_ubs.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traadv_ubs.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006)  
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbc.F90	(revision 2208)
@@ -43,5 +43,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbl.F90	(revision 2208)
@@ -61,5 +61,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbl_adv.h90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbl_adv.h90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trabbl_adv.h90	(revision 2208)
@@ -9,5 +9,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tradmp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tradmp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tradmp.F90	(revision 2208)
@@ -65,5 +65,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traldf.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traldf.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traldf.F90	(revision 2208)
@@ -47,5 +47,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traldf_iso.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traldf_iso.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traldf_iso.F90	(revision 2208)
@@ -47,5 +47,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tranpc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tranpc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tranpc.F90	(revision 2208)
@@ -32,5 +32,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tranxt.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tranxt.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/tranxt.F90	(revision 2208)
@@ -36,7 +36,10 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
+   USE obc_oce 
+#if defined key_agrif
    USE agrif_opa_update
    USE agrif_opa_interp
    USE obc_oce 
+#endif
 
    IMPLICIT NONE
@@ -52,5 +55,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traqsr.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traqsr.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/traqsr.F90	(revision 2208)
@@ -57,5 +57,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trasbc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trasbc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trasbc.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf.F90	(revision 2208)
@@ -48,5 +48,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_exp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_exp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_exp.F90	(revision 2208)
@@ -44,5 +44,5 @@
    !! NEMO/OPA  3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_imp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_imp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_imp.F90	(revision 2208)
@@ -47,5 +47,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdicp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdicp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdicp.F90	(revision 2208)
@@ -50,5 +50,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdicp_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdicp_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdicp_oce.F90	(revision 2208)
@@ -86,5 +86,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE trdicp_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmld_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmld_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmld_oce.F90	(revision 2208)
@@ -85,5 +85,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE trdmld_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmld_rst.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmld_rst.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmld_rst.F90	(revision 2208)
@@ -25,5 +25,5 @@
    !! OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!---------------------------------------------------------------------------------
   
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmod.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmod.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmod.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmod_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmod_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdmod_oce.F90	(revision 2208)
@@ -65,5 +65,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE trdmod_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdvor.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdvor.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdvor.F90	(revision 2208)
@@ -66,5 +66,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
   
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdvor_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdvor_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRD/trdvor_oce.F90	(revision 2208)
@@ -36,5 +36,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE trdvor_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdf_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdf_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdf_oce.F90	(revision 2208)
@@ -41,5 +41,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE zdf_oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfbfr.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfbfr.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfbfr.F90	(revision 2208)
@@ -45,5 +45,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfddm.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfddm.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfddm.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfevd.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfevd.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfevd.F90	(revision 2208)
@@ -33,5 +33,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfini.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfini.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfini.F90	(revision 2208)
@@ -39,5 +39,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfkpp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfkpp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfkpp.F90	(revision 2208)
@@ -142,5 +142,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL   (2009)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfmxl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfmxl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfmxl.F90	(revision 2208)
@@ -31,5 +31,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfric.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfric.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdfric.F90	(revision 2208)
@@ -44,5 +44,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftke.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftke.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftke.F90	(revision 2208)
@@ -96,5 +96,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id: zdftke2.F90 1201 2008-09-24 13:24:21Z rblod $
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftke_old.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftke_old.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftke_old.F90	(revision 2208)
@@ -93,5 +93,5 @@
    !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftmx.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftmx.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ZDF/zdftmx.F90	(revision 2208)
@@ -49,5 +49,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: anches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/agrif_opa_interp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/agrif_opa_interp.F90	(revision 2207)
+++ 	(revision )
@@ -1,15 +1,0 @@
-MODULE agrif_opa_interp
-   !!======================================================================
-   !!                       ***  MODULE agrif_opa_interp  ***
-   !!  Dummy module
-   !!======================================================================
-
-   !!----------------------------------------------------------------------
-   !!   Dummy module                                     NO agrif use
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
-   !!----------------------------------------------------------------------
-END MODULE agrif_opa_interp
Index: anches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/agrif_opa_sponge.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/agrif_opa_sponge.F90	(revision 2207)
+++ 	(revision )
@@ -1,15 +1,0 @@
-MODULE agrif_opa_sponge
-   !!======================================================================
-   !!                       ***  MODULE agrif_opa_sponge  ***
-   !!  Dummy module
-   !!======================================================================
-
-   !!----------------------------------------------------------------------
-   !!   Dummy module                                     NO agrif use
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
-   !!----------------------------------------------------------------------
-END MODULE agrif_opa_sponge
Index: anches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/agrif_opa_update.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/agrif_opa_update.F90	(revision 2207)
+++ 	(revision )
@@ -1,15 +1,0 @@
-MODULE agrif_opa_update
-   !!======================================================================
-   !!                       ***  MODULE agrif_opa_update  ***
-   !!  Dummy module
-   !!======================================================================
-
-   !!----------------------------------------------------------------------
-   !!   Dummy module                                     NO agrif use
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
-   !!----------------------------------------------------------------------
-END MODULE agrif_opa_update
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/istate.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/istate.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/istate.F90	(revision 2208)
@@ -34,5 +34,4 @@
    USE in_out_manager  ! I/O manager
    USE iom
-   USE c1d             ! re-initialization of u-v mask for the 1D configuration
    USE zpshde          ! partial step: hor. derivative (zps_hde routine)
    USE eosbn2          ! equation of state            (eos bn2 routine)
@@ -54,5 +53,5 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -124,8 +123,10 @@
          CALL eos( tb, sb, rhd, rhop )        ! before potential and in situ densities
          
-         IF( ln_zps .AND. .NOT. lk_c1d )   &
+#if ! defined key_c1d
+         IF( ln_zps )   &
             &             CALL zps_hde( nit000, tb, sb, rhd,  &  ! Partial steps: before Horizontal DErivative
             &                                  gtu, gsu, gru, &  ! of t, s, rd at the bottom ocean level
             &                                  gtv, gsv, grv )
+#endif
          
       ENDIF
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/lib_cray.f90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/lib_cray.f90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/lib_cray.f90	(revision 2208)
@@ -10,5 +10,5 @@
 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
 !!----------------------------------------------------------------------
-     SUBROUTINE wheneq ( i, x, j, t, ind, nn )
+SUBROUTINE wheneq ( i, x, j, t, ind, nn )
         IMPLICIT NONE
 
@@ -28,3 +28,3 @@
         END DO 
 
-     END SUBROUTINE wheneq
+END SUBROUTINE wheneq
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/lib_mpp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/lib_mpp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/lib_mpp.F90	(revision 2208)
@@ -101,5 +101,5 @@
    !! ========================= !!
 !$AGRIF_DO_NOT_TREAT
-#  include <mpif.h>
+   INCLUDE 'mpif.h'
 !$AGRIF_END_DO_NOT_TREAT
    
@@ -160,5 +160,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/oce.F90	(revision 2208)
@@ -52,5 +52,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2008) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================
 END MODULE oce
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/opa.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/opa.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/opa.F90	(revision 2208)
@@ -67,7 +67,8 @@
    USE dynspg_oce      ! Control choice of surface pressure gradient schemes
    USE prtctl          ! Print control                 (prt_ctl_init routine)
-   USE c1d             ! 1D configuration
+#if defined key_c1d
    USE dyncor_c1d      ! Coriolis factor at T-point
    USE step_c1d        ! Time stepping loop for the 1D configuration
+#endif
 #if defined key_top
    USE trcini          ! passive tracer initialisation
@@ -92,5 +93,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -266,9 +267,9 @@
       CALL dom_init                         ! Domain
 !!gm c1d case can be moved in dom_init routine
-      IF( lk_c1d ) THEN                          ! 1D configuration 
+#if defined key_c1d
          CALL cor_c1d                            ! Coriolis defined at T-point
          umask(:,:,:) = tmask(:,:,:)             ! U, V and T-points are the same
          vmask(:,:,:) = tmask(:,:,:)             ! 
-      ENDIF
+#endif
 !!gm c1d end
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/par_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/par_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/par_oce.F90	(revision 2208)
@@ -26,9 +26,22 @@
 
 #if ! defined key_mpp_dyndist 
-   INTEGER, PUBLIC, PARAMETER ::    &  !: 
-      jpni   = 1,                   &  !: number of processors following i 
+
+   INTEGER, PUBLIC, PARAMETER ::    &  !:
+# if ! defined key_nproci
+      jpni   = 1,                   &  !: number of processors following i
       jpnj   = 1,                   &  !: number of processors following j
       jpnij  = 1                       !: nb of local domain = nb of processors 
       !                                !  ( <= jpni x jpnj )
+# else
+      jpni   = key_nproci,          &  !: number of processors following i
+      jpnj   = key_nprocj,          &  !: number of processors following j
+#  if ! defined key_nprocij
+      jpnij  = key_nproci * key_nprocj !: nb of local domain = nb of processors 
+      !                                !  ( <= jpni x jpnj )
+#  else
+      jpnij  = key_nprocij             !: nb of local domain = nb of processors 
+      !                                !  ( <= jpni x jpnj )
+#  endif
+# endif
 #else
    INTEGER, PUBLIC ::               &  !
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/step.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/step.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/step.F90	(revision 2208)
@@ -135,5 +135,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/stpctl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/stpctl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/stpctl.F90	(revision 2208)
@@ -29,5 +29,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/trc_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/trc_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/trc_oce.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt) 
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/par_c14b.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/par_c14b.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/par_c14b.F90	(revision 2208)
@@ -8,5 +8,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id: par_cfc.F90 1152 2008-06-26 14:11:13Z rblod $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    USE par_lobster, ONLY : jp_lobster      !: number of tracers in LOBSTER
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trcctl_c14b.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trcctl_c14b.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trcctl_c14b.F90	(revision 2208)
@@ -22,5 +22,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id: trcctl_cfc.F90 1146 2008-06-25 11:42:56Z rblod $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trcini_c14b.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trcini_c14b.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trcini_c14b.F90	(revision 2208)
@@ -43,5 +43,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id: trcini_cfc.F90 1146 2008-06-25 11:42:56Z rblod $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trclsm_c14b.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trclsm_c14b.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/C14b/trclsm_c14b.F90	(revision 2208)
@@ -26,5 +26,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id: trclsm_cfc.F90 1146 2008-06-25 11:42:56Z rblod $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/par_cfc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/par_cfc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/par_cfc.F90	(revision 2208)
@@ -8,5 +8,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    USE par_lobster, ONLY : jp_lobster      !: number of tracers in LOBSTER
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcctl_cfc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcctl_cfc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcctl_cfc.F90	(revision 2208)
@@ -22,5 +22,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcini_cfc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcini_cfc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcini_cfc.F90	(revision 2208)
@@ -32,5 +32,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trclsm_cfc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trclsm_cfc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trclsm_cfc.F90	(revision 2208)
@@ -26,5 +26,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcsms_cfc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcsms_cfc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/CFC/trcsms_cfc.F90	(revision 2208)
@@ -54,5 +54,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/par_lobster.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/par_lobster.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/par_lobster.F90	(revision 2208)
@@ -8,5 +8,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/sms_lobster.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/sms_lobster.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/sms_lobster.F90	(revision 2208)
@@ -25,5 +25,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcbio.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcbio.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcbio.F90	(revision 2208)
@@ -34,5 +34,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcctl_lobster.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcctl_lobster.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcctl_lobster.F90	(revision 2208)
@@ -22,5 +22,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcexp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcexp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcexp.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90	(revision 2208)
@@ -30,5 +30,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trclsm_lobster.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trclsm_lobster.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trclsm_lobster.F90	(revision 2208)
@@ -26,5 +26,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcopt.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcopt.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcopt.F90	(revision 2208)
@@ -32,5 +32,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcsed.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcsed.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcsed.F90	(revision 2208)
@@ -33,5 +33,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcsms_lobster.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcsms_lobster.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/LOBSTER/trcsms_lobster.F90	(revision 2208)
@@ -30,5 +30,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90	(revision 2208)
@@ -8,5 +8,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    USE par_lobster, ONLY : jp_lobster      !: number of tracers in LOBSTER
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcctl_my_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcctl_my_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcctl_my_trc.F90	(revision 2208)
@@ -23,5 +23,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90	(revision 2208)
@@ -24,5 +24,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trclsm_my_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trclsm_my_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trclsm_my_trc.F90	(revision 2208)
@@ -24,5 +24,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/MY_TRC/trcsms_my_trc.F90	(revision 2208)
@@ -26,5 +26,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zbio.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zbio.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zbio.F90	(revision 2208)
@@ -43,5 +43,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zche.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zche.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zche.F90	(revision 2208)
@@ -151,5 +151,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zflx.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zflx.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zflx.F90	(revision 2208)
@@ -56,5 +56,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zint.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zint.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zint.F90	(revision 2208)
@@ -34,5 +34,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zlim.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zlim.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zlim.F90	(revision 2208)
@@ -45,5 +45,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zlys.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zlys.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zlys.F90	(revision 2208)
@@ -44,5 +44,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmeso.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmeso.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmeso.F90	(revision 2208)
@@ -49,5 +49,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmicro.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmicro.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmicro.F90	(revision 2208)
@@ -47,5 +47,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmort.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmort.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zmort.F90	(revision 2208)
@@ -45,5 +45,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zopt.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zopt.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zopt.F90	(revision 2208)
@@ -39,5 +39,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zprod.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zprod.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zprod.F90	(revision 2208)
@@ -57,5 +57,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zrem.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zrem.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zrem.F90	(revision 2208)
@@ -49,5 +49,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zsed.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zsed.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zsed.F90	(revision 2208)
@@ -68,5 +68,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Header:$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zsink.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zsink.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/p4zsink.F90	(revision 2208)
@@ -73,5 +73,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/par_pisces.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/par_pisces.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/par_pisces.F90	(revision 2208)
@@ -8,5 +8,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    USE par_lobster, ONLY : jp_lobster      !: number of tracers in LOBSTER
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/sms_pisces.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/sms_pisces.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/sms_pisces.F90	(revision 2208)
@@ -93,5 +93,5 @@
    !! NEMO/TOP 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!======================================================================   
 END MODULE sms_pisces    
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcctl_pisces.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcctl_pisces.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcctl_pisces.F90	(revision 2208)
@@ -23,5 +23,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcini_pisces.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcini_pisces.F90	(revision 2208)
@@ -42,5 +42,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trclsm_pisces.F90	(revision 2208)
@@ -31,5 +31,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90	(revision 2208)
@@ -39,5 +39,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcadv_smolar.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcadv_smolar.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcadv_smolar.F90	(revision 2208)
@@ -45,5 +45,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcadv_smolar.F90,v 1.11 2006/04/10 15:38:54 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcadv_tvd.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcadv_tvd.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcadv_tvd.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcadv_tvd.F90,v 1.12 2006/04/10 15:38:54 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcbbc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcbbc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcbbc.F90	(revision 2208)
@@ -46,5 +46,5 @@
    !!  TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcbbc.F90,v 1.11 2006/09/12 11:10:13 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcbbl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcbbl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcbbl.F90	(revision 2208)
@@ -59,5 +59,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcbbl.F90,v 1.12 2006/09/12 11:10:13 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcdmp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcdmp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcdmp.F90	(revision 2208)
@@ -42,5 +42,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcdmp.F90,v 1.11 2006/09/01 14:03:49 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_bilapg.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_bilapg.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_bilapg.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_bilapg.F90,v 1.9 2006/04/10 15:38:54 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_iso.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_iso.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_iso.F90	(revision 2208)
@@ -37,5 +37,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_iso.F90,v 1.9 2006/04/10 15:38:54 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90	(revision 2208)
@@ -33,5 +33,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_iso_zps.F90,v 1.10 2006/09/12 11:10:14 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_lap.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_lap.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcldf_lap.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trcldf_lap.F90,v 1.10 2006/09/12 11:10:14 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcnxt.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcnxt.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcnxt.F90	(revision 2208)
@@ -30,6 +30,8 @@
    USE trdmld_trc
    USE trdmld_trc_oce
+# if defined key_agrif
    USE agrif_top_update
    USE agrif_top_interp
+# endif
 
    IMPLICIT NONE
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcrad.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcrad.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trcrad.F90	(revision 2208)
@@ -30,5 +30,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp.F90	(revision 2208)
@@ -57,5 +57,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp_ctl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp_ctl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp_ctl.F90	(revision 2208)
@@ -33,5 +33,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp_lec.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp_lec.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trctrp_lec.F90	(revision 2208)
@@ -78,5 +78,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90	(revision 2208)
@@ -51,5 +51,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90,v 1.11 2007/02/21 12:55:33 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc.F90	(revision 2208)
@@ -62,5 +62,5 @@
    !!   TOP 1.0 , LOCEAN-IPSL (2007) 
    !! $Header:  $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc_oce.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc_oce.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc_oce.F90	(revision 2208)
@@ -7,5 +7,5 @@
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/TRD/trdmld_oce.F90,v 1.2 2005/03/27 18:35:23 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 #if defined key_top
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc_rst.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc_rst.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trdmld_trc_rst.F90	(revision 2208)
@@ -25,5 +25,5 @@
    !! OPA 9.0 , LOCEAN-IPSL (2006) 
    !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/TRD/trdmld_rst.F90,v 1.6 2006/11/14 09:46:13 opalod Exp $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!---------------------------------------------------------------------------------
   
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trp_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trp_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/TRP/trp_trc.F90	(revision 2208)
@@ -8,5 +8,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 #if defined key_top
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/oce_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/oce_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/oce_trc.F90	(revision 2208)
@@ -9,5 +9,5 @@
    !! NEMO/TOP 2.0,  LOCEAN-IPSL (2007)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 #if defined key_top
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/par_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/par_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/par_trc.F90	(revision 2208)
@@ -12,5 +12,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    USE par_kind          ! kind parameters
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/prtctl_trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/prtctl_trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/prtctl_trc.F90	(revision 2208)
@@ -39,5 +39,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/top_substitute.h90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/top_substitute.h90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/top_substitute.h90	(revision 2208)
@@ -10,5 +10,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trc.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trc.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trc.F90	(revision 2208)
@@ -11,5 +11,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 #if defined key_top
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcctl.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcctl.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcctl.F90	(revision 2208)
@@ -29,5 +29,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcdia.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcdia.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcdia.F90	(revision 2208)
@@ -66,5 +66,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcdta.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcdta.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcdta.F90	(revision 2208)
@@ -38,5 +38,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcini.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcini.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcini.F90	(revision 2208)
@@ -46,5 +46,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
   
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trclec.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trclec.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trclec.F90	(revision 2208)
@@ -40,5 +40,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcrst.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcrst.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcrst.F90	(revision 2208)
@@ -50,5 +50,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
    
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcsms.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcsms.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcsms.F90	(revision 2208)
@@ -30,5 +30,5 @@
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
Index: /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcwri.F90
===================================================================
--- /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcwri.F90	(revision 2207)
+++ /branches/DEV_r2191_3partymerge2010/NEMO/TOP_SRC/trcwri.F90	(revision 2208)
@@ -35,5 +35,5 @@
    !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
    !! $Id: trcdia.F90 1450 2009-05-15 14:12:12Z cetlod $ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
