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 6358 for branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA – NEMO

Ignore:
Timestamp:
2016-03-07T12:34:27+01:00 (8 years ago)
Author:
dancopsey
Message:

Reverse last merge (I did it wrong)

Location:
branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    4444   !!---------------------------------------------------------------------- 
    4545   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    46    !! $Id: diaar5.F90 5253 2015-05-05 12:46:46Z diovino $ 
     46   !! $Id$ 
    4747   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    4848   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    112112  REAL(wp), ALLOCATABLE, DIMENSION(:,:,:)   ::  transports_2d   
    113113 
    114    !! $Id: diadct.F90 5505 2015-06-29 12:51:57Z timgraham $ 
     114   !! $Id$ 
    115115CONTAINS 
    116116 
    … …  
    12981298   LOGICAL, PUBLIC, PARAMETER ::   lk_diadct = .FALSE.    !: diamht flag 
    12991299   PUBLIC  
    1300    !! $Id: diadct.F90 5505 2015-06-29 12:51:57Z timgraham $ 
     1300   !! $Id$ 
    13011301CONTAINS 
    13021302 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diadimg.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    2828   !!---------------------------------------------------------------------- 
    2929   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    30    !! $Id: diadimg.F90 4292 2013-11-20 16:28:04Z cetlod $ 
     30   !! $Id$ 
    3131   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    3232   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    3737   !!---------------------------------------------------------------------- 
    3838   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    39    !! $Id: diafwb.F90 5506 2015-06-29 15:19:38Z clevy $ 
     39   !! $Id$ 
    4040   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    4141   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    6060   !!---------------------------------------------------------------------- 
    6161   !! NEMO/OPA 3.5 , NEMO Consortium (2013) 
    62    !! $Id: diaharm.F90 5215 2015-04-15 16:11:56Z nicolasmartin $ 
     62   !! $Id$ 
    6363   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    6464   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    5555   !!---------------------------------------------------------------------- 
    5656   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    57    !! $Id: diahsb.F90 5120 2015-03-03 16:11:55Z acc $ 
     57   !! $Id$ 
    5858   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    5959   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    4242   !!---------------------------------------------------------------------- 
    4343   !! NEMO/OPA 4.0 , NEMO Consortium (2011) 
    44    !! $Id: diahth.F90 5363 2015-06-05 10:15:22Z hadcv $ 
     44   !! $Id$  
    4545   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    4646   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/dianam.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    2424   !!---------------------------------------------------------------------- 
    2525   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    26    !! $Id: dianam.F90 2528 2010-12-27 17:33:53Z rblod $ 
     26   !! $Id$  
    2727   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    2828   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    6565   !!---------------------------------------------------------------------- 
    6666   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    67    !! $Id: diaptr.F90 5147 2015-03-13 10:01:32Z cetlod $ 
     67   !! $Id$  
    6868   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    6969   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

    • Property svn:keywords set to Id
    r6357 r6358  
    8080   !!---------------------------------------------------------------------- 
    8181   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    82    !! $Id: diawri.F90 5463 2015-06-22 14:57:34Z jchanut $ 
     82   !! $Id$ 
    8383   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    8484   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90

    • Property svn:keywords set to Id
    r6357 r6358  
    33  !!---------------------------------------------------------------------- 
    44  !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    5   !! $Id: diawri_dimg.h90 3764 2013-01-23 14:33:04Z smasson $ 
     5  !! $Id $ 
    66  !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    77  !!---------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.