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 10396 for branches – NEMO

Changeset 10396 for branches


Ignore:
Timestamp:
2018-12-14T16:04:11+01:00 (5 years ago)
Author:
jcastill
Message:

Merge branch r6232_sst_landsea_cpl@7466

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90

    r10395 r10396  
    6767      REAL(wp), INTENT(  out), DIMENSION(jpi,jpj) ::   px2          ! i-componante (defined at u-point) 
    6868      REAL(wp), INTENT(  out), DIMENSION(jpi,jpj) ::   py2          ! j-componante (defined at v-point) 
    69       !!---------------------------------------------------------------------- 
    70        
    7169      INTEGER, INTENT( IN )                       ::   kchoix       ! type of transformation    
    7270                                                                    ! = 1 change from geographic to model grid.    
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r10395 r10396  
    17691769            ! 
    17701770            SELECT CASE( sn_snd_temp%cldes) 
    1771             CASE( 'oce only'             )   ;   ztmp1(:,:) =   ztmp1(:,:) + rt0 
     1771            CASE( 'oce only'             )   ;   ztmp1(:,:) = (ztmp1(:,:) + rt0) * tmask(:,:,1) 
    17721772            CASE( 'oce and ice'          )   ;   ztmp1(:,:) =   ztmp1(:,:) + rt0 
    17731773               SELECT CASE( sn_snd_temp%clcat ) 
Note: See TracChangeset for help on using the changeset viewer.