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 4990 for trunk/NEMOGCM/CONFIG/ORCA2_LIM – NEMO

Ignore:
Timestamp:
2014-12-15T17:42:49+01:00 (9 years ago)
Author:
timgraham
Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

Location:
trunk/NEMOGCM/CONFIG/ORCA2_LIM
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg

    r4329 r4990  
    5555/ 
    5656!----------------------------------------------------------------------- 
     57&namsplit      !   time splitting parameters                            ("key_dynspg_ts") 
     58!----------------------------------------------------------------------- 
     59/ 
     60!----------------------------------------------------------------------- 
     61&namcrs        !   Grid coarsening for dynamics output and/or 
     62               !   passive tracer coarsened online simulations 
     63!----------------------------------------------------------------------- 
     64/ 
     65!----------------------------------------------------------------------- 
    5766&namtsd    !   data : Temperature  & Salinity 
    5867!----------------------------------------------------------------------- 
    … …  
    7281/ 
    7382!----------------------------------------------------------------------- 
    74 &namsbc_core   !   namsbc_core  CORE bulk formulea 
    75 !----------------------------------------------------------------------- 
     83&namsbc_core   !   namsbc_core  CORE bulk formulae 
     84!----------------------------------------------------------------------- 
     85!              !  file name                    ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights                               ! rotation ! land/sea mask ! 
     86!              !                               !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename                              ! pairing  ! filename      ! 
     87   sn_wndi     = 'u_10.15JUNE2009_fill'        ,         6         , 'U_10_MOD',   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bicubic.nc'      , 'Uwnd'   , '' 
     88   sn_wndj     = 'v_10.15JUNE2009_fill'        ,         6         , 'V_10_MOD',   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bicubic.nc'      , 'Vwnd'   , '' 
     89   sn_qsr      = 'ncar_rad.15JUNE2009_fill'    ,        24         , 'SWDN_MOD',   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bilinear.nc'     , ''       , '' 
     90   sn_qlw      = 'ncar_rad.15JUNE2009_fill'    ,        24         , 'LWDN_MOD',   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bilinear.nc'     , ''       , '' 
     91   sn_tair     = 't_10.15JUNE2009_fill'        ,         6         , 'T_10_MOD',   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bilinear.nc'     , ''       , '' 
     92   sn_humi     = 'q_10.15JUNE2009_fill'        ,         6         , 'Q_10_MOD',   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bilinear.nc'     , ''       , '' 
     93   sn_prec     = 'ncar_precip.15JUNE2009_fill' ,        -1         , 'PRC_MOD1',   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bilinear.nc'     , ''       , '' 
     94   sn_snow     = 'ncar_precip.15JUNE2009_fill' ,        -1         , 'SNOW'    ,   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bilinear.nc'     , ''       , '' 
     95   sn_tdif     = 'taudif_core'                 ,        24         , 'taudif'  ,   .false.    , .true. , 'yearly'  , 'weights_core2_agrif_bilinear.nc'     , ''       , '' 
     96   cn_dir      = './'      !  root directory for the location of the bulk files 
     97   ln_2m       = .false.   !  air temperature and humidity referenced at 2m (T) instead 10m (F) 
     98   ln_taudif   = .false.   !  HF tau contribution: use "mean of stress module - module of the mean stress" data 
     99   ln_bulk2z   = .false.   !  Air temperature/humidity and wind vectors are referenced at heights rn_zqt and rn_zu 
     100   rn_zqt      = 3.        !  Air temperature and humidity reference height (m) (ln_bulk2z) 
     101   rn_zu       = 4.        !  Wind vector reference height (m)                  (ln_bulk2z) 
     102   rn_pfac     = 1.        !  multiplicative factor for precipitation (total & snow) 
     103   rn_efac     = 1.        !  multiplicative factor for evaporation (0. or 1.) 
     104   rn_vfac     = 0.        !  multiplicative factor for ocean/ice velocity  
     105                           !  in the calculation of the wind stress (0.=absolute winds or 1.=relative winds) 
    76106/ 
    77107!----------------------------------------------------------------------- 
    78108&namtra_qsr    !   penetrative solar radiation 
    79109!----------------------------------------------------------------------- 
     110!              !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! 
     111!              !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! 
     112   sn_chl      ='chlorophyll',        -1         , 'CHLA'    ,   .true.     , .true. , 'yearly'  , 'weights_bilin.nc'       , '' 
    80113/ 
    81114!----------------------------------------------------------------------- 
    … …  
    106139&nameos        !   ocean physical parameters 
    107140!----------------------------------------------------------------------- 
     141/ 
     142!----------------------------------------------------------------------- 
     143&namtra_dmp    !   tracer: T & S newtonian damping 
     144!----------------------------------------------------------------------- 
     145   ln_tradmp   =  .false.   !  add a damping termn (T) or not (F) 
    108146/ 
    109147!----------------------------------------------------------------------- 
    … …  
    183221!----------------------------------------------------------------------- 
    184222/ 
     223!----------------------------------------------------------------------- 
     224&namobs       !  observation usage                                      ('key_diaobs') 
     225!----------------------------------------------------------------------- 
     226/ 
     227!----------------------------------------------------------------------- 
     228&nam_asminc   !   assimilation increments                               ('key_asminc') 
     229!----------------------------------------------------------------------- 
     230/ 

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg

    r4370 r4990  
    188188!----------------------------------------------------------------------- 
    189189/ 
     190!----------------------------------------------------------------------- 
     191&namobs       !  observation usage                                      ('key_diaobs') 
     192!----------------------------------------------------------------------- 
     193/ 
     194!----------------------------------------------------------------------- 
     195&nam_asminc   !   assimilation increments                               ('key_asminc') 
     196!----------------------------------------------------------------------- 
     197/ 

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm

    r4523 r4990  
    1  bld::tool::fppkeys key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi 
     1bld::tool::fppkeys key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobs key_asminc 
Note: See TracChangeset for help on using the changeset viewer.