Changeset 4276 for branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/CONFIG/ORCA2_SAS_LIM

Timestamp:

2013-11-20T10:35:28+01:00 (11 years ago)

Author:

cbricaud

Message:

merge changes from 3856 to 4119 from trunk in dev_r3856_MERCATOR3_QSRMEAN24

Location:

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00

Files:

• iodef.xml (modified) (2 diffs)
• namelist_ice_lim2 (modified) (1 diff)

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml

@@ -21 +21 @@
     -->
     
-    <file_definition type="multiple_file" sync_freq="1d" min_digits="4">
+    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4">
     
       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
@@ -60 +60 @@
       <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
+      <axis id="icbcla" long_name="Iceberg class"     unit="-"  />
    </axis_definition> 
     

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_ice_lim2

@@ -89 +89 @@
 !              !              !  (if <0  months)  !   name   !  (logical)   !  (T/F) ! 'monthly' ! filename ! pairing  !
    sn_hicif    = 'ice_damping',  -1.              , 'hicif'  ,   .true.     , .true. , 'yearly'  , ''       , ''
-   sn_cnf      = 'ice_damping',  -1.              , 'frld'   ,   .true.     , .true. , 'yearly'  , ''       , ''
+   sn_frld     = 'ice_damping',  -1.              , 'frld'   ,   .true.     , .true. , 'yearly'  , ''       , ''
 !
    cn_dir      = './'      !  root directory for the location of the runoff files