Changeset 3764 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90

Timestamp:

2013-01-23T15:33:04+01:00 (11 years ago)

Author:

smasson

Message:

dev_MERGE_2012: report bugfixes done in the trunk from r3555 to r3763 into dev_MERGE_2012

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90 (modified) (5 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90

@@ -105 +105 @@
       !!
       INTEGER  ::   ji, jj, jf                      ! dummy loop indices
-      CHARACTER(len = 40)  ::   clhstnam, clop
+      CHARACTER(len = 80)  ::   clhstnam, clop
       REAL(wp) ::   zsto, zjulian, zout,   &  ! temporary scalars
          &          zindh, zinda, zindb, ztmu
@@ -161 +161 @@
             zcmo(ji,jj,5)  = sist  (ji,jj)
             zcmo(ji,jj,6)  = fbif  (ji,jj)
+           IF (lk_lim2_vp) THEN
             zcmo(ji,jj,7)  = zindb * (  u_ice(ji,jj  ) * tmu(ji,jj  ) + u_ice(ji+1,jj  ) * tmu(ji+1,jj  )   &
                                       + u_ice(ji,jj+1) * tmu(ji,jj+1) + u_ice(ji+1,jj+1) * tmu(ji+1,jj+1) ) &
@@ -168 +169 @@
                                       + v_ice(ji,jj+1) * tmu(ji,jj+1) + v_ice(ji+1,jj+1) * tmu(ji+1,jj+1) ) &
                                   / ztmu
+           ELSE
+
+            zcmo(ji,jj,7)  = zindb * (  u_ice(ji,jj  ) * tmu(ji,jj)                       &
+             &                        + u_ice(ji-1,jj) * tmu(ji-1,jj) )                   &
+             &                    / 2.0
+            zcmo(ji,jj,8)  = zindb * (  v_ice(ji,jj  ) * tmv(ji,jj)                       &
+             &                        + v_ice(ji,jj-1) * tmv(ji,jj-1) )                   &
+             &                    / 2.0
+
+           ENDIF
             zcmo(ji,jj,9)  = sst_m(ji,jj)
             zcmo(ji,jj,10) = sss_m(ji,jj)
@@ -187 +198 @@
       niter = niter + 1
       DO jf = 1 , noumef
-         DO jj = 1 , jpj
-            DO ji = 1 , jpi
-               zfield(ji,jj) = zcmo(ji,jj,jf) * cmulti(jf) + cadd(jf)
-            END DO
-         END DO
-         
-         IF( jf == 7  .OR. jf == 8  .OR. jf == 15 .OR. jf == 16 ) THEN
+         zfield(:,:) = zcmo(:,:,jf) * cmulti(jf) + cadd(jf) * tmask(:,:,1)
+         SELECT CASE ( jf )
+         CASE ( 7, 8, 15, 16, 20, 21 )  ! velocity or stress fields (vectors)
             CALL lbc_lnk( zfield, 'T', -1. )
-         ELSE 
+         CASE DEFAULT                   ! scalar fields
             CALL lbc_lnk( zfield, 'T',  1. )
-         ENDIF
-         
+         END SELECT
+
          IF( nc(jf) == 1 )   CALL histwrite( nice, nam(jf), niter, zfield, ndim, ndex51 )
-         
+
       END DO
-      
+
       IF( ( nn_fsbc * niter ) >= nitend )   CALL histclo( nice ) 
 
@@ -209 +216 @@
    END SUBROUTINE lim_wri_2
      
-# endif
+#endif     
 
    SUBROUTINE lim_wri_init_2