Changeset 11836


Ignore:
Timestamp:
2019-10-30T14:08:43+01:00 (11 months ago)
Author:
acc
Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Merge remaining trunk changes from 11742 to 11830

Location:
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps
Files:
4 deleted
21 edited
4 copied

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs

    • Property svn:mergeinfo deleted
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/AGRIF_DEMO/EXPREF/namelist_ice_cfg

    r10535 r11836  
    3838&namdyn_rhg     !   Ice rheology 
    3939!------------------------------------------------------------------------------ 
     40      ln_aEVP       = .false.          !     adaptive rheology (Kimmritz et al. 2016 & 2017) 
    4041/ 
    4142!------------------------------------------------------------------------------ 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/AGRIF_DEMO/README.rst

    r11777 r11836  
    1313======== 
    1414 
    15 AGRIF (Adaptive Grid Refinement In Fortran) is a library that allows the seamless space and time refinement over 
    16 rectangular regions in NEMO. 
     15AGRIF (Adaptive Grid Refinement In Fortran) is a library that 
     16allows the seamless space and time refinement over rectangular regions in NEMO. 
    1717Refinement factors can be odd or even (usually lower than 5 to maintain stability). 
    18 Interaction between grid is "two-ways" in the sense that the parent grid feeds the child grid open boundaries and 
    19 the child grid provides volume averages of prognostic variables once a given number of time step is completed. 
     18Interaction between grid is "two-ways" in the sense that 
     19the parent grid feeds the child grid open boundaries and 
     20the child grid provides volume averages of prognostic variables once 
     21a given number of time step is completed. 
    2022These pages provide guidelines how to use AGRIF in NEMO. 
    21 For a more technical description of the library itself, please refer to http://agrif.imag.fr. 
     23For a more technical description of the library itself, please refer to AGRIF_. 
    2224 
    2325Compilation 
     
    2830.. code-block:: sh 
    2931 
    30    ./makenemo add_key 'key_agrif' 
     32   ./makenemo [...] add_key 'key_agrif' 
    3133 
    32 Although this is transparent to users, the way the code is processed during compilation is different from 
    33 the standard case: 
    34 a preprocessing stage (the so called "conv" program) translates the actual code so that 
     34Although this is transparent to users, 
     35the way the code is processed during compilation is different from the standard case: 
     36a preprocessing stage (the so called ``conv`` program) translates the actual code so that 
    3537saved arrays may be switched in memory space from one domain to an other. 
    3638 
     
    3840================================ 
    3941 
    40 An additional text file ``AGRIF_FixedGrids.in`` is required at run time. 
     42An additional text file :file:`AGRIF_FixedGrids.in` is required at run time. 
    4143This is where the grid hierarchy is defined. 
    42 An example of such a file, here taken from the ``ICEDYN`` test case, is given below:: 
     44An example of such a file, here taken from the ``ICEDYN`` test case, is given below 
    4345 
    44    1 
    45    34 63 34 63 3 3 3 
    46    0 
     46.. literalinclude:: ../../../tests/ICE_AGRIF/EXPREF/AGRIF_FixedGrids.in 
    4747 
    4848The first line indicates the number of zooms (1). 
    4949The second line contains the starting and ending indices in both directions on the root grid 
    50 (imin=34 imax=63 jmin=34 jmax=63) followed by the space and time refinement factors (3 3 3). 
     50(``imin=34 imax=63 jmin=34 jmax=63``) followed by the space and time refinement factors (3 3 3). 
    5151The last line is the number of child grid nested in the refined region (0). 
    5252A more complex example with telescoping grids can be found below and 
    53 in the ``AGRIF_DEMO`` reference configuration directory. 
     53in the :file:`AGRIF_DEMO` reference configuration directory. 
    5454 
    55 [Add some plots here with grid staggering and positioning ?] 
     55.. todo:: 
    5656 
    57 When creating the nested domain, one must keep in mind that the child domain is shifted toward north-east and 
    58 depends on the number of ghost cells as illustrated by the (attempted) drawing below for nbghostcells=1 and 
    59 nbghostcells=3. 
    60 The grid refinement is 3 and nxfin is the number of child grid points in i-direction. 
     57   Add some plots here with grid staggering and positioning? 
     58 
     59When creating the nested domain, one must keep in mind that 
     60the child domain is shifted toward north-east and 
     61depends on the number of ghost cells as illustrated by 
     62the *attempted* drawing below for ``nbghostcells=1`` and ``nbghostcells=3``. 
     63The grid refinement is 3 and ``nxfin`` is the number of child grid points in i-direction. 
    6164 
    6265.. image:: _static/agrif_grid_position.jpg 
     
    7174============= 
    7275 
    73 Knowing the refinement factors and area, a ``NESTING`` pre-processing tool may help to create needed input files 
     76Knowing the refinement factors and area, 
     77a ``NESTING`` pre-processing tool may help to create needed input files 
    7478(mesh file, restart, climatological and forcing files). 
    7579The key is to ensure volume matching near the child grid interface, 
    76 a step done by invoking the ``Agrif_create_bathy.exe`` program. 
    77 You may use the namelists provided in the ``NESTING`` directory as a guide. 
     80a step done by invoking the :file:`Agrif_create_bathy.exe` program. 
     81You may use the namelists provided in the :file:`NESTING` directory as a guide. 
    7882These correspond to the namelists used to create ``AGRIF_DEMO`` inputs. 
    7983 
     
    8286 
    8387Each child grid expects to read its own namelist so that different numerical choices can be made 
    84 (these should be stored in the form ``1_namelist_cfg``, ``2_namelist_cfg``, etc... according to their rank in 
    85 the grid hierarchy). 
     88(these should be stored in the form :file:`1_namelist_cfg`, :file:`2_namelist_cfg`, etc... 
     89according to their rank in the grid hierarchy). 
    8690Consistent time steps and number of steps with the chosen time refinement have to be provided. 
    8791Specific to AGRIF is the following block: 
    8892 
    89 .. code-block:: fortran 
    90  
    91    !----------------------------------------------------------------------- 
    92    &namagrif      !  AGRIF zoom                                            ("key_agrif") 
    93    !----------------------------------------------------------------------- 
    94       ln_spc_dyn    = .true.  !  use 0 as special value for dynamics 
    95       rn_sponge_tra = 2880.   !  coefficient for tracer   sponge layer [m2/s] 
    96       rn_sponge_dyn = 2880.   !  coefficient for dynamics sponge layer [m2/s] 
    97       ln_chk_bathy  = .false. !  =T  check the parent bathymetry 
    98    / 
     93.. literalinclude:: ../../namelists/namagrif 
     94   :language: fortran 
    9995 
    10096where sponge layer coefficients have to be chosen according to the child grid mesh size. 
    10197The sponge area is hard coded in NEMO and applies on the following grid points: 
    102 2 x refinement factor (from i=1+nbghostcells+1 to i=1+nbghostcells+sponge_area) 
     982 x refinement factor (from ``i=1+nbghostcells+1`` to ``i=1+nbghostcells+sponge_area``) 
    10399 
    104100.. rubric:: References 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/README.rst

    r11777 r11836  
    2929=========================================================== 
    3030 
    31 To compile the ORCA2_ICE_PISCES_ reference configuration using ``makenemo``, 
     31To compile the ORCA2_ICE_PISCES_ reference configuration using :file:`makenemo`, 
    3232one should use the following, by selecting among available architecture file or 
    3333providing a user defined one: 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/SHARED

    • Property svn:mergeinfo deleted
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/SHARED/README.rst

    r11777 r11836  
    1111 
    1212Output of diagnostics in NEMO is usually done using XIOS. 
    13 This is an efficient way of writing diagnostics because the time averaging, file writing and even some simple arithmetic or regridding is carried out in parallel to the NEMO model run. 
     13This is an efficient way of writing diagnostics because 
     14the time averaging, file writing and even some simple arithmetic or regridding is carried out in 
     15parallel to the NEMO model run. 
    1416This page gives a basic introduction to using XIOS with NEMO. 
    15 Much more information is available from the XIOS homepage above and from the NEMO manual. 
     17Much more information is available from the :xios:`XIOS homepage<>` above and from the NEMO manual. 
    1618 
    1719Use of XIOS for diagnostics is activated using the pre-compiler key ``key_iomput``. 
    1820 
    1921Extracting and installing XIOS 
    20 ------------------------------ 
     22============================== 
    2123 
    22241. Install the NetCDF4 library. 
    23    If you want to use single file output you will need to compile the HDF & NetCDF libraries to allow parallel IO. 
    24 2. Download the version of XIOS that you wish to use. The recommended version is now XIOS 2.5: 
     25   If you want to use single file output you will need to compile the HDF & NetCDF libraries to 
     26   allow parallel IO. 
     272. Download the version of XIOS that you wish to use. 
     28   The recommended version is now XIOS 2.5: 
    2529 
    26 .. code-block:: console 
     30   .. code-block:: console 
    2731 
    28    $ svn co http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5 xios-2.5 
     32      $ svn co http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5 
    2933 
    30 and follow the instructions in `XIOS documentation <http://forge.ipsl.jussieu.fr/ioserver/wiki/documentation>`_ to compile it. 
    31    If you find problems at this stage, support can be found by subscribing to the `XIOS mailing list <http://forge.ipsl.jussieu.fr/mailman/listinfo.cgi/xios-users>`_ and sending a mail message to it. 
     34and follow the instructions in :xios:`XIOS documentation <wiki/documentation>` to compile it. 
     35If you find problems at this stage, support can be found by subscribing to 
     36the :xios:`XIOS mailing list <../mailman/listinfo.cgi/xios-users>` and sending a mail message to it. 
    3237 
    3338XIOS Configuration files 
    3439------------------------ 
    3540 
    36 XIOS is controlled using xml input files that should be copied to your model run directory before running the model. 
    37 Examples of these files can be found in the reference configurations (``cfgs``). The XIOS executable expects to find a file called ``iodef.xml`` in the model run directory. 
    38 In NEMO we have made the decision to use include statements in the ``iodef.xml`` file to include ``field_def_nemo-oce.xml`` (for physics), ``field_def_nemo-ice.xml`` (for ice), ``field_def_nemo-pisces.xml`` (for biogeochemistry) and ``domain_def.xml`` from the /cfgs/SHARED directory. 
    39 Most users will not need to modify ``domain_def.xml`` or ``field_def_nemo-???.xml`` unless they want to add new diagnostics to the NEMO code. 
    40 The definition of the output files is organized into separate ``file_definition.xml`` files which are included in the ``iodef.xml`` file. 
     41XIOS is controlled using XML input files that should be copied to 
     42your model run directory before running the model. 
     43Examples of these files can be found in the reference configurations (:file:`./cfgs`). 
     44The XIOS executable expects to find a file called :file:`iodef.xml` in the model run directory. 
     45In NEMO we have made the decision to use include statements in the :file:`iodef.xml` file to include: 
     46 
     47- :file:`field_def_nemo-oce.xml` (for physics), 
     48- :file:`field_def_nemo-ice.xml` (for ice), 
     49- :file:`field_def_nemo-pisces.xml` (for biogeochemistry) and 
     50- :file:`domain_def.xml` from the :file:`./cfgs/SHARED` directory. 
     51 
     52Most users will not need to modify :file:`domain_def.xml` or :file:`field_def_nemo-???.xml` unless 
     53they want to add new diagnostics to the NEMO code. 
     54The definition of the output files is organized into separate :file:`file_definition.xml` files which 
     55are included in the :file:`iodef.xml` file. 
    4156 
    4257Modes 
    43 ----- 
     58===== 
    4459 
    4560Detached Mode 
     
    4863In detached mode the XIOS executable is executed on separate cores from the NEMO model. 
    4964This is the recommended method for using XIOS for realistic model runs. 
    50 To use this mode set ``using_server`` to ``true`` at the bottom of the ``iodef.xml`` file: 
     65To use this mode set ``using_server`` to ``true`` at the bottom of the :file:`iodef.xml` file: 
    5166 
    5267.. code-block:: xml 
    5368 
    54    <variable id="using_server" type="boolean">true</variable> 
     69   <variable id="using_server" type="boolean">true</variable> 
    5570 
    56 Make sure there is a copy (or link to) your XIOS executable in the working directory and in your job submission script allocate processors to XIOS. 
     71Make sure there is a copy (or link to) your XIOS executable in the working directory and 
     72in your job submission script allocate processors to XIOS. 
    5773 
    5874Attached Mode 
     
    6076 
    6177In attached mode XIOS runs on each of the cores used by NEMO. 
    62 This method is less efficient than the detached mode but can be more convenient for testing or with small configurations. 
    63 To activate this mode simply set ``using_server`` to false in the ``iodef.xml`` file 
     78This method is less efficient than the detached mode but can be more convenient for testing or 
     79with small configurations. 
     80To activate this mode simply set ``using_server`` to false in the :file:`iodef.xml` file 
    6481 
    6582.. code-block:: xml 
    6683 
    67    <variable id="using_server" type="boolean">false</variable> 
     84   <variable id="using_server" type="boolean">false</variable> 
    6885 
    6986and don't allocate any cores to XIOS. 
    70 Note that due to the different domain decompositions between XIOS and NEMO if the total number of cores is larger than the number of grid points in the j direction then the model run will fail. 
     87 
     88.. note:: 
     89 
     90   Due to the different domain decompositions between XIOS and NEMO, 
     91   if the total number of cores is larger than the number of grid points in the ``j`` direction then 
     92   the model run will fail. 
    7193 
    7294Adding new diagnostics 
    73 ---------------------- 
     95====================== 
    7496 
    7597If you want to add a NEMO diagnostic to the NEMO code you will need to do the following: 
    7698 
    77991. Add any necessary code to calculate you new diagnostic in NEMO 
    78 2. Send the field to XIOS using ``CALL iom_put( 'field_id', variable )`` where ``field_id`` is a unique id for your new diagnostics and variable is the fortran variable containing the data. 
    79    This should be called at every model timestep regardless of how often you want to output the field. No time averaging should be done in the model code. 
    80 3. If it is computationally expensive to calculate your new diagnostic you should also use "iom_use" to determine if it is requested in the current model run. For example, 
     1002. Send the field to XIOS using ``CALL iom_put( 'field_id', variable )`` where 
     101   ``field_id`` is a unique id for your new diagnostics and 
     102   variable is the fortran variable containing the data. 
     103   This should be called at every model timestep regardless of how often you want to output the field. 
     104   No time averaging should be done in the model code. 
     1053. If it is computationally expensive to calculate your new diagnostic 
     106   you should also use "iom_use" to determine if it is requested in the current model run. 
     107   For example, 
    81108 
    82 .. code-block:: fortran 
     109   .. code-block:: fortran 
    83110 
    84       IF iom_use('field_id') THEN 
    85          !Some expensive computation 
    86          !... 
    87          !... 
    88          iom_put('field_id', variable) 
    89       ENDIF 
     111      IF iom_use('field_id') THEN 
     112         !Some expensive computation 
     113         !... 
     114         !... 
     115    iom_put('field_id', variable) 
     116      ENDIF 
    90117 
    91 4. Add a variable definition to the ``field_def_nemo-???.xml`` file. 
    92 5. Add the variable to the ``iodef.xml`` or ``file_definition.xml`` file. 
     1184. Add a variable definition to the :file:`field_def_nemo-???.xml` file. 
     1195. Add the variable to the :file:`iodef.xml` or :file:`file_definition.xml` file. 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/SHARED/namelist_ref

    r11777 r11836  
    290290   !                       !   -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel) 
    291291   nn_cats_cpl   =     5   !  Number of sea ice categories over which coupling is to be carried out (if not 1) 
    292  
    293292   !_____________!__________________________!____________!_____________!______________________!________! 
    294293   !             !        description       !  multiple  !    vector   !       vector         ! vector ! 
     
    327326   sn_rcv_wper   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   '' 
    328327   sn_rcv_wnum   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   '' 
    329    sn_rcv_wstrf  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   '' 
     328   sn_rcv_wfreq  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   '' 
    330329   sn_rcv_wdrag  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   '' 
    331330   sn_rcv_ts_ice =   'none'                 ,    'no'    ,     ''      ,         ''           ,   '' 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/doc/README.rst

    r11830 r11836  
     1************************** 
     2Building the documentation 
     3************************** 
    14 
     5.. todo:: 
     6 
     7 
     8 
     9:file:`latex`    : LaTeX sources and Latexmk configuration to build reference manuals with :file:`manual_build.sh` 
     10 
     11:file:`namelists`: Namelist blocks included in the documentation 
     12 
     13:file:`rst`      : |RST man|_ sources and Sphinx configuration to build this guide hereby with :file:`guide_build.sh` 
     14 
     15.. |RST man| replace:: reStructuredText (rst) 
    216 
    317.. warning:: 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/doc/rst/source/conf.py

    r11830 r11836  
    2626# Add any Sphinx extension module names here, as strings. They can be extensions 
    2727# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. 
    28 extensions = ['sphinx.ext.extlinks', 'sphinxcontrib.bibtex', 'sphinx.ext.todo'] 
     28extensions = ['sphinx.ext.extlinks', 'sphinxcontrib.bibtex', 
     29              'sphinx.ext.todo'    , 'sphinx.ext.autosectionlabel'] 
    2930 
    3031# Add any paths that contain templates here, relative to this directory. 
     
    6566# List of patterns, relative to source directory, that match files and 
    6667# directories to ignore when looking for source files. 
    67 exclude_patterns = ['global.rst', 'crs.rst'] 
     68exclude_patterns = ['global.rst', 'readme.rst'] 
    6869 
    6970# The reST default role (used for this markup: `text`) to use for all documents. 
     
    252253extlinks = { 
    253254   'doi'    : ('https://doi.org/%s'                                                    , 'doi:'), 
    254    'doxy'   : ('https://forge.ipsl.jussieu.fr/nemo/chrome/site/doc/NEMO/manual/html/%s', None  ), 
     255   'manhtml': ('https://forge.ipsl.jussieu.fr/nemo/chrome/site/doc/NEMO/manual/html/%s', None  ), 
    255256   'forge'  : ('https://forge.ipsl.jussieu.fr/nemo/%s'                                 , None  ), 
    256257   'gmd'    : ('https://www.geosci-model-dev.net/%s'                                   , None  ), 
     
    266267# SVN revision 
    267268import subprocess 
    268 revision = subprocess.check_output("svnversion").decode("utf-8") 
    269 rst_prolog = '.. |revision| replace:: %s' % revision 
     269rev = subprocess.check_output("svnversion").decode("utf-8") 
     270rst_prolog = '.. |revision| replace:: %s' % rev 
    270271 
    271272# 'draft' build tag: DRAFT watermark and TODO list 
    272273if tags.has('draft'): 
    273     todo_include_todos = True 
    274     todo_emit_warnings = True 
     274   todo_include_todos = True 
     275   todo_emit_warnings = True 
     276else: 
     277   exclude_patterns = ['global.rst', 'readme.rst', 'todos.rst', 'unpub*'] 
     278 
     279# Default language to highlight set to fortran 
     280highlight_language = 'fortran' 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/doc/rst/source/cplg.rst

    r11830 r11836  
    55.. todo:: 
    66 
    7  
     7   The ‘Coupling’ chapter needs to be enriched 
    88 
    99NEMO currently exploits OASIS-3-MCT (versions 1 to 4) to implement a generalised coupled interface 
    10 (:doxy:`Coupled Formulation <node50.html?doc=NEMO>`). 
    11 It can be used to interface with most of the European atmospheric GCM (ARPEGE, ECHAM, ECMWF, Ha- dAM, HadGAM, LMDz), as well as to regional atmospheric models (WRF, COSMO, Meso-NH, AROME). 
     10(:manhtml:`Coupled Formulation <node50.html>`). 
     11It can be used to interface with most of the European atmospheric GCM 
     12(ARPEGE, ECHAM, ECMWF, Ha- dAM, HadGAM, LMDz), as well as to regional atmospheric models 
     13(WRF, COSMO, Meso-NH, AROME). 
    1214To implement the coupling of two independent NEMO components, 
    1315ocean on one hand and sea-ice plus other surface processes on the other hand 
    14 (:doxy:`Standalone Surface Module - SAS <node46.html?doc=NEMO>`). 
     16(:manhtml:`Standalone Surface Module - SAS <node46.html>`). 
    1517 
    1618To enable the OASIS interface the required compilation key is ``key_oasis3``. 
    1719You must also add ``key_oasis3_v1v2`` if you use OASIS-3-MCT version 1 and 2. 
    18 The parameters to set are in sections ``namsbc_cpl`` and 
    19 in case of using of SAS also in section ``namsbc_sas``. 
     20The parameters to set are in sections ``&namsbc_cpl`` and 
     21in case of using of SAS also in section ``&namsbc_sas``. 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/doc/rst/source/da.rst

    r11830 r11836  
    1717- ``TAM`` the tangent linear and adjoint model. 
    1818 
    19 Please see |DOI man OCE|_ for more details including information about the input file formats and 
    20 the namelist settings. 
     19Please see :doc:`NEMO manual <cite>` for more details including 
     20information about the input file formats and the namelist settings. 
    2121 
    2222Observation and model comparison (``OBS``) 
     
    3333To build with the OBS code active ``key_diaobs`` must be set. 
    3434 
    35 More details in |DOI man OCE|_ "Observation and Model Comparison (``OBS``)" chapter. 
     35More details in :manhtml:`"Observation and Model Comparison (OBS)" chapter <node83.html>`. 
    3636 
    3737Standalone observation operator (``SAO``) 
     
    4242(previously known the offline observation operator). 
    4343 
    44 To build the SAO use makenemo. 
     44To build the SAO use :file:`makenemo`. 
    4545This means compiling NEMO once (in the normal way) for the chosen configuration. 
    4646Then include ``SAO`` at the end of the relevant line in :file:`cfg.txt` file. 
     
    4848This is a special version of :file:`nemogcm.F90` (which doesn't run the model, 
    4949but reads in the model fields, and observations and runs the OBS code. 
    50 See "Standalone observation operator (``SAO``)" section in |DOI man OCE|_. 
     50See :manhtml:`"Standalone observation operator (SAO)" section <node88.html>`. 
    5151 
    5252Apply assimilation increments (``ASM``) 
     
    6161To build the ASM code ``key asminc`` must be set. 
    6262 
    63 More details in |DOI man OCE|_ "Apply Assimilation Increments (``ASM``)" chapter. 
     63More details in :manhtml:`"Apply Assimilation Increments (ASM)" chapter <node89.html>`. 
    6464 
    6565Tangent linear and adjoint (``TAM``) 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/doc/rst/source/guide.rst

    r11830 r11836  
    33################# 
    44 
    5 .. 
    6    For headings markup, this convention is recommended from Python’s Style Guide 
    7    # with overline, for parts 
    8    * with overline, for chapters 
    9    =, for sections 
    10    -, for subsections 
    11    ^, for subsubsections 
    12    ", for paragraphs 
     5.. For headings markup, this convention is recommended from Python’s Style Guide 
     6   # with overline, for parts 
     7   * with overline, for chapters 
     8   =, for sections 
     9   -, for subsections 
     10   ^, for subsubsections 
     11   ", for paragraphs 
    1312 
    14    'global.rst' contains a list of roles, substitutions and URL links for the guide. 
    15    It is loaded for each file with the 'rst_epilog' setting in 'conf.py' 
     13   'global.rst' contains a list of roles, substitutions and URL links for the guide. 
     14   It is loaded for each file with the 'rst_epilog' setting in 'conf.py' 
     15 
     16.. toctree:: 
     17   :hidden: 
     18 
     19   todos 
     20 
     21.. Only displayed with 'make drafthtml' 
     22 
     23.. toctree:: 
     24   :hidden: 
     25   :caption: Unpublished READMEs 
     26   :glob: 
     27   :titlesonly: 
     28 
     29   unpub/* 
     30 
     31.. Only displayed with 'make drafthtml' 
    1632 
    1733.. toctree:: 
     
    5369.. only:: draft 
    5470 
     71   .. Only on draft 
     72 
    5573   :*Date*:     |today| 
    5674   :*SVN rev*:  |revision| 
    5775 
    58    .. include:: todos.rst 
    59  
    6076.. include:: readme.rst 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/doc/rst/source/todos.rst

    r11830 r11836  
    1 .. rubric:: List of editing tasks 
     1********************* 
     2List of editing tasks 
     3********************* 
    24 
    35.. todolist:: 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src

    • Property svn:mergeinfo deleted
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/ICE/icedyn_adv_pra.F90

    r11822 r11836  
    1616   !!   adv_pra_rst     : read/write Prather field in ice restart file, or initialized to zero 
    1717   !!---------------------------------------------------------------------- 
     18   USE phycst         ! physical constant 
    1819   USE dom_oce        ! ocean domain 
    1920   USE ice            ! sea-ice variables 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/BDY/bdydta.F90

    r11822 r11836  
    624624                  bf_alias(1)%imap    => idx_bdy(jbdy)%nbmap(1:iszdim,igrd)   ! associate the mapping used for this bdy 
    625625                  bf_alias(1)%igrd    = igrd                                  ! used only for vertical integration of 3D arrays 
     626                  bf_alias(1)%ibdy    = jbdy                                  !  "    "    "     "          "      "  "    "     
    626627                  bf_alias(1)%ltotvel = ln_full_vel                           ! T if u3d is full velocity 
    627628                  bf_alias(1)%lzint   = ln_zinterp                            ! T if it requires a vertical interpolation 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/FLO/flodom.F90

    r11822 r11836  
    436436      IF( ABS(dlx) > 1.0_wp ) dlx = 1.0_wp 
    437437      ! 
    438       dld = ATAN(DSQRT( 1._wp * ( 1._wp-dlx )/( 1._wp+dlx ) )) * 222.24_wp / dls 
     438      dld = ATAN(SQRT( 1._wp * ( 1._wp-dlx )/( 1._wp+dlx ) )) * 222.24_wp / dls 
    439439      flo_dstnce = dld * 1000._wp 
    440440      ! 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/FLO/flowri.F90

    r11822 r11836  
    222222               clname=TRIM(clname)//".nc" 
    223223 
    224                CALL fliocrfd( clname , (/ 'ntraj' , 't' /), (/ jpnfl , -1  /) , numflo ) 
     224               CALL fliocrfd( clname , (/'ntraj' , '    t' /), (/ jpnfl , -1/) , numflo ) 
    225225    
    226226               CALL fliodefv( numflo, 'traj_lon'    , (/1,2/), v_t=flio_r8, long_name="Longitude"           , units="degrees_east"  ) 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/trcbdy.F90

    r11822 r11836  
    9696         END DO 
    9797         IF( ANY(llsend1) .OR. ANY(llrecv1) ) THEN   ! if need to send/recv in at least one direction 
    98             CALL lbc_lnk( 'bdytra', tr(:,:,:,:,Krhs), 'T',  1., kfillmode=jpfillnothing ,lsend=llsend1, lrecv=llrecv1 ) 
     98            CALL lbc_lnk( 'trcbdy', tr(:,:,:,:,Krhs), 'T',  1., kfillmode=jpfillnothing ,lsend=llsend1, lrecv=llrecv1 ) 
    9999         END IF 
    100100         ! 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests

    • Property svn:mergeinfo deleted
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/README.rst

    r11822 r11836  
    55.. todo:: 
    66 
    7  
     7   CANAL animated gif is missing 
    88 
    99.. contents:: 
Note: See TracChangeset for help on using the changeset viewer.