Ignore:
Timestamp:
2020-05-15T09:51:24+02:00 (10 months ago)
Author:
smasson
Message:

r12581_ticket2418: update with trunk @12929, see #2418

Location:
NEMO/branches/2020/r12581_ticket2418
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r12581_ticket2418

    • Property svn:externals
      •  

        old new  
        88 
        99# SETTE 
        10 ^/utils/CI/sette@HEAD         sette 
         10^/utils/CI/sette@12798        sette 
  • NEMO/branches/2020/r12581_ticket2418/tests/ISOMIP+/MY_SRC/isfstp.F90

    r12077 r12930  
    250250      IF ( l_isfoasis .AND. ln_isf ) THEN 
    251251         ! 
    252          CALL ctl_stop( ' ln_ctl and ice shelf not tested' ) 
     252         CALL ctl_stop( 'namelist combination ln_cpl and ln_isf not tested' ) 
    253253         ! 
    254254         ! NEMO coupled to ATMO model with isf cavity need oasis method for melt computation  
     
    291291      !!---------------------------------------------------------------------- 
    292292      ! 
    293       REWIND( numnam_ref )              ! Namelist namsbc_rnf in reference namelist : Runoffs  
    294293      READ  ( numnam_ref, namisf, IOSTAT = ios, ERR = 901) 
    295294901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namisf in reference namelist' ) 
    296295      ! 
    297       REWIND( numnam_cfg )              ! Namelist namsbc_rnf in configuration namelist : Runoffs 
    298296      READ  ( numnam_cfg, namisf, IOSTAT = ios, ERR = 902 ) 
    299297902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namisf in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.