Changeset 5655 for branches/UKMO

Timestamp:

2015-07-30T20:26:31+02:00 (9 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:

• DOM/domzgr.F90 (modified) (1 diff)
• SBC/sbcflx.F90 (modified) (1 diff)
• TRA/tradwl.F90 (modified) (2 diffs)

branches/UKMO/2015_V36_STABLE_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1810 +1810 @@
       IF( nn_timing == 1 )  CALL timing_start('zgr_sco')
       !
-      CALL wrk_alloc( jpi, jpj, zenv, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 )
+      CALL wrk_alloc( jpi, jpj, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 )
       !
       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

@@ -37 +37 @@
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf    ! structure of input fields (file informations, fields read)
    LOGICAL , PUBLIC    ::   ln_shelf_flx = .FALSE. ! UKMO SHELF specific flux flag
-   INTEGER             ::   jpfld_local   ! maximum number of files to
-read (locally modified depending on ln_shelf_flx) 
+   INTEGER             ::   jpfld_local   ! maximum number of files to read (locally modified depending on ln_shelf_flx) 
 
    !! * Substitutions

branches/UKMO/2015_V36_STABLE_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/TRA/tradwl.F90

@@ -16 +16 @@
    USE sbc_oce         ! surface boundary condition: ocean
    USE trc_oce         ! share SMS/Ocean variables
-   USE trdmod_oce      ! ocean variables trends
-   USE trdmod          ! ocean active tracers trends 
+   USE trd_oce         ! trends: ocean variables
+   USE trdtra          ! ocean active tracers trends 
    USE in_out_manager  ! I/O manager
    USE phycst          ! physical constants
@@ -176 +176 @@
       IF( l_trdtra ) THEN     ! qsr tracers trends saved for diagnostics
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)
-         CALL trd_mod( ztrdt, ztrds, jptra_trd_qsr, 'TRA', kt )
+         !CEODCALL trd_mod( ztrdt, ztrds, jptra_trd_qsr, 'TRA', kt )
       ENDIF
       !                       ! print mean trends (used for debugging)