Changeset 6675


Ignore:
Timestamp:
2016-06-08T17:54:56+02:00 (4 years ago)
Author:
dancopsey
Message:

Reversed changeset 6458 as I don't want to use revision 6436 of nemo_v3_6_STABLE_copy but carry on using revison 6237

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bitcomp/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r6458 r6675  
    1515   USE dom_oce         ! ocean space and time domain 
    1616   USE domvvl 
    17    USE eosbn2, only : eos_fzp ! Subroutine to calculate freezing point of seawater 
     17   USE eosbn2, only : eos_fzp ! Function to calculate freezing point of seawater 
    1818   USE phycst, only : rcp, rau0, r1_rau0, rhosn, rhoic, rt0 
    1919   USE in_out_manager  ! I/O manager 
     
    208208         CALL wrk_alloc( jpi,jpj,jpk, ztfrz3d )  
    209209         DO jk=1,jpk 
    210             CALL eos_fzp( tsn(:,:,jk,jp_sal),ztfrz3d(:,:,jk),fsdept_n(:,:,jk) ) 
     210            ztfrz3d(:,:,jk) = eos_fzp( tsn(:,:,jk,jp_sal), fsdept_n(:,:,jk) ) 
    211211         ENDDO 
    212212         tsn(:,:,:,jp_tem) = MAX( tsn(:,:,:,jp_tem), ztfrz3d ) 
     
    224224 
    225225      ! calculate surface freezing temperature and send to CICE 
    226       CALL eos_fzp( sss_m(:,:), sstfrz(:,:), fsdept_n(:,:,1) ) 
     226      sstfrz(:,:) = eos_fzp(sss_m(:,:), fsdept_n(:,:,1))  
    227227      CALL nemo2cice(sstfrz,Tf, 'T', 1. ) 
    228228 
     
    462462 
    463463! Recalculate freezing temperature and send to CICE  
    464       CALL eos_fzp( sss_m(:,:), sstfrz(:,:), fsdept_n(:,:,1) ) 
     464      sstfrz(:,:)=eos_fzp(sss_m(:,:), fsdept_n(:,:,1))  
    465465      CALL nemo2cice(sstfrz,Tf,'T', 1. ) 
    466466 
Note: See TracChangeset for help on using the changeset viewer.