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/P4Z – 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:
20 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/P4Z/p4zfechem.F90

    r11949 r11960  
    255255      ENDIF 
    256256      ! 
    257       REWIND( numnatp_ref )            ! Namelist nampisfer in reference namelist : Pisces iron chemistry 
    258257      READ  ( numnatp_ref, nampisfer, IOSTAT = ios, ERR = 901) 
    259258901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisfer in reference namelist' ) 
    260       REWIND( numnatp_cfg )            ! Namelist nampisfer in configuration namelist : Pisces iron chemistry 
    261259      READ  ( numnatp_cfg, nampisfer, IOSTAT = ios, ERR = 902 ) 
    262260902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisfer in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zflx.F90

    r11949 r11960  
    240240      ENDIF 
    241241      ! 
    242       REWIND( numnatp_ref )              ! Namelist nampisext in reference namelist : Pisces atm. conditions 
    243242      READ  ( numnatp_ref, nampisext, IOSTAT = ios, ERR = 901) 
    244243901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisext in reference namelist' ) 
    245       REWIND( numnatp_cfg )              ! Namelist nampisext in configuration namelist : Pisces atm. conditions 
    246244      READ  ( numnatp_cfg, nampisext, IOSTAT = ios, ERR = 902 ) 
    247245902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisext in configuration namelist' ) 
    … …  
    321319         ENDIF 
    322320         ! 
    323          REWIND( numnatp_ref )              ! Namelist nampisatm in reference namelist : Pisces atm. sea level pressure file 
    324321         READ  ( numnatp_ref, nampisatm, IOSTAT = ios, ERR = 901) 
    325322901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisatm in reference namelist' ) 
    326          REWIND( numnatp_cfg )              ! Namelist nampisatm in configuration namelist : Pisces atm. sea level pressure file  
    327323         READ  ( numnatp_cfg, nampisatm, IOSTAT = ios, ERR = 902 ) 
    328324902      IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisatm in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zligand.F90

    r11949 r11960  
    126126         WRITE(numout,*) '~~~~~~~~~~~~~~~' 
    127127      ENDIF 
    128       REWIND( numnatp_ref )              ! Namelist nampislig in reference namelist : Pisces remineralization 
    129128      READ  ( numnatp_ref, nampislig, IOSTAT = ios, ERR = 901) 
    130129901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampislig in reference namelist' ) 
    131       REWIND( numnatp_cfg )              ! Namelist nampislig in configuration namelist : Pisces remineralization 
    132130      READ  ( numnatp_cfg, nampislig, IOSTAT = ios, ERR = 902 ) 
    133131902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampislig in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zlim.F90

    r11949 r11960  
    253253      ENDIF 
    254254      ! 
    255       REWIND( numnatp_ref )              ! Namelist nampislim in reference namelist : Pisces nutrient limitation parameters 
    256255      READ  ( numnatp_ref, namp4zlim, IOSTAT = ios, ERR = 901) 
    257256901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zlim in reference namelist' ) 
    258       REWIND( numnatp_cfg )              ! Namelist nampislim in configuration namelist : Pisces nutrient limitation parameters  
    259257      READ  ( numnatp_cfg, namp4zlim, IOSTAT = ios, ERR = 902 ) 
    260258902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zlim in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zlys.F90

    r11949 r11960  
    163163      ENDIF 
    164164      ! 
    165       REWIND( numnatp_ref )              ! Namelist nampiscal in reference namelist : Pisces CaCO3 dissolution 
    166165      READ  ( numnatp_ref, nampiscal, IOSTAT = ios, ERR = 901) 
    167166901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampiscal in reference namelist' ) 
    168       REWIND( numnatp_cfg )              ! Namelist nampiscal in configuration namelist : Pisces CaCO3 dissolution 
    169167      READ  ( numnatp_cfg, nampiscal, IOSTAT = ios, ERR = 902 ) 
    170168902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampiscal in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmeso.F90

    r11949 r11960  
    291291      ENDIF 
    292292      ! 
    293       REWIND( numnatp_ref )              ! Namelist nampismes in reference namelist : Pisces mesozooplankton 
    294293      READ  ( numnatp_ref, namp4zmes, IOSTAT = ios, ERR = 901) 
    295294901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zmes in reference namelist' ) 
    296       REWIND( numnatp_cfg )              ! Namelist nampismes in configuration namelist : Pisces mesozooplankton 
    297295      READ  ( numnatp_cfg, namp4zmes, IOSTAT = ios, ERR = 902 ) 
    298296902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zmes in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmicro.F90

    r11949 r11960  
    244244      ENDIF 
    245245      ! 
    246       REWIND( numnatp_ref )              ! Namelist nampiszoo in reference namelist : Pisces microzooplankton 
    247246      READ  ( numnatp_ref, namp4zzoo, IOSTAT = ios, ERR = 901) 
    248247901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zzoo in reference namelist' ) 
    249       REWIND( numnatp_cfg )              ! Namelist nampiszoo in configuration namelist : Pisces microzooplankton 
    250248      READ  ( numnatp_cfg, namp4zzoo, IOSTAT = ios, ERR = 902 ) 
    251249902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zzoo in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zmort.F90

    r11949 r11960  
    230230      ENDIF 
    231231      ! 
    232       REWIND( numnatp_ref )              ! Namelist nampismort in reference namelist : Pisces phytoplankton 
    233232      READ  ( numnatp_ref, namp4zmort, IOSTAT = ios, ERR = 901) 
    234233901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zmort in reference namelist' ) 
    235       REWIND( numnatp_cfg )              ! Namelist nampismort in configuration namelist : Pisces phytoplankton 
    236234      READ  ( numnatp_cfg, namp4zmort, IOSTAT = ios, ERR = 902 ) 
    237235902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zmort in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zopt.F90

    r11949 r11960  
    402402         WRITE(numout,*) '~~~~~~~~~~~~ ' 
    403403      ENDIF 
    404       REWIND( numnatp_ref )              ! Namelist nampisopt in reference namelist : Pisces attenuation coef. and PAR 
    405404      READ  ( numnatp_ref, nampisopt, IOSTAT = ios, ERR = 901) 
    406405901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisopt in reference namelist' ) 
    407       REWIND( numnatp_cfg )              ! Namelist nampisopt in configuration namelist : Pisces attenuation coef. and PAR 
    408406      READ  ( numnatp_cfg, nampisopt, IOSTAT = ios, ERR = 902 ) 
    409407902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisopt in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zpoc.F90

    r11949 r11960  
    498498      ENDIF 
    499499      ! 
    500       REWIND( numnatp_ref )              ! Namelist nampisrem in reference namelist : Pisces remineralization 
    501500      READ  ( numnatp_ref, nampispoc, IOSTAT = ios, ERR = 901) 
    502501901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampispoc in reference namelist' ) 
    503       REWIND( numnatp_cfg )              ! Namelist nampisrem in configuration namelist : Pisces remineralization 
    504502      READ  ( numnatp_cfg, nampispoc, IOSTAT = ios, ERR = 902 ) 
    505503902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampispoc in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zprod.F90

    r11949 r11960  
    491491      ENDIF 
    492492      ! 
    493       REWIND( numnatp_ref )              ! Namelist nampisprod in reference namelist : Pisces phytoplankton production 
    494493      READ  ( numnatp_ref, namp4zprod, IOSTAT = ios, ERR = 901) 
    495494901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zprod in reference namelist' ) 
    496       REWIND( numnatp_cfg )              ! Namelist nampisprod in configuration namelist : Pisces phytoplankton production 
    497495      READ  ( numnatp_cfg, namp4zprod, IOSTAT = ios, ERR = 902 ) 
    498496902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zprod in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zrem.F90

    r11949 r11960  
    328328      ENDIF 
    329329      ! 
    330       REWIND( numnatp_ref )              ! Namelist nampisrem in reference namelist : Pisces remineralization 
    331330      READ  ( numnatp_ref, nampisrem, IOSTAT = ios, ERR = 901) 
    332331901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisrem in reference namelist' ) 
    333       REWIND( numnatp_cfg )              ! Namelist nampisrem in configuration namelist : Pisces remineralization 
    334332      READ  ( numnatp_cfg, nampisrem, IOSTAT = ios, ERR = 902 ) 
    335333902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisrem in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsbc.F90

    r11949 r11960  
    232232      ENDIF 
    233233      !                            !* set file information 
    234       REWIND( numnatp_ref )              ! Namelist nampissbc in reference namelist : Pisces external sources of nutrients 
    235234      READ  ( numnatp_ref, nampissbc, IOSTAT = ios, ERR = 901) 
    236235901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampissbc in reference namelist' ) 
    237       REWIND( numnatp_cfg )              ! Namelist nampissbc in configuration namelist : Pisces external sources of nutrients 
    238236      READ  ( numnatp_cfg, nampissbc, IOSTAT = ios, ERR = 902 ) 
    239237902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampissbc in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zsms.F90

    r11949 r11960  
    202202      ENDIF 
    203203 
    204       REWIND( numnatp_ref )              ! Namelist nampisbio in reference namelist : Pisces variables 
    205204      READ  ( numnatp_ref, nampisbio, IOSTAT = ios, ERR = 901) 
    206205901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisbio in reference namelist' ) 
    207       REWIND( numnatp_cfg )              ! Namelist nampisbio in configuration namelist : Pisces variables 
    208206      READ  ( numnatp_cfg, nampisbio, IOSTAT = ios, ERR = 902 ) 
    209207902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisbio in configuration namelist' ) 
    … …  
    233231 
    234232 
    235       REWIND( numnatp_ref )              ! Namelist nampisdmp in reference namelist : Pisces damping 
    236233      READ  ( numnatp_ref, nampisdmp, IOSTAT = ios, ERR = 905) 
    237234905   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisdmp in reference namelist' ) 
    238       REWIND( numnatp_cfg )              ! Namelist nampisdmp in configuration namelist : Pisces damping 
    239235      READ  ( numnatp_cfg, nampisdmp, IOSTAT = ios, ERR = 906 ) 
    240236906   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisdmp in configuration namelist' ) 
    … …  
    248244      ENDIF 
    249245 
    250       REWIND( numnatp_ref )              ! Namelist nampismass in reference namelist : Pisces mass conservation check 
    251246      READ  ( numnatp_ref, nampismass, IOSTAT = ios, ERR = 907) 
    252247907   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampismass in reference namelist' ) 
    253       REWIND( numnatp_cfg )              ! Namelist nampismass in configuration namelist : Pisces mass conservation check  
    254248      READ  ( numnatp_cfg, nampismass, IOSTAT = ios, ERR = 908 ) 
    255249908   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampismass in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zlim.F90

    r11949 r11960  
    449449      !!---------------------------------------------------------------------- 
    450450      ! 
    451       REWIND( numnatp_ref )              ! Namelist nampislim in reference namelist : Pisces nutrient limitation parameters 
    452451      READ  ( numnatp_ref, namp5zlim, IOSTAT = ios, ERR = 901) 
    453452901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampislim in reference namelist' ) 
    454453      ! 
    455       REWIND( numnatp_cfg )              ! Namelist nampislim in configuration namelist : Pisces nutrient limitation parameters  
    456454      READ  ( numnatp_cfg, namp5zlim, IOSTAT = ios, ERR = 902 ) 
    457455902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampislim in configuration namelist' ) 
    … …  
    490488      ENDIF 
    491489 
    492       REWIND( numnatp_ref )              ! Namelist nampislim in reference namelist : Pisces nutrient limitation parameters 
    493490      READ  ( numnatp_ref, namp5zquota, IOSTAT = ios, ERR = 903) 
    494491903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisquota in reference namelist' ) 
    495492      ! 
    496       REWIND( numnatp_cfg )              ! Namelist nampislim in configuration namelist : Pisces nutrient limitation parameters  
    497493      READ  ( numnatp_cfg, namp5zquota, IOSTAT = ios, ERR = 904 ) 
    498494904   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampisquota in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmeso.F90

    r11949 r11960  
    408408      !!---------------------------------------------------------------------- 
    409409      ! 
    410       REWIND( numnatp_ref )              ! Namelist nampismes in reference namelist : Pisces mesozooplankton 
    411410      READ  ( numnatp_ref, namp5zmes, IOSTAT = ios, ERR = 901) 
    412411901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampismes in reference namelist' ) 
    413412      ! 
    414       REWIND( numnatp_cfg )              ! Namelist nampismes in configuration namelist : Pisces mesozooplankton 
    415413      READ  ( numnatp_cfg, namp5zmes, IOSTAT = ios, ERR = 902 ) 
    416414902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampismes in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmicro.F90

    r11949 r11960  
    350350      !!---------------------------------------------------------------------- 
    351351      ! 
    352       REWIND( numnatp_ref )              ! Namelist nampiszoo in reference namelist : Pisces microzooplankton 
    353352      READ  ( numnatp_ref, namp5zzoo, IOSTAT = ios, ERR = 901) 
    354353901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zzoo in reference namelist' ) 
    355354      ! 
    356       REWIND( numnatp_cfg )              ! Namelist nampiszoo in configuration namelist : Pisces microzooplankton 
    357355      READ  ( numnatp_cfg, namp5zzoo, IOSTAT = ios, ERR = 902 ) 
    358356902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zzoo in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zmort.F90

    r11949 r11960  
    290290      !!---------------------------------------------------------------------- 
    291291 
    292       REWIND( numnatp_ref )              ! Namelist nampismort in reference namelist : Pisces phytoplankton 
    293292      READ  ( numnatp_ref, namp5zmort, IOSTAT = ios, ERR = 901) 
    294293901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zmort in reference namelist' ) 
    295294 
    296       REWIND( numnatp_cfg )              ! Namelist nampismort in configuration namelist : Pisces phytoplankton 
    297295      READ  ( numnatp_cfg, namp5zmort, IOSTAT = ios, ERR = 902 ) 
    298296902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zmort in configuration namelist' ) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p5zprod.F90

    r11949 r11960  
    583583      !!---------------------------------------------------------------------- 
    584584 
    585       REWIND( numnatp_ref )              ! Namelist nampisprod in reference namelist : Pisces phytoplankton production 
    586585      READ  ( numnatp_ref, namp5zprod, IOSTAT = ios, ERR = 901) 
    587586901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zprod in reference namelist' ) 
    588587 
    589       REWIND( numnatp_cfg )              ! Namelist nampisprod in configuration namelist : Pisces phytoplankton production 
    590588      READ  ( numnatp_cfg, namp5zprod, IOSTAT = ios, ERR = 902 ) 
    591589902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zprod in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.