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 3071 – NEMO

Changeset 3071


Ignore:
Timestamp:
2011-11-09T17:54:30+01:00 (12 years ago)
Author:
rfurner
Message:

ticket #885 adding changes from branches/2011/dev_r2855_UKMO1_AMMCONFIG between r2855 and r3034

Location:
branches/2011/dev_UKM0_2011/NEMOGCM
Files:
3 edited
4 copied

Legend:

Unmodified
Added
Removed

  • branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

    r2715 r3071  
    14951495      ! 
    14961496!!    H. Liu, POL. April 2009. Added for passing the scale check for the new released vvl code. 
     1497      where (e3t   (:,:,:).eq.0.0)  e3t(:,:,:) = 1.0 
     1498      where (e3u   (:,:,:).eq.0.0)  e3u(:,:,:) = 1.0 
     1499      where (e3v   (:,:,:).eq.0.0)  e3v(:,:,:) = 1.0 
     1500      where (e3f   (:,:,:).eq.0.0)  e3f(:,:,:) = 1.0 
     1501      where (e3w   (:,:,:).eq.0.0)  e3w(:,:,:) = 1.0 
     1502      where (e3uw  (:,:,:).eq.0.0)  e3uw(:,:,:) = 1.0 
     1503      where (e3vw  (:,:,:).eq.0.0)  e3vw(:,:,:) = 1.0 
     1504 
    14971505 
    14981506      fsdept(:,:,:) = gdept (:,:,:) 

  • branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/par_oce.F90

    r2715 r3071  
    8181   !!--------------------------------------------------------------------- 
    8282#             include "par_POMME_R025.h90" 
     83#elif defined key_amm_12km 
     84   !!--------------------------------------------------------------------- 
     85   !!   'key_amm_12km':                    Atlantic Margin Model : AMM12km  
     86   !!--------------------------------------------------------------------- 
     87#             include "par_AMM_12km.h90" 
    8388#else 
    8489   !!--------------------------------------------------------------------- 

  • branches/2011/dev_UKM0_2011/NEMOGCM/TOOLS/COMPILE/cfg.txt

    r2413 r3071  
    33GYRE_LOBSTER OPA_SRC TOP_SRC 
    44ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC 
    5 POMME OPA_SRC NST_SRC 
    65ORCA2_LIM3 OPA_SRC LIM_SRC_3 
    76ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC 
     7POMME OPA_SRC NST_SRC 
     8AMM OPA_SRC TOP_SRC 
     9AMM-PISCES OPA_SRC TOP_SRC 
Note: See TracChangeset for help on using the changeset viewer.