Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (8 months ago)
Author:
acc
Message:

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge —ignore-ancestry \

svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The —ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

Location:
NEMO/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
  • NEMO/trunk/src/OCE/IOM/in_out_manager.F90

    r11536 r12377  
    8787   LOGICAL ::   lrst_oce              !: logical to control the oce restart write  
    8888   LOGICAL ::   lrst_ice              !: logical to control the ice restart write  
     89   LOGICAL ::   lrst_abl              !: logical to control the abl restart write  
    8990   INTEGER ::   numror = 0            !: logical unit for ocean restart (read). Init to 0 is needed for SAS (in daymod.F90) 
    9091   INTEGER ::   numrir                !: logical unit for ice   restart (read) 
     92   INTEGER ::   numrar                !: logical unit for abl   restart (read) 
    9193   INTEGER ::   numrow                !: logical unit for ocean restart (write) 
    9294   INTEGER ::   numriw                !: logical unit for ice   restart (write) 
     95   INTEGER ::   numraw                !: logical unit for abl   restart (write) 
    9396   INTEGER ::   nrst_lst              !: number of restart to output next 
    9497 
     
    9699   !!                    output monitoring 
    97100   !!---------------------------------------------------------------------- 
    98    LOGICAL ::   ln_ctl           !: run control for debugging 
    99    TYPE :: sn_ctl                !: optional use structure for finer control over output selection 
     101   TYPE :: sn_ctl                !: structure for control over output selection 
     102      LOGICAL :: l_glochk  = .FALSE.  !: range sanity checks are local (F) or global (T) 
     103                                      !  Use global setting for debugging only; 
     104                                      !  local breaches will still be reported 
     105                                      !  and stop the code in most cases. 
     106      LOGICAL :: l_allon   = .FALSE.  !: overall control; activate all following output options 
    100107      LOGICAL :: l_config  = .FALSE.  !: activate/deactivate finer control 
    101                                       !  Note if l_config is True then ln_ctl is ignored. 
    102                                       !  Otherwise setting ln_ctl True is equivalent to setting 
    103                                       !  all the following logicals in this structure True 
     108                                      !  Note if l_config is True then sn_cfctl%l_allon is ignored. 
     109                                      !  Otherwise setting sn_cfctl%l_allon T/F is equivalent to  
     110                                      !  setting all the following logicals in this structure T/F 
     111                                      !  and disabling subsetting of processors 
    104112      LOGICAL :: l_runstat = .FALSE.  !: Produce/do not produce run.stat file (T/F) 
    105113      LOGICAL :: l_trcstat = .FALSE.  !: Produce/do not produce tracer.stat file (T/F) 
    106114      LOGICAL :: l_oceout  = .FALSE.  !: Produce all ocean.outputs    (T) or just one (F) 
    107115      LOGICAL :: l_layout  = .FALSE.  !: Produce all layout.dat files (T) or just one (F) 
    108       LOGICAL :: l_mppout  = .FALSE.  !: Produce/do not produce mpp.output_XXXX files (T/F) 
    109       LOGICAL :: l_mpptop  = .FALSE.  !: Produce/do not produce mpp.top.output_XXXX files (T/F) 
     116      LOGICAL :: l_prtctl  = .FALSE.  !: Produce/do not produce mpp.output_XXXX files (T/F) 
     117      LOGICAL :: l_prttrc  = .FALSE.  !: Produce/do not produce mpp.top.output_XXXX files (T/F) 
     118      LOGICAL :: l_oasout  = .FALSE.  !: Produce/do not write oasis setup info to ocean.output (T/F) 
    110119                                      !  Optional subsetting of processor report files 
    111120                                      !  Default settings of 0/1000000/1 should ensure all areas report. 
     
    139148   INTEGER ::   numnul          =   -1      !: logical unit for /dev/null 
    140149      !                                     !  early output can be collected; do not change 
    141    INTEGER ::   numnam_ref      =   -1      !: logical unit for reference namelist 
    142    INTEGER ::   numnam_cfg      =   -1      !: logical unit for configuration specific namelist 
    143150   INTEGER ::   numond          =   -1      !: logical unit for Output Namelist Dynamics 
    144    INTEGER ::   numnam_ice_ref  =   -1      !: logical unit for ice reference namelist 
    145    INTEGER ::   numnam_ice_cfg  =   -1      !: logical unit for ice reference namelist 
    146151   INTEGER ::   numoni          =   -1      !: logical unit for Output Namelist Ice 
    147152   INTEGER ::   numevo_ice      =   -1      !: logical unit for ice variables (temp. evolution) 
    148153   INTEGER ::   numrun          =   -1      !: logical unit for run statistics 
    149154   INTEGER ::   numdct_in       =   -1      !: logical unit for transports computing 
    150    INTEGER ::   numdct_vol      =   -1      !: logical unit for voulume transports output 
    151    INTEGER ::   numdct_heat     =   -1      !: logical unit for heat    transports output 
    152    INTEGER ::   numdct_salt     =   -1      !: logical unit for salt    transports output 
     155   INTEGER ::   numdct_vol      =   -1      !: logical unit for volume transports output 
     156   INTEGER ::   numdct_heat     =   -1      !: logical unit for heat   transports output 
     157   INTEGER ::   numdct_salt     =   -1      !: logical unit for salt   transports output 
    153158   INTEGER ::   numfl           =   -1      !: logical unit for floats ascii output 
    154159   INTEGER ::   numflo          =   -1      !: logical unit for floats ascii output 
     160      ! 
     161   CHARACTER(LEN=:), ALLOCATABLE :: numnam_ref      !: character buffer for reference namelist 
     162   CHARACTER(LEN=:), ALLOCATABLE :: numnam_cfg      !: character buffer for configuration specific namelist 
     163   CHARACTER(LEN=:), ALLOCATABLE :: numnam_ice_ref  !: character buffer for ice reference namelist 
     164   CHARACTER(LEN=:), ALLOCATABLE :: numnam_ice_cfg  !: character buffer for ice configuration specific namelist 
    155165 
    156166   !!---------------------------------------------------------------------- 
     
    165175   CHARACTER(lc) ::   ctmp10                !: temporary character 10 
    166176   LOGICAL       ::   lwm      = .FALSE.    !: boolean : true on the 1st processor only (always) 
    167    LOGICAL       ::   lwp      = .FALSE.    !: boolean : true on the 1st processor only .OR. ln_ctl 
     177   LOGICAL       ::   lwp      = .FALSE.    !: boolean : true on the 1st processor only .OR. sn_cfctl%l_oceout=T 
    168178   LOGICAL       ::   lsp_area = .TRUE.     !: to make a control print over a specific area 
    169179   CHARACTER(lc) ::   cxios_context         !: context name used in xios 
     
    171181   CHARACTER(lc) ::   cwxios_context        !: context name used in xios to write restart file 
    172182 
     183   !! * Substitutions 
     184#  include "do_loop_substitute.h90" 
    173185   !!---------------------------------------------------------------------- 
    174186   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
Note: See TracChangeset for help on using the changeset viewer.