Changeset 2789 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/BDY

Timestamp:

2011-06-27T13:18:25+02:00 (13 years ago)

Author:

cetlod

Message:

Implementation of the merge of TRA/TRP : first guess, see ticket #842

Location:

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/BDY

Files:

• bdydta.F90 (modified) (1 diff)
• bdytra.F90 (modified) (1 diff)

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90

@@ -332 +332 @@
                   ij = nbj(ib,igrd)
                   DO ik = 1, jpkm1
-                     tbdy(ib,ik) = tn(ii,ij,ik)
-                     sbdy(ib,ik) = sn(ii,ij,ik)
+                     tbdy(ib,ik) = tsn(ii,ij,ik,jp_tem)
+                     sbdy(ib,ik) = tsn(ii,ij,ik,jp_sal)
                   END DO
                END DO

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90

@@ -61 +61 @@
                ij = nbj(ib,igrd)
                zwgt = nbw(ib,igrd)
-               ta(ii,ij,ik) = ( ta(ii,ij,ik) * (1.-zwgt) + tbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)         
-               sa(ii,ij,ik) = ( sa(ii,ij,ik) * (1.-zwgt) + sbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)
+               tsa(ii,ij,ik,jp_tem) = ( tsa(ii,ij,ik,jp_tem) * (1.-zwgt) + tbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)         
+               tsa(ii,ij,ik,jp_sal) = ( tsa(ii,ij,ik,jp_sal) * (1.-zwgt) + sbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)
             END DO
          END DO 
-         !
-         CALL lbc_lnk( ta, 'T', 1. )   ; CALL lbc_lnk( sa, 'T', 1. )    ! Boundary points should be updated
+         !                                              ! Boundary points should be updated
+         CALL lbc_lnk( tsa(:,:,:,jp_tem), 'T', 1. )     
+         CALL lbc_lnk( tsa(:,:,:,jp_sal), 'T', 1. )    
          !
       ENDIF ! ln_tra_frs