Changeset 7068 for branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90

Timestamp:

2016-10-21T17:38:13+02:00 (8 years ago)

Author:

cetlod

Message:

ROBUST5_CNRS : implementation of part I of new TOP interface - 1st step -, see ticket #1782

File:

• branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90 (modified) (3 diffs)

branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90

@@ -8 +8 @@
    !!             1.0  !  2003-08 (C. Ethe)  module F90
    !!             2.0  !  2007-12  (C. Ethe, G. Madec) from trcnam.pisces.h90
-   !!----------------------------------------------------------------------
-#if defined key_pisces 
-   !!----------------------------------------------------------------------
-   !!   'key_pisces'   :                                   PISCES bio-model
    !!----------------------------------------------------------------------
    !! trc_nam_pisces       : PISCES model namelist read
@@ -74 +70 @@
 
       IF(lwp) THEN                         ! control print
-         WRITE(numout,*) ' Namelist : nampismod'
-         WRITE(numout,*) '    PISCES   model                 ln_p4z  =', ln_p4z
-         WRITE(numout,*) '    LOBSTER  model                 ln_p2z  =', ln_p2z
+         WRITE(numout,*) ' '
+         IF( ln_p4z )  WRITE(numout,*) '          PISCES  model is used'
+         IF( ln_p2z )  WRITE(numout,*) '          LOBSTER model is used'
+         WRITE(numout,*) ' '
       ENDIF
     
@@ -87 +84 @@
    END SUBROUTINE trc_nam_pisces
 
-#else
-   !!----------------------------------------------------------------------
-   !!  Dummy module :                                   No PISCES bio-model
-   !!----------------------------------------------------------------------
-CONTAINS
-   SUBROUTINE trc_nam_pisces                      ! Empty routine
-   END  SUBROUTINE  trc_nam_pisces
-#endif  
-
    !!======================================================================
 END MODULE trcnam_pisces