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/trcnam.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/TOP/trcnam.F90

    r11949 r11960  
    105105      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
    106106      ! 
    107       CALL ctl_opn( numnat_ref, 'namelist_top_ref'   , 'OLD'    , 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. ) 
    108       CALL ctl_opn( numnat_cfg, 'namelist_top_cfg'   , 'OLD'    , 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. ) 
     107      CALL load_nml( numnat_ref, 'namelist_top_ref' , numout, lwm ) 
     108      CALL load_nml( numnat_cfg, 'namelist_top_cfg' , numout, lwm ) 
    109109      IF(lwm) CALL ctl_opn( numont, 'output.namelist.top', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE., 1 ) 
    110110      ! 
    111       REWIND( numnat_ref )              ! Namelist namtrc in reference namelist : Passive tracer variables 
    112111      READ  ( numnat_ref, namtrc_run, IOSTAT = ios, ERR = 901) 
    113112901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc in reference namelist' ) 
    114       REWIND( numnat_cfg )              ! Namelist namtrc in configuration namelist : Passive tracer variables 
    115113      READ  ( numnat_cfg, namtrc_run, IOSTAT = ios, ERR = 902 ) 
    116114902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrc in configuration namelist' ) 
    … …  
    150148      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
    151149 
    152       REWIND( numnat_ref )              ! Namelist namtrc in reference namelist : Passive tracer variables 
    153150      READ  ( numnat_ref, namtrc, IOSTAT = ios, ERR = 901) 
    154151901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc in reference namelist' ) 
    155       REWIND( numnat_cfg )              ! Namelist namtrc in configuration namelist : Passive tracer variables 
    156152      READ  ( numnat_cfg, namtrc, IOSTAT = ios, ERR = 902 ) 
    157153902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrc in configuration namelist' ) 
    … …  
    220216      IF( ll_cfc .OR. ln_c14 ) THEN 
    221217        !                             ! Open namelist files 
    222         CALL ctl_opn( numtrc_ref, 'namelist_trc_ref'   ,     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. ) 
    223         CALL ctl_opn( numtrc_cfg, 'namelist_trc_cfg'   ,     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. ) 
     218        CALL load_nml( numtrc_ref, 'namelist_trc_ref' , numout, lwm ) 
     219        CALL load_nml( numtrc_cfg, 'namelist_trc_cfg' , numout, lwm ) 
    224220        IF(lwm) CALL ctl_opn( numonr, 'output.namelist.trc', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. ) 
    225221        ! 
    … …  
    253249      ALLOCATE( ln_trdtrc(jptra) )  
    254250      ! 
    255       REWIND( numnat_ref )              ! Namelist namtrc_trd in reference namelist : Passive tracer trends 
    256251      READ  ( numnat_ref, namtrc_trd, IOSTAT = ios, ERR = 905) 
    257252905   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc_trd in reference namelist' ) 
    258       REWIND( numnat_cfg )              ! Namelist namtrc_trd in configuration namelist : Passive tracer trends 
    259253      READ  ( numnat_cfg, namtrc_trd, IOSTAT = ios, ERR = 906 ) 
    260254906   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrc_trd in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.