Ignore:
Timestamp:
2019-10-29T11:41:36+01:00 (2 years ago)
Author:
acc
Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Sette tested updates to branch to align with trunk changes between 10721 and 11740. Sette tests are passing but results differ from branch before these changes (except for GYRE_PISCES and VORTEX) and branch results already differed from trunk because of algorithmic fixes. Will need more checks to confirm correctness.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DOM/domvvl.F90

    r11483 r11822  
    331331      END DO 
    332332      ! 
    333       IF( ln_vvl_ztilde .OR. ln_vvl_layer .AND. ll_do_bclinic ) THEN   ! z_tilde or layer coordinate ! 
    334          !                                                            ! ------baroclinic part------ ! 
     333      IF( (ln_vvl_ztilde .OR. ln_vvl_layer) .AND. ll_do_bclinic ) THEN   ! z_tilde or layer coordinate ! 
     334         !                                                               ! ------baroclinic part------ ! 
    335335         ! I - initialization 
    336336         ! ================== 
     
    989989      REWIND( numnam_ref )              ! Namelist nam_vvl in reference namelist :  
    990990      READ  ( numnam_ref, nam_vvl, IOSTAT = ios, ERR = 901) 
    991 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nam_vvl in reference namelist', lwp ) 
     991901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nam_vvl in reference namelist' ) 
    992992      REWIND( numnam_cfg )              ! Namelist nam_vvl in configuration namelist : Parameters of the run 
    993993      READ  ( numnam_cfg, nam_vvl, IOSTAT = ios, ERR = 902 ) 
    994 902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nam_vvl in configuration namelist', lwp ) 
     994902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nam_vvl in configuration namelist' ) 
    995995      IF(lwm) WRITE ( numond, nam_vvl ) 
    996996      ! 
Note: See TracChangeset for help on using the changeset viewer.