Changeset 6675

Timestamp:

2016-06-08T17:54:56+02:00 (8 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:

• branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bitcomp/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bitcomp/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -15 +15 @@
    USE dom_oce         ! ocean space and time domain
    USE domvvl
-   USE eosbn2, only : eos_fzp ! Subroutine to calculate freezing point of seawater
+   USE eosbn2, only : eos_fzp ! Function to calculate freezing point of seawater
    USE phycst, only : rcp, rau0, r1_rau0, rhosn, rhoic, rt0
    USE in_out_manager  ! I/O manager
@@ -208 +208 @@
          CALL wrk_alloc( jpi,jpj,jpk, ztfrz3d ) 
          DO jk=1,jpk
-            CALL eos_fzp( tsn(:,:,jk,jp_sal),ztfrz3d(:,:,jk),fsdept_n(:,:,jk) )
+            ztfrz3d(:,:,jk) = eos_fzp( tsn(:,:,jk,jp_sal), fsdept_n(:,:,jk) )
          ENDDO
          tsn(:,:,:,jp_tem) = MAX( tsn(:,:,:,jp_tem), ztfrz3d )
@@ -224 +224 @@
 
       ! calculate surface freezing temperature and send to CICE
-      CALL eos_fzp( sss_m(:,:), sstfrz(:,:), fsdept_n(:,:,1) )
+      sstfrz(:,:) = eos_fzp(sss_m(:,:), fsdept_n(:,:,1)) 
       CALL nemo2cice(sstfrz,Tf, 'T', 1. )
 
@@ -462 +462 @@
 
 ! Recalculate freezing temperature and send to CICE 
-      CALL eos_fzp( sss_m(:,:), sstfrz(:,:), fsdept_n(:,:,1) )
+      sstfrz(:,:)=eos_fzp(sss_m(:,:), fsdept_n(:,:,1)) 
       CALL nemo2cice(sstfrz,Tf,'T', 1. )