Ignore:
Timestamp:
2015-07-16T13:55:15+02:00 (6 years ago)
Author:
cbricaud
Message:

merge change from trunk rev 5003 to 5519 ( rev where branche 3.6_stable were created )

Location:
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/CONFIG/GYRE_BFM/EXP00
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/CONFIG/GYRE_BFM/EXP00/iodef.xml

    r4153 r5602  
    3131      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files --> 
    3232      
    33       <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."> <!-- 1d files --> 
    34       </file_group> 
     33      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."/> <!-- 1d files --> 
    3534      <file_group id="3d" output_freq="3d"  output_level="10" enabled=".TRUE."/> <!-- 3d files -->     
    36       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->    
    37       </file_group> 
     35      <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE."/>  <!-- 5d files -->    
    3836 
    3937      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files --> 
     
    5755     
    5856   <axis_definition>   
    59       <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" /> 
    60       <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" /> 
    61       <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" /> 
    62       <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    63       <axis id="nfloat" long_name="Float number"      unit="-"  /> 
    64       <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
     57      <axis id="deptht"  long_name="Vertical T levels"  unit="m" positive="down" /> 
     58      <axis id="depthu"  long_name="Vertical U levels"  unit="m" positive="down" /> 
     59      <axis id="depthv"  long_name="Vertical V levels"  unit="m" positive="down" /> 
     60      <axis id="depthw"  long_name="Vertical W levels"  unit="m" positive="down" /> 
     61      <axis id="nfloat"  long_name="Float number"       unit="1"                 /> 
     62      <axis id="icbcla"  long_name="Iceberg class"      unit="1"                 /> 
     63      <axis id="ncatice" long_name="Ice category"       unit="1"                 /> 
     64      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"              /> 
     65      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"              /> 
    6566   </axis_definition>  
    6667     
  • branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg

    r4990 r5602  
    121121/ 
    122122!----------------------------------------------------------------------- 
    123 &namsbc_cpl    !   coupled ocean/atmosphere model                       ("key_coupled") 
     123&namsbc_cpl    !   coupled ocean/atmosphere model                       ("key_oasis3") 
    124124!----------------------------------------------------------------------- 
    125125/ 
     
    244244!----------------------------------------------------------------------- 
    245245   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F) 
    246    nn_zdmp     =    1      !  vertical   shape =0    damping throughout the water column 
    247    nn_file     =    1      !  create a damping.coeff NetCDF file (=1) or not (=0) 
    248246/ 
    249247!----------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.