Index: branches/2015/dev_r5171_CNRS_LIM3_seaicebgc/NEMOGCM/NEMO/TOP_SRC/PISCES/trcice_pisces.F90
===================================================================
--- branches/2015/dev_r5171_CNRS_LIM3_seaicebgc/NEMOGCM/NEMO/TOP_SRC/PISCES/trcice_pisces.F90	(revision 5195)
+++ branches/2015/dev_r5171_CNRS_LIM3_seaicebgc/NEMOGCM/NEMO/TOP_SRC/PISCES/trcice_pisces.F90	(revision 5325)
@@ -20,5 +20,4 @@
    USE phycst          ! Ocean physics parameters
    USE sms_pisces      ! PISCES Source Minus Sink variables
-   USE p4zsbc
    USE in_out_manager
 
@@ -58,17 +57,4 @@
       !!----------------------------------------------------------------------
 
-      ! --- Variable declarations --- !
-      TYPE TRC_I_NML                    !--- Ice tracer namelist structure
-         REAL(wp)         :: trc_ratio  ! ice-ocean trc ratio 
-         REAL(wp)         :: trc_prescr ! prescribed ice trc cc
-         CHARACTER(len=2) :: ctrc_o     ! choice of ocean trc cc
-      END TYPE
-
-                                        !--- Variables extracted from the
-                                        !    namelist
-      REAL(wp), DIMENSION(24)         :: trc_ice_ratio, & ! ice-ocean tracer ratio
-                                         trc_ice_prescr   ! prescribed ice trc cc
-      CHARACTER(len=2), DIMENSION(24) :: cn_trc_o ! choice of ocean tracer cc
-
                                         !--- Dummy variables
       REAL(wp), DIMENSION(jptra,2) &
@@ -83,144 +69,7 @@
       !!----------------------------------------------------------------------
 
-      ! --- Namelist declarations --- !
-
-      ! Tracer structures for individual tracers
-      TYPE(TRC_I_NML) :: sn_tri_dic, sn_tri_doc, sn_tri_tal, sn_tri_oxy, &
-                     sn_tri_cal, sn_tri_po4, sn_tri_poc, sn_tri_goc, &
-                     sn_tri_bfe, &
-                     sn_tri_num, &
-                                 sn_tri_sil, sn_tri_dsi, sn_tri_gsi, &
-                     sn_tri_phy, sn_tri_dia, sn_tri_zoo, sn_tri_mes, &
-                     sn_tri_fer, sn_tri_sfe, sn_tri_dfe, sn_tri_nfe, &
-                     sn_tri_nch, sn_tri_dch, sn_tri_no3, sn_tri_nh4
-
-     
-      NAMELIST/nampisice/ sn_tri_dic, sn_tri_doc, sn_tri_tal, sn_tri_oxy, &
-                          sn_tri_cal, sn_tri_po4, sn_tri_poc, sn_tri_goc, &
-                          sn_tri_bfe, &
-                          sn_tri_num, &
-                                      sn_tri_sil, sn_tri_dsi, sn_tri_gsi, &
-                          sn_tri_phy, sn_tri_dia, sn_tri_zoo, sn_tri_mes, &
-                          sn_tri_fer, sn_tri_sfe, sn_tri_dfe, sn_tri_nfe, &
-                          sn_tri_nch, sn_tri_dch, sn_tri_no3, sn_tri_nh4
-
-      !!----------------------------------------------------------------------
-
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) ' trc_ice_ini_pisces: Prescribed sea ice biogeochemistry '
       IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~~~~~~'
