New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 2082 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/SED/seddta.F90 – NEMO

Ignore:
Timestamp:
2010-09-10T12:32:58+02:00 (14 years ago)
Author:
cetlod
Message:

Improve the merge of TRA-TRC, see ticket #717

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/SED/seddta.F90

    r1264 r2082  
    131131                  trc_data(ji,jj,9 ) = sinking2(ji,jj,ikt) 
    132132                  trc_data(ji,jj,10) = sinkcal (ji,jj,ikt) 
    133                   trc_data(ji,jj,11) = tn      (ji,jj,ikt) 
    134                   trc_data(ji,jj,12) = sn      (ji,jj,ikt) 
     133                  trc_data(ji,jj,11) = tsn     (ji,jj,ikt,jp_tem) 
     134                  trc_data(ji,jj,12) = tsn     (ji,jj,ikt,jp_sal) 
    135135#   else 
    136136                  trc_data(ji,jj,7 ) = sinksil (ji,jj,ikt) 
    137137                  trc_data(ji,jj,8 ) = sinking (ji,jj,ikt) 
    138138                  trc_data(ji,jj,9 ) = sinkcal (ji,jj,ikt) 
    139                   trc_data(ji,jj,10) = tn      (ji,jj,ikt) 
    140                   trc_data(ji,jj,11) = sn      (ji,jj,ikt)        
     139                  trc_data(ji,jj,10) = tsn     (ji,jj,ikt,jp_tem) 
     140                  trc_data(ji,jj,11) = tsn     (ji,jj,ikt,jp_sal)        
    141141#   endif 
    142142               ENDIF 
Note: See TracChangeset for help on using the changeset viewer.