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 12202 for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA – NEMO

Ignore:
Timestamp:
2019-12-12T09:59:50+01:00 (4 years ago)
Author:
cetlod
Message:

dev_merge_option2 : merge in dev_r11613_ENHANCE-04_namelists_as_internalfiles

Location:
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/dia25h.F90

    r11536 r12202  
    5353      !!---------------------------------------------------------------------- 
    5454      ! 
    55       REWIND ( numnam_ref )              ! Read Namelist nam_dia25h in reference namelist : 25hour mean diagnostics 
    5655      READ   ( numnam_ref, nam_dia25h, IOSTAT=ios, ERR= 901 ) 
    5756901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nam_dia25h in reference namelist' ) 
    58       REWIND( numnam_cfg )              ! Namelist nam_dia25h in configuration namelist  25hour diagnostics 
    5957      READ  ( numnam_cfg, nam_dia25h, IOSTAT = ios, ERR = 902 ) 
    6058902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nam_dia25h in configuration namelist' ) 

  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diadct.F90

    r11536 r12202  
    123123      !!--------------------------------------------------------------------- 
    124124 
    125      REWIND( numnam_ref )              ! Namelist nam_diadct in reference namelist : Diagnostic: transport through sections 
    126125     READ  ( numnam_ref, nam_diadct, IOSTAT = ios, ERR = 901) 
    127126901  IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_diadct in reference namelist' ) 
    128127 
    129      REWIND( numnam_cfg )              ! Namelist nam_diadct in configuration namelist : Diagnostic: transport through sections 
    130128     READ  ( numnam_cfg, nam_diadct, IOSTAT = ios, ERR = 902 ) 
    131129902  IF( ios >  0 ) CALL ctl_nam ( ios , 'nam_diadct in configuration namelist' ) 

  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diahsb.F90

    r12166 r12202  
    365365         WRITE(numout,*) '~~~~~~~~~~~~ ' 
    366366      ENDIF 
    367       REWIND( numnam_ref )              ! Namelist namhsb in reference namelist 
    368367      READ  ( numnam_ref, namhsb, IOSTAT = ios, ERR = 901) 
    369368901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namhsb in reference namelist' ) 
    370       REWIND( numnam_cfg )              ! Namelist namhsb in configuration namelist 
    371369      READ  ( numnam_cfg, namhsb, IOSTAT = ios, ERR = 902 ) 
    372370902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namhsb in configuration namelist' ) 

  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diaptr.F90

    r12109 r12202  
    344344         &  iom_use( 'sophtvtr' ) .OR. iom_use( 'uocetr_vsum_cumul' ) )  l_diaptr  = .TRUE. 
    345345 
    346   
     346      READ  ( numnam_ref, namptr, IOSTAT = ios, ERR = 901) 
     347901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namptr in reference namelist' ) 
     348      ! 
     349      READ  ( numnam_cfg, namptr, IOSTAT = ios, ERR = 902 ) 
     350902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namptr in configuration namelist' ) 
     351      IF(lwm) WRITE ( numond, namptr ) 
     352 
    347353      IF(lwp) THEN                     ! Control print 
    348354         WRITE(numout,*) 

  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DIA/diatmb.F90

    r11536 r12202  
    4141      !!---------------------------------------------------------------------- 
    4242      ! 
    43       REWIND( numnam_ref )              ! Read Namelist nam_diatmb in reference namelist : TMB diagnostics 
    4443      READ  ( numnam_ref, nam_diatmb, IOSTAT=ios, ERR= 901 ) 
    4544901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_diatmb in reference namelist' ) 
    4645  
    47       REWIND( numnam_cfg )              ! Namelist nam_diatmb in configuration namelist  TMB diagnostics 
    4846      READ  ( numnam_cfg, nam_diatmb, IOSTAT = ios, ERR = 902 ) 
    4947902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nam_diatmb in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.