Changeset 3680 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

Timestamp:

2012-11-27T15:42:24+01:00 (11 years ago)

Author:

rblod

Message:

First commit of the final branch for 2012 (future nemo_3_5), see ticket #1028

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) (13 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

@@ -34 +34 @@
    USE prtctl            ! print control
    USE sms_pisces        ! PISCES bio-model
-   USE sms_lobster       ! LOBSTER bio-model
    USE wrk_nemo          ! Memory allocation
 
@@ -53 +52 @@
    INTEGER ::   ndimtrd1                        
    INTEGER, SAVE ::  ionce, icount
-#if defined key_lobster
+#if defined key_pisces_reduced
    INTEGER ::   nidtrdbio, nh_tb
    INTEGER, SAVE ::  ioncebio, icountbio
@@ -62 +61 @@
 
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) ::  ztmltrd2   !
-#if defined key_lobster
+#if defined key_pisces_reduced
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  ztmltrdbio2  ! only needed for mean diagnostics in trd_mld_bio()
 #endif
@@ -81 +80 @@
       !!----------------------------------------------------------------------
       ALLOCATE( ztmltrd2(jpi,jpj,jpltrd_trc,jptra) ,      &
-#if defined key_lobster
+#if defined key_pisces_reduced
          &      ztmltrdbio2(jpi,jpj,jpdiabio)      ,      &
 #endif
@@ -133 +132 @@
          SELECT CASE ( nn_ctls_trc )                                ! choice of the control surface
             CASE ( -2  )   ;   STOP 'trdmld_trc : not ready '     !     -> isopycnal surface (see ???)
-#if defined key_pisces || defined key_lobster
+#if defined key_pisces || defined key_pisces_reduced
             CASE ( -1  )   ;   nmld_trc(:,:) = neln(:,:)          !     -> euphotic layer with light criterion
 #endif
@@ -232 +231 @@
       INTEGER                         , INTENT(in) ::   ktrd          ! bio trend index
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in) ::   ptrc_trdmld   ! passive trc trend
-#if defined key_lobster
+#if defined key_pisces_reduced
       !
       INTEGER ::   ji, jj, jk, isum
@@ -940 +939 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in ) ::   kt                       ! ocean time-step index
-#if defined key_lobster
+#if defined key_pisces_reduced
       INTEGER  ::  jl, it, itmod
       LOGICAL  :: llwarn  = .TRUE., lldebug = .TRUE.
@@ -1217 +1216 @@
       tmltrd_csum_ln_trc (:,:,:,:) = 0.e0   ;   rmld_sum_trc       (:,:)     = 0.e0
 
-#if defined key_lobster
+#if defined key_pisces_reduced
       nmoymltrdbio   = 0
       tmltrd_sum_bio     (:,:,:) = 0.e0     ;   tmltrd_csum_ln_bio (:,:,:) = 0.e0
-      DO jl = 1, jp_lobster_trd
+      DO jl = 1, jp_pisces_trd
           ctrd_bio(jl,1) = ctrbil(jl)   ! long name
           ctrd_bio(jl,2) = ctrbio(jl)   ! short name
@@ -1234 +1233 @@
          tml_sumb_trc       (:,:,:)   = 0.e0   ;   tmltrd_csum_ub_trc (:,:,:,:) = 0.e0     ! mean
          tmltrd_atf_sumb_trc(:,:,:)   = 0.e0   ;   tmltrd_rad_sumb_trc(:,:,:)   = 0.e0 
-#if defined key_lobster
+#if defined key_pisces_reduced
          tmltrd_csum_ub_bio (:,:,:) = 0.e0
 #endif
@@ -1242 +1241 @@
       icount = 1   ;   ionce  = 1  ! open specifier   
 
-#if defined key_lobster
+#if defined key_pisces_reduced
       icountbio = 1   ;   ioncebio  = 1  ! open specifier
 #endif
@@ -1337 +1336 @@
       END DO
 
-#if defined key_lobster
+#if defined key_pisces_reduced
           !-- Create a NetCDF file and enter the define mode
           CALL dia_nam( clhstnam, nn_trd_trc, 'trdbio' )
@@ -1383 +1382 @@
       END DO
 
-#if defined key_lobster
-      DO jl = 1, jp_lobster_trd
+#if defined key_pisces_reduced
+      DO jl = 1, jp_pisces_trd
          CALL histdef(nidtrdbio, TRIM("ML_"//ctrd_bio(jl,2)), TRIM(clmxl//" ML_"//ctrd_bio(jl,1))   ,            &
              &    cltrcu, jpi, jpj, nh_tb, 1  , 1, 1  , -99 , 32, clop, zsto, zout ) ! IOIPSL: time mean
@@ -1395 +1394 @@
       END DO
 
-#if defined key_lobster
+#if defined key_pisces_reduced
       !-- Leave IOIPSL/NetCDF define mode
       CALL histend( nidtrdbio, snc4set )