Changeset 7198 for branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

Timestamp:

2016-11-04T18:58:24+01:00 (7 years ago)

Author:

lovato

Message:

New top interface : merge with dev_r7012_ROBUST5_CMCC (#1783) and update sette.sh

File:

• branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) (4 diffs)

branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -145 +145 @@
       INTEGER  ::   ios, ierr, icfc       ! Local integer output status for namelist read
       !!
-      NAMELIST/namtrc/jptra, ln_pisces, ln_my_trc, ln_age, ln_cfc11, ln_cfc12, ln_c14, &
-         &            sn_tracer, ln_trcdta, ln_trcdmp, ln_trcdmp_clo
+      NAMELIST/namtrc/jp_bgc, ln_pisces, ln_my_trc, ln_age, ln_cfc11, ln_cfc12, ln_c14, &
+         &            sn_tracer, ln_trcdta, ln_trcdmp, ln_trcdmp_clo, jp_dia3d, jp_dia2d
       !!---------------------------------------------------------------------
       ! Dummy settings to fill tracers data structure
@@ -167 +167 @@
       ! Control settings
       IF( ln_pisces .AND. ln_my_trc )   CALL ctl_stop( 'Choose only ONE BGC model - PISCES or MY_TRC' )
-      IF( .NOT. ln_pisces .AND. .NOT. ln_my_trc )   jptra = 0
+      IF( .NOT. ln_pisces .AND. .NOT. ln_my_trc )   jp_bgc = 0
       ll_cfc = ln_cfc11 .OR. ln_cfc12
       !
+      jptra       =  0
       jp_pisces   =  0    ;   jp_pcs0  =  0    ;   jp_pcs1  = 0
       jp_my_trc   =  0    ;   jp_myt0  =  0    ;   jp_myt1  = 0
       jp_cfc      =  0    ;   jp_cfc0  =  0    ;   jp_cfc1  = 0
-      jp_age      =  0    ;   jp_c14   = 0
+      jp_age      =  0    ;   jp_c14   =  0
       !
       IF( ln_pisces )  THEN
-         jp_pisces = jptra
+         jp_pisces = jp_bgc
          jp_pcs0   = 1
          jp_pcs1   = jp_pisces
       ENDIF
       IF( ln_my_trc )  THEN
-          jp_my_trc = jptra
+          jp_my_trc = jp_bgc
           jp_myt0   = 1
           jp_myt1   = jp_my_trc
       ENDIF
       !
-      jp_bgc  =   jptra
+      jptra  = jp_bgc
       !
       IF( ln_age )    THEN
@@ -210 +211 @@
          WRITE(numout,*) ' Namelist : namtrc'
          WRITE(numout,*) '   Total number of passive tracers              jptra         = ', jptra
+         WRITE(numout,*) '   Total number of BGC tracers                  jp_bgc        = ', jp_bgc
          WRITE(numout,*) '   Simulating PISCES model                      ln_pisces     = ', ln_pisces
          WRITE(numout,*) '   Simulating MY_TRC  model                     ln_my_trc     = ', ln_my_trc
@@ -219 +221 @@
          WRITE(numout,*) '   Damping of passive tracer (y/n)              ln_trcdmp     = ', ln_trcdmp
          WRITE(numout,*) '   Restoring of tracer on closed seas           ln_trcdmp_clo = ', ln_trcdmp_clo
-         WRITE(numout,*) '   Total number of BGC-like tracers             jp_bgc        = ', jp_bgc
          WRITE(numout,*) ' '
          WRITE(numout,*) ' '