New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5712 for branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC – NEMO

Ignore:
Timestamp:
2015-09-02T15:53:51+02:00 (9 years ago)
Author:
acc
Message:

Branch NERC/dev_r5107_NOC_MEDUSA. Remove extra blanks from the ends of the SVN keyword lines that cause unnecessary conflicts with fcm_make

Location:
branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90

    r5710 r5712  
    3636   !!---------------------------------------------------------------------- 
    3737   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    38    !! $Id$  
     38   !! $Id$ 
    3939   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    4040   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90

    r5710 r5712  
    3333   !!---------------------------------------------------------------------- 
    3434   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    35    !! $Id$  
     35   !! $Id$ 
    3636   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    3737   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90

    r5710 r5712  
    2929   !!---------------------------------------------------------------------- 
    3030   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    31    !! $Id$  
     31   !! $Id$ 
    3232   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    3333   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90

    r5710 r5712  
    3131   !!---------------------------------------------------------------------- 
    3232   !! NEMO/C1D 3.3 , NEMO Consortium (2010) 
    33    !! $Id$  
     33   !! $Id$ 
    3434   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    3535   !!====================================================================== 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90

    r5710 r5712  
    2626   !!---------------------------------------------------------------------- 
    2727   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    28    !! $Id$  
     28   !! $Id$ 
    2929   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    3030   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/C1D/dtauvd.F90

    r5710 r5712  
    3535   !!---------------------------------------------------------------------- 
    3636   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    37    !! $Id$  
     37   !! $Id$ 
    3838   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    3939   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90

    r5710 r5712  
    3030   !!---------------------------------------------------------------------- 
    3131   !! NEMO/C1D 3.3 , NEMO Consortium (2010) 
    32    !! $Id$  
     32   !! $Id$ 
    3333   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    3434   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/C1D/dyndmp.F90

    r5710 r5712  
    4747   !!---------------------------------------------------------------------- 
    4848   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    49    !! $Id$  
     49   !! $Id$ 
    5050   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    5151   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/C1D/dynnxt_c1d.F90

    r5710 r5712  
    2525   !!---------------------------------------------------------------------- 
    2626   !! NEMO/C1D 3.3 , NEMO Consortium (2010) 
    27    !! $Id$  
     27   !! $Id$ 
    2828   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    2929   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

    r5710 r5712  
    3939   !!---------------------------------------------------------------------- 
    4040   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    41    !! $Id$  
     41   !! $Id$ 
    4242   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    4343   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/SBC/cyclone.F90

    r5710 r5712  
    4141   !!---------------------------------------------------------------------- 
    4242   !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010)  
    43    !! $Id$  
     43   !! $Id$ 
    4444   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4545   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90

    r5710 r5712  
    3535   !!---------------------------------------------------------------------- 
    3636   !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010)  
    37    !! $Id$  
     37   !! $Id$ 
    3838   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3939   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90

    r5710 r5712  
    7777   !!---------------------------------------------------------------------- 
    7878   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    79    !! $Id$  
     79   !! $Id$ 
    8080   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    8181   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_oce.F90

    r5710 r5712  
    8383   !!---------------------------------------------------------------------- 
    8484   !! NEMO/OPA 4.0 , NEMO Consortium (2011) 
    85    !! $Id$  
     85   !! $Id$ 
    8686   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    8787   !!---------------------------------------------------------------------- 
  • branches/NERC/dev_r5107_NOC_MEDUSA/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl_rst.F90

    r5710 r5712  
    2727   !!--------------------------------------------------------------------------------- 
    2828   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    29    !! $Id$  
     29   !! $Id$ 
    3030   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    3131   !!--------------------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.