Changeset 12377 for NEMO/trunk/src/SAO


Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (10 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:
3 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/SAO/nemogcm.F90

    r11536 r12377  
    9191      INTEGER ::   ios, ilocal_comm   ! local integer 
    9292      ! 
    93       NAMELIST/namctl/ ln_ctl   , sn_cfctl, nn_print, nn_ictls, nn_ictle,   & 
     93      NAMELIST/namctl/ sn_cfctl,  nn_print, nn_ictls, nn_ictle,             & 
    9494         &             nn_isplt , nn_jsplt, nn_jctls, nn_jctle,             & 
    9595         &             ln_timing, ln_diacfl 
     
    135135      IF( lwm )   CALL ctl_opn(     numout,        'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. ) 
    136136      ! open reference and configuration namelist files 
    137                   CALL ctl_opn( numnam_ref,        'namelist_ref',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. ) 
    138                   CALL ctl_opn( numnam_cfg,        'namelist_cfg',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. ) 
     137                  CALL load_nml( numnam_ref,        'namelist_ref',                                           -1, lwm ) 
     138                  CALL load_nml( numnam_cfg,        'namelist_cfg',                                           -1, lwm ) 
    139139      IF( lwm )   CALL ctl_opn(     numond, 'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. ) 
    140140      ! open /dev/null file to be able to supress output write easily 
     
    142142      ! 
    143143      !                             !--------------------! 
    144       !                             ! Open listing units !  -> need ln_ctl from namctl to define lwp 
     144      !                             ! Open listing units !  -> need sn_cfctl from namctl to define lwp 
    145145      !                             !--------------------! 
    146146      ! 
    147       REWIND( numnam_ref )              ! Namelist namctl in reference namelist 
    148147      READ  ( numnam_ref, namctl, IOSTAT = ios, ERR = 901 ) 
    149148901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namctl in reference namelist' ) 
    150       REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist 
    151149      READ  ( numnam_cfg, namctl, IOSTAT = ios, ERR = 902 ) 
    152150902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namctl in configuration namelist' ) 
    153151      ! 
    154       lwp = (narea == 1) .OR. ln_ctl    ! control of all listing output print 
     152      ! finalize the definition of namctl variables 
     153      IF( sn_cfctl%l_allon ) THEN 
     154         ! Turn on all options. 
     155         CALL nemo_set_cfctl( sn_cfctl, .TRUE., .TRUE. ) 
     156         ! Ensure all processors are active 
     157         sn_cfctl%procmin = 0 ; sn_cfctl%procmax = 1000000 ; sn_cfctl%procincr = 1 
     158      ELSEIF( sn_cfctl%l_config ) THEN 
     159         ! Activate finer control of report outputs 
     160         ! optionally switch off output from selected areas (note this only 
     161         ! applies to output which does not involve global communications) 
     162         IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
     163           & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
     164           &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
     165      ELSE 
     166         ! turn off all options. 
     167         CALL nemo_set_cfctl( sn_cfctl, .FALSE., .TRUE. ) 
     168      ENDIF 
     169      ! 
     170      lwp = (narea == 1) .OR. sn_cfctl%l_oceout    ! control of all listing output print 
    155171      ! 
    156172      IF(lwp) THEN                      ! open listing units 
     
    184200      ENDIF 
    185201      ! 
    186       ! finalize the definition of namctl variables 
    187       IF( sn_cfctl%l_config ) THEN 
    188          ! Activate finer control of report outputs 
    189          ! optionally switch off output from selected areas (note this only 
    190          ! applies to output which does not involve global communications) 
    191          IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
    192            & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
    193            &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
    194       ELSE 
    195          ! Use ln_ctl to turn on or off all options. 
    196          CALL nemo_set_cfctl( sn_cfctl, ln_ctl, .TRUE. ) 
    197       ENDIF 
    198       ! 
    199202      IF(lwm) WRITE( numond, namctl ) 
    200203      ! 
     
    203206      !                             !------------------------------------! 
    204207      ! 
    205       REWIND( numnam_ref )              ! Namelist namcfg in reference namelist 
    206208      READ  ( numnam_ref, namcfg, IOSTAT = ios, ERR = 903 ) 
    207209903   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namcfg in reference namelist' ) 
    208       REWIND( numnam_cfg )              ! Namelist namcfg in confguration namelist 
    209210      READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 ) 
    210211904   IF( ios >  0 )   CALL ctl_nam ( ios , 'namcfg in configuration namelist' )    
     
    238239                           CALL phy_cst            ! Physical constants 
    239240                           CALL eos_init           ! Equation of state 
    240                            CALL dom_init('SAO')    ! Domain 
    241  
    242  
    243       IF( ln_ctl       )   CALL prt_ctl_init    ! Print control 
    244  
    245                            CALL istate_init     ! ocean initial state (Dynamics and tracers) 
     241                           CALL dom_init( Nbb, Nnn, Naa, 'SAO')    ! Domain 
     242 
     243 
     244      IF( sn_cfctl%l_prtctl )   & 
     245         &                 CALL prt_ctl_init       ! Print control 
     246 
     247                           CALL istate_init        ! ocean initial state (Dynamics and tracers) 
    246248   END SUBROUTINE nemo_init 
    247249 
     
    253255      !! ** Purpose :   control print setting 
    254256      !! 
    255       !! ** Method  : - print namctl information and check some consistencies 
     257      !! ** Method  : - print namctl and namcfg information and check some consistencies 
    256258      !!---------------------------------------------------------------------- 
    257259      ! 
     
    261263         WRITE(numout,*) '~~~~~~~~' 
    262264         WRITE(numout,*) '   Namelist namctl' 
    263          WRITE(numout,*) '      run control (for debugging)     ln_ctl     = ', ln_ctl 
     265         WRITE(numout,*) '                              sn_cfctl%l_glochk  = ', sn_cfctl%l_glochk 
     266         WRITE(numout,*) '                              sn_cfctl%l_allon   = ', sn_cfctl%l_allon 
    264267         WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    265268         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
     
    267270         WRITE(numout,*) '                              sn_cfctl%l_oceout  = ', sn_cfctl%l_oceout 
    268271         WRITE(numout,*) '                              sn_cfctl%l_layout  = ', sn_cfctl%l_layout 
    269          WRITE(numout,*) '                              sn_cfctl%l_mppout  = ', sn_cfctl%l_mppout 
    270          WRITE(numout,*) '                              sn_cfctl%l_mpptop  = ', sn_cfctl%l_mpptop 
     272         WRITE(numout,*) '                              sn_cfctl%l_prtctl  = ', sn_cfctl%l_prtctl 
     273         WRITE(numout,*) '                              sn_cfctl%l_prttrc  = ', sn_cfctl%l_prttrc 
     274         WRITE(numout,*) '                              sn_cfctl%l_oasout  = ', sn_cfctl%l_oasout 
    271275         WRITE(numout,*) '                              sn_cfctl%procmin   = ', sn_cfctl%procmin   
    272276         WRITE(numout,*) '                              sn_cfctl%procmax   = ', sn_cfctl%procmax   
     
    306310      !                             ! Parameter control 
    307311      ! 
    308       IF( ln_ctl ) THEN                 ! sub-domain area indices for the control prints 
     312      IF( sn_cfctl%l_prtctl .OR. sn_cfctl%l_prttrc ) THEN              ! sub-domain area indices for the control prints 
    309313         IF( lk_mpp .AND. jpnij > 1 ) THEN 
    310314            isplt = jpni   ;   jsplt = jpnj   ;   ijsplt = jpni*jpnj   ! the domain is forced to the real split domain 
     
    363367      IF( numstp          /= -1 )   CLOSE( numstp          )   ! time-step file 
    364368      IF( numrun          /= -1 )   CLOSE( numrun          )   ! run statistics file 
    365       IF( numnam_ref      /= -1 )   CLOSE( numnam_ref      )   ! oce reference namelist 
    366       IF( numnam_cfg      /= -1 )   CLOSE( numnam_cfg      )   ! oce configuration namelist 
    367369      IF( lwm.AND.numond  /= -1 )   CLOSE( numond          )   ! oce output namelist 
    368       IF( numnam_ice_ref  /= -1 )   CLOSE( numnam_ice_ref  )   ! ice reference namelist 
    369       IF( numnam_ice_cfg  /= -1 )   CLOSE( numnam_ice_cfg  )   ! ice configuration namelist 
    370370      IF( lwm.AND.numoni  /= -1 )   CLOSE( numoni          )   ! ice output namelist 
    371371      IF( numevo_ice      /= -1 )   CLOSE( numevo_ice      )   ! ice variables (temp. evolution) 
     
    426426      sn_cfctl%l_oceout  = setto 
    427427      sn_cfctl%l_layout  = setto 
    428       sn_cfctl%l_mppout  = setto 
    429       sn_cfctl%l_mpptop  = setto 
     428      sn_cfctl%l_prtctl  = setto 
     429      sn_cfctl%l_prttrc  = setto 
     430      sn_cfctl%l_oasout  = setto 
    430431   END SUBROUTINE nemo_set_cfctl 
    431432 
  • NEMO/trunk/src/SAO/sao_data.F90

    r11536 r12377  
    5252 
    5353      ! Standard offline obs_oper settings 
    54       REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints & Benchmark 
    5554      READ  ( numnam_ref, namsao, IOSTAT = ios, ERR = 901 ) 
    5655901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namsao in reference namelist' ) 
    57       REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist : Control prints & Benchmark 
    5856      READ  ( numnam_cfg, namsao, IOSTAT = ios, ERR = 902 ) 
    5957902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namsao in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.