Changeset 4290


Ignore:
Timestamp:
2013-11-20T16:33:46+01:00 (7 years ago)
Author:
cetlod
Message:

fix to lwp use for namelist reads

Location:
branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

    r4230 r4290  
    150150         &             jpizoom, jpjzoom, jperio 
    151151      !!---------------------------------------------------------------------- 
    152       ! 
    153152      cltxt = '' 
    154153      ! 
     
    156155      CALL ctl_opn( numnam_ref, 'namelist_ref', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
    157156      CALL ctl_opn( numnam_cfg, 'namelist_cfg', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
    158       CALL ctl_opn( numond, 'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., narea ) 
    159       ! 
     157      CALL ctl_opn( numond, 'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. , 1 ) 
    160158      ! 
    161159      REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints & Benchmark 
    162160      READ  ( numnam_ref, namctl, IOSTAT = ios, ERR = 901 ) 
    163 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in reference namelist', lwp ) 
     161901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in reference namelist', .TRUE. ) 
    164162 
    165163      REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist : Control prints & Benchmark 
    166164      READ  ( numnam_cfg, namctl, IOSTAT = ios, ERR = 902 ) 
    167 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in configuration namelist', lwp ) 
     165902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in configuration namelist', .TRUE. ) 
    168166      WRITE( numond, namctl ) 
     167 
    169168      ! 
    170169      REWIND( numnam_ref )              ! Namelist namcfg in reference namelist : Control prints & Benchmark 
    171170      READ  ( numnam_ref, namcfg, IOSTAT = ios, ERR = 903 ) 
    172 903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in reference namelist', lwp ) 
     171903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in reference namelist', .TRUE. ) 
    173172 
    174173      REWIND( numnam_cfg )              ! Namelist namcfg in confguration namelist : Control prints & Benchmark 
    175174      READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 ) 
    176 904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', lwp )    
     175904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )    
    177176      WRITE( numond, namcfg ) 
     177 
     178      ! 
    178179      !                             !--------------------------------------------! 
    179180      !                             !  set communicator & select the local node  ! 
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OOO_SRC/nemogcm.F90

    r4120 r4290  
    129129      CHARACTER(len=80), DIMENSION(16) ::   cltxt 
    130130      !! 
    131       NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   & 
     131      NAMELIST/namctl/ ln_ctl, nn_print, nn_ictls, nn_ictle,   & 
    132132         &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle,   & 
    133133         &             nn_bench, nn_timing 
     134      NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, & 
     135         &             jpizoom, jpjzoom, jperio 
    134136      !!---------------------------------------------------------------------- 
    135137      ! 
    136138      cltxt = '' 
    137139      ! 
    138       !                             ! open Namelist file 
    139       CALL ctl_opn( numnam, 'namelist', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
    140       ! 
    141       READ( numnam, namctl )        ! Namelist namctl : Control prints & Benchmark 
    142       ! 
     140      !                             ! Open reference namelist and configuration namelist files 
     141      CALL ctl_opn( numnam_ref, 'namelist_ref', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
     142      CALL ctl_opn( numnam_cfg, 'namelist_cfg', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
     143      CALL ctl_opn( numond, 'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. , 1 ) 
     144      ! 
     145      REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints & Benchmark 
     146      READ  ( numnam_ref, namctl, IOSTAT = ios, ERR = 901 ) 
     147901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in reference namelist', .TRUE. ) 
     148 
     149      REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist : Control prints & Benchmark 
     150      READ  ( numnam_cfg, namctl, IOSTAT = ios, ERR = 902 ) 
     151902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in configuration namelist', .TRUE. ) 
     152      WRITE( numond, namctl ) 
     153 
     154      ! 
     155      REWIND( numnam_ref )              ! Namelist namcfg in reference namelist : Control prints & Benchmark 
     156      READ  ( numnam_ref, namcfg, IOSTAT = ios, ERR = 903 ) 
     157903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in reference namelist', .TRUE. ) 
     158 
     159      REWIND( numnam_cfg )              ! Namelist namcfg in confguration namelist : Control prints & Benchmark 
     160      READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 ) 
     161904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )    
     162      WRITE( numond, namcfg ) 
     163 
    143164      !                             !--------------------------------------------! 
    144165      !                             !  set communicator & select the local node  ! 
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

    r4232 r4290  
    163163         &             jpizoom, jpjzoom, jperio 
    164164      !!---------------------------------------------------------------------- 
    165       ! 
    166       cltxt = ''      ! 
     165      cltxt = '' 
     166      ! 
    167167      !                             ! Open reference namelist and configuration namelist files 
    168168      CALL ctl_opn( numnam_ref, 'namelist_ref', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
    169169      CALL ctl_opn( numnam_cfg, 'namelist_cfg', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
    170       CALL ctl_opn( numond, 'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
     170      CALL ctl_opn( numond, 'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. , 1 ) 
    171171      ! 
    172172      REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints & Benchmark 
    173173      READ  ( numnam_ref, namctl, IOSTAT = ios, ERR = 901 ) 
    174 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in reference namelist', lwp ) 
     174901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in reference namelist', .TRUE. ) 
    175175 
    176176      REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist : Control prints & Benchmark 
    177177      READ  ( numnam_cfg, namctl, IOSTAT = ios, ERR = 902 ) 
    178 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in configuration namelist', lwp ) 
     178902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in configuration namelist', .TRUE. ) 
    179179      WRITE( numond, namctl ) 
     180 
    180181      ! 
    181182      REWIND( numnam_ref )              ! Namelist namcfg in reference namelist : Control prints & Benchmark 
    182183      READ  ( numnam_ref, namcfg, IOSTAT = ios, ERR = 903 ) 
    183 903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in reference namelist', lwp ) 
     184903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in reference namelist', .TRUE. ) 
    184185 
    185186      REWIND( numnam_cfg )              ! Namelist namcfg in confguration namelist : Control prints & Benchmark 
    186187      READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 ) 
    187 904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', lwp )    
     188904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )    
    188189      WRITE( numond, namcfg ) 
     190 
    189191      !                             !--------------------------------------------! 
    190192      !                             !  set communicator & select the local node  ! 
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

    r4159 r4290  
    185185      IF(lwp) WRITE(numout,*) '~~~~~~~' 
    186186 
    187       CALL ctl_opn( numnat_ref, 'namelist_top_ref'   , 'OLD'    , 'FORMATTED', 'SEQUENTIAL', 1, numout, .FALSE. ) 
    188       CALL ctl_opn( numnat_cfg, 'namelist_top_cfg'   , 'OLD'    , 'FORMATTED', 'SEQUENTIAL', 1, numout, .FALSE. ) 
    189       CALL ctl_opn( numont    , 'output.namelist.top', 'REPLACE', 'FORMATTED', 'SEQUENTIAL',-1, numout, .FALSE. ) 
     187      CALL ctl_opn( numnat_ref, 'namelist_top_ref'   , 'OLD'    , 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. ) 
     188      CALL ctl_opn( numnat_cfg, 'namelist_top_cfg'   , 'OLD'    , 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. ) 
     189      CALL ctl_opn( numont    , 'output.namelist.top', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE., narea ) 
    190190 
    191191      REWIND( numnat_ref )              ! Namelist namtrc in reference namelist : Passive tracer variables 
Note: See TracChangeset for help on using the changeset viewer.