New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 7150 for branches/UKMO/r5936_hadgem3_cplfld/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 – NEMO

Ignore:
Timestamp:
2016-10-27T18:03:23+02:00 (7 years ago)
Author:
jcastill
Message:

Move one line of code to allow merging with another branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/r5936_hadgem3_cplfld/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r7139 r7150  
    17581758            ! 
    17591759            SELECT CASE( sn_snd_temp%cldes) 
    1760             CASE( 'none'         )       ! nothing to do 
    17611760            CASE( 'oce only'             )   ;   ztmp1(:,:) =   ztmp1(:,:) + rt0 
    17621761            CASE( 'oce and ice'          )   ;   ztmp1(:,:) =   ztmp1(:,:) + rt0 
     
    17881787                  ztmp1(:,:) = ztmp1(:,:) + tn_ice(:,:,jl) * a_i(:,:,jl) 
    17891788               ENDDO 
     1789            CASE( 'none'         )       ! nothing to do 
    17901790            CASE default                     ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_temp%cldes' ) 
    17911791            END SELECT 
Note: See TracChangeset for help on using the changeset viewer.