Changeset 5162

Timestamp:

2015-03-23T16:57:10+01:00 (8 years ago)

Author:

davestorkey

Message:

Bug fixes for 2015/dev_r5021_UKMO1_CICE_coupling

Location:

branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbccpl.F90 (modified) (2 diffs)
• sbcice_cice.F90 (modified) (5 diffs)

branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -697 +697 @@
       !!
       LOGICAL ::    llnewtx, llnewtau      ! update wind stress components and module??
-      INTEGER  ::   ji, jj, jn             ! dummy loop indices
+      INTEGER  ::   ji, jj, jl, jn         ! dummy loop indices
       INTEGER  ::   isec                   ! number of seconds since nit000 (assuming rdttra did not change since nit000)
       REAL(wp) ::   zcumulneg, zcumulpos   ! temporary scalars     
@@ -1543 +1543 @@
             ztmp4(:,:,1:jpl) = ht_p(:,:,1:jpl) 
          END SELECT 
-         IF( ssnd(jps_a_p)%laction )   CALL cpl_prism_snd( jps_a_p, isec, ztmp3, info )    
-         IF( ssnd(jps_ht_p)%laction )   CALL cpl_prism_snd( jps_ht_p, isec, ztmp4, info )    
+         IF( ssnd(jps_a_p)%laction )   CALL cpl_snd( jps_a_p, isec, ztmp3, info )    
+         IF( ssnd(jps_ht_p)%laction )   CALL cpl_snd( jps_ht_p, isec, ztmp4, info )    
       ENDIF
       !

branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -45 +45 @@
                 flatn_f,fsurfn_f,fcondtopn_f,                    &
                 uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   &
-                swvdr,swvdf,swidr,swidf
+                swvdr,swvdf,swidr,swidf,Tf
    USE ice_therm_vertical, only: calc_Tsfc
 #else
@@ -55 +55 @@
                 flatn_f,fsurfn_f,fcondtopn_f,                    &
                 uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   &
-                swvdr,swvdf,swidr,swidf
+                swvdr,swvdf,swidr,swidf,Tf
    USE ice_therm_shared, only: calc_Tsfc
    USE ice_shortwave, only: apeffn
@@ -179 +179 @@
       CALL wrk_alloc( jpi,jpj,jpk, ztfrz3d ) 
       DO jk=1,jpk
-         ztfrz3d(:,:,jk) = eos_fzp( tsn(:,:,jk,jp_sal), fsdewq(:,:,jk) )
-      ENDDO
-      sstfrz(:,:)=ztfrz(:,:,1)
+         ztfrz3d(:,:,jk) = eos_fzp( tsn(:,:,jk,jp_sal), fsdept_n(:,:,jk) )
+      ENDDO
+      sstfrz(:,:)=ztfrz3d(:,:,1)
 
       !Ensure that no temperature points are below freezing if not a NEMO restart
@@ -440 +440 @@
 
 ! Recalculate freezing temperature and send to CICE 
-      sstfrz(:,:)=tfreez(sss_m(:,:)) 
+      sstfrz(:,:)=eos_fzp(sss_m(:,:), fsdept_n(:,:,1)) 
       CALL nemo2cice(sstfrz,Tf,'T', 1. )
 
@@ -724 +724 @@
       DO jl = 1,ncat
          CALL cice2nemo(apeffn(:,:,jl,:),a_p(:,:,jl),'T', 1. )
-         CALL cice2nemo(trcrn(:,:,jl,:),ht_p(:,:,jl),'T', 1. )
+         CALL cice2nemo(trcrn(:,:,nt_hpnd,jl,:),ht_p(:,:,jl),'T', 1. )
       ENDDO
 #endif