Changeset 5655


Ignore:
Timestamp:
2015-07-30T20:26:31+02:00 (5 years ago)
Author:
deazer
Message:

Some modifcations for this branch required to build at 3.6_STABLE

Location:
branches/UKMO/2015_V36_STABLE_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/2015_V36_STABLE_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

    r5654 r5655  
    18101810      IF( nn_timing == 1 )  CALL timing_start('zgr_sco') 
    18111811      ! 
    1812       CALL wrk_alloc( jpi, jpj, zenv, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 ) 
     1812      CALL wrk_alloc( jpi, jpj, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 ) 
    18131813      ! 
    18141814      REWIND( numnam_ref )              ! Namelist namzgr_sco in reference namelist : Sigma-stretching parameters 
  • branches/UKMO/2015_V36_STABLE_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90

    r5654 r5655  
    3737   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf    ! structure of input fields (file informations, fields read) 
    3838   LOGICAL , PUBLIC    ::   ln_shelf_flx = .FALSE. ! UKMO SHELF specific flux flag 
    39    INTEGER             ::   jpfld_local   ! maximum number of files to 
    40 read (locally modified depending on ln_shelf_flx)  
     39   INTEGER             ::   jpfld_local   ! maximum number of files to read (locally modified depending on ln_shelf_flx)  
    4140 
    4241   !! * Substitutions 
  • branches/UKMO/2015_V36_STABLE_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/TRA/tradwl.F90

    r5654 r5655  
    1616   USE sbc_oce         ! surface boundary condition: ocean 
    1717   USE trc_oce         ! share SMS/Ocean variables 
    18    USE trdmod_oce      ! ocean variables trends 
    19    USE trdmod          ! ocean active tracers trends  
     18   USE trd_oce         ! trends: ocean variables 
     19   USE trdtra          ! ocean active tracers trends  
    2020   USE in_out_manager  ! I/O manager 
    2121   USE phycst          ! physical constants 
     
    176176      IF( l_trdtra ) THEN     ! qsr tracers trends saved for diagnostics 
    177177         ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:) 
    178          CALL trd_mod( ztrdt, ztrds, jptra_trd_qsr, 'TRA', kt ) 
     178         !CEODCALL trd_mod( ztrdt, ztrds, jptra_trd_qsr, 'TRA', kt ) 
    179179      ENDIF 
    180180      !                       ! print mean trends (used for debugging) 
Note: See TracChangeset for help on using the changeset viewer.