Changeset 7124 for branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2016-10-26T20:08:30+02:00 (8 years ago)

Author:

lovato

Message:

New top interface : revise initialisation routines and namelist_top_cfg in ORCA2_LIM3_TRC, see ticket #1782

File:

• branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (5 diffs)

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

@@ -70 +70 @@
       !
       CALL trc_ini_sms   ! SMS
+      CALL trc_ini_inv   ! Inventories
       CALL trc_ini_trp   ! passive tracers transport
       CALL trc_ice_ini   ! Tracers in sea ice
@@ -78 +79 @@
       IF( nn_dttrc /= 1 ) &
       CALL trc_sub_ini    ! Initialize variables for substepping passive tracers
-      CALL trc_ini_inv    ! Inventories
       !
       IF( nn_timing == 1 )   CALL timing_stop('trc_init')
@@ -123 +123 @@
       IF(lwp) THEN               ! control print
          WRITE(numout,*)
-         WRITE(numout,*)
-         WRITE(numout,*) '          *** Total number of passive tracer jptra = ', jptra
-         WRITE(numout,*) '          *** Total volume of ocean                = ', areatot
-         WRITE(numout,*) '          *** Total inital content of all tracers '
+         WRITE(numout,*) '  *** Total number of passive tracer jptra = ', jptra
+         WRITE(numout,*) '  *** Total volume of ocean                = ', areatot
+         WRITE(numout,*) '  *** Total inital content of all tracers '
          WRITE(numout,*)
          DO jn = 1, jptra
@@ -140 +139 @@
          CALL prt_ctl_trc( tab4d=trn, mask=tmask, clinfo=ctrcnm )
       ENDIF
-9000  FORMAT(' tracer nb : ',i2,'      name :',a10,'      initial content :',e18.10)
+9000  FORMAT('  tracer nb : ',i2,'      name :',a10,'      initial content :',e18.10)
       !
    END SUBROUTINE trc_ini_inv
@@ -177 +176 @@
       !
       IF(lwp) THEN                   ! control print
-         WRITE(numout,*) 'ID     NAME     INI  SBC  CBC  OBC'
+         WRITE(numout,*)
+         WRITE(numout,*) ' trc_init: Summary for selected passive tracers'
+         WRITE(numout,*) ' ~~~~~~~~~~~~~~'
+         WRITE(numout,*) ' ID     NAME     INI  SBC  CBC  OBC'
          DO jn = 1, jptra
             WRITE(numout,9001) jn, TRIM(ctrcnm(jn)), ln_trc_ini(jn), ln_trc_sbc(jn),ln_trc_cbc(jn),ln_trc_obc(jn)
          END DO
-         WRITE(numout,*) ' '
       ENDIF
-9001  FORMAT(i3,1x,a10,3x,l2,3x,l2,3x,l2,3x,l2)
+9001  FORMAT(1x,i3,1x,a10,3x,l2,3x,l2,3x,l2,3x,l2)
       !
    END SUBROUTINE trc_ini_sms