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 11960 for NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP – NEMO

Ignore:
Timestamp:
2019-11-25T18:19:39+01:00 (5 years ago)
Author:
acc
Message:

Branch 2019/dev_r11943_MERGE_2019. Merge in changes from 2019/dev_r11613_ENHANCE-04_namelists_as_internalfiles. (svn merge -r 11614:11954). Resolved tree conflicts and one actual conflict. Sette tested(these changes alter the ext/AGRIF reference; remember to update). See ticket #2341

Location:
NEMO/branches/2019/dev_r11943_MERGE_2019
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r11943_MERGE_2019

    • 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/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcadv.F90

    r11949 r11960  
    166166      ! 
    167167      !                                !==  Namelist  ==! 
    168       REWIND( numnat_ref )                   !  namtrc_adv in reference namelist  
    169168      READ  ( numnat_ref, namtrc_adv, IOSTAT = ios, ERR = 901) 
    170169901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc_adv in reference namelist' ) 
    171       REWIND( numnat_cfg )                   ! namtrc_adv in configuration namelist 
    172170      READ  ( numnat_cfg, namtrc_adv, IOSTAT = ios, ERR = 902 ) 
    173171902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrc_adv in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcdmp.F90

    r11949 r11960  
    183183      !!---------------------------------------------------------------------- 
    184184      ! 
    185       REWIND( numnat_ref )              ! Namelist namtrc_dmp in reference namelist : Passive tracers newtonian damping 
    186185      READ  ( numnat_ref, namtrc_dmp, IOSTAT = ios, ERR = 909) 
    187186909   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc_dmp in reference namelist' ) 
    188       REWIND( numnat_cfg )              ! Namelist namtrc_dmp in configuration namelist : Passive tracers newtonian damping 
    189187      READ  ( numnat_cfg, namtrc_dmp, IOSTAT = ios, ERR = 910) 
    190188910   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrc_dmp in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcldf.F90

    r11949 r11960  
    149149      ENDIF 
    150150      ! 
    151       REWIND( numnat_ref )             !  namtrc_ldf in reference namelist  
    152151      READ  ( numnat_ref, namtrc_ldf, IOSTAT = ios, ERR = 903) 
    153152903   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc_ldf in reference namelist' ) 
    154153      ! 
    155       REWIND( numnat_cfg )             !  namtrc_ldf in configuration namelist  
    156154      READ  ( numnat_cfg, namtrc_ldf, IOSTAT = ios, ERR = 904 ) 
    157155904   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrc_ldf in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcrad.F90

    r11949 r11960  
    9090      !!---------------------------------------------------------------------- 
    9191      ! 
    92       REWIND( numnat_ref )              ! namtrc_rad in reference namelist  
    9392      READ  ( numnat_ref, namtrc_rad, IOSTAT = ios, ERR = 907) 
    9493907   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc_rad in reference namelist' ) 
    95       REWIND( numnat_cfg )              ! namtrc_rad in configuration namelist  
    9694      READ  ( numnat_cfg, namtrc_rad, IOSTAT = ios, ERR = 908 ) 
    9795908   IF( ios > 0 )   CALL ctl_nam ( ios , 'namtrc_rad in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcsink.F90

    r11949 r11960  
    218218      !!---------------------------------------------------------------------- 
    219219      ! 
    220       REWIND( numnat_ref )              ! namtrc_rad in reference namelist  
    221220      READ  ( numnat_ref, namtrc_snk, IOSTAT = ios, ERR = 907) 
    222221907   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc_snk in reference namelist' ) 
    223       REWIND( numnat_cfg )              ! namtrc_rad in configuration namelist  
    224222      READ  ( numnat_cfg, namtrc_snk, IOSTAT = ios, ERR = 908 ) 
    225223908   IF( ios > 0 )   CALL ctl_nam ( ios , 'namtrc_snk in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.