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 11949 for NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/sedsfc.F90 – NEMO

Ignore:
Timestamp:
2019-11-22T15:29:17+01:00 (4 years ago)
Author:
acc
Message:

Merge in changes from 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. This just creates a fresh copy of this branch to use as the merge base. See ticket #2341

Location:
NEMO/branches/2019/dev_r11943_MERGE_2019/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src

    • Property svn:mergeinfo deleted
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/sedsfc.F90

    r10222 r11949  
    1414CONTAINS 
    1515 
    16    SUBROUTINE sed_sfc( kt ) 
     16   SUBROUTINE sed_sfc( kt, Kbb ) 
    1717      !!--------------------------------------------------------------------- 
    1818      !!                  ***  ROUTINE sed_sfc *** 
     
    2626      !!* Arguments 
    2727      INTEGER, INTENT(in) ::  kt              ! time step 
     28      INTEGER, INTENT(in) ::  Kbb             ! time index 
    2829 
    2930      ! * local variables 
     
    4950            ikt = mbkt(ji,jj) 
    5051            IF ( tmask(ji,jj,ikt) == 1 ) THEN 
    51                trb(ji,jj,ikt,jptal) = trc_data(ji,jj,1) 
    52                trb(ji,jj,ikt,jpdic) = trc_data(ji,jj,2) 
    53                trb(ji,jj,ikt,jpno3) = trc_data(ji,jj,3) * 7.625 
    54                trb(ji,jj,ikt,jppo4) = trc_data(ji,jj,4) * 122. 
    55                trb(ji,jj,ikt,jpoxy) = trc_data(ji,jj,5) 
    56                trb(ji,jj,ikt,jpsil) = trc_data(ji,jj,6) 
    57                trb(ji,jj,ikt,jpnh4) = trc_data(ji,jj,7) * 7.625 
    58                trb(ji,jj,ikt,jpfer) = trc_data(ji,jj,8) 
     52               tr(ji,jj,ikt,jptal,Kbb) = trc_data(ji,jj,1) 
     53               tr(ji,jj,ikt,jpdic,Kbb) = trc_data(ji,jj,2) 
     54               tr(ji,jj,ikt,jpno3,Kbb) = trc_data(ji,jj,3) * 7.625 
     55               tr(ji,jj,ikt,jppo4,Kbb) = trc_data(ji,jj,4) * 122. 
     56               tr(ji,jj,ikt,jpoxy,Kbb) = trc_data(ji,jj,5) 
     57               tr(ji,jj,ikt,jpsil,Kbb) = trc_data(ji,jj,6) 
     58               tr(ji,jj,ikt,jpnh4,Kbb) = trc_data(ji,jj,7) * 7.625 
     59               tr(ji,jj,ikt,jpfer,Kbb) = trc_data(ji,jj,8) 
    5960            ENDIF 
    6061         ENDDO 
Note: See TracChangeset for help on using the changeset viewer.