Changeset 2789 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90

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

File:

• branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 (modified) (2 diffs)

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90

@@ -94 +94 @@
       CALL iom_put( 'sshtot', zvolssh / area_tot )
 
-      !                                         ! thermosteric ssh
-      ztsn(:,:,:,jp_tem) = tn (:,:,:)
+      !                     
+      ztsn(:,:,:,jp_tem) = tsn(:,:,:,jp_tem)                    ! thermosteric ssh
       ztsn(:,:,:,jp_sal) = sn0(:,:,:)
       CALL eos( ztsn, zrhd )                       ! now in situ density using initial salinity
@@ -138 +138 @@
             DO ji = 1, jpi
                zztmp = area(ji,jj) * fse3t(ji,jj,jk)
-               ztemp = ztemp + zztmp * tn(ji,jj,jk)
-               zsal  = zsal  + zztmp * sn(ji,jj,jk)
+               ztemp = ztemp + zztmp * tsn(ji,jj,jk,jp_tem)
+               zsal  = zsal  + zztmp * tsn(ji,jj,jk,jp_sal)
             END DO
          END DO
       END DO
       IF( .NOT.lk_vvl ) THEN
-         ztemp = ztemp + SUM( zarea_ssh(:,:) * tn(:,:,1) )
-         zsal  = zsal  + SUM( zarea_ssh(:,:) * sn(:,:,1) )
+         ztemp = ztemp + SUM( zarea_ssh(:,:) * tsn(:,:,1,jp_tem) )
+         zsal  = zsal  + SUM( zarea_ssh(:,:) * tsn(:,:,1,jp_sal) )
       ENDIF
       IF( lk_mpp ) THEN