Ignore:
Timestamp:
2020-07-02T17:33:41+02:00 (3 months ago)
Author:
francesca
Message:

dev_r12558_HPC-08_epico_Extra_Halo: merge with trunk@13218, see #2366

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg

    r13065 r13229  
    9595!----------------------------------------------------------------------- 
    9696   !                    !  bulk algorithm : 
     97<<<<<<< .locale 
    9798   ln_NCAR    = .true.     ! "NCAR"      algorithm   (Large and Yeager 2008) 
    9899 
     100======= 
     101   ln_NCAR      = .true.    ! "NCAR"      algorithm   (Large and Yeager 2008) 
     102   ! 
     103>>>>>>> .merge-dx.r13218 
    99104   cn_dir = './'  !  root directory for the bulk data location 
    100105   !___________!_________________________!___________________!___________!_____________!________!___________!______________________________________!__________!_______________! 
Note: See TracChangeset for help on using the changeset viewer.