Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90

@@ -16 +16 @@
    USE eosbn2          ! equation of state
    USE sbc_oce         ! surface boundary condition: ocean fields
+   USE sbccpl
    USE fldread         ! read input field
    USE iom             ! I/O manager library
@@ -97 +98 @@
          
          fr_i(:,:) = tfreez( sss_m ) * tmask(:,:,1)      ! sea surface freezing temperature [Celcius]
+#if defined key_coupled 
+         a_i(:,:,1) = fr_i(:,:)         
+#endif
 
          ! Flux and ice fraction computation
@@ -110 +114 @@
                ENDIF
 
-               tn(ji,jj,1) = MAX( tn(ji,jj,1), zt_fzp )     ! avoid over-freezing point temperature
+               tsn(ji,jj,1,jp_tem) = MAX( tsn(ji,jj,1,jp_tem), zt_fzp )     ! avoid over-freezing point temperature
 
                qsr(ji,jj) = ( 1. - zfr_obs ) * qsr(ji,jj)   ! solar heat flux : zero below observed ice cover
@@ -117 +121 @@
                !      # ztrp*(t-(tgel-1.))  if observed ice and no opa ice   (zfr_obs=1 fr_i=0)
                !      # ztrp*min(0,t-tgel)  if observed ice and opa ice      (zfr_obs=1 fr_i=1)
-               zqri = ztrp * ( tb(ji,jj,1) - ( zt_fzp - 1.) )
-               zqrj = ztrp * MIN( 0., tb(ji,jj,1) - zt_fzp )
+               zqri = ztrp * ( tsb(ji,jj,1,jp_tem) - ( zt_fzp - 1.) )
+               zqrj = ztrp * MIN( 0., tsb(ji,jj,1,jp_tem) - zt_fzp )
                zqrp = ( zfr_obs * ( (1. - fr_i(ji,jj) ) * zqri    &
                  &                 +      fr_i(ji,jj)   * zqrj ) ) * tmask(ji,jj,1)