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/OCE/DOM/domain.F90 – NEMO

Ignore:
Timestamp:
2019-11-25T18:19:39+01:00 (4 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:
2 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/OCE/DOM/domain.F90

    r11949 r11960  
    308308      ! 
    309309      ! 
    310       REWIND( numnam_ref )              ! Namelist namrun in reference namelist : Parameters of the run 
    311310      READ  ( numnam_ref, namrun, IOSTAT = ios, ERR = 901) 
    312311901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namrun in reference namelist' ) 
    313       REWIND( numnam_cfg )              ! Namelist namrun in configuration namelist : Parameters of the run 
    314312      READ  ( numnam_cfg, namrun, IOSTAT = ios, ERR = 902 ) 
    315313902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namrun in configuration namelist' ) 
    … …  
    406404#endif 
    407405 
    408       REWIND( numnam_ref )              ! Namelist namdom in reference namelist : space & time domain (bathymetry, mesh, timestep) 
    409406      READ  ( numnam_ref, namdom, IOSTAT = ios, ERR = 903) 
    410407903   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namdom in reference namelist' ) 
    411       REWIND( numnam_cfg )              ! Namelist namdom in configuration namelist : space & time domain (bathymetry, mesh, timestep) 
    412408      READ  ( numnam_cfg, namdom, IOSTAT = ios, ERR = 904 ) 
    413409904   IF( ios >  0 )   CALL ctl_nam ( ios , 'namdom in configuration namelist' ) 
    … …  
    438434#if defined key_netcdf4 
    439435      !                             ! NetCDF 4 case   ("key_netcdf4" defined) 
    440       REWIND( numnam_ref )              ! Namelist namnc4 in reference namelist : NETCDF 
    441436      READ  ( numnam_ref, namnc4, IOSTAT = ios, ERR = 907) 
    442437907   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namnc4 in reference namelist' ) 
    443       REWIND( numnam_cfg )              ! Namelist namnc4 in configuration namelist : NETCDF 
    444438      READ  ( numnam_cfg, namnc4, IOSTAT = ios, ERR = 908 ) 
    445439908   IF( ios >  0 )   CALL ctl_nam ( ios , 'namnc4 in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.