-
-      !--------------------------------------------
-      ! Read namelist
-      !--------------------------------------------
-
-      REWIND( numnatp_ref )
-      READ( numnatp_ref, nampisice )
-
-      REWIND( numnatp_cfg )
-      READ( numnatp_cfg, nampisice )
-
-      ! Assign namelist stuff
-      trc_ice_ratio(jpdic)  = sn_tri_dic%trc_ratio 
-      trc_ice_prescr(jpdic) = sn_tri_dic%trc_prescr
-      cn_trc_o      (jpdic) = sn_tri_dic%ctrc_o
-
-      trc_ice_ratio(jpdoc)  = sn_tri_doc%trc_ratio 
-      trc_ice_prescr(jpdoc) = sn_tri_doc%trc_prescr
-      cn_trc_o      (jpdoc) = sn_tri_doc%ctrc_o
-
-      trc_ice_ratio(jptal)  = sn_tri_tal%trc_ratio 
-      trc_ice_prescr(jptal) = sn_tri_tal%trc_prescr
-      cn_trc_o      (jptal) = sn_tri_tal%ctrc_o
-
-      trc_ice_ratio(jpoxy)  = sn_tri_oxy%trc_ratio 
-      trc_ice_prescr(jpoxy) = sn_tri_oxy%trc_prescr
-      cn_trc_o      (jpoxy) = sn_tri_oxy%ctrc_o
-
-      trc_ice_ratio(jpcal)  = sn_tri_cal%trc_ratio 
-      trc_ice_prescr(jpcal) = sn_tri_cal%trc_prescr
-      cn_trc_o      (jpcal) = sn_tri_cal%ctrc_o
-
-      trc_ice_ratio(jppo4)  = sn_tri_po4%trc_ratio 
-      trc_ice_prescr(jppo4) = sn_tri_po4%trc_prescr
-      cn_trc_o      (jppo4) = sn_tri_po4%ctrc_o
-
-      trc_ice_ratio(jppoc)  = sn_tri_poc%trc_ratio 
-      trc_ice_prescr(jppoc) = sn_tri_poc%trc_prescr
-      cn_trc_o      (jppoc) = sn_tri_poc%ctrc_o
-
-#if ! defined key_kriest
-      trc_ice_ratio(jpgoc)  = sn_tri_goc%trc_ratio 
-      trc_ice_prescr(jpgoc) = sn_tri_goc%trc_prescr
-      cn_trc_o      (jpgoc) = sn_tri_goc%ctrc_o
-
-      trc_ice_ratio(jpbfe)  = sn_tri_bfe%trc_ratio 
-      trc_ice_prescr(jpbfe) = sn_tri_bfe%trc_prescr
-      cn_trc_o      (jpbfe) = sn_tri_bfe%ctrc_o
-#else
-      trc_ice_ratio(jpnum)  = sn_tri_num%trc_ratio 
-      trc_ice_prescr(jpnum) = sn_tri_num%trc_prescr
-      cn_trc_o      (jpnum) = sn_tri_num%ctrc_o
-#endif
-
-      trc_ice_ratio(jpsil)  = sn_tri_sil%trc_ratio 
-      trc_ice_prescr(jpsil) = sn_tri_sil%trc_prescr
-      cn_trc_o      (jpsil) = sn_tri_sil%ctrc_o
-
-      trc_ice_ratio(jpdsi)  = sn_tri_dsi%trc_ratio 
-      trc_ice_prescr(jpdsi) = sn_tri_dsi%trc_prescr
-      cn_trc_o      (jpdsi) = sn_tri_dsi%ctrc_o
-
-      trc_ice_ratio(jpgsi)  = sn_tri_gsi%trc_ratio 
-      trc_ice_prescr(jpgsi) = sn_tri_gsi%trc_prescr
-      cn_trc_o      (jpgsi) = sn_tri_gsi%ctrc_o
-
-      trc_ice_ratio(jpphy)  = sn_tri_phy%trc_ratio 
-      trc_ice_prescr(jpphy) = sn_tri_phy%trc_prescr
-      cn_trc_o      (jpphy) = sn_tri_phy%ctrc_o
-
-      trc_ice_ratio(jpdia)  = sn_tri_dia%trc_ratio 
-      trc_ice_prescr(jpdia) = sn_tri_dia%trc_prescr
-      cn_trc_o      (jpdia) = sn_tri_dia%ctrc_o
-
-      trc_ice_ratio(jpzoo)  = sn_tri_zoo%trc_ratio 
-      trc_ice_prescr(jpzoo) = sn_tri_zoo%trc_prescr
-      cn_trc_o      (jpzoo) = sn_tri_zoo%ctrc_o
-
-      trc_ice_ratio(jpmes)  = sn_tri_mes%trc_ratio 
-      trc_ice_prescr(jpmes) = sn_tri_mes%trc_prescr
-      cn_trc_o      (jpmes) = sn_tri_mes%ctrc_o
-
-      trc_ice_ratio(jpfer)  = sn_tri_fer%trc_ratio 
-      trc_ice_prescr(jpfer) = sn_tri_fer%trc_prescr
-      cn_trc_o      (jpfer) = sn_tri_fer%ctrc_o
-
-      trc_ice_ratio(jpsfe)  = sn_tri_sfe%trc_ratio 
-      trc_ice_prescr(jpsfe) = sn_tri_sfe%trc_prescr
-      cn_trc_o      (jpsfe) = sn_tri_sfe%ctrc_o
-
-      trc_ice_ratio(jpdfe)  = sn_tri_dfe%trc_ratio 
-      trc_ice_prescr(jpdfe) = sn_tri_dfe%trc_prescr
-      cn_trc_o      (jpdfe) = sn_tri_dfe%ctrc_o
-
-      trc_ice_ratio(jpnfe)  = sn_tri_nfe%trc_ratio 
-      trc_ice_prescr(jpnfe) = sn_tri_nfe%trc_prescr
-      cn_trc_o      (jpnfe) = sn_tri_nfe%ctrc_o
-
-      trc_ice_ratio(jpnch)  = sn_tri_nch%trc_ratio 
-      trc_ice_prescr(jpnch) = sn_tri_nch%trc_prescr
-      cn_trc_o      (jpnch) = sn_tri_nch%ctrc_o
-
-      trc_ice_ratio(jpdch)  = sn_tri_dch%trc_ratio 
-      trc_ice_prescr(jpdch) = sn_tri_dch%trc_prescr
-      cn_trc_o      (jpdch) = sn_tri_dch%ctrc_o
-
-      trc_ice_ratio(jpno3)  = sn_tri_no3%trc_ratio 
-      trc_ice_prescr(jpno3) = sn_tri_no3%trc_prescr
-      cn_trc_o      (jpno3) = sn_tri_no3%ctrc_o
-
-      trc_ice_ratio(jpnh4)  = sn_tri_nh4%trc_ratio 
-      trc_ice_prescr(jpnh4) = sn_tri_nh4%trc_prescr
-      cn_trc_o      (jpnh4) = sn_tri_nh4%ctrc_o
 
       !--------------------------------------------
