Changeset 10157


Ignore:
Timestamp:
2018-09-25T13:11:52+02:00 (22 months ago)
Author:
dford
Message:

Apply patch fabm_patch_20607539_0ababeaa6b.diff from Jim Clark.

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/OPA_SRC/DIA/diaharmana.F90

    r8059 r10157  
    659659           END SUBROUTINE harm_ana_init 
    660660           SUBROUTINE harm_ana( kt ) 
    661            END SUBROUTINE harm_ana_init 
     661           END SUBROUTINE harm_ana 
    662662           SUBROUTINE gelim (a,b,x,n) 
    663            END SUBROUTINE gelim (a,b,x,n) 
     663           END SUBROUTINE gelim 
    664664            
    665665#endif 
  • branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/trcbc.F90

    r10156 r10157  
    183183         ENDIF 
    184184      ENDDO 
    185       ntra_obc = MAX( 1, nb_trcobc )   ! To avoid compilation error with bounds checking 
    186       IF( lwp ) WRITE(numout,*) ' ' 
    187       IF( lwp ) WRITE(numout,*) ' Number of passive tracers to be initialized with open boundary data :', nb_trcobc 
    188       IF( lwp ) WRITE(numout,*) ' ' 
    189       ntra_sbc = MAX( 1, nb_trcsbc )   ! To avoid compilation error with bounds checking 
    190       IF( lwp ) WRITE(numout,*) ' ' 
    191       IF( lwp ) WRITE(numout,*) ' Number of passive tracers to be initialized with surface boundary data :', nb_trcsbc 
    192       IF( lwp ) WRITE(numout,*) ' ' 
    193       ntra_cbc = MAX( 1, nb_trccbc )   ! To avoid compilation error with bounds checking 
    194       IF( lwp ) WRITE(numout,*) ' ' 
    195       IF( lwp ) WRITE(numout,*) ' Number of passive tracers to be initialized with coastal boundary data :', nb_trccbc 
    196       IF( lwp ) WRITE(numout,*) ' ' 
    197185 
    198186      ! Print summmary of Boundary Conditions 
     
    431419      ENDIF 
    432420 
    433       ! COASTAL boundary conditions        
    434       IF( nb_trccbc > 0 ) THEN 
    435         if (lwp) write(numout,'(a,i5,a,i5)') '   reading CBC data for ', nb_trccbc ,' variables at step ', kt 
    436         CALL fld_read(kt,1,sf_trccbc) 
    437       ENDIF    
    438421      ! 
    439422      IF( nn_timing == 1 )  CALL timing_stop('trc_bc_read') 
  • branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

    r8058 r10157  
    2020#endif 
    2121#if defined key_zdfgls 
    22    USE zdfgls, ONLY: en 
     22!   USE zdfgls, ONLY: en 
    2323#endif 
    2424   USE trabbl 
Note: See TracChangeset for help on using the changeset viewer.