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

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

Merged in UKMO/dev_r5518_fix_global_ice@6343

Location:
branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90

    • Property svn:keywords deleted
    r5506 r6357  
    4949   !!---------------------------------------------------------------------- 
    5050   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    51    !! $Id$ 
     51   !! $Id: closea.F90 5506 2015-06-29 15:19:38Z clevy $ 
    5252   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    5353   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

    • Property svn:keywords deleted
    r5002 r6357  
    4747   !!---------------------------------------------------------------------- 
    4848   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    49    !! $Id$ 
     49   !! $Id: daymod.F90 5002 2015-01-02 16:16:46Z smasson $ 
    5050   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    5151   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

    • Property svn:keywords deleted
    r5123 r6357  
    313313   !!---------------------------------------------------------------------- 
    314314   !! NEMO/OPA 4.0 , NEMO Consortium (2011) 
    315    !! $Id$  
     315   !! $Id: dom_oce.F90 5123 2015-03-04 16:06:03Z clem $ 
    316316   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    317317   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

    • Property svn:keywords deleted
    r5363 r6357  
    4848   !!------------------------------------------------------------------------- 
    4949   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    50    !! $Id$ 
     50   !! $Id: domain.F90 5363 2015-06-05 10:15:22Z hadcv $ 
    5151   !! Software governed by the CeCILL licence        (NEMOGCM/NEMO_CeCILL.txt) 
    5252   !!------------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domcfg.F90

    • Property svn:keywords deleted
    r4667 r6357  
    2626   !!---------------------------------------------------------------------- 
    2727   !! NEMO/OPA 3.2 , LODYC-IPSL  (2009) 
    28    !! $Id$  
     28   !! $Id: domcfg.F90 4667 2014-06-12 08:47:52Z cbricaud $ 
    2929   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    3030   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90

    • Property svn:keywords deleted
    r5506 r6357  
    3636   !!---------------------------------------------------------------------- 
    3737   !! NEMO/OPA 4.0 , NEMO Consortium (2011) 
    38    !! $Id$  
     38   !! $Id: domhgr.F90 5506 2015-06-29 15:19:38Z clevy $ 
    3939   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    4040   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

    • Property svn:keywords deleted
    r5506 r6357  
    5050   !!---------------------------------------------------------------------- 
    5151   !! NEMO/OPA 3.2 , LODYC-IPSL  (2009) 
    52    !! $Id$  
     52   !! $Id: dommsk.F90 5506 2015-06-29 15:19:38Z clevy $ 
    5353   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    5454   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90

    • Property svn:keywords deleted
    r3294 r6357  
    2323   !!---------------------------------------------------------------------- 
    2424   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    25    !! $Id$  
     25   !! $Id: domngb.F90 3294 2012-01-28 16:44:18Z rblod $ 
    2626   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    2727   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domstp.F90

    • Property svn:keywords deleted
    r4292 r6357  
    2626   !!---------------------------------------------------------------------- 
    2727   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    28    !! $Id$  
     28   !! $Id: domstp.F90 4292 2013-11-20 16:28:04Z cetlod $ 
    2929   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    3030   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

    • Property svn:keywords deleted
    r5506 r6357  
    7171   !!---------------------------------------------------------------------- 
    7272   !! NEMO/OPA 3.3 , NEMO-Consortium (2010)  
    73    !! $Id$ 
     73   !! $Id: domvvl.F90 5506 2015-06-29 15:19:38Z clevy $ 
    7474   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    7575   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90

    • Property svn:keywords deleted
    r4990 r6357  
    3232   !!---------------------------------------------------------------------- 
    3333   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    34    !! $Id$  
     34   !! $Id: domwri.F90 4990 2014-12-15 16:42:49Z timgraham $ 
    3535   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    3636   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

    • Property svn:keywords deleted
    r5506 r6357  
    7777   !!---------------------------------------------------------------------- 
    7878   !! NEMO/OPA 3.3.1 , NEMO Consortium (2011) 
    79    !! $Id$ 
     79   !! $Id: domzgr.F90 5506 2015-06-29 15:19:38Z clevy $ 
    8080   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    8181   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr_substitute.h90

    • Property svn:keywords deleted
    r4488 r6357  
    118118   !!---------------------------------------------------------------------- 
    119119   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    120    !! $Id$ 
     120   !! $Id: domzgr_substitute.h90 4488 2014-02-06 10:43:09Z rfurner $ 
    121121   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    122122   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

    • Property svn:keywords deleted
    r5215 r6357  
    3939   !!---------------------------------------------------------------------- 
    4040   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    41    !! $Id$  
     41   !! $Id: dtatsd.F90 5215 2015-04-15 16:11:56Z nicolasmartin $ 
    4242   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    4343   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

    • Property svn:keywords deleted
    r5332 r6357  
    5858   !!---------------------------------------------------------------------- 
    5959   !! NEMO/OPA 3.7 , NEMO Consortium (2014) 
    60    !! $Id$ 
     60   !! $Id: istate.F90 5332 2015-06-01 16:59:09Z mathiot $ 
    6161   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    6262   !!---------------------------------------------------------------------- 

  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90

    • Property svn:keywords deleted
    r5147 r6357  
    6868   REAL(wp), PUBLIC ::   rcdsn    =    0.31_wp       !: thermal conductivity of snow 
    6969   REAL(wp), PUBLIC ::   cpic     = 2067.0_wp        !: specific heat for ice  
     70#if defined key_cice 
     71   REAL(wp), PUBLIC ::   lsub     =    2.835e+6_wp   !: pure ice latent heat of sublimation                   [J/kg] 
     72#else 
    7073   REAL(wp), PUBLIC ::   lsub     =    2.834e+6_wp   !: pure ice latent heat of sublimation                   [J/kg] 
     74#endif 
    7175   REAL(wp), PUBLIC ::   lfus     =    0.334e+6_wp   !: latent heat of fusion of fresh ice                    [J/kg] 
    7276   REAL(wp), PUBLIC ::   tmut     =    0.054_wp      !: decrease of seawater meltpoint with salinity 
    … …  
    9094   !!---------------------------------------------------------------------- 
    9195   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    92    !! $Id$  
     96   !! $Id: phycst.F90 5147 2015-03-13 10:01:32Z cetlod $ 
    9397   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    9498   !!---------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.