@@ -367,5 +216,5 @@
       zrs(2) = zsice_bal / zsoce_bal      !! ice-ocean salinity ratio, Baltic case
 
-      DO jn = 1, jptra
+      DO jn = jp_pcs0, jp_pcs1
          IF ( trc_ice_ratio(jn) >= 0._wp )  zratio(jn,:) = trc_ice_ratio(jn)
          IF ( trc_ice_ratio(jn) == -1._wp ) zratio(jn,:) = zrs(:)
@@ -376,5 +225,5 @@
       ! Sea ice tracer concentrations
       !-------------------------------
-      DO jn = 1, jptra
+      DO jn = jp_pcs0, jp_pcs1
          !-- Everywhere but in the Baltic
          IF ( trc_ice_ratio(jn) >= -1._wp ) THEN !! no prescribed concentration
@@ -391,10 +240,10 @@
                WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.    &
                       54._wp <= gphit(:,:) .AND. gphit(:,:) <= 66._wp )
-                  trc_i(:,:,jn) = zratio(jn,2) * trc_o(:,:,jn) 
+                     trc_i(:,:,jn) = zratio(jn,2) * trc_o(:,:,jn) 
                END WHERE
             ELSE                                 !! prescribed tracer concentration in ice
                WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.    &
                    54._wp <= gphit(:,:) .AND. gphit(:,:) <= 66._wp )
-                  trc_i(:,:,jn) = trc_ice_prescr(jn)
+                     trc_i(:,:,jn) = trc_ice_prescr(jn)
                END WHERE
             ENDIF ! trc_ice_ratio
