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 7646 for trunk/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml – NEMO

Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (7 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml

    r6140 r7646  
    22<simulation>  
    33 
    4  <context id="nemo" time_origin="1950-01-01 00:00:00" > 
    5      
    6     <!-- $id$ --> 
    7      
    8     <!--  
    9 ============================================================================================================ 
    10 =                                  definition of all existing variables                                    = 
    11 =                                            DO NOT CHANGE                                                 = 
    12 ============================================================================================================ 
    13     --> 
    14     <field_definition src="./field_def.xml"/> 
    15     <!--  
    16 ============================================================================================================ 
    17 =                                           output files definition                                        = 
    18 =                                            Define your own files                                         = 
    19 =                                         put the variables you want...                                    = 
    20 ============================================================================================================ 
    21     --> 
    22      
    23     <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4"> 
    24      
    25       <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files --> 
    26  
    27 <!--old      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> old --> <!-- 1h files -->  
    28    <!-- TMB files --> 
    29       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."  >                       
    30  
    31    <file id="file9" name_suffix="_shelftmb_grid_T" description="ocean T grid variables" enabled=".TRUE." > 
    32      <field field_ref="top_temp"           name="votemper_top"   operation="instant" enabled=".TRUE." /> 
    33      <field field_ref="mid_temp"           name="votemper_mid"   operation="instant" enabled=".TRUE." /> 
    34      <field field_ref="bot_temp"           name="votemper_bot"   operation="instant" enabled=".TRUE." /> 
    35      <field field_ref="sshnmasked"         name="sossheig"       operation="instant" enabled=".TRUE." />  
    36      <field field_ref="top_sal"            name="vosaline_top"   operation="instant" enabled=".TRUE." /> 
    37      <field field_ref="mid_sal"            name="vosaline_mid"   operation="instant" enabled=".TRUE." /> 
    38      <field field_ref="bot_sal"            name="vosaline_bot"   operation="instant" enabled=".TRUE." /> 
    39    </file> 
    40  
    41    <file id="file10" name_suffix="_shelftmb_grid_U" description="TMB ocean U grid variables" enabled=".TRUE." > 
    42      <field field_ref="top_u"         name="vozocrtx_top"   operation="instant" /> 
    43      <field field_ref="mid_u"         name="vozocrtx_mid"   operation="instant" /> 
    44      <field field_ref="bot_u"         name="vozocrtx_bot"   operation="instant" /> 
    45      <field field_ref="baro_u"        name="vobtcrtx"       operation="instant" /> 
    46    </file> 
    47  
    48    <file id="file11" name_suffix="_shelftmb_grid_V" description="TMB ocean V grid variables" enabled=".TRUE." > 
    49      <field field_ref="top_v"         name="vomecrty_top"   operation="instant" /> 
    50      <field field_ref="mid_v"         name="vomecrty_mid"   operation="instant" /> 
    51      <field field_ref="bot_v"         name="vomecrty_bot"   operation="instant" /> 
    52      <field field_ref="baro_v"        name="vobtcrty"       operation="instant" /> 
    53    </file> 
    54  
    55       </file_group> 
    56  
    57       <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files --> 
    58       <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->      
    59       <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files --> 
    60       <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files --> 
    61  
    62       <file_group id="25h_mean" output_freq="1d" output_level="10" enabled=".TRUE."> 
    63  
    64  
    65      <file id="file12" name_suffix="_25hourm_grid_T" description="ocean T grid variables, 25h meaned" enabled=".TRUE." > 
    66      <field field_ref="temper25h"   name="votemper"  operation="instant" enabled=".TRUE."/> 
    67      <field field_ref="tempis25h"   name="votempis"  operation="instant" enabled=".TRUE."/> 
    68      <field field_ref="salin25h"    name="vosaline"  operation="instant" enabled=".TRUE."/> 
    69      <field field_ref="ssh25h"      name="sossheig"  operation="instant" enabled=".TRUE."/> 
    70     </file> 
    71  
    72      <file id="file13" name_suffix="_25hourm_grid_U" description="ocean U grid variables, 25h meaned" enabled=".TRUE." > 
    73      <field field_ref="vozocrtx25h" name="vozocrtx"  operation="instant" enabled=".TRUE."/> 
    74     </file> 
    75  
    76      <file id="file14" name_suffix="_25hourm_grid_V" description="ocean V grid variables, 25h meaned" enabled=".TRUE." > 
    77      <field field_ref="vomecrty25h" name="vomecrty"  operation="instant" enabled=".TRUE."/> 
    78     </file> 
    79  
    80      <file id="file15" name_suffix="_25hourm_grid_W" description="ocean W grid variables, 25h meaned" enabled=".TRUE." > 
    81      <field field_ref="vomecrtz25h"          name="vomerctz"  operation="instant" enabled=".TRUE."/> 
    82      <field field_ref="woce"                 name="vovecrtz"  operation="instant" enabled=".TRUE."/> 
    83      <field field_ref="avt25h"               name="votkeavt"  operation="instant" enabled=".TRUE."/> 
    84      <field field_ref="avm25h"               name="votkeavm"  operation="instant" enabled=".TRUE."/> 
    85      <field field_ref="tke25h"               name="votke"  operation="instant" enabled=".TRUE."/> 
    86      <field field_ref="mxln25h"              name="mxln"   operation="instant" enabled=".TRUE."/> 
    87     </file> 
    88       </file_group> 
    89       
    90       <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."> <!-- 1d files --> 
    91  
    92    <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" > 
    93      <field field_ref="sst"          name="tos" /> 
    94      <field field_ref="sss"          name="sos" /> 
    95      <field field_ref="ssh"          name="zos" /> 
    96    </file> 
    97  
    98    <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" > 
    99      <field field_ref="ssu"          name="uos" /> 
    100    </file> 
    101     
    102    <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" > 
    103      <field field_ref="ssv"          name="vos" /> 
    104    </file> 
    105     
    106       </file_group> 
    107  
    108       <file_group id="3d" output_freq="3d"  output_level="10" enabled=".TRUE."/> <!-- 3d files -->     
    109  
    110       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->    
    111  
    112    <file id="file4" name_suffix="_grid_T" description="ocean T grid variables" > 
    113      <field field_ref="toce"         name="thetao" /> 
    114      <field field_ref="soce"         name="so"     /> 
    115      <field field_ref="sst"          name="tos"    /> 
    116      <field field_ref="sst2"         name="tossq"  /> 
    117      <field field_ref="sss"          name="sos"    /> 
    118      <field field_ref="ssh"          name="zos"    /> 
    119      <field field_ref="ssh2"         name="zossq"  /> 
    120      <field field_ref="empmr"        name="wfo"    /> 
    121      <field field_ref="qsr"          name="rsntds" /> 
    122      <field field_ref="qt"           name="tohfls" /> 
    123      <field field_ref="taum"     /> 
    124      <field field_ref="mldkz5"   /> 
    125      <field field_ref="mldr10_1" /> 
    126    </file> 
    127     
    128    <file id="file5" name_suffix="_grid_U" description="ocean U grid variables" > 
    129      <field field_ref="uoce"         name="uo"    /> 
    130      <field field_ref="ssu"          name="uos"   /> 
    131      <field field_ref="utau"         name="tauuo" /> 
    132    </file> 
    133     
    134    <file id="file6" name_suffix="_grid_V" description="ocean V grid variables" > 
    135      <field field_ref="voce"         name="vo"    /> 
    136      <field field_ref="ssv"          name="vos"   /> 
    137      <field field_ref="vtau"         name="tauvo" /> 
    138    </file> 
    139     
    140    <file id="file7" name_suffix="_grid_W" description="ocean W grid variables" > 
    141      <field field_ref="woce"         name="wo"     /> 
    142      <field field_ref="avt"          name="difvho" /> 
    143    </file> 
    144     
    145       </file_group> 
    146  
    147       <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files --> 
    148       <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files --> 
    149       <file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files --> 
    150       <file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files --> 
    151       <file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files --> 
    152  
    153       <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."/> <!-- real yearly files --> 
    154       <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files --> 
    155       <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files --> 
    156       <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files --> 
    157  
    158  
    159    </file_definition> 
    160      
    161     <!--  
    162 ============================================================================================================ 
    163 = grid definition = = DO NOT CHANGE = 
    164 ============================================================================================================ 
    165     --> 
    166      
    167    <axis_definition>   
    168       <axis id="deptht"  long_name="Vertical T levels"  unit="m" positive="down" /> 
    169       <axis id="depthu"  long_name="Vertical U levels"  unit="m" positive="down" /> 
    170       <axis id="depthv"  long_name="Vertical V levels"  unit="m" positive="down" /> 
    171       <axis id="depthw"  long_name="Vertical W levels"  unit="m" positive="down" /> 
    172       <axis id="nfloat"  long_name="Float number"       unit="1"                 /> 
    173       <axis id="icbcla"  long_name="Iceberg class"      unit="1"                 /> 
    174       <axis id="ncatice" long_name="Ice category"       unit="1"                 /> 
    175       <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"              /> 
    176       <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"              /> 
    177    </axis_definition>  
    178      
    179    <domain_definition src="./domain_def.xml"/> 
    180     
    181    <grid_definition>     
    182      <grid id="grid_T_2D" domain_ref="grid_T"/> 
    183      <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/> 
    184      <grid id="grid_U_2D" domain_ref="grid_U"/> 
    185      <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/> 
    186      <grid id="grid_V_2D" domain_ref="grid_V"/> 
    187      <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/> 
    188      <grid id="grid_W_2D" domain_ref="grid_W"/> 
    189      <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/> 
    190      <grid id="gznl_T_2D" domain_ref="gznl"/> 
    191      <grid id="gznl_T_3D" domain_ref="gznl" axis_ref="deptht"/> 
    192      <grid id="gznl_W_3D" domain_ref="gznl" axis_ref="depthw"/> 
    193     </grid_definition>    
    194   </context> 
    195    
     4<!-- ============================================================================================ --> 
     5<!-- XIOS context                                                                                 --> 
     6<!-- ============================================================================================ --> 
    1967 
    1978  <context id="xios"> 
     
    19910      <variable_definition> 
    20011    
    201      <!--  
    202         We must have buffer_size > jpi*jpj*jpk*8 (with jpi and jpj the subdomain size) 
    203 --> 
    204      <variable id="buffer_size"               type="integer">10000000</variable> 
    205      <variable id="buffer_server_factor_size" type="integer">2</variable> 
    206      <variable id="info_level"                type="integer">0</variable> 
    207      <variable id="using_server"              type="boolean">false</variable> 
    208      <variable id="using_oasis"               type="boolean">false</variable> 
     12     <variable id="info_level"                type="int">0</variable> 
     13     <variable id="using_server"              type="bool">false</variable> 
     14     <variable id="using_oasis"               type="bool">false</variable> 
    20915     <variable id="oasis_codes_id"            type="string" >oceanx</variable> 
    21016    
     
    21218                
    21319  </context> 
     20 
     21<!-- ============================================================================================ --> 
     22<!-- NEMO  CONTEXT add and suppress the components you need                                       --> 
     23<!-- ============================================================================================ --> 
     24 
     25  <context id="nemo" src="./context_nemo.xml"/>       <!--  NEMO       --> 
    21426   
    21527</simulation> 
Note: See TracChangeset for help on using the changeset viewer.