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/PISCES/P2Z – 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:
4 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/PISCES/P2Z/p2zbio.F90

    r11949 r11960  
    403403      IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~' 
    404404      ! 
    405       REWIND( numnatp_ref )              ! Namelist namlobphy in reference namelist : Lobster biological parameters 
    406405      READ  ( numnatp_ref, namlobphy, IOSTAT = ios, ERR = 901) 
    407406901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namlobphy in reference namelist' ) 
    408       REWIND( numnatp_cfg )              ! Namelist namlobphy in configuration namelist : Lobster biological parameters 
    409407      READ  ( numnatp_cfg, namlobphy, IOSTAT = ios, ERR = 902 ) 
    410408902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namlobphy in configuration namelist' ) 
    … …  
    420418      ENDIF 
    421419 
    422       REWIND( numnatp_ref )              ! Namelist namlobnut in reference namelist : Lobster nutriments parameters 
    423420      READ  ( numnatp_ref, namlobnut, IOSTAT = ios, ERR = 903) 
    424421903   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namlobnut in reference namelist' ) 
    425       REWIND( numnatp_cfg )              ! Namelist namlobnut in configuration namelist : Lobster nutriments parameters 
    426422      READ  ( numnatp_cfg, namlobnut, IOSTAT = ios, ERR = 904 ) 
    427423904   IF( ios >  0 )   CALL ctl_nam ( ios , 'namlobnut in configuration namelist' ) 
    … …  
    437433      ENDIF 
    438434 
    439       REWIND( numnatp_ref )              ! Namelist namlobzoo in reference namelist : Lobster zooplankton parameters 
    440435      READ  ( numnatp_ref, namlobzoo, IOSTAT = ios, ERR = 905) 
    441436905   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namlobzoo in reference namelist' ) 
    442       REWIND( numnatp_cfg )              ! Namelist namlobzoo in configuration namelist : Lobster zooplankton parameters 
    443437      READ  ( numnatp_cfg, namlobzoo, IOSTAT = ios, ERR = 906 ) 
    444438906   IF( ios >  0 )   CALL ctl_nam ( ios , 'namlobzoo in configuration namelist' ) 
    … …  
    459453      ENDIF 
    460454 
    461       REWIND( numnatp_ref )              ! Namelist namlobdet in reference namelist : Lobster detritus parameters 
    462455      READ  ( numnatp_ref, namlobdet, IOSTAT = ios, ERR = 907) 
    463456907   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namlobdet in reference namelist' ) 
    464       REWIND( numnatp_cfg )              ! Namelist namlobdet in configuration namelist : Lobster detritus parameters 
    465457      READ  ( numnatp_cfg, namlobdet, IOSTAT = ios, ERR = 908 ) 
    466458908   IF( ios >  0 )   CALL ctl_nam ( ios , 'namlobdet in configuration namelist' ) 
    … …  
    474466      ENDIF 
    475467 
    476       REWIND( numnatp_ref )              ! Namelist namlobdom in reference namelist : Lobster DOM breakdown rate 
    477468      READ  ( numnatp_ref, namlobdom, IOSTAT = ios, ERR = 909) 
    478469909   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namlobdom in reference namelist' ) 
    479       REWIND( numnatp_cfg )              ! Namelist namlobdom in configuration namelist : Lobster DOM breakdown rate 
    480470      READ  ( numnatp_cfg, namlobdom, IOSTAT = ios, ERR = 910 ) 
    481471910   IF( ios >  0 )   CALL ctl_nam ( ios , 'namlobdom in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zopt.F90

    r11949 r11960  
    160160      !!---------------------------------------------------------------------- 
    161161 
    162       REWIND( numnatp_ref )              ! Namelist namlobopt in reference namelist : Lobster options 
    163162      READ  ( numnatp_ref, namlobopt, IOSTAT = ios, ERR = 901) 
    164163901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlobopt in reference namelist' ) 
    165164 
    166       REWIND( numnatp_cfg )              ! Namelist namlobopt in configuration namelist : Lobster options 
    167165      READ  ( numnatp_cfg, namlobopt, IOSTAT = ios, ERR = 902 ) 
    168166902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namlobopt in configuration namelist' ) 
    … …  
    182180      ENDIF 
    183181      ! 
    184       REWIND( numnatp_ref )              ! Namelist namlobrat in reference namelist : Lobster ratios 
    185182      READ  ( numnatp_ref, namlobrat, IOSTAT = ios, ERR = 903) 
    186183903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlobrat in reference namelist' ) 
    187184 
    188       REWIND( numnatp_cfg )              ! Namelist namlobrat in configuration namelist : Lobster ratios 
    189185      READ  ( numnatp_cfg, namlobrat, IOSTAT = ios, ERR = 904 ) 
    190186904   IF( ios >  0 ) CALL ctl_nam ( ios , 'namlobrat in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zsed.F90

    r11949 r11960  
    133133      !!---------------------------------------------------------------------- 
    134134      ! 
    135       REWIND( numnatp_ref )              ! Namelist namlobsed in reference namelist : Lobster sediments 
    136135      READ  ( numnatp_ref, namlobsed, IOSTAT = ios, ERR = 901) 
    137136901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namlosed in reference namelist' ) 
    138       REWIND( numnatp_cfg )              ! Namelist namlobsed in configuration namelist : Lobster sediments 
    139137      READ  ( numnatp_cfg, namlobsed, IOSTAT = ios, ERR = 902 ) 
    140138902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namlobsed in